diff options
| author | bala <bala@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-11-22 16:14:51 +0000 |
|---|---|---|
| committer | bala <bala@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-11-22 16:14:51 +0000 |
| commit | bb73aed507848a3f2ec847c06985c04deb756bde (patch) | |
| tree | 4a85d1e9a9cc03f2dee1e0e039b53cc444d1c790 /TAO/rules.tao.GNU | |
| parent | 08ee687eaed7460494eccc9b70cdcb4dac302103 (diff) | |
| download | ATCD-bb73aed507848a3f2ec847c06985c04deb756bde.tar.gz | |
ChangeLogTag:Sat Nov 22 10:12:37 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
Diffstat (limited to 'TAO/rules.tao.GNU')
| -rw-r--r-- | TAO/rules.tao.GNU | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/TAO/rules.tao.GNU b/TAO/rules.tao.GNU index 4a4ea8e4eb5..8f1cab25095 100644 --- a/TAO/rules.tao.GNU +++ b/TAO/rules.tao.GNU @@ -102,17 +102,8 @@ else # ami_callback ACE_MAKE_OPTIONS += ami_callback endif # ami_callback -ifeq ($(rt_corba),0) - CPPFLAGS += -DTAO_HAS_RT_CORBA=0 -else # rt_corba - override rt_corba = 1 - # The following line is not needed, - # the $TAO_ROOT/tao/orbconf.h file defines it by default - # CPPFLAGS += -DTAO_HAS_RT_CORBA=1 - ACE_MAKE_OPTIONS += rt_corba -endif # rt_corba - ifeq ($(corba_messaging),0) + rt_corba = 0 CPPFLAGS += -DTAO_HAS_CORBA_MESSAGING=0 else # corba_messaging override corba_messaging = 1 @@ -122,6 +113,16 @@ else # corba_messaging ACE_MAKE_OPTIONS += corba_messaging endif # corba_messaging +ifeq ($(rt_corba),0) + CPPFLAGS += -DTAO_HAS_RT_CORBA=0 +else # rt_corba + override rt_corba = 1 + # The following line is not needed, + # the $TAO_ROOT/tao/orbconf.h file defines it by default + # CPPFLAGS += -DTAO_HAS_RT_CORBA=1 + ACE_MAKE_OPTIONS += rt_corba +endif # rt_corba + ifeq ($(interceptors),0) CPPFLAGS += -DTAO_HAS_INTERCEPTORS=0 else # interceptors |