diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2002-08-31 21:08:33 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2002-08-31 21:08:33 +0000 |
| commit | a549545f68d7dc7ae72ae7e259d516f894fd6b25 (patch) | |
| tree | 53093d1385a6af98f0c1e92f9f0904690e43dad7 | |
| parent | 0bac2e047e3a0e13aad1fe6c0f97b1042274144c (diff) | |
| download | ATCD-a549545f68d7dc7ae72ae7e259d516f894fd6b25.tar.gz | |
ChangeLogTag: Sat Aug 31 16:06:42 2002 Balachandran Natarajan <bala@isis-server.vuse.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/tao/Makefile.dirs | 2 | ||||
| -rw-r--r-- | TAO/tao/Messaging/Makefile | 10 |
3 files changed, 11 insertions, 9 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index f06eec12851..350e4b92bdf 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Sat Aug 31 16:06:42 2002 Balachandran Natarajan <bala@isis-server.vuse.vanderbilt.edu> + * tao/Messaging/Makefile: Reverted the change "Sat Aug 31 14:54:01 + 2002 Balachandran Natarajan " since there is better way to do + this. + + * tao/Makefile.dirs: Make the Messaging directory to be + conditionally compiled. + Sat Aug 31 14:54:01 2002 Balachandran Natarajan <bala@isis-server.vuse.vanderbilt.edu> * tao/Adapter.cpp: #included debug.h diff --git a/TAO/tao/Makefile.dirs b/TAO/tao/Makefile.dirs index d1818258c69..c01b1391e42 100644 --- a/TAO/tao/Makefile.dirs +++ b/TAO/tao/Makefile.dirs @@ -9,7 +9,6 @@ MAKEFILE = Makefile.dirs DIRS = \ PortableServer \ - Messaging \ DynamicAny \ DynamicInterface \ BiDir_GIOP \ @@ -29,6 +28,7 @@ ifeq ($(corba_messaging),1) DIRS += \ RTCORBA \ + Messaging \ RTPortableServer endif # corba_messaging diff --git a/TAO/tao/Messaging/Makefile b/TAO/tao/Messaging/Makefile index 0c0b20539c6..2c7d498a953 100644 --- a/TAO/tao/Messaging/Makefile +++ b/TAO/tao/Messaging/Makefile @@ -9,8 +9,8 @@ endif # ! TAO_ROOT MAKEFILE = Makefile LIBNAME = libTAO_Messaging -LIB_UNCHECKED = $(LIBNAME).a -SHLIB_UNCHECKED = $(LIBNAME).$(SOEXT) +LIB = $(LIBNAME).a +SHLIB = $(LIBNAME).$(SOEXT) ACE_SHLIBS = -lTAO_PortableServer -lTAO -lACE @@ -38,12 +38,6 @@ LSRC = $(addsuffix .cpp,$(FILES)) include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(TAO_ROOT)/rules.tao.GNU include $(ACE_ROOT)/include/makeinclude/macros.GNU - -ifeq ($(corba_messaging),1) -LIB=$(LIB_UNCHECKED) -SHLIB=$(SHLIB_UNCHECKED) -endif # corba_messaging - include $(ACE_ROOT)/include/makeinclude/rules.common.GNU include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU |