diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2003-01-14 07:07:35 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2003-01-14 07:07:35 +0000 |
| commit | 50aa079dcfc579f472db18e5e28c2d50815829de (patch) | |
| tree | 654edca321d648b1badbc17299ee981c962c422e | |
| parent | 86fcc969a95ed170b8f5d0aaaa266dadd0210ae7 (diff) | |
| download | ATCD-50aa079dcfc579f472db18e5e28c2d50815829de.tar.gz | |
ChangeLogTag: Tue Jan 14 07:02:12 UTC 2002 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/ChangeLog | 10 | ||||
| -rw-r--r-- | TAO/tao/DynamicAny/Makefile | 12 | ||||
| -rw-r--r-- | TAO/tao/DynamicInterface/Makefile | 12 | ||||
| -rw-r--r-- | TAO/tao/IORManipulation/Makefile | 12 | ||||
| -rw-r--r-- | TAO/tao/IORTable/Makefile | 12 | ||||
| -rw-r--r-- | TAO/tao/Messaging/Makefile | 12 |
6 files changed, 70 insertions, 0 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index f20e5c0aaf1..c6924b1e41f 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,13 @@ +Tue Jan 14 07:05:21 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl> + + * tao/DynamicAny/Makefile: + * tao/DynamicInterface/Makefile: + * tao/IORManipulation/Makefile: + * tao/IORTable/Makefile: + * tao/Messaging/Makefile: + Set the correct BUILD_DLL define when building a shared lib, + this is needed for the Cygwin, MingW and Kylix compiler + Mon Jan 13 20:52:43 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl> * tao/BiDir_GIOP/Makefile: diff --git a/TAO/tao/DynamicAny/Makefile b/TAO/tao/DynamicAny/Makefile index 24f65985d97..a3b7323359f 100644 --- a/TAO/tao/DynamicAny/Makefile +++ b/TAO/tao/DynamicAny/Makefile @@ -54,6 +54,18 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU LDFLAGS += -L$(TAO_ROOT)/tao CPPFLAGS += -I$(TAO_ROOT) +ifeq ($(shared_libs),1) +ifneq ($(SHLIB),) +CPPFLAGS += -DTAO_DYNAMICANY_BUILD_DLL +endif +endif + +ifeq ($(static_libs),1) +ifneq ($(LIB),) +CPPFLAGS += -DTAO_AS_STATIC_LIBS +endif +endif + #---------------------------------------------------------------------------- # Dependencies #---------------------------------------------------------------------------- diff --git a/TAO/tao/DynamicInterface/Makefile b/TAO/tao/DynamicInterface/Makefile index fb9baab82ee..afe50df6846 100644 --- a/TAO/tao/DynamicInterface/Makefile +++ b/TAO/tao/DynamicInterface/Makefile @@ -50,6 +50,18 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU LDFLAGS += -L$(TAO_ROOT)/tao CPPFLAGS += -I$(TAO_ROOT) +ifeq ($(shared_libs),1) +ifneq ($(SHLIB),) +CPPFLAGS += -DTAO_DYNAMICINTERFACE_BUILD_DLL +endif +endif + +ifeq ($(static_libs),1) +ifneq ($(LIB),) +CPPFLAGS += -DTAO_AS_STATIC_LIBS +endif +endif + #---------------------------------------------------------------------------- # Dependencies #---------------------------------------------------------------------------- diff --git a/TAO/tao/IORManipulation/Makefile b/TAO/tao/IORManipulation/Makefile index c3e0f13ba3a..264d02d8696 100644 --- a/TAO/tao/IORManipulation/Makefile +++ b/TAO/tao/IORManipulation/Makefile @@ -47,6 +47,18 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU LDFLAGS += -L$(TAO_ROOT)/tao CPPFLAGS += -I$(TAO_ROOT) +ifeq ($(shared_libs),1) +ifneq ($(SHLIB),) +CPPFLAGS += -DTAO_IORMANIP_BUILD_DLL +endif +endif + +ifeq ($(static_libs),1) +ifneq ($(LIB),) +CPPFLAGS += -DTAO_AS_STATIC_LIBS +endif +endif + #---------------------------------------------------------------------------- # Dependencies #---------------------------------------------------------------------------- diff --git a/TAO/tao/IORTable/Makefile b/TAO/tao/IORTable/Makefile index 76698ff180b..723fb9eea65 100644 --- a/TAO/tao/IORTable/Makefile +++ b/TAO/tao/IORTable/Makefile @@ -45,6 +45,18 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU LDFLAGS += -L$(TAO_ROOT)/tao CPPFLAGS += -I$(TAO_ROOT) +ifeq ($(shared_libs),1) +ifneq ($(SHLIB),) +CPPFLAGS += -DTAO_IORTABLE_BUILD_DLL +endif +endif + +ifeq ($(static_libs),1) +ifneq ($(LIB),) +CPPFLAGS += -DTAO_AS_STATIC_LIBS +endif +endif + #---------------------------------------------------------------------------- # Dependencies #---------------------------------------------------------------------------- diff --git a/TAO/tao/Messaging/Makefile b/TAO/tao/Messaging/Makefile index 4d5a26aa2d1..4605acbf781 100644 --- a/TAO/tao/Messaging/Makefile +++ b/TAO/tao/Messaging/Makefile @@ -55,6 +55,18 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU LDFLAGS += -L$(TAO_ROOT)/tao CPPFLAGS += -I$(TAO_ROOT) +ifeq ($(shared_libs),1) +ifneq ($(SHLIB),) +CPPFLAGS += -DTAO_MESSAGING_BUILD_DLL +endif +endif + +ifeq ($(static_libs),1) +ifneq ($(LIB),) +CPPFLAGS += -DTAO_AS_STATIC_LIBS +endif +endif + #---------------------------------------------------------------------------- # Dependencies #---------------------------------------------------------------------------- |