diff options
author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-10-31 23:56:04 +0000 |
---|---|---|
committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-10-31 23:56:04 +0000 |
commit | 025173006517d0488b0c0c010b6021a663e1e26f (patch) | |
tree | 01f0e3dcebc8f8c5a1717e34edbd447004483a9f | |
parent | 6487e5280ac01bf8384eeaa2b1306ca6f002279b (diff) | |
download | ATCD-025173006517d0488b0c0c010b6021a663e1e26f.tar.gz |
Added TAO_DynamicInterface to linked libraries.
-rw-r--r-- | TAO/examples/POA/DSI/Makefile | 2 | ||||
-rw-r--r-- | TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile | 2 | ||||
-rw-r--r-- | TAO/performance-tests/Latency/Makefile | 2 | ||||
-rw-r--r-- | TAO/tests/DSI_Gateway/Makefile | 47 | ||||
-rw-r--r-- | TAO/tests/Param_Test/Makefile | 2 |
5 files changed, 44 insertions, 11 deletions
diff --git a/TAO/examples/POA/DSI/Makefile b/TAO/examples/POA/DSI/Makefile index 36c71db0bf5..3d892bea570 100644 --- a/TAO/examples/POA/DSI/Makefile +++ b/TAO/examples/POA/DSI/Makefile @@ -48,7 +48,7 @@ include $(TAO_ROOT)/taoconfig.mk .PRECIOUS: DatabaseC.h DatabaseC.i DatabaseC.cpp DatabaseS.h DatabaseS.i DatabaseS.cpp DatabaseS_T.h DatabaseS_T.i DatabaseS_T.cpp server: $(addprefix $(VDIR),$(FILE_SVR_OBJS)) - $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_SRVR_LIBS) $(POSTLINK) + $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_DYNAMIC_LIBS) $(TAO_SRVR_LIBS) $(POSTLINK) client: $(addprefix $(VDIR),$(FILE_CLT_OBJS)) $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_SRVR_LIBS) $(POSTLINK) diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile b/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile index b6366daf1ae..bca40dcf594 100644 --- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile +++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile @@ -69,7 +69,7 @@ endif # cxx .PRECIOUS: cubitC.cpp cubitS.cpp cubitC.h cubitS.h client: $(addprefix $(VDIR),$(CUBIT_CLT_OBJS)) - $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) + $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_DYNAMIC_LIBS) $(VLDLIBS) $(POSTLINK) ../IDL_Cubit/server: cd ../IDL_Cubit; $(MAKE) BIN=server diff --git a/TAO/performance-tests/Latency/Makefile b/TAO/performance-tests/Latency/Makefile index f93f8eeaccd..9d2a05a2506 100644 --- a/TAO/performance-tests/Latency/Makefile +++ b/TAO/performance-tests/Latency/Makefile @@ -77,7 +77,7 @@ st_client: $(addprefix $(VDIR),$(ST_CLIENT_OBJS)) $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_CLNT_LIBS) $(POSTLINK) deferred_synch_client: $(addprefix $(VDIR),$(DII_CLIENT_OBJS)) - $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_CLNT_LIBS) $(POSTLINK) + $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_DYNAMIC_LIBS) $(TAO_CLNT_LIBS) $(POSTLINK) server: $(addprefix $(VDIR),$(SERVER_OBJS)) $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_SRVR_LIBS) $(POSTLINK) diff --git a/TAO/tests/DSI_Gateway/Makefile b/TAO/tests/DSI_Gateway/Makefile index 49cd94141ee..4d456acd2a7 100644 --- a/TAO/tests/DSI_Gateway/Makefile +++ b/TAO/tests/DSI_Gateway/Makefile @@ -49,13 +49,13 @@ include $(TAO_ROOT)/taoconfig.mk .PRECIOUS: $(foreach ext, $(IDL_EXT), test$(ext)) server: $(addprefix $(VDIR),$(SERVER_OBJS)) - $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_SRVR_LIBS) $(POSTLINK) + $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_DYNAMIC_LIBS) $(TAO_SRVR_LIBS) $(POSTLINK) gateway: $(addprefix $(VDIR),$(GATEWAY_OBJS)) - $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_SRVR_LIBS) $(POSTLINK) + $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_DYNAMIC_LIBS) $(TAO_SRVR_LIBS) $(POSTLINK) client: $(addprefix $(VDIR),$(CLIENT_OBJS)) - $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_CLNT_LIBS) $(POSTLINK) + $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_DYNAMIC_LIBS) $(TAO_CLNT_LIBS) $(POSTLINK) realclean: clean -$(RM) $(foreach ext, $(IDL_EXT), test$(ext)) @@ -69,6 +69,8 @@ realclean: clean $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -223,8 +225,7 @@ realclean: clean $(ACE_ROOT)/ace/Module.cpp \ $(ACE_ROOT)/ace/Stream_Modules.h \ $(ACE_ROOT)/ace/Stream_Modules.cpp \ - testC.h \ - $(TAO_ROOT)/tao/corba.h \ + testC.h $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/CDR_Base.inl \ @@ -293,6 +294,8 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Server_Request.i \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Smart_Proxies.h \ + $(TAO_ROOT)/tao/Smart_Proxies.i \ $(TAO_ROOT)/tao/Stub.h \ $(TAO_ROOT)/tao/Pluggable.h \ $(TAO_ROOT)/tao/Pluggable.i \ @@ -379,6 +382,7 @@ realclean: clean $(TAO_ROOT)/tao/WrongTransactionC.h \ $(TAO_ROOT)/tao/InterfaceC.h \ $(TAO_ROOT)/tao/ifrfwd.h \ + $(TAO_ROOT)/tao/InterfaceC.i \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ $(TAO_ROOT)/tao/OctetSeqC.h \ @@ -392,6 +396,8 @@ realclean: clean .obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp test_i.h testS.h testC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -546,6 +552,8 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Server_Request.i \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Smart_Proxies.h \ + $(TAO_ROOT)/tao/Smart_Proxies.i \ $(TAO_ROOT)/tao/Stub.h \ $(TAO_ROOT)/tao/Pluggable.h \ $(ACE_ROOT)/ace/Message_Queue.h \ @@ -691,6 +699,7 @@ realclean: clean $(TAO_ROOT)/tao/WrongTransactionC.h \ $(TAO_ROOT)/tao/InterfaceC.h \ $(TAO_ROOT)/tao/ifrfwd.h \ + $(TAO_ROOT)/tao/InterfaceC.i \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ $(TAO_ROOT)/tao/OctetSeqC.h \ @@ -726,6 +735,8 @@ realclean: clean .obj/gateway.o .obj/gateway.so .shobj/gateway.o .shobj/gateway.so: gateway.cpp test_dsi.h testS.h testC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -880,6 +891,8 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Server_Request.i \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Smart_Proxies.h \ + $(TAO_ROOT)/tao/Smart_Proxies.i \ $(TAO_ROOT)/tao/Stub.h \ $(TAO_ROOT)/tao/Pluggable.h \ $(ACE_ROOT)/ace/Message_Queue.h \ @@ -1025,6 +1038,7 @@ realclean: clean $(TAO_ROOT)/tao/WrongTransactionC.h \ $(TAO_ROOT)/tao/InterfaceC.h \ $(TAO_ROOT)/tao/ifrfwd.h \ + $(TAO_ROOT)/tao/InterfaceC.i \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ $(TAO_ROOT)/tao/OctetSeqC.h \ @@ -1050,8 +1064,7 @@ realclean: clean $(TAO_ROOT)/tao/DynamicInterface/Context.inl \ $(TAO_ROOT)/tao/DynamicInterface/Server_Request.inl \ $(TAO_ROOT)/tao/DynamicInterface/Dynamic_Implementation.h \ - test_dsi.i \ - $(ACE_ROOT)/ace/Get_Opt.h \ + test_dsi.i $(ACE_ROOT)/ace/Get_Opt.h \ $(ACE_ROOT)/ace/Get_Opt.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Task.i \ @@ -1067,6 +1080,8 @@ realclean: clean .obj/test_i.o .obj/test_i.so .shobj/test_i.o .shobj/test_i.so: test_i.cpp test_i.h testS.h testC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1221,6 +1236,8 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Server_Request.i \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Smart_Proxies.h \ + $(TAO_ROOT)/tao/Smart_Proxies.i \ $(TAO_ROOT)/tao/Stub.h \ $(TAO_ROOT)/tao/Pluggable.h \ $(ACE_ROOT)/ace/Message_Queue.h \ @@ -1366,6 +1383,7 @@ realclean: clean $(TAO_ROOT)/tao/WrongTransactionC.h \ $(TAO_ROOT)/tao/InterfaceC.h \ $(TAO_ROOT)/tao/ifrfwd.h \ + $(TAO_ROOT)/tao/InterfaceC.i \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ $(TAO_ROOT)/tao/OctetSeqC.h \ @@ -1389,6 +1407,8 @@ realclean: clean .obj/test_dsi.o .obj/test_dsi.so .shobj/test_dsi.o .shobj/test_dsi.so: test_dsi.cpp test_dsi.h testS.h testC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1543,6 +1563,8 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Server_Request.i \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Smart_Proxies.h \ + $(TAO_ROOT)/tao/Smart_Proxies.i \ $(TAO_ROOT)/tao/Stub.h \ $(TAO_ROOT)/tao/Pluggable.h \ $(ACE_ROOT)/ace/Message_Queue.h \ @@ -1688,6 +1710,7 @@ realclean: clean $(TAO_ROOT)/tao/WrongTransactionC.h \ $(TAO_ROOT)/tao/InterfaceC.h \ $(TAO_ROOT)/tao/ifrfwd.h \ + $(TAO_ROOT)/tao/InterfaceC.i \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ $(TAO_ROOT)/tao/OctetSeqC.h \ @@ -1722,6 +1745,8 @@ realclean: clean .obj/testC.o .obj/testC.so .shobj/testC.o .shobj/testC.so: testC.cpp testC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1876,6 +1901,8 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Server_Request.i \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Smart_Proxies.h \ + $(TAO_ROOT)/tao/Smart_Proxies.i \ $(TAO_ROOT)/tao/Stub.h \ $(TAO_ROOT)/tao/Pluggable.h \ $(ACE_ROOT)/ace/Message_Queue.h \ @@ -2021,6 +2048,7 @@ realclean: clean $(TAO_ROOT)/tao/WrongTransactionC.h \ $(TAO_ROOT)/tao/InterfaceC.h \ $(TAO_ROOT)/tao/ifrfwd.h \ + $(TAO_ROOT)/tao/InterfaceC.i \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ $(TAO_ROOT)/tao/OctetSeqC.h \ @@ -2034,6 +2062,8 @@ realclean: clean .obj/testS.o .obj/testS.so .shobj/testS.o .shobj/testS.so: testS.cpp testS.h testC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -2188,6 +2218,8 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Server_Request.i \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Smart_Proxies.h \ + $(TAO_ROOT)/tao/Smart_Proxies.i \ $(TAO_ROOT)/tao/Stub.h \ $(TAO_ROOT)/tao/Pluggable.h \ $(ACE_ROOT)/ace/Message_Queue.h \ @@ -2333,6 +2365,7 @@ realclean: clean $(TAO_ROOT)/tao/WrongTransactionC.h \ $(TAO_ROOT)/tao/InterfaceC.h \ $(TAO_ROOT)/tao/ifrfwd.h \ + $(TAO_ROOT)/tao/InterfaceC.i \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ $(TAO_ROOT)/tao/OctetSeqC.h \ diff --git a/TAO/tests/Param_Test/Makefile b/TAO/tests/Param_Test/Makefile index 5f5d02f0ad2..c4fad3c6967 100644 --- a/TAO/tests/Param_Test/Makefile +++ b/TAO/tests/Param_Test/Makefile @@ -122,7 +122,7 @@ server: $(addprefix $(VDIR),$(PARAM_TEST_SVR_OBJS)) $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_SRVR_LIBS) $(POSTLINK) client: $(addprefix $(VDIR),$(PARAM_TEST_CLT_OBJS)) - $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_CLNT_LIBS) $(POSTLINK) + $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_DYNAMIC_LIBS) $(TAO_CLNT_LIBS) $(POSTLINK) anyop: $(addprefix $(VDIR),$(PARAM_TEST_ANYOP_OBJS)) $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_CLNT_LIBS) $(POSTLINK) |