diff options
32 files changed, 46 insertions, 60 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index b63a2b13e40..9dddfc326ea 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,40 @@ +Mon Mar 12 14:56:47 2001 Nanbor Wang <nanbor@cs.wustl.edu> + + * examples/Buffered_Oneways/Makefile: + * examples/PluggableUDP/DIOP/Makefile: + * orbsvcs/IFR_Service/Makefile.IFR_Service: + * orbsvcs/IFR_Service/Makefile.TypeCodeFactory: + * orbsvcs/tests/Event/Basic/Makefile: + * orbsvcs/tests/InterfaceRepo/Application_Test/Makefile: + * orbsvcs/tests/Notify/Basic/Makefile: + * performance-tests/Pluggable/Makefile: + * performance-tests/RTCorba/Oneways/Reliable/Makefile: + * performance-tests/Thruput/TAO/Makefile: + * tests/AMI/Makefile: + * tests/Codec/Makefile: + * tests/DSI_Gateway/Makefile: + * tests/FL_Cube/Makefile: + * tests/Forwarding/Makefile: + * tests/InterOp-Naming/Makefile: + * tests/MProfile/Makefile: + * tests/MT_Server/Makefile: + * tests/Multiple_Inheritance/Makefile: + * tests/Native_Exceptions/Makefile: + * tests/OctetSeq/Makefile: + * tests/Param_Test/Makefile: + * tests/Portable_Interceptors/Benchmark/Makefile: + * tests/Portable_Interceptors/Dynamic/Makefile: + * tests/Portable_Interceptors/ForwardRequest/Makefile: + * tests/Portable_Interceptors/IORInterceptor/Makefile: + * tests/Portable_Interceptors/Service_Context_Manipulation/Makefile: + * tests/QtTests/Makefile: + * tests/Single_Read/Makefile: + * tests/Timed_Buffered_Oneways/Makefile: + * tests/Timeout/Makefile: Fixed duplicate uses of library. KCC is + the only compiler that catches this problem. Usually, this is + caused by Makefiles adding -lTAO into $(LDLIBS) but it has + already been taken care of by rule.tao.GNU. + Mon Mar 12 12:55:50 2001 Carlos O'Ryan <coryan@uci.edu> * performance-tests/Latency/client.conf: diff --git a/TAO/examples/Buffered_Oneways/Makefile b/TAO/examples/Buffered_Oneways/Makefile index 7df89084a39..ba0e518c955 100644 --- a/TAO/examples/Buffered_Oneways/Makefile +++ b/TAO/examples/Buffered_Oneways/Makefile @@ -12,8 +12,6 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LDLIBS = -lTAO - IDL_FILES = test IDL_SRC = testC.cpp testS.cpp BIN_UNCHECKED = client server diff --git a/TAO/examples/PluggableUDP/DIOP/Makefile b/TAO/examples/PluggableUDP/DIOP/Makefile index 2a4006225e0..da933f25ed4 100644 --- a/TAO/examples/PluggableUDP/DIOP/Makefile +++ b/TAO/examples/PluggableUDP/DIOP/Makefile @@ -13,7 +13,7 @@ LIBNAME = libTAO_DIOP LIB = $(LIBNAME).a SHLIB = $(LIBNAME).$(SOEXT) -ACE_SHLIBS = -lTAO -lACE +#ACE_SHLIBS = -lTAO -lACE #---------------------------------------------------------------------------- # Include macros and targets diff --git a/TAO/orbsvcs/IFR_Service/Makefile.IFR_Service b/TAO/orbsvcs/IFR_Service/Makefile.IFR_Service index a08699d242d..88f9078c5e7 100644 --- a/TAO/orbsvcs/IFR_Service/Makefile.IFR_Service +++ b/TAO/orbsvcs/IFR_Service/Makefile.IFR_Service @@ -13,7 +13,7 @@ ifndef TAO_ROOT endif LDLIBS = -lTypeCodeFactory_DLL -lTAO_Svc_Utils -lTAO_IFR_Client \ - -lTAO_IORTable -lTAO_PortableServer -lTAO -lACE + -lTAO_IORTable -lTAO_PortableServer PROG_SRCS = \ AliasDef_i.cpp \ diff --git a/TAO/orbsvcs/IFR_Service/Makefile.TypeCodeFactory b/TAO/orbsvcs/IFR_Service/Makefile.TypeCodeFactory index 3af96111531..14c9f4e46f9 100644 --- a/TAO/orbsvcs/IFR_Service/Makefile.TypeCodeFactory +++ b/TAO/orbsvcs/IFR_Service/Makefile.TypeCodeFactory @@ -12,8 +12,8 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LDLIBS = -lTAO_IFR_Client -lTAO -lACE -ACE_SHLIBS += -lTAO_IFR_Client -lTAO -lACE +LDLIBS = -lTAO_IFR_Client +ACE_SHLIBS += -lTAO_IFR_Client LIBNAME = libTypeCodeFactory_DLL LIB = $(LIBNAME).a diff --git a/TAO/orbsvcs/tests/Event/Basic/Makefile b/TAO/orbsvcs/tests/Event/Basic/Makefile index a9e0d850f30..dad7f5c660d 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Makefile +++ b/TAO/orbsvcs/tests/Event/Basic/Makefile @@ -29,7 +29,7 @@ BIN2 = Reconnect \ Random PSRC=$(addsuffix .cpp,$(BIN2)) Schedule.cpp -LDLIBS = -lECTests -lTAO_RTEvent -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO +LDLIBS = -lECTests -lTAO_RTEvent -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer CPPFLAGS += -I../lib -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs \ $(foreach svc, $(TAO_ORBSVCS), -DTAO_ORBSVCS_HAS_$(svc)) diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/Makefile b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/Makefile index d5e5381bc10..4fc685072fb 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/Makefile +++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/Makefile @@ -12,7 +12,7 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LDLIBS += -lTAO_IFR_Client -lTAO +LDLIBS += -lTAO_IFR_Client LDFLAGS += -L$(ACE_ROOT)/bin IDL_FILES = test diff --git a/TAO/orbsvcs/tests/Notify/Basic/Makefile b/TAO/orbsvcs/tests/Notify/Basic/Makefile index d097064cff6..6f45b80f2d7 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Makefile +++ b/TAO/orbsvcs/tests/Notify/Basic/Makefile @@ -29,7 +29,7 @@ endif # Naming endif # Notify PSRC=$(addsuffix .cpp,$(BIN)) Updates.cpp -LDLIBS = -lNotifyTests -lTAO_CosNotification -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_DynamicAny -lTAO_IORTable -lTAO_PortableServer -lTAO +LDLIBS = -lNotifyTests -lTAO_CosNotification -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_DynamicAny -lTAO_IORTable -lTAO_PortableServer CPPFLAGS += -I../lib -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs \ $(foreach svc, $(TAO_ORBSVCS), -DTAO_ORBSVCS_HAS_$(svc)) diff --git a/TAO/performance-tests/Pluggable/Makefile b/TAO/performance-tests/Pluggable/Makefile index 0aa2818537e..5aca4853e08 100644 --- a/TAO/performance-tests/Pluggable/Makefile +++ b/TAO/performance-tests/Pluggable/Makefile @@ -12,8 +12,6 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LDLIBS = -lTAO - IDL_FILES = PP_Test IDL_SRC = PP_TestC.cpp PP_TestS.cpp PROG_SRCS = PP_Test_Server.cpp \ diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/Makefile b/TAO/performance-tests/RTCorba/Oneways/Reliable/Makefile index e5c8eecabd3..6352d914129 100644 --- a/TAO/performance-tests/RTCorba/Oneways/Reliable/Makefile +++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/Makefile @@ -12,8 +12,6 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LDLIBS = -lTAO - IDL_FILES = test IDL_SRC = testC.cpp testS.cpp BIN_UNCHECKED = server client diff --git a/TAO/performance-tests/Thruput/TAO/Makefile b/TAO/performance-tests/Thruput/TAO/Makefile index 77ac9210c39..81452aa9508 100644 --- a/TAO/performance-tests/Thruput/TAO/Makefile +++ b/TAO/performance-tests/Thruput/TAO/Makefile @@ -12,8 +12,6 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LDLIBS = -lTAO - IDL_FILES = ttcp IDL_SRC = ttcpC.cpp ttcpS.cpp PROG_SRCS = $(IDL_SRC) client.cpp ttcp_i.cpp server.cpp utils.cpp tmplinst.cpp diff --git a/TAO/tests/AMI/Makefile b/TAO/tests/AMI/Makefile index 4e54dc7a3a3..b45616c8f21 100644 --- a/TAO/tests/AMI/Makefile +++ b/TAO/tests/AMI/Makefile @@ -12,8 +12,6 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LDLIBS = -lTAO - IDL_FILES = ami_test IDL_SRC = \ $(addsuffix C.cpp, $(IDL_FILES)) \ diff --git a/TAO/tests/Codec/Makefile b/TAO/tests/Codec/Makefile index 55bc018ea1d..cb9be61b420 100644 --- a/TAO/tests/Codec/Makefile +++ b/TAO/tests/Codec/Makefile @@ -10,8 +10,6 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LDLIBS = -lTAO - IDL_FILES = test IDL_SRC = testC BIN = client diff --git a/TAO/tests/DSI_Gateway/Makefile b/TAO/tests/DSI_Gateway/Makefile index 331ed7ad80b..0eb8b3e17f6 100644 --- a/TAO/tests/DSI_Gateway/Makefile +++ b/TAO/tests/DSI_Gateway/Makefile @@ -12,8 +12,6 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LDLIBS = -lTAO - IDL_FILES = test IDL_SRC = testC.cpp testS.cpp BIN_UNCHECKED = client server gateway diff --git a/TAO/tests/FL_Cube/Makefile b/TAO/tests/FL_Cube/Makefile index 51905ac30ef..2fae493a2d5 100644 --- a/TAO/tests/FL_Cube/Makefile +++ b/TAO/tests/FL_Cube/Makefile @@ -12,8 +12,6 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LDLIBS = -lTAO - IDL_FILES = test IDL_SRC = testC.cpp testS.cpp BIN = client server diff --git a/TAO/tests/Forwarding/Makefile b/TAO/tests/Forwarding/Makefile index 30e1b1e5661..69ac8b712b0 100644 --- a/TAO/tests/Forwarding/Makefile +++ b/TAO/tests/Forwarding/Makefile @@ -12,8 +12,6 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LDLIBS = -lTAO - IDL_FILES = test IDL_SRC = testC.cpp testS.cpp BIN = client server diff --git a/TAO/tests/InterOp-Naming/Makefile b/TAO/tests/InterOp-Naming/Makefile index a54175393ff..1e146c73db4 100644 --- a/TAO/tests/InterOp-Naming/Makefile +++ b/TAO/tests/InterOp-Naming/Makefile @@ -17,8 +17,6 @@ IDL_SRC = \ INSC.cpp \ INSS.cpp -LDLIBS = -lTAO - PROG_SRCS = \ INS_test_client.cpp \ INS_i.cpp \ diff --git a/TAO/tests/MProfile/Makefile b/TAO/tests/MProfile/Makefile index 15c4b60d06a..e4977b28f84 100644 --- a/TAO/tests/MProfile/Makefile +++ b/TAO/tests/MProfile/Makefile @@ -12,8 +12,6 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LDLIBS = -lTAO - IDL_FILES = test IDL_SRC = testC.cpp testS.cpp BIN = client server diff --git a/TAO/tests/MT_Server/Makefile b/TAO/tests/MT_Server/Makefile index 56f24120993..e4e66b7bc94 100644 --- a/TAO/tests/MT_Server/Makefile +++ b/TAO/tests/MT_Server/Makefile @@ -12,8 +12,6 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LDLIBS = -lTAO - IDL_FILES = test IDL_SRC = testC.cpp testS.cpp BIN = client server diff --git a/TAO/tests/Multiple_Inheritance/Makefile b/TAO/tests/Multiple_Inheritance/Makefile index 5cbda88a941..eba3fd5c20d 100644 --- a/TAO/tests/Multiple_Inheritance/Makefile +++ b/TAO/tests/Multiple_Inheritance/Makefile @@ -12,8 +12,6 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LDLIBS = -lTAO - IDL_FILES = Multiple_Inheritance IDL_SRC = Multiple_InheritanceC.cpp Multiple_InheritanceS.cpp PROG_SRCS = $(IDL_SRC) server.cpp client.cpp diff --git a/TAO/tests/Native_Exceptions/Makefile b/TAO/tests/Native_Exceptions/Makefile index c890328ac63..06e7ad6dc6b 100644 --- a/TAO/tests/Native_Exceptions/Makefile +++ b/TAO/tests/Native_Exceptions/Makefile @@ -12,8 +12,6 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LDLIBS = -lTAO - IDL_FILES = test IDL_SRC = testC.cpp testS.cpp BIN_UNCHECKED = client server diff --git a/TAO/tests/OctetSeq/Makefile b/TAO/tests/OctetSeq/Makefile index eb7f98a7ed1..04ea23e8365 100644 --- a/TAO/tests/OctetSeq/Makefile +++ b/TAO/tests/OctetSeq/Makefile @@ -12,8 +12,6 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LDLIBS = -lTAO - IDL_FILES = test IDL_SRC = testC.cpp testS.cpp BIN = OctetSeq client server diff --git a/TAO/tests/Param_Test/Makefile b/TAO/tests/Param_Test/Makefile index a742fdb44cc..57246aae222 100644 --- a/TAO/tests/Param_Test/Makefile +++ b/TAO/tests/Param_Test/Makefile @@ -12,9 +12,6 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LDLIBS = -lTAO -LDFLAGS += -L$(TAO_ROOT)/tao - IDL_FILES = param_test IDL_SRC = param_testCli.cpp param_testSer.cpp IDL_HDR = param_testCli.h param_testSer.h diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Makefile b/TAO/tests/Portable_Interceptors/Benchmark/Makefile index ba81280e1f0..efe08094018 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/Makefile +++ b/TAO/tests/Portable_Interceptors/Benchmark/Makefile @@ -12,8 +12,6 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LDLIBS = -lTAO - IDL_FILES = test IDL_SRC = testC.cpp testS.cpp BIN_UNCHECKED = client server diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Makefile b/TAO/tests/Portable_Interceptors/Dynamic/Makefile index 3d56bc32500..6521b7c42fa 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/Makefile +++ b/TAO/tests/Portable_Interceptors/Dynamic/Makefile @@ -12,8 +12,6 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LDLIBS = -lTAO - IDL_FILES = test IDL_SRC = testC.cpp testS.cpp BIN_UNCHECKED = client server diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Makefile b/TAO/tests/Portable_Interceptors/ForwardRequest/Makefile index e190948d60f..0fb2b8fa0ea 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/Makefile +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Makefile @@ -12,8 +12,6 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LDLIBS = -lTAO - IDL_FILES = test IDL_SRC = \ testC.cpp \ diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/Makefile b/TAO/tests/Portable_Interceptors/IORInterceptor/Makefile index 69c83a57178..451646ac875 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/Makefile +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/Makefile @@ -10,8 +10,6 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LDLIBS = -lTAO - IDL_FILES = test TAO_IDLFLAGS += -I../../.. IDL_SRC = testC.cpp testS.cpp diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Makefile b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Makefile index 8e3cd823115..39d1f888e83 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Makefile +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Makefile @@ -12,8 +12,6 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LDLIBS = -lTAO - IDL_FILES = test IDL_SRC = testC.cpp testS.cpp BIN_UNCHECKED = client server diff --git a/TAO/tests/QtTests/Makefile b/TAO/tests/QtTests/Makefile index 2cf070cb6d7..e5664787df3 100755 --- a/TAO/tests/QtTests/Makefile +++ b/TAO/tests/QtTests/Makefile @@ -12,8 +12,6 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LDLIBS = -lTAO - IDL_FILES = test IDL_SRC = testC.cpp testS.cpp BIN = client server @@ -26,8 +24,8 @@ TEST_MOC_OBJ = test_i_moc.o endif #qt_reactor ifeq ($(qt_reactor),) -CLNT_MOC = -TEST_MOC = +CLNT_MOC = +TEST_MOC = endif #qt_reactor SRC = $(addsuffix .cpp, $(BIN) test_i $(CLNT_MOC) $(TEST_MOC)) $(IDL_SRC) diff --git a/TAO/tests/Single_Read/Makefile b/TAO/tests/Single_Read/Makefile index 7bf72563779..00c49b80779 100644 --- a/TAO/tests/Single_Read/Makefile +++ b/TAO/tests/Single_Read/Makefile @@ -12,8 +12,6 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LDLIBS = -lTAO - IDL_FILES = test IDL_SRC = testC.cpp testS.cpp BIN_UNCHECKED = client server diff --git a/TAO/tests/Timed_Buffered_Oneways/Makefile b/TAO/tests/Timed_Buffered_Oneways/Makefile index 7bf72563779..00c49b80779 100644 --- a/TAO/tests/Timed_Buffered_Oneways/Makefile +++ b/TAO/tests/Timed_Buffered_Oneways/Makefile @@ -12,8 +12,6 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LDLIBS = -lTAO - IDL_FILES = test IDL_SRC = testC.cpp testS.cpp BIN_UNCHECKED = client server diff --git a/TAO/tests/Timeout/Makefile b/TAO/tests/Timeout/Makefile index 7d943d63800..c0dc99db0f9 100644 --- a/TAO/tests/Timeout/Makefile +++ b/TAO/tests/Timeout/Makefile @@ -12,8 +12,6 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LDLIBS = -lTAO - IDL_FILES = test IDL_SRC = testC.cpp testS.cpp BIN_UNCHECKED = client server |