diff options
| author | pradeep <pradeep@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-07-03 17:25:27 +0000 |
|---|---|---|
| committer | pradeep <pradeep@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-07-03 17:25:27 +0000 |
| commit | 05f811da763a8503e7722d5ff02884e9cf64f640 (patch) | |
| tree | 2071919546bade125c1437014a084aee84949988 | |
| parent | c52769050e82e43bc6896cc5cce9fc5783ce78a7 (diff) | |
| download | ATCD-05f811da763a8503e7722d5ff02884e9cf64f640.tar.gz | |
ChangeLogTag: Thu Jul 03 13:20:16 2003 Pradeep Gore <pradeep@oomworks.com>
| -rw-r--r-- | TAO/ChangeLog | 17 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Notify/RT_lib/Makefile | 11 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Notify/lib/Makefile | 11 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Notify/lib/Makefile.bor | 4 |
4 files changed, 42 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index d0b98bf3e54..f7f62544a5a 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,20 @@ +Thu Jul 03 13:20:16 2003 Pradeep Gore <pradeep@oomworks.com> + + * orbsvcs/tests/Notify/lib/Makefile.bor: + + Added TAO_DYNAMICANY to the EXTERNAL_LIBS to fix Borland static + build problems. + + * orbsvcs/tests/Notify/lib/Makefile: + * orbsvcs/tests/Notify/RT_lib/Makefile: + + Added BUILD_DLL option to CPPFLAGS. These are needed + for the cygwin/mingw compiler to export the symbols from the DLL. + + Many thanks to Johnny Willemsen <jwillemsen@remedy.nl> for all + of the above. + + Thu Jul 03 17:03:33 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl> * orbsvcs/tests/Event/lib/Makefile: diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/Makefile b/TAO/orbsvcs/tests/Notify/RT_lib/Makefile index 0c4ccf5883c..704c2f3fbc8 100644 --- a/TAO/orbsvcs/tests/Notify/RT_lib/Makefile +++ b/TAO/orbsvcs/tests/Notify/RT_lib/Makefile @@ -58,6 +58,17 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU LDFLAGS += -L$(TAO_ROOT)/tao CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs +ifeq ($(shared_libs),1) +ifneq ($(SHLIB),) +CPPFLAGS += -DTAO_RT_NOTIFY_TEST_BUILD_DLL +endif +endif +ifeq ($(static_libs),1) +ifneq ($(LIB),) +CPPFLAGS += -DTAO_AS_STATIC_LIBS -DACE_AS_STATIC_LIBS +endif +endif + #---------------------------------------------------------------------------- # Dependencies #---------------------------------------------------------------------------- diff --git a/TAO/orbsvcs/tests/Notify/lib/Makefile b/TAO/orbsvcs/tests/Notify/lib/Makefile index 09e2332c277..3321a034032 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Makefile +++ b/TAO/orbsvcs/tests/Notify/lib/Makefile @@ -92,6 +92,17 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU LDFLAGS += -L$(TAO_ROOT)/tao CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs +ifeq ($(shared_libs),1) +ifneq ($(SHLIB),) +CPPFLAGS += -DTAO_NOTIFY_TEST_BUILD_DLL +endif +endif +ifeq ($(static_libs),1) +ifneq ($(LIB),) +CPPFLAGS += -DTAO_AS_STATIC_LIBS -DACE_AS_STATIC_LIBS +endif +endif + ADDITIONAL_IDL_TARGETS = # IDL File Directory: . diff --git a/TAO/orbsvcs/tests/Notify/lib/Makefile.bor b/TAO/orbsvcs/tests/Notify/lib/Makefile.bor index fabe98e8793..3a9b30bb141 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Makefile.bor +++ b/TAO/orbsvcs/tests/Notify/lib/Makefile.bor @@ -51,7 +51,8 @@ EXTERNAL_LIBS = \ $(TAO_IORTABLE_LIB) \ $(TAO_PORTABLESERVER_LIB) \ $(TAO_ETCL_LIB) \ - $(TAO_NOTIFY_LIB) + $(TAO_NOTIFY_LIB) \ + $(TAO_DYNAMICANY_LIB) LFLAGS = \ -j$(CORE_BINDIR) \ @@ -82,6 +83,7 @@ CFLAGS = \ $(TAO_NOTIFYTESTS_CFLAGS) \ $(TAO_ETCL_CFLAGS) \ $(TAO_NOTIFY_CFLAGS) \ + $(TAO_DYNAMICANY_CFLAGS) \ -DTAO_NOTIFY_TEST_BUILD_DLL CPPDIR = . |