diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2003-01-27 09:38:28 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2003-01-27 09:38:28 +0000 |
| commit | 9246d6fc059eaf20752072933b2660f4b51e4c82 (patch) | |
| tree | 9176ec88f2a0049ddfda7b847f42d3156714cd93 | |
| parent | 3b2ff45129612c415d6bf08242232e9ced219c91 (diff) | |
| download | ATCD-9246d6fc059eaf20752072933b2660f4b51e4c82.tar.gz | |
ChangeLogTag: Mon Jan 27 09:38:12 UTC 2002 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Common.mpc | 1 | ||||
| -rw-r--r-- | TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile | 13 |
2 files changed, 13 insertions, 1 deletions
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Common.mpc b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Common.mpc index 787f064974f..87f832826b4 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Common.mpc +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Common.mpc @@ -4,4 +4,5 @@ project: taolib_with_idl { libs += TAO_PortableServer TAO requires += rt_corba idlflags += -Wb,export_macro=RTCORBA_COMMON_Export -Wb,export_include=rtcorba_common_export.h + dllflags = RTCORBA_COMMON_BUILD_DLL } diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile index 74b95763691..feae9952ce6 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile @@ -17,7 +17,7 @@ endif # ! TAO_ROOT TAO_IDLFLAGS += -Ge 1\ -Wb,export_macro=RTCORBA_COMMON_Export \ -Wb,export_include=rtcorba_common_export.h \ - + LIB = libRTCORBA_Common.a SHLIB = libRTCORBA_Common.$(SOEXT) @@ -50,6 +50,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 += -DRTCORBA_COMMON_BUILD_DLL +endif +endif +ifeq ($(static_libs),1) +ifneq ($(LIB),) +CPPFLAGS += -DTAO_AS_STATIC_LIBS -DACE_AS_STATIC_LIBS +endif +endif + .PRECIOUS: $(foreach file, $(IDL_FILES), $(foreach ext, $(IDL_EXT), $(file)$(ext)))) realclean: clean |