diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2003-01-21 19:29:24 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2003-01-21 19:29:24 +0000 |
| commit | 79a2fdc80d8dd6238d9335cc7f418dbfe9595148 (patch) | |
| tree | 31bdd811147f3920fef223a276619f656efc2f9e | |
| parent | eaabe01a21cb3f6c150595608204528b9e0ef0da (diff) | |
| download | ATCD-79a2fdc80d8dd6238d9335cc7f418dbfe9595148.tar.gz | |
ChangeLogTag: Tue Jan 21 19:26:12 UTC 2002 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Makefile.CosLoadBalancing | 11 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Makefile.av | 11 |
3 files changed, 29 insertions, 0 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index c708c74ac44..b10c135cfd2 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Tue Jan 21 19:28:12 UC 2003 Johnny Willemsen <jwillemsen@remedy.nl> + + * Makefile.av: + * Makefile.CosLoadBalancing: + Set the correct x_BUILD_DLL defines. These are needed for the + Cygwin/MingW and Kylix compiler. + Tue Jan 21 10:38:48 2003 Boris S Kolpackov <boris@isis-server.isis.vanderbilt.edu> * orbsvcs/tests/Security/Crash_Test/run_test.pl: fixed few diff --git a/TAO/orbsvcs/orbsvcs/Makefile.CosLoadBalancing b/TAO/orbsvcs/orbsvcs/Makefile.CosLoadBalancing index d0102c395c7..e5820775b9c 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.CosLoadBalancing +++ b/TAO/orbsvcs/orbsvcs/Makefile.CosLoadBalancing @@ -92,6 +92,17 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU LDFLAGS += -L$(TAO_ROOT)/tao -L$(TAO_ROOT)/orbsvcs/orbsvcs CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs +ifeq ($(shared_libs),1) +ifneq ($(SHLIB),) +CPPFLAGS += -DTAO_LOADBALANCING_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 diff --git a/TAO/orbsvcs/orbsvcs/Makefile.av b/TAO/orbsvcs/orbsvcs/Makefile.av index 6e6c250724d..b164ea77923 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.av +++ b/TAO/orbsvcs/orbsvcs/Makefile.av @@ -93,6 +93,17 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU LDFLAGS += -L$(TAO_ROOT)/tao -L$(TAO_ROOT)/orbsvcs/orbsvcs CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs -DTAO_ORBSVCS_HAS_AV +ifeq ($(shared_libs),1) +ifneq ($(SHLIB),) +CPPFLAGS += -DTAO_AV_BUILD_DLL +endif +endif +ifeq ($(static_libs),1) +ifneq ($(LIB),) +CPPFLAGS += -DTAO_AS_STATIC_LIBS -DACE_AS_STATIC_LIBS +endif +endif + # # Extra dependencies not caught by make depend. # |