diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2003-02-02 13:05:37 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2003-02-02 13:05:37 +0000 |
| commit | b8ddfa11b8b6e31b68f5d8bfaf088b6bb2c0320b (patch) | |
| tree | bd4e1d0f7224ae9bf3bf6cf46680ff11b6a2aed3 | |
| parent | 55e53072a57cb9f00110fb5d51e054d90991d11b (diff) | |
| download | ATCD-b8ddfa11b8b6e31b68f5d8bfaf088b6bb2c0320b.tar.gz | |
ChangeLogTag: Sun Feb 02 13:03:12 UTC 2002 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/ChangeLog | 13 | ||||
| -rw-r--r-- | TAO/tests/Collocation/Makefile.impl | 12 | ||||
| -rw-r--r-- | TAO/tests/Collocation/Makefile.stub | 12 |
3 files changed, 34 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 9d4a3906e43..46dca87766c 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Sun Feb 2 13:05:12 2003 Ossama Othman <ossama@uci.edu> + + * tests/Collocation/Makefile.impl: + * tests/Collocation/Makefile.stub: + Set the correct x_BUILD_DLL define. This is needed for the + Cygwin/MingW and Kylix compiler. + Sat Feb 1 09:03:55 2003 Ossama Othman <ossama@uci.edu> * orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Monitor.cpp (loads): @@ -14,16 +21,16 @@ Fri Jan 31 17:07:20 2003 Pradeep Gore <pradeep@oomworks.com> * orbsvcs/orbsvcs/Notify/Worker_Task.h: The is a Refcountable object now. - + * orbsvcs/orbsvcs/Notify/Reactive_Task.cpp: * orbsvcs/orbsvcs/Notify/Reactive_Task.h: Modifications for Refcounting support. - + * orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp: * orbsvcs/orbsvcs/Notify/ThreadPool_Task.h: Instead of relying on the thread count, the <close> method decrements the count on the Task Object. - + * orbsvcs/orbsvcs/Notify/Object.cpp: Apply refcounting to Task objects. diff --git a/TAO/tests/Collocation/Makefile.impl b/TAO/tests/Collocation/Makefile.impl index ea29fbe7f1f..90b15508a05 100644 --- a/TAO/tests/Collocation/Makefile.impl +++ b/TAO/tests/Collocation/Makefile.impl @@ -57,6 +57,18 @@ include $(TAO_ROOT)/taoconfig.mk realclean: clean -$(RM) DiamondC.* DiamondS.* DiamondS_T.* +ifeq ($(shared_libs),1) +ifneq ($(SHLIB),) +CPPFLAGS += -DDIAMOND_BUILD_DLL +endif +endif + +ifeq ($(static_libs),1) +ifneq ($(LIB),) +CPPFLAGS += -DACE_AS_STATIC_LIBS -DTAO_AS_STATIC_LIBS +endif +endif + # DO NOT DELETE THIS LINE -- g++dep uses it. # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. diff --git a/TAO/tests/Collocation/Makefile.stub b/TAO/tests/Collocation/Makefile.stub index db9485758f2..137ec4ac02a 100644 --- a/TAO/tests/Collocation/Makefile.stub +++ b/TAO/tests/Collocation/Makefile.stub @@ -55,6 +55,18 @@ include $(TAO_ROOT)/taoconfig.mk realclean: clean -$(RM) DiamondC.* DiamondS.* DiamondS_T.* +ifeq ($(shared_libs),1) +ifneq ($(SHLIB),) +CPPFLAGS += -DMY_STUB_BUILD_DLL +endif +endif + +ifeq ($(static_libs),1) +ifneq ($(LIB),) +CPPFLAGS += -DACE_AS_STATIC_LIBS -DTAO_AS_STATIC_LIBS +endif +endif + # DO NOT DELETE THIS LINE -- g++dep uses it. # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. |