diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2003-01-13 20:58:44 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2003-01-13 20:58:44 +0000 |
commit | 573d865e218345dc0d6956bbdcb6ade66274525f (patch) | |
tree | dff29f74c0e9c4b4643dc967a8aa21ad79ed4248 | |
parent | bf5841dbcb2c5253b05c03a63197e800db25188e (diff) | |
download | ATCD-573d865e218345dc0d6956bbdcb6ade66274525f.tar.gz |
ChangeLogTag: Mon Jan 13 20:56:12 UTC 2002 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r-- | TAO/tao/BiDir_GIOP/Makefile | 12 | ||||
-rw-r--r-- | TAO/tao/IFR_Client/Makefile | 12 | ||||
-rw-r--r-- | TAO/tao/PortableServer/Makefile | 12 | ||||
-rw-r--r-- | TAO/tao/Strategies/Makefile | 12 |
4 files changed, 48 insertions, 0 deletions
diff --git a/TAO/tao/BiDir_GIOP/Makefile b/TAO/tao/BiDir_GIOP/Makefile index 58e10c6b857..f11b232d79d 100644 --- a/TAO/tao/BiDir_GIOP/Makefile +++ b/TAO/tao/BiDir_GIOP/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_BIDIRGIOP_BUILD_DLL +endif +endif + +ifeq ($(static_libs),1) +ifneq ($(LIB),) +CPPFLAGS += -DTAO_AS_STATIC_LIBS +endif +endif + #---------------------------------------------------------------------------- # Dependencies #---------------------------------------------------------------------------- diff --git a/TAO/tao/IFR_Client/Makefile b/TAO/tao/IFR_Client/Makefile index 90c09225dc7..c0353c58423 100644 --- a/TAO/tao/IFR_Client/Makefile +++ b/TAO/tao/IFR_Client/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_IFR_CLIENT_BUILD_DLL +endif +endif + +ifeq ($(static_libs),1) +ifneq ($(LIB),) +CPPFLAGS += -DTAO_AS_STATIC_LIBS +endif +endif + #---------------------------------------------------------------------------- # Dependencies #---------------------------------------------------------------------------- diff --git a/TAO/tao/PortableServer/Makefile b/TAO/tao/PortableServer/Makefile index dbb298ab833..0995ce416ef 100644 --- a/TAO/tao/PortableServer/Makefile +++ b/TAO/tao/PortableServer/Makefile @@ -88,6 +88,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_PORTABLESERVER_BUILD_DLL +endif +endif + +ifeq ($(static_libs),1) +ifneq ($(LIB),) +CPPFLAGS += -DTAO_AS_STATIC_LIBS +endif +endif + #---------------------------------------------------------------------------- # Dependencies #---------------------------------------------------------------------------- diff --git a/TAO/tao/Strategies/Makefile b/TAO/tao/Strategies/Makefile index 3129a84275d..f61cc5b3b85 100644 --- a/TAO/tao/Strategies/Makefile +++ b/TAO/tao/Strategies/Makefile @@ -75,6 +75,18 @@ include $(TAO_ROOT)/taoconfig.mk LDFLAGS += -L$(TAO_ROOT)/tao CPPFLAGS += -I$(TAO_ROOT) +ifeq ($(shared_libs),1) +ifneq ($(SHLIB),) +CPPFLAGS += -DTAO_STRATEGIES_BUILD_DLL +endif +endif + +ifeq ($(static_libs),1) +ifneq ($(LIB),) +CPPFLAGS += -DTAO_AS_STATIC_LIBS +endif +endif + #---------------------------------------------------------------------------- # Dependencies #---------------------------------------------------------------------------- |