diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-07-16 20:36:38 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-07-16 20:36:38 +0000 |
| commit | b3f6ff7b5e8b89f54fd2d75e7707602cad2cf21d (patch) | |
| tree | ad55f6386cfaeb34f183e49eeec2891ab86d200c | |
| parent | e77853ca01947b807c1916b7074e3716dd63b76b (diff) | |
| download | ATCD-b3f6ff7b5e8b89f54fd2d75e7707602cad2cf21d.tar.gz | |
ChangeLogTag:Fri Jul 16 15:16:14 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
97 files changed, 36 insertions, 356 deletions
diff --git a/TAO/Benchmark/Marshal_Test/Orbix/Makefile b/TAO/Benchmark/Marshal_Test/Orbix/Makefile index 159d7beaa6b..240b57926a3 100644 --- a/TAO/Benchmark/Marshal_Test/Orbix/Makefile +++ b/TAO/Benchmark/Marshal_Test/Orbix/Makefile @@ -24,15 +24,11 @@ MARSHAL_SERVER_OBJS = marshalS.o orbix_marshal_impl.o orbix_marshal_server.o ser endif BIN = client server -BUILD = $(BIN) - #CLIENT_LIBS = -lITini -liiop -lorbix #SERVER_LIBS = -lITini -liiop -lDSI -lorbix -lIRclt CLIENT_LIBS = -liiop -lorbix SERVER_LIBS = -liiop -lDSI -lorbix -lIRclt -VLDLIBS = $(LDLIBS:%=%$(VAR)) - #---------------------------------------------------------------------------- # Include macros and targets #---------------------------------------------------------------------------- diff --git a/TAO/Benchmark/Marshal_Test/TAO/Makefile b/TAO/Benchmark/Marshal_Test/TAO/Makefile index 8e512953752..93dcaab7b66 100644 --- a/TAO/Benchmark/Marshal_Test/TAO/Makefile +++ b/TAO/Benchmark/Marshal_Test/TAO/Makefile @@ -21,10 +21,6 @@ MARSHAL_SERVER_OBJS = marshalC.o marshalS.o tao_marshal_impl.o tao_marshal_serve BIN = client server -BUILD = $(BIN) - -VLDLIBS = $(LDLIBS:%=%$(VAR)) - #---------------------------------------------------------------------------- # Include macros and targets #---------------------------------------------------------------------------- diff --git a/TAO/Benchmark/Marshal_Test/VisiBroker/Makefile b/TAO/Benchmark/Marshal_Test/VisiBroker/Makefile index 3b0bf024df4..2b281d3daad 100644 --- a/TAO/Benchmark/Marshal_Test/VisiBroker/Makefile +++ b/TAO/Benchmark/Marshal_Test/VisiBroker/Makefile @@ -21,10 +21,6 @@ MARSHAL_SERVER_OBJS = marshalC.o marshalS.o visi_marshal_impl.o visi_marshal_ser BIN = client server -BUILD = $(BIN) - -VLDLIBS = $(LDLIBS:%=%$(VAR)) - #---------------------------------------------------------------------------- # Include macros and targets #---------------------------------------------------------------------------- diff --git a/TAO/Benchmark/benchmark/Makefile b/TAO/Benchmark/benchmark/Makefile index 9f5327741bf..38dc2215423 100644 --- a/TAO/Benchmark/benchmark/Makefile +++ b/TAO/Benchmark/benchmark/Makefile @@ -21,9 +21,6 @@ LSRC = $(addsuffix .cpp,$(FILES)) LDLIBS = -lACE LIBS = -lACE -VLDLIBS = $(LDLIBS:%=%$(VAR)) - -BUILD = $(VSHLIB) $(VLIB) ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c index e18a3f60df4..1e7fdd6ff0f 100644 --- a/TAO/ChangeLog-99c +++ b/TAO/ChangeLog-99c @@ -1,3 +1,19 @@ +Fri Jul 16 15:16:14 1999 Carlos O'Ryan <coryan@cs.wustl.edu> + + * */Makefile: + Remved the definitions for VLDLIBS and VBIN, these macros are + defined in wrapper_macros.GNU and depend on the platform. Thanks + to Steve Huston for pointing this out. + Also removed the definitions for the BUILD macro for similar + reasons. + + * orbsvcs/orbsvcs/Makefile: + Do not compile the AV/Streaming service on AIX until we figure + out what the problem is + + * docs/releasenotes/TODO.html: + Several tasks have been completed or moved to the BTS + Fri Jul 16 14:22:01 1999 Nanbor Wang <nanbor@cs.wustl.edu> * orbsvcs/tests/Simple_Naming/run_test.pl: Fixed the location of diff --git a/TAO/TAO_IDL/Makefile b/TAO/TAO_IDL/Makefile index e6bc88821c6..5a1612caa20 100644 --- a/TAO/TAO_IDL/Makefile +++ b/TAO/TAO_IDL/Makefile @@ -14,7 +14,6 @@ endif # ! TAO_ROOT BIN = tao_idl LDLIBS = -lACE -BUILD = $(BIN) VPATH=.:driver:fe:ast:util:narrow:be diff --git a/TAO/docs/releasenotes/TODO.html b/TAO/docs/releasenotes/TODO.html index dfa7657dea7..2ca311cc36a 100644 --- a/TAO/docs/releasenotes/TODO.html +++ b/TAO/docs/releasenotes/TODO.html @@ -28,38 +28,6 @@ </P> <OL> - <LI><P>The ORB should support server side and client side - interceptors - <BR>[ASSIGNED TO:] Nanbor - </P> - </LI> - - <LI><P>Implement an Implementation Repository for TAO. - <BR>[ASSIGNED TO:] Darrell. - </P> - </LI> - - <LI><P>Implement a nice example of the COS Event Channel, - showing how it can provide filtering when combined with the - real-time Event Channel. - <BR>[ASSIGNED TO:] Pradeep - </P> - </LI> - - <LI><P><B>EC:</B> Complete the implementation of the new EC, - specially generate the strategies and changes required to - support hard real-time behavior. - </P> - <P>The new EC does not update the dependencies in - the scheduling service. We should be able to strategize this - by the appropiate use of a <CODE>Filter_Builder</CODE> and - decorators for the regular filters. - <BR>[ASSIGNED TO:] Carlos - <BR>[STATUS] All the pieces are in place, but I have to - continue debugging it. - </P> - </LI> - <LI><P>Implement the Interoperable Naming Service spec, specially the new standard features to bootstrap the initial object references in the ORB. @@ -100,15 +68,6 @@ </P> </LI> - <LI><P>Add support for timeouts and protocol attributes to the - ORB. - <BR>[ASSIGNED TO:] Carlos - <BR>[STATUS] Support for the Policy objects is present, but - we haven't implemented any of the Policy objects and, of - course, we don't use them. - </P> - </LI> - </OL> <HR> @@ -260,25 +219,6 @@ <H4>New features and Bug fixes</H4> <OL> - <LI><P><B>EC:</B>The <CODE>Priority_Dispatching</CODE> strategy - is incomplete. - <BR>[STATUS] The latest round of changes completed the - implementation, but more testing is required before dropping - this task - </P> - </LI> - <LI><P><B>EC:</B>Implement a dispatching strategy that uses the - current thread priority or ID to dispatch the event. This - will let us use multiple queues at different priorities but - without any scheduling service. - </P> - </LI> - <LI><P><B>EC:</B>Implement a null filter for consumers that - correctly matches the events, this can be used to do all the - filtering on the suppliers for applications that do not - require correlation. - </P> - </LI> <LI><P><B>EC:</B>Several tests must be added to the event channel testsuite, for example: <UL> @@ -320,23 +260,6 @@ </P> </LI> - <LI><P><B>EC:</B> We need some strategy in the EC to periodically - flush out misbehaving suppliers and consumers. Examples of - misbehavior include: suppliers flooding the EC; - consumers or suppliers that are destroyed, but were not - disconnected; - consumers that are not accepting events (risking a - dead-lock); - etc. - </P> - </LI> - - <LI><P><B>IDL Compiler:</B> Support for the <CODE>version</CODE> - pragma, this also requires some changes in the - <CODE>_is_a()</CODE> implementation. - </P> - </LI> - <LI><P><B>ORB: </B> Stress test the ORB in the presence of exceptions, verifying that no resources are leaked, all locks are released, etc. @@ -381,14 +304,6 @@ </P> </LI> - <LI><P><B>ORB: </B> Use the IIOP 1.1 profile info to pass QoS - info and use it to preserve end-to-end QoS. - <BR>[STATUS] The tagged component for encoding QoS - information was created, but the server does not create it, - neither does the client use that information. - </P> - </LI> - <LI>The size of pre-allocated buffer for the outgoing CDR streams is defined at compilation time; but if we use an efficient enough allocator we could make its size configurable @@ -557,16 +472,6 @@ </P> </LI> - <LI><P><B>ORB:</B> - By default TAO disables Nagle's algorithm, this should be - an optional feature, otherwise TAO will perform poorly over - WANs. - <BR>[STATUS] An alternative: this could be fixed as part of - the real-time spec that introduces transport specific - policies. - </P> - </LI> - <LI><P>Check that system calls like <CODE>recv()</CODE> and <CODE>send()</CODE> are restarted if a signal is received by the process while they are executing. @@ -809,6 +714,17 @@ encapsulation format. <H3>Completed Tasks</H3> <OL> + <LI><P>Add support for timeouts and protocol attributes to the + ORB. + <BR>[ASSIGNED TO:] Carlos + <BR>[STATUS] Support for the Policy objects is present, but + we haven't implemented any of the Policy objects and, of + course, we don't use them. + <BR>[DONE] Protocol attributes is deferred until the + real-time spec is implemented. + </P> + </LI> + <LI><P>The current implementation of collocation is optimal for hard-real-time applications, but in some cases it may be desirable to follow diff --git a/TAO/examples/Callback_Quoter/Makefile b/TAO/examples/Callback_Quoter/Makefile index 19535e14030..376cf7a6855 100644 --- a/TAO/examples/Callback_Quoter/Makefile +++ b/TAO/examples/Callback_Quoter/Makefile @@ -61,8 +61,6 @@ SIMPLE_SVR_OBJS = \ ConsumerS.o\ notifier.o -VLDLIBS = $(LDLIBS:%=%$(VAR)) - BIN2 = notifier \ consumer\ supplier diff --git a/TAO/examples/Event_Comm/Makefile b/TAO/examples/Event_Comm/Makefile index 9b1b165201e..5ba27725b37 100644 --- a/TAO/examples/Event_Comm/Makefile +++ b/TAO/examples/Event_Comm/Makefile @@ -47,8 +47,6 @@ NOTIFIER_OBJS = Event_CommC.o \ Event_Comm_i.o \ notifier.o -VLDLIBS = $(LDLIBS:%=%$(VAR)) - BIN2 = supplier \ notifier \ consumer diff --git a/TAO/examples/OBV/Typed_Events/Makefile b/TAO/examples/OBV/Typed_Events/Makefile index 1d9829bc856..4d09c0a9116 100644 --- a/TAO/examples/OBV/Typed_Events/Makefile +++ b/TAO/examples/OBV/Typed_Events/Makefile @@ -44,9 +44,6 @@ SIMPLE_SVR_OBJS = \ BIN = server \ client -VLDLIBS = $(LDLIBS:%=%$(VAR)) -VBIN = $(BIN:%=%$(VAR)) - TAO_IDLFLAGS += -Ge 1 #---------------------------------------------------------------------------- diff --git a/TAO/examples/POA/Adapter_Activator/Makefile b/TAO/examples/POA/Adapter_Activator/Makefile index 60444945ed6..aa564488783 100644 --- a/TAO/examples/POA/Adapter_Activator/Makefile +++ b/TAO/examples/POA/Adapter_Activator/Makefile @@ -11,10 +11,6 @@ CPPFLAGS += -I$(TAO_ROOT) -I../Generic_Servant LDLIBS = -lGeneric_Servant -lTAO LDFLAGS += -L$(TAO_ROOT)/tao -L../Generic_Servant -VLDLIBS = $(LDLIBS:%=%$(VAR)) - -BUILD = $(VBIN) - INSTALL = #TAO_IDLFLAGS += -Ge 1 diff --git a/TAO/examples/POA/DSI/Makefile b/TAO/examples/POA/DSI/Makefile index 3f788cfc943..8b885b351a2 100644 --- a/TAO/examples/POA/DSI/Makefile +++ b/TAO/examples/POA/DSI/Makefile @@ -23,9 +23,6 @@ FILE_SVR_OBJS = DatabaseC.o DatabaseS.o server.o Database_i.o FILE_CLT_OBJS = DatabaseC.o DatabaseS.o client.o BIN = server client -BUILD = $(BIN) -VLDLIBS = $(LDLIBS:%=%$(VAR)) -VBIN = $(BIN:%=%$(VAR)) TAO_IDLFLAGS += -Ge 1 #---------------------------------------------------------------------------- diff --git a/TAO/examples/POA/Default_Servant/Makefile b/TAO/examples/POA/Default_Servant/Makefile index 21ae6bbb59d..c2e9943b753 100644 --- a/TAO/examples/POA/Default_Servant/Makefile +++ b/TAO/examples/POA/Default_Servant/Makefile @@ -23,9 +23,7 @@ FILE_SVR_OBJS = FileC.o FileS.o server.o File_i.o FILE_CLT_OBJS = FileC.o FileS.o client.o BIN = server client -BUILD = $(BIN) -VLDLIBS = $(LDLIBS:%=%$(VAR)) -VBIN = $(BIN:%=%$(VAR)) + TAO_IDLFLAGS += -Ge 1 #---------------------------------------------------------------------------- # Include macros and targets diff --git a/TAO/examples/POA/Explicit_Activation/Makefile b/TAO/examples/POA/Explicit_Activation/Makefile index a63b245298c..6c5d8811e76 100644 --- a/TAO/examples/POA/Explicit_Activation/Makefile +++ b/TAO/examples/POA/Explicit_Activation/Makefile @@ -11,10 +11,6 @@ CPPFLAGS += -I$(TAO_ROOT) -I../Generic_Servant LDLIBS = -lGeneric_Servant -lTAO LDFLAGS += -L$(TAO_ROOT)/tao -L../Generic_Servant -VLDLIBS = $(LDLIBS:%=%$(VAR)) - -BUILD = $(VBIN) - INSTALL = TAO_IDLFLAGS += -Ge 1 #---------------------------------------------------------------------------- diff --git a/TAO/examples/POA/FindPOA/Makefile b/TAO/examples/POA/FindPOA/Makefile index 4aa0505ee2a..1ce932da8f8 100644 --- a/TAO/examples/POA/FindPOA/Makefile +++ b/TAO/examples/POA/FindPOA/Makefile @@ -15,10 +15,6 @@ CPPFLAGS += -I$(TAO_ROOT) LDLIBS = -lTAO LDFLAGS += -L$(TAO_ROOT)/tao -VLDLIBS = $(LDLIBS:%=%$(VAR)) - -BUILD = $(VBIN) - INSTALL = TAO_IDLFLAGS += -Ge 1 diff --git a/TAO/examples/POA/Forwarding/Makefile b/TAO/examples/POA/Forwarding/Makefile index 28dd8b5b783..c853a407f25 100644 --- a/TAO/examples/POA/Forwarding/Makefile +++ b/TAO/examples/POA/Forwarding/Makefile @@ -24,9 +24,7 @@ SVR_OBJS = FooC.o FooS.o server.o MyFooServant.o Servant_Locator.o CLT_OBJS = FooC.o FooS.o client.o BIN = server client -BUILD = $(BIN) -VLDLIBS = $(LDLIBS:%=%$(VAR)) -VBIN = $(BIN:%=%$(VAR)) + TAO_IDLFLAGS += -Ge 1 #---------------------------------------------------------------------------- # Include macros and targets diff --git a/TAO/examples/POA/Generic_Servant/Makefile b/TAO/examples/POA/Generic_Servant/Makefile index 70a00d29b70..1efa8599e79 100644 --- a/TAO/examples/POA/Generic_Servant/Makefile +++ b/TAO/examples/POA/Generic_Servant/Makefile @@ -33,12 +33,6 @@ POA_CLT_OBJS = $(addprefix $(VDIR),$(addsuffix .o,$(BINFILES))) BIN = client -BUILD = $(VOBJS) $(VLIB) $(BIN) - -VLDLIBS = $(LDLIBS:%=%$(VAR)) - -VBIN = $(BIN:%=%$(VAR)) - LIBS = -lTAO LSRC = $(addsuffix .cpp,$(SHLIB_SRC)) LOBJ = $(addsuffix .o,$(SHLIB_SRC)) diff --git a/TAO/examples/POA/Loader/Makefile b/TAO/examples/POA/Loader/Makefile index bb802913130..1b2f3ef794d 100644 --- a/TAO/examples/POA/Loader/Makefile +++ b/TAO/examples/POA/Loader/Makefile @@ -14,10 +14,6 @@ CPPFLAGS += -I$(TAO_ROOT) LDLIBS = -lTAO LDFLAGS += -L$(TAO_ROOT)/tao -VLDLIBS = $(LDLIBS:%=%$(VAR)) - -BUILD = $(VBIN) - INSTALL = #---------------------------------------------------------------------------- diff --git a/TAO/examples/POA/NewPOA/Makefile b/TAO/examples/POA/NewPOA/Makefile index ceda2634492..24279c705c6 100644 --- a/TAO/examples/POA/NewPOA/Makefile +++ b/TAO/examples/POA/NewPOA/Makefile @@ -15,10 +15,6 @@ CPPFLAGS += -I$(TAO_ROOT) LDLIBS = -lTAO LDFLAGS += -L$(TAO_ROOT)/tao -VLDLIBS = $(LDLIBS:%=%$(VAR)) - -BUILD = $(VBIN) - INSTALL = #---------------------------------------------------------------------------- diff --git a/TAO/examples/POA/On_Demand_Activation/Makefile b/TAO/examples/POA/On_Demand_Activation/Makefile index 1bd3f3d4540..aad170eac5c 100644 --- a/TAO/examples/POA/On_Demand_Activation/Makefile +++ b/TAO/examples/POA/On_Demand_Activation/Makefile @@ -14,10 +14,6 @@ CPPFLAGS += -I$(TAO_ROOT) -I../Generic_Servant LDLIBS = -lGeneric_Servant -lTAO LDFLAGS += -L$(TAO_ROOT)/tao -L../Generic_Servant -VLDLIBS = $(LDLIBS:%=%$(VAR)) - -BUILD = $(VBIN) - INSTALL = #---------------------------------------------------------------------------- diff --git a/TAO/examples/POA/On_Demand_Loading/Makefile b/TAO/examples/POA/On_Demand_Loading/Makefile index 91c487ad3f0..18d8d6097b5 100644 --- a/TAO/examples/POA/On_Demand_Loading/Makefile +++ b/TAO/examples/POA/On_Demand_Loading/Makefile @@ -17,10 +17,6 @@ CPPFLAGS += -I$(TAO_ROOT) LDLIBS = -lTAO LDFLAGS += -L$(TAO_ROOT)/tao -VLDLIBS = $(LDLIBS:%=%$(VAR)) - -BUILD = $(VBIN) - INSTALL = #---------------------------------------------------------------------------- diff --git a/TAO/examples/POA/Reference_Counted_Servant/Makefile b/TAO/examples/POA/Reference_Counted_Servant/Makefile index 990273b45b8..e9bd3b34178 100644 --- a/TAO/examples/POA/Reference_Counted_Servant/Makefile +++ b/TAO/examples/POA/Reference_Counted_Servant/Makefile @@ -9,10 +9,6 @@ endif BIN = server SERVER_OBJS = server.o -VLDLIBS = $(LDLIBS:%=%$(VAR)) -VBIN = $(BIN:%=%$(VAR)) -BUILD = $(VBIN) - CPPFLAGS += -I$(TAO_ROOT) -I../Generic_Servant LDLIBS = -lGeneric_Servant -lTAO diff --git a/TAO/examples/POA/RootPOA/Makefile b/TAO/examples/POA/RootPOA/Makefile index e73b05f5043..e5dd6cb6a39 100644 --- a/TAO/examples/POA/RootPOA/Makefile +++ b/TAO/examples/POA/RootPOA/Makefile @@ -11,10 +11,6 @@ CPPFLAGS += -I$(TAO_ROOT) LDLIBS = -lTAO LDFLAGS += -L$(TAO_ROOT)/tao -VLDLIBS = $(LDLIBS:%=%$(VAR)) - -BUILD = $(VBIN) - INSTALL = #---------------------------------------------------------------------------- diff --git a/TAO/examples/POA/TIE/Makefile b/TAO/examples/POA/TIE/Makefile index 14e4947db34..3cfc388e819 100644 --- a/TAO/examples/POA/TIE/Makefile +++ b/TAO/examples/POA/TIE/Makefile @@ -23,9 +23,6 @@ FILE_SVR_OBJS = FooC.o FooS.o server.o Foo_i.o FILE_CLT_OBJS = FooC.o FooS.o client.o BIN = server client -BUILD = $(BIN) -VLDLIBS = $(LDLIBS:%=%$(VAR)) -VBIN = $(BIN:%=%$(VAR)) TAO_IDLFLAGS += -Ge 1 #---------------------------------------------------------------------------- diff --git a/TAO/examples/Persistent_Grid/Makefile b/TAO/examples/Persistent_Grid/Makefile index 76f23c97fdd..b9dcbd82b8e 100644 --- a/TAO/examples/Persistent_Grid/Makefile +++ b/TAO/examples/Persistent_Grid/Makefile @@ -45,8 +45,6 @@ SIMPLE_SVR_OBJS = \ server.o \ Simple_util.o -VLDLIBS = $(LDLIBS:%=%$(VAR)) - BIN2 = server \ client \ persistent_client diff --git a/TAO/examples/Simple/bank/Makefile b/TAO/examples/Simple/bank/Makefile index e8fcf27555b..165b7d1c865 100644 --- a/TAO/examples/Simple/bank/Makefile +++ b/TAO/examples/Simple/bank/Makefile @@ -40,8 +40,6 @@ SIMPLE_SVR_OBJS = \ ../Simple_util.o \ server.o -VLDLIBS = $(LDLIBS:%=%$(VAR)) - BIN2 = server \ client diff --git a/TAO/examples/Simple/chat/Makefile b/TAO/examples/Simple/chat/Makefile index 695f9ac3c97..e6e0e8e1433 100644 --- a/TAO/examples/Simple/chat/Makefile +++ b/TAO/examples/Simple/chat/Makefile @@ -43,9 +43,6 @@ SIMPLE_SVR_OBJS = \ BIN = server \ client -BUILD = $(BIN) -VLDLIBS = $(LDLIBS:%=%$(VAR)) -VBIN = $(BIN:%=%$(VAR)) TAO_IDLFLAGS += -Ge 1 #---------------------------------------------------------------------------- diff --git a/TAO/examples/Simple/echo/Makefile b/TAO/examples/Simple/echo/Makefile index e6f81721987..77b65ef77da 100644 --- a/TAO/examples/Simple/echo/Makefile +++ b/TAO/examples/Simple/echo/Makefile @@ -38,8 +38,6 @@ SIMPLE_SVR_OBJS = \ ../Simple_util.o \ server.o -VLDLIBS = $(LDLIBS:%=%$(VAR)) - BIN2 = server \ client diff --git a/TAO/examples/Simple/grid/Makefile b/TAO/examples/Simple/grid/Makefile index 1bcd6f88adc..cc7fe81556f 100644 --- a/TAO/examples/Simple/grid/Makefile +++ b/TAO/examples/Simple/grid/Makefile @@ -38,8 +38,6 @@ SIMPLE_SVR_OBJS = \ server.o \ ../Simple_util.o -VLDLIBS = $(LDLIBS:%=%$(VAR)) - BIN2 = server \ client diff --git a/TAO/examples/Simple/time-date/Makefile b/TAO/examples/Simple/time-date/Makefile index 6de0cce40b0..c32181be0fd 100644 --- a/TAO/examples/Simple/time-date/Makefile +++ b/TAO/examples/Simple/time-date/Makefile @@ -39,7 +39,6 @@ SIMPLE_CLT_OBJS = Time_DateC.o \ Time_Date_Client_i.o SIMPLE_SVR_OBJS = server.o \ ../Simple_util.o -VLDLIBS = $(LDLIBS:%=%$(VAR)) BIN2 = server \ client diff --git a/TAO/examples/Simple/time/Makefile b/TAO/examples/Simple/time/Makefile index 43dd4327d32..2339ddbe623 100644 --- a/TAO/examples/Simple/time/Makefile +++ b/TAO/examples/Simple/time/Makefile @@ -38,8 +38,6 @@ SIMPLE_SVR_OBJS = \ server.o \ ../Simple_util.o -VLDLIBS = $(LDLIBS:%=%$(VAR)) - BIN2 = server \ client diff --git a/TAO/examples/Simulator/DOVEMIB/Makefile b/TAO/examples/Simulator/DOVEMIB/Makefile index 92b4fc9299f..39ef41ad47d 100644 --- a/TAO/examples/Simulator/DOVEMIB/Makefile +++ b/TAO/examples/Simulator/DOVEMIB/Makefile @@ -17,7 +17,6 @@ LSRC = $(PROG_SRCS) MIB_OBJS = DOVEMIB.o NavWeapC.o Node.o PrintVisitor.o AnyAnalyser.o LDLIBS = -lorbsvcs -lTAO -VLDLIBS = $(LDLIBS:%=%$(VAR)) BIN2 = DOVEMIB diff --git a/TAO/orbsvcs/Concurrency_Service/Makefile b/TAO/orbsvcs/Concurrency_Service/Makefile index 4076ae993a2..45c229e65ea 100644 --- a/TAO/orbsvcs/Concurrency_Service/Makefile +++ b/TAO/orbsvcs/Concurrency_Service/Makefile @@ -11,7 +11,6 @@ SRC = Concurrency_Service.cpp LDLIBS = -lorbsvcs -lTAO -VLDLIBS = $(LDLIBS:%=%$(VAR)) BIN2 = Concurrency_Service diff --git a/TAO/orbsvcs/Dump_Schedule/Makefile b/TAO/orbsvcs/Dump_Schedule/Makefile index 0cbb299afdf..78cc65607c4 100644 --- a/TAO/orbsvcs/Dump_Schedule/Makefile +++ b/TAO/orbsvcs/Dump_Schedule/Makefile @@ -7,7 +7,6 @@ SCHEDULE_OBJS = $(SCHEDULE_SRCS:.cpp=.o) DUMP_OBJS = $(DUMP_SRCS:.cpp=.o) LDLIBS = -lorbsvcs -lTAO -VLDLIBS = $(LDLIBS:%=%$(VAR)) BIN2 = Dump_Schedule diff --git a/TAO/orbsvcs/ImplRepo_Service/Makefile b/TAO/orbsvcs/ImplRepo_Service/Makefile index 0d842fd46a0..ff011988d2e 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Makefile +++ b/TAO/orbsvcs/ImplRepo_Service/Makefile @@ -34,8 +34,6 @@ TAO_IR_OBJS = \ tao_ir.o \ tao_ir_i.o -VLDLIBS = $(LDLIBS:%=%$(VAR)) - BIN2 = ImplRepo_Service \ tao_ir diff --git a/TAO/orbsvcs/Naming_Service/Makefile b/TAO/orbsvcs/Naming_Service/Makefile index 11b0a8f6874..66c19895e1c 100644 --- a/TAO/orbsvcs/Naming_Service/Makefile +++ b/TAO/orbsvcs/Naming_Service/Makefile @@ -12,10 +12,6 @@ SRC = $(addsuffix .cpp, $(BIN)) LDLIBS = -lorbsvcs -lTAO -VLDLIBS = $(LDLIBS:%=%$(VAR)) - -FILES = Naming_Service - BIN2 = Naming_Server #### If the TAO orbsvcs library wasn't built with sufficient components, diff --git a/TAO/orbsvcs/Scheduling_Service/Makefile b/TAO/orbsvcs/Scheduling_Service/Makefile index c67e0d10799..b71f6db494d 100644 --- a/TAO/orbsvcs/Scheduling_Service/Makefile +++ b/TAO/orbsvcs/Scheduling_Service/Makefile @@ -6,7 +6,6 @@ LSRC = $(SCHEDULE_SRCS) SCHEDULE_OBJS = $(SCHEDULE_SRCS:.cpp=.o) LDLIBS = -lorbsvcs -lTAO -VLDLIBS = $(LDLIBS:%=%$(VAR)) BIN2 = Scheduling_Service diff --git a/TAO/orbsvcs/Time_Service/Makefile b/TAO/orbsvcs/Time_Service/Makefile index cadedc7e8e8..95a3f3aa90e 100644 --- a/TAO/orbsvcs/Time_Service/Makefile +++ b/TAO/orbsvcs/Time_Service/Makefile @@ -28,8 +28,6 @@ SIMPLE_SVR_OBJS = Server_i.o \ SIMPLE_CRK_OBJS = Clerk_i.o \ Time_Service_Clerk.o \ -VLDLIBS = $(LDLIBS:%=%$(VAR)) - BIN2 = Time_Service_Server \ Time_Service_Clerk diff --git a/TAO/orbsvcs/Trading_Service/Makefile b/TAO/orbsvcs/Trading_Service/Makefile index 73dc532d84f..ee20e53f9af 100644 --- a/TAO/orbsvcs/Trading_Service/Makefile +++ b/TAO/orbsvcs/Trading_Service/Makefile @@ -8,8 +8,6 @@ LDLIBS = -lorbsvcs -lTAO -VLDLIBS = $(LDLIBS:%=%$(VAR)) - SRC = $(addsuffix .cpp, $(BIN)) BIN2 = Trading_Service diff --git a/TAO/orbsvcs/examples/CosEC/Factory/Makefile b/TAO/orbsvcs/examples/CosEC/Factory/Makefile index 93591bc8696..a3d6ba83543 100644 --- a/TAO/orbsvcs/examples/CosEC/Factory/Makefile +++ b/TAO/orbsvcs/examples/CosEC/Factory/Makefile @@ -36,8 +36,6 @@ CLIENT_OBJS = \ CosEventChannelFactoryC.o \ CosEventChannelFactoryS.o -VLDLIBS = $(LDLIBS:%=%$(VAR)) - BIN2 = factory \ factoryclient diff --git a/TAO/orbsvcs/orbsvcs/Makefile b/TAO/orbsvcs/orbsvcs/Makefile index eba72d3ce4e..d1c1972aaed 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile +++ b/TAO/orbsvcs/orbsvcs/Makefile @@ -54,8 +54,11 @@ ifndef TAO_ORBSVCS Sched \ Event \ CosEvent \ - Event2 \ - AV + Event2 + +ifndef TEMPINCDIR # ! AIX + TAO_ORBSVCS += AV +endif # TEMPINCDIR # This services is not compiled by default, it is rarely used and it # is not prepared to deal with exceptions diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/Makefile b/TAO/orbsvcs/tests/AVStreams/benchmark/Makefile index b871a5f98e0..be2257347f3 100644 --- a/TAO/orbsvcs/tests/AVStreams/benchmark/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/benchmark/Makefile @@ -15,8 +15,6 @@ SERVER_OBJS = server.o child.o CLIENT_OBJS = client.o CHILD_PROCESS_OBJS = child.o child_process.o -VLDLIBS = $(LDLIBS:%=%$(VAR)) - ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif diff --git a/TAO/orbsvcs/tests/AVStreams/server_discovery/Makefile b/TAO/orbsvcs/tests/AVStreams/server_discovery/Makefile index 8d36d536681..453904b5942 100644 --- a/TAO/orbsvcs/tests/AVStreams/server_discovery/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/server_discovery/Makefile @@ -31,7 +31,6 @@ LDFLAGS += -L$(JAVA_ROOT)/jre/lib/sparc -L$(JAVA_ROOT)/jre/lib/sparc/native_thre LIBS = -lorbsvcs -lTAO -lACE -lmpeg_shared LDLIBS = -lavdemo -ljava -ljvm -VLDLIBS = $(LDLIBS:%=%$(VAR)) CPPFLAGS += -I$(JAVA_ROOT)/include-old -I$(JAVA_ROOT)/include-old/solaris \ -I$(TAO_ROOT)/orbsvcs -I$(MPEG_ROOT) -I$(TAO_ROOT) $(TSS_ORB_FLAG) -I$(TAO_ROOT)/orbsvcs/orbsvcs diff --git a/TAO/orbsvcs/tests/Concurrency/Makefile b/TAO/orbsvcs/tests/Concurrency/Makefile index f091c372ba2..ee44969f909 100644 --- a/TAO/orbsvcs/tests/Concurrency/Makefile +++ b/TAO/orbsvcs/tests/Concurrency/Makefile @@ -26,9 +26,6 @@ CC_CLT_OBJS = CC_client.o CC_tests.o tmplinst.o CC_naming_service.o \ CC_command.tab.o lex.CC_command.o \ CC_command.o CC_test_utils.o -VLDLIBS = $(LDLIBS:%=%$(VAR)) -VBIN = $(BIN:%=%$(VAR)) - BIN2 = CC_client #### If the TAO orbsvcs library wasn't built with sufficient components, diff --git a/TAO/orbsvcs/tests/CosEC_Multiple/Makefile b/TAO/orbsvcs/tests/CosEC_Multiple/Makefile index 24fb6ed7521..75322e30473 100644 --- a/TAO/orbsvcs/tests/CosEC_Multiple/Makefile +++ b/TAO/orbsvcs/tests/CosEC_Multiple/Makefile @@ -28,8 +28,6 @@ SIMPLE_SUP_OBJS = \ CosEC_Multiple.o \ CosECSupplier.o -VLDLIBS = $(LDLIBS:%=%$(VAR)) - BIN2 = supplier \ consumer diff --git a/TAO/orbsvcs/tests/ImplRepo/Makefile b/TAO/orbsvcs/tests/ImplRepo/Makefile index 7982b4862eb..77e5443263e 100644 --- a/TAO/orbsvcs/tests/ImplRepo/Makefile +++ b/TAO/orbsvcs/tests/ImplRepo/Makefile @@ -53,8 +53,6 @@ NESTEA_SERVER_OBJS = NesteaC.o \ nestea_server_i.o \ nestea_i.o -VLDLIBS = $(LDLIBS:%=%$(VAR)) - BIN2 = airplane_server \ airplane_client \ nestea_server \ diff --git a/TAO/orbsvcs/tests/Property/Makefile b/TAO/orbsvcs/tests/Property/Makefile index 52979c1b173..8ffb640165a 100644 --- a/TAO/orbsvcs/tests/Property/Makefile +++ b/TAO/orbsvcs/tests/Property/Makefile @@ -15,8 +15,6 @@ CosProperty_SERVER_OBJS = server.o CosProperty_CLIENT_OBJS = client.o SRC=server.cpp client.cpp -VLDLIBS = $(LDLIBS:%=%$(VAR)) - BIN2 = server client #### If the TAO orbsvcs library wasn't built with sufficient components, diff --git a/TAO/orbsvcs/tests/Sched_Conf/Makefile b/TAO/orbsvcs/tests/Sched_Conf/Makefile index 11559c69138..ead0f2185e8 100644 --- a/TAO/orbsvcs/tests/Sched_Conf/Makefile +++ b/TAO/orbsvcs/tests/Sched_Conf/Makefile @@ -7,7 +7,6 @@ SCHEDULE_OBJS = $(SCHEDULE_SRCS:.cpp=.o) DUMP_OBJS = $(DUMP_SRCS:.cpp=.o) LDLIBS = -lorbsvcs -lTAO -VLDLIBS = $(LDLIBS:%=%$(VAR)) BIN2 = Sched_Conf diff --git a/TAO/orbsvcs/tests/Simple_Naming/Makefile b/TAO/orbsvcs/tests/Simple_Naming/Makefile index bd74f226fa6..7f75bab7be5 100644 --- a/TAO/orbsvcs/tests/Simple_Naming/Makefile +++ b/TAO/orbsvcs/tests/Simple_Naming/Makefile @@ -25,8 +25,6 @@ TEST_OBJECT_OBJS = test_objectC.o \ test_objectS.o \ client.o -VLDLIBS = $(LDLIBS:%=%$(VAR)) - BIN2 = client TAO_IDLFLAGS += -Ge 1 diff --git a/TAO/orbsvcs/tests/Time/Makefile b/TAO/orbsvcs/tests/Time/Makefile index 044c0eaa776..57f68bad76d 100644 --- a/TAO/orbsvcs/tests/Time/Makefile +++ b/TAO/orbsvcs/tests/Time/Makefile @@ -23,8 +23,6 @@ SRC = $(PROG_SRCS) SIMPLE_CLT_OBJS = Client_i.o \ client.o -VLDLIBS = $(LDLIBS:%=%$(VAR)) - BIN2 = client #### If the TAO orbsvcs library wasn't built with sufficient components, diff --git a/TAO/orbsvcs/tests/Trading/Makefile b/TAO/orbsvcs/tests/Trading/Makefile index cd298e95f73..df1ae4e240e 100644 --- a/TAO/orbsvcs/tests/Trading/Makefile +++ b/TAO/orbsvcs/tests/Trading/Makefile @@ -39,7 +39,6 @@ LSRC = $(addsuffix .cpp,$(FILES)) PSRC = $(addsuffix .cpp,$(BIN)) LIBS = -lorbsvcs -lTAO LDLIBS = -lorbsvcs -lTAO -VLDLIBS = $(LDLIBS:%=%$(VAR)) #### If the TAO orbsvcs library wasn't built with sufficient components, #### don't try to build here. diff --git a/TAO/performance-tests/Cubit/COOL/IDL_Cubit/Makefile b/TAO/performance-tests/Cubit/COOL/IDL_Cubit/Makefile index 7443d01573b..927e5e61d77 100644 --- a/TAO/performance-tests/Cubit/COOL/IDL_Cubit/Makefile +++ b/TAO/performance-tests/Cubit/COOL/IDL_Cubit/Makefile @@ -47,8 +47,6 @@ else LDLIBS += -lOrb-mt $(MATHLIB) endif -VLDLIBS := $(LDLIBS:%=%$(VAR)) $(ACELIB) $(LIBS) - #---------------------------------------------------------------------------- # Local targets #---------------------------------------------------------------------------- diff --git a/TAO/performance-tests/Cubit/COOL/MT_Cubit/Makefile b/TAO/performance-tests/Cubit/COOL/MT_Cubit/Makefile index 9dc8b41e2e4..ba19b1dffaf 100644 --- a/TAO/performance-tests/Cubit/COOL/MT_Cubit/Makefile +++ b/TAO/performance-tests/Cubit/COOL/MT_Cubit/Makefile @@ -61,8 +61,6 @@ else LDLIBS += -lOrb-mt endif -VLDLIBS := $(LDLIBS:%=%$(VAR)) $(ACELIB) $(LIBS) - #---------------------------------------------------------------------------- # Local targets #---------------------------------------------------------------------------- diff --git a/TAO/performance-tests/Cubit/CORBAplus/IDL_Cubit/Makefile b/TAO/performance-tests/Cubit/CORBAplus/IDL_Cubit/Makefile index f89dc1b2eb2..c4016edd1a0 100644 --- a/TAO/performance-tests/Cubit/CORBAplus/IDL_Cubit/Makefile +++ b/TAO/performance-tests/Cubit/CORBAplus/IDL_Cubit/Makefile @@ -18,9 +18,6 @@ CUBIT_SVR_OBJS = cubit.o cubit_s.o svr.o cubit_i.o CUBIT_CLT_OBJS = cubit.o clnt.o BIN = svr clnt -BUILD = $(BIN) -VLDLIBS = $(LDLIBS:%=%$(VAR)) -VBIN = $(BIN:%=%$(VAR)) #---------------------------------------------------------------------------- # Include macros and targets diff --git a/TAO/performance-tests/Cubit/CORBAplus/MT_Cubit/client/Makefile b/TAO/performance-tests/Cubit/CORBAplus/MT_Cubit/client/Makefile index d6834f2d40a..de794049ebc 100644 --- a/TAO/performance-tests/Cubit/CORBAplus/MT_Cubit/client/Makefile +++ b/TAO/performance-tests/Cubit/CORBAplus/MT_Cubit/client/Makefile @@ -19,9 +19,6 @@ LSRC = $(PROG_SRCS) CUBIT_CLIENT_OBJS = cubit.o Task_Client.o client.o BIN = client -BUILD = $(BIN) -VLDLIBS = $(LDLIBS:%=%$(VAR)) -VBIN = $(BIN:%=%$(VAR)) #---------------------------------------------------------------------------- # Include macros and targets diff --git a/TAO/performance-tests/Cubit/CORBAplus/MT_Cubit/server/Makefile b/TAO/performance-tests/Cubit/CORBAplus/MT_Cubit/server/Makefile index 4a73e39f1a8..406ac91aa26 100644 --- a/TAO/performance-tests/Cubit/CORBAplus/MT_Cubit/server/Makefile +++ b/TAO/performance-tests/Cubit/CORBAplus/MT_Cubit/server/Makefile @@ -20,9 +20,6 @@ LSRC = $(IDL_SRC) $(PROG_SRCS) CUBIT_SVR_OBJS = cubit.o cubit_s.o svr.o cubit_i.o BIN = svr -BUILD = $(BIN) -VLDLIBS = $(LDLIBS:%=%$(VAR)) -VBIN = $(BIN:%=%$(VAR)) #---------------------------------------------------------------------------- # Include macros and targets diff --git a/TAO/performance-tests/Cubit/Orbix/base_server/Makefile b/TAO/performance-tests/Cubit/Orbix/base_server/Makefile index 47e25193c7b..36002f19199 100644 --- a/TAO/performance-tests/Cubit/Orbix/base_server/Makefile +++ b/TAO/performance-tests/Cubit/Orbix/base_server/Makefile @@ -14,8 +14,6 @@ SVR_OBJS = cubitS.o cubit_impl.o server.o LDLIBS = -lorbixmt -VLDLIBS = $(LDLIBS:%=%$(VAR)) - #---------------------------------------------------------------------------- # Include macros and targets #---------------------------------------------------------------------------- diff --git a/TAO/performance-tests/Cubit/Orbix/client/Makefile b/TAO/performance-tests/Cubit/Orbix/client/Makefile index 4600f50b145..9b2e8f71a63 100644 --- a/TAO/performance-tests/Cubit/Orbix/client/Makefile +++ b/TAO/performance-tests/Cubit/Orbix/client/Makefile @@ -14,8 +14,6 @@ CLT_OBJS = cubitC.o client.o LDLIBS = -VLDLIBS = $(LDLIBS:%=%$(VAR)) - #---------------------------------------------------------------------------- # Include macros and targets #---------------------------------------------------------------------------- diff --git a/TAO/performance-tests/Cubit/Orbix/factory_client/Makefile b/TAO/performance-tests/Cubit/Orbix/factory_client/Makefile index b1dfde41302..afb3debd306 100644 --- a/TAO/performance-tests/Cubit/Orbix/factory_client/Makefile +++ b/TAO/performance-tests/Cubit/Orbix/factory_client/Makefile @@ -14,8 +14,6 @@ CLT_OBJS = cubitC.o client.o LDLIBS = -VLDLIBS = $(LDLIBS:%=%$(VAR)) - #---------------------------------------------------------------------------- # Include macros and targets #---------------------------------------------------------------------------- diff --git a/TAO/performance-tests/Cubit/Orbix/tpool/Makefile b/TAO/performance-tests/Cubit/Orbix/tpool/Makefile index addb29d130c..7ec7ff2ee09 100644 --- a/TAO/performance-tests/Cubit/Orbix/tpool/Makefile +++ b/TAO/performance-tests/Cubit/Orbix/tpool/Makefile @@ -14,8 +14,6 @@ SVR_OBJS = cubitS.o cubit_impl.o server.o tpool.o LDLIBS = -VLDLIBS = $(LDLIBS:%=%$(VAR)) - #---------------------------------------------------------------------------- # Include macros and targets #---------------------------------------------------------------------------- diff --git a/TAO/performance-tests/Cubit/Orbix/tpr/Makefile b/TAO/performance-tests/Cubit/Orbix/tpr/Makefile index 96fe70563a7..222afc55c31 100644 --- a/TAO/performance-tests/Cubit/Orbix/tpr/Makefile +++ b/TAO/performance-tests/Cubit/Orbix/tpr/Makefile @@ -14,8 +14,6 @@ SVR_OBJS = cubitS.o cubit_impl.o server.o tpr.o LDLIBS = -VLDLIBS = $(LDLIBS:%=%$(VAR)) - #---------------------------------------------------------------------------- # Include macros and targets #---------------------------------------------------------------------------- diff --git a/TAO/performance-tests/Cubit/Orbix/tps/Makefile b/TAO/performance-tests/Cubit/Orbix/tps/Makefile index ff12f24622d..f1ff326f867 100644 --- a/TAO/performance-tests/Cubit/Orbix/tps/Makefile +++ b/TAO/performance-tests/Cubit/Orbix/tps/Makefile @@ -14,8 +14,6 @@ SVR_OBJS = cubitS.o cubit_impl.o server.o tps.o LDLIBS = -VLDLIBS = $(LDLIBS:%=%$(VAR)) - #---------------------------------------------------------------------------- # Include macros and targets #---------------------------------------------------------------------------- diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile b/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile index 76d415f9f11..deeda6d821b 100644 --- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile +++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile @@ -26,7 +26,6 @@ CUBIT_CLT_OBJS = client.o CFLAGS += -I../IDL_Cubit BIN = client -VLDLIBS = $(LDLIBS:%=%$(VAR)) TAO_IDLFLAGS += -Ge 1 #---------------------------------------------------------------------------- @@ -68,7 +67,7 @@ client: $(addprefix $(VDIR),$(CUBIT_CLT_OBJS)) $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) ../IDL_Cubit/server: - cd ../IDL_Cubit; $(MAKE) BUILD=server + cd ../IDL_Cubit; $(MAKE) BIN=server realclean: clean -$(RM) cubitC.* cubitS.* cubitS_T.* diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile index 485bebfad68..b0ecd1621bb 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile @@ -52,9 +52,6 @@ COLLOCATION_OBJS = cubitC.o \ BIN = server \ client \ collocation/collocation_test -BUILD = $(BIN) -VLDLIBS = $(LDLIBS:%=%$(VAR)) -VBIN = $(BIN:%=%$(VAR)) TAO_IDLFLAGS += -Ge 1 diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile index e475d61ae0d..f2e46643fbb 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile @@ -50,9 +50,6 @@ CUBIT_CLIENT_OBJS = \ Timer.o BIN = server client -BUILD = $(BIN) -VLDLIBS = $(LDLIBS:%=%$(VAR)) -VBIN = $(BIN:%=%$(VAR)) TAO_IDLFLAGS += -Ge 1 #---------------------------------------------------------------------------- diff --git a/TAO/performance-tests/Latency/Makefile b/TAO/performance-tests/Latency/Makefile index 66d39c55495..439741d6972 100644 --- a/TAO/performance-tests/Latency/Makefile +++ b/TAO/performance-tests/Latency/Makefile @@ -22,9 +22,6 @@ SRC = $(addsuffix .cpp, $(BIN) $(IDLFILES) test_i) CLIENT_OBJS = client.o testC.o SERVER_OBJS = server.o test_i.o $(addsuffix .o, $(IDLFILES)) -BUILD = $(BIN) -VLDLIBS = $(LDLIBS:%=%$(VAR)) -VBIN = $(BIN:%=%$(VAR)) TAO_IDLFLAGS += -Ge 1 #---------------------------------------------------------------------------- diff --git a/TAO/performance-tests/POA/Demux/Makefile b/TAO/performance-tests/POA/Demux/Makefile index fe6dd78f768..2ac7e4d3a9d 100644 --- a/TAO/performance-tests/POA/Demux/Makefile +++ b/TAO/performance-tests/POA/Demux/Makefile @@ -43,7 +43,6 @@ SRC = $(addsuffix .cpp,$(SVR_FILES)) \ $(addsuffix .cpp,$(STAT_FILE)) BIN2 = server client -VLDLIBS = $(LDLIBS:%=%$(VAR)) TAO_IDLFLAGS += -Ge 1 #### If the TAO orbsvcs library wasn't built with sufficient components, diff --git a/TAO/performance-tests/POA/Object_Creation_And_Registration/Makefile b/TAO/performance-tests/POA/Object_Creation_And_Registration/Makefile index eb017178a87..a08ad6f60e9 100644 --- a/TAO/performance-tests/POA/Object_Creation_And_Registration/Makefile +++ b/TAO/performance-tests/POA/Object_Creation_And_Registration/Makefile @@ -22,9 +22,6 @@ LSRC = $(PROG_SRCS) TEST_OBJS = testC.o testS.o registration.o BIN = registration -BUILD = $(BIN) -VLDLIBS = $(LDLIBS:%=%$(VAR)) -VBIN = $(BIN:%=%$(VAR)) TAO_IDLFLAGS += -Ge 1 #---------------------------------------------------------------------------- diff --git a/TAO/performance-tests/Pluggable/Makefile b/TAO/performance-tests/Pluggable/Makefile index 1530a12d821..116c6daf007 100644 --- a/TAO/performance-tests/Pluggable/Makefile +++ b/TAO/performance-tests/Pluggable/Makefile @@ -34,9 +34,6 @@ PP_TEST_CLT_OBJS = PP_TestC.o \ BIN = server \ client -BUILD = $(BIN) -VLDLIBS = $(LDLIBS:%=%$(VAR)) -VBIN = $(BIN:%=%$(VAR)) TAO_IDLFLAGS += -Ge 1 #---------------------------------------------------------------------------- diff --git a/TAO/performance-tests/Thruput/COOL/Makefile b/TAO/performance-tests/Thruput/COOL/Makefile index 1ffc61fd6cb..f7578ee27a8 100644 --- a/TAO/performance-tests/Thruput/COOL/Makefile +++ b/TAO/performance-tests/Thruput/COOL/Makefile @@ -18,8 +18,6 @@ CLT_OBJS = client.o ttcp.o utils.o LDLIBS = -lm -lOrb-mt -lposix4 -VLDLIBS = $(LDLIBS:%=%$(VAR)) - #---------------------------------------------------------------------------- # Include macros and targets #---------------------------------------------------------------------------- diff --git a/TAO/performance-tests/Thruput/CORBAplus/Makefile b/TAO/performance-tests/Thruput/CORBAplus/Makefile index 8bad8861b30..233d90d4c8e 100644 --- a/TAO/performance-tests/Thruput/CORBAplus/Makefile +++ b/TAO/performance-tests/Thruput/CORBAplus/Makefile @@ -21,11 +21,6 @@ TTCP_SERVER_OBJS = ttcp.o ttcp_s.o server.o ttcp_i.o utils.o BIN = client server -BUILD = $(BIN) - -VLDLIBS = $(LDLIBS:%=%$(VAR)) -VBIN = $(BIN:%=%$(VAR)) - #---------------------------------------------------------------------------- # Include macros and targets #---------------------------------------------------------------------------- diff --git a/TAO/performance-tests/Thruput/TAO/Makefile b/TAO/performance-tests/Thruput/TAO/Makefile index 7c9d811027f..04c991378d1 100644 --- a/TAO/performance-tests/Thruput/TAO/Makefile +++ b/TAO/performance-tests/Thruput/TAO/Makefile @@ -25,11 +25,6 @@ TTCP_SERVER_OBJS = ttcpC.o ttcpS.o server.o ttcp_i.o utils.o tmplinst.o BIN = client server -BUILD = $(BIN) - -VLDLIBS = $(LDLIBS:%=%$(VAR)) -VBIN = $(BIN:%=%$(VAR)) - TAO_IDLFLAGS += -Ge 1 #---------------------------------------------------------------------------- # Include macros and targets diff --git a/TAO/tests/AMI/Makefile b/TAO/tests/AMI/Makefile index 86ac3a83c4b..b67ec0253b6 100644 --- a/TAO/tests/AMI/Makefile +++ b/TAO/tests/AMI/Makefile @@ -24,10 +24,6 @@ SIMPLE_CLIENT_OBJS = simple-client.o $(addsuffix .o, $(IDLFILES)) ORB_CREATION_OBJS = orb_creation.o $(addsuffix .o, $(IDLFILES)) SERVER_OBJS = server.o test_i.o $(addsuffix .o, $(IDLFILES)) -BUILD = $(BIN) -VLDLIBS = $(LDLIBS:%=%$(VAR)) -VBIN = $(BIN:%=%$(VAR)) - #---------------------------------------------------------------------------- # Include macros and targets #---------------------------------------------------------------------------- diff --git a/TAO/tests/CDR/Makefile b/TAO/tests/CDR/Makefile index 3b8476e4d13..2d9381062f0 100644 --- a/TAO/tests/CDR/Makefile +++ b/TAO/tests/CDR/Makefile @@ -31,9 +31,6 @@ OCTET_SEQUENCE_OBJS = octet_sequence.o ALLOCATOR_OBJS = allocator.o BIN = basic_types tc growth octet_sequence allocator -BUILD = $(BIN) -VLDLIBS = $(LDLIBS:%=%$(VAR)) -VBIN = $(BIN:%=%$(VAR)) TAO_IDLFLAGS += -Ge 1 #---------------------------------------------------------------------------- diff --git a/TAO/tests/DynAny_Test/Makefile b/TAO/tests/DynAny_Test/Makefile index de67c60ff1b..7d70a1135e3 100644 --- a/TAO/tests/DynAny_Test/Makefile +++ b/TAO/tests/DynAny_Test/Makefile @@ -33,9 +33,6 @@ BASIC_TEST_OBJS = $(addsuffix .o, $(BASIC_TEST_FILES)) SRC = $(addsuffix .cpp, $(BASIC_TEST_FILES)) BIN = basic_test -BUILD = $(BIN) -VLDLIBS = $(LDLIBS:%=%$(VAR)) -VBIN = $(BIN:%=%$(VAR)) TAO_IDLFLAGS += -Ge 1 #---------------------------------------------------------------------------- diff --git a/TAO/tests/FL_Cube/Makefile b/TAO/tests/FL_Cube/Makefile index 0c64e60b6c3..dfce4c558dd 100644 --- a/TAO/tests/FL_Cube/Makefile +++ b/TAO/tests/FL_Cube/Makefile @@ -22,10 +22,6 @@ SRC = $(addsuffix .cpp, $(BIN) $(IDLFILES) test_i) CLIENT_OBJS = client.o $(addsuffix .o, $(IDLFILES)) SERVER_OBJS = server.o test_i.o $(addsuffix .o, $(IDLFILES)) -BUILD = $(BIN) -VLDLIBS = $(LDLIBS:%=%$(VAR)) -VBIN = $(BIN:%=%$(VAR)) - TAO_IDLFLAGS += -Ge 1 #---------------------------------------------------------------------------- # Include macros and targets diff --git a/TAO/tests/Faults/Makefile b/TAO/tests/Faults/Makefile index 6ed49d56258..52c48da55a7 100644 --- a/TAO/tests/Faults/Makefile +++ b/TAO/tests/Faults/Makefile @@ -22,10 +22,6 @@ SRC = $(addsuffix .cpp, $(BIN) $(IDLFILES) test_i) CLIENT_OBJS = client.o test_i.o $(addsuffix .o, $(IDLFILES)) SERVER_OBJS = server.o test_i.o $(addsuffix .o, $(IDLFILES)) -BUILD = $(BIN) -VLDLIBS = $(LDLIBS:%=%$(VAR)) -VBIN = $(BIN:%=%$(VAR)) - TAO_IDLFLAGS += -Ge 1 #---------------------------------------------------------------------------- # Include macros and targets diff --git a/TAO/tests/IDL_Test/Makefile b/TAO/tests/IDL_Test/Makefile index 3565b56927f..5c4af2d32f2 100644 --- a/TAO/tests/IDL_Test/Makefile +++ b/TAO/tests/IDL_Test/Makefile @@ -39,9 +39,6 @@ IDL_TEST_OBJS = $(addsuffix .o, $(IDL_TEST_FILES)) SRC = $(addsuffix .cpp, $(IDL_TEST_FILES)) BIN = main -BUILD = $(BIN) -VLDLIBS = $(LDLIBS:%=%$(VAR)) -VBIN = $(BIN:%=%$(VAR)) TAO_IDLFLAGS += -Ge 1 #---------------------------------------------------------------------------- diff --git a/TAO/tests/IORManipulation/Makefile b/TAO/tests/IORManipulation/Makefile index 0c2920195bd..c784b23276e 100644 --- a/TAO/tests/IORManipulation/Makefile +++ b/TAO/tests/IORManipulation/Makefile @@ -23,8 +23,6 @@ SRC = $(PROG_SRCS) SIMPLE_CLT_OBJS = IORTest.o SIMPLE_SVR_OBJS = -VLDLIBS = $(LDLIBS:%=%$(VAR)) - BIN2 = IORTest #### If the TAO orbsvcs library wasn't built with sufficient components, diff --git a/TAO/tests/InterOp-Naming/Makefile b/TAO/tests/InterOp-Naming/Makefile index cea11eedc21..d5c762d7a51 100644 --- a/TAO/tests/InterOp-Naming/Makefile +++ b/TAO/tests/InterOp-Naming/Makefile @@ -38,14 +38,6 @@ SIMPLE_SERVER_OBJS = \ Server_i.o \ INS_test_server.o -BIN = \ - INS_test_server \ - INS_test_client - -BUILD = $(BIN) - -VLDLIBS = $(LDLIBS:%=%$(VAR)) - BIN2 = \ INS_test_server \ INS_test_client diff --git a/TAO/tests/MT_Client/Makefile b/TAO/tests/MT_Client/Makefile index a5bc72b71be..b58ab075191 100644 --- a/TAO/tests/MT_Client/Makefile +++ b/TAO/tests/MT_Client/Makefile @@ -24,9 +24,6 @@ SIMPLE_CLIENT_OBJS = simple-client.o $(addsuffix .o, $(IDLFILES)) ORB_CREATION_OBJS = orb_creation.o $(addsuffix .o, $(IDLFILES)) SERVER_OBJS = server.o test_i.o $(addsuffix .o, $(IDLFILES)) -BUILD = $(BIN) -VLDLIBS = $(LDLIBS:%=%$(VAR)) -VBIN = $(BIN:%=%$(VAR)) TAO_IDLFLAGS += -Ge 1 #---------------------------------------------------------------------------- # Include macros and targets diff --git a/TAO/tests/MT_Server/Makefile b/TAO/tests/MT_Server/Makefile index 00f589d2d86..e2eac974d59 100644 --- a/TAO/tests/MT_Server/Makefile +++ b/TAO/tests/MT_Server/Makefile @@ -22,10 +22,6 @@ SRC = $(addsuffix .cpp, $(BIN) $(IDLFILES) test_i) CLIENT_OBJS = client.o testC.o SERVER_OBJS = server.o test_i.o $(addsuffix .o, $(IDLFILES)) -BUILD = $(BIN) -VLDLIBS = $(LDLIBS:%=%$(VAR)) -VBIN = $(BIN:%=%$(VAR)) - TAO_IDLFLAGS += -Ge 1 #---------------------------------------------------------------------------- # Include macros and targets diff --git a/TAO/tests/Multiple_Inheritance/Makefile b/TAO/tests/Multiple_Inheritance/Makefile index 0aff7171b7d..fd1b4e6e910 100644 --- a/TAO/tests/Multiple_Inheritance/Makefile +++ b/TAO/tests/Multiple_Inheritance/Makefile @@ -23,9 +23,6 @@ FILE_SVR_OBJS = Multiple_InheritanceC.o Multiple_InheritanceS.o server.o FILE_CLT_OBJS = Multiple_InheritanceC.o Multiple_InheritanceS.o client.o BIN = server client -BUILD = $(BIN) -VLDLIBS = $(LDLIBS:%=%$(VAR)) -VBIN = $(BIN:%=%$(VAR)) TAO_IDLFLAGS += -Ge 1 #---------------------------------------------------------------------------- diff --git a/TAO/tests/Native_Exceptions/Makefile b/TAO/tests/Native_Exceptions/Makefile index dd400ff6429..657d7554d69 100644 --- a/TAO/tests/Native_Exceptions/Makefile +++ b/TAO/tests/Native_Exceptions/Makefile @@ -21,8 +21,6 @@ SRC = $(addsuffix .cpp, $(BIN) $(IDLFILES) test_i) CLIENT_OBJS = client.o testC.o SERVER_OBJS = server.o test_i.o $(addsuffix .o, $(IDLFILES)) -VLDLIBS = $(LDLIBS:%=%$(VAR)) -VBIN = $(BIN:%=%$(VAR)) TAO_IDLFLAGS += -Ge 0 @@ -33,7 +31,7 @@ TAO_IDLFLAGS += -Ge 0 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU ifeq ($(exceptions),1) - BUILD = $(BIN) + BUILD = $(VBIN) else default: @echo This directory only compiles if native exceptions are enabled! diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/Makefile b/TAO/tests/NestedUpcall/MT_Client_Test/Makefile index e06656b0d9c..f4d17335375 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/Makefile +++ b/TAO/tests/NestedUpcall/MT_Client_Test/Makefile @@ -26,7 +26,6 @@ CLIENT_OBJS = MT_Client_TestS.o MT_Client_TestC.o \ SERVER_OBJS = MT_Client_TestS.o MT_Client_TestC.o server.o \ MT_Object_i.o -VLDLIBS = $(LDLIBS:%=%$(VAR)) BIN = client server TAO_IDLFLAGS += -Ge 1 diff --git a/TAO/tests/NestedUpcall/Simple/Makefile b/TAO/tests/NestedUpcall/Simple/Makefile index 92d1ee7c5b5..2191163e2e6 100644 --- a/TAO/tests/NestedUpcall/Simple/Makefile +++ b/TAO/tests/NestedUpcall/Simple/Makefile @@ -23,8 +23,6 @@ NESTEDUPCALLS_CLT_OBJS = testS.o testC.o client.o client_i.o SRC = $(sort $(NESTEDUPCALLS_SVR_OBJS:.o=.cpp) \ $(NESTEDUPCALLS_CLT_OBJS:.o=.cpp)) -VLDLIBS = $(LDLIBS:%=%$(VAR)) - BIN = server client TAO_IDLFLAGS += -Ge 1 diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Makefile b/TAO/tests/NestedUpcall/Triangle_Test/Makefile index 264f14450db..9138ed75538 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/Makefile +++ b/TAO/tests/NestedUpcall/Triangle_Test/Makefile @@ -32,9 +32,6 @@ NESTEDUPCALLS_INITIATOR_OBJS = Triangle_TestS.o Triangle_TestC.o initiator.o \ BIN = server_A server_B initiator -BUILD = $(BIN) -VLDLIBS = $(LDLIBS:%=%$(VAR)) -VBIN = $(BIN:%=%$(VAR)) TAO_IDLFLAGS += -Ge 1 #---------------------------------------------------------------------------- diff --git a/TAO/tests/OctetSeq/Makefile b/TAO/tests/OctetSeq/Makefile index c23e85d54c3..c2cb6c9b38c 100644 --- a/TAO/tests/OctetSeq/Makefile +++ b/TAO/tests/OctetSeq/Makefile @@ -23,10 +23,6 @@ CLIENT_OBJS = client.o testC.o SERVER_OBJS = server.o test_i.o testC.o testS.o OCTETSEQ_OBJS = testC.o testS.o OctetSeq.o -BUILD = $(BIN) -VLDLIBS = $(LDLIBS:%=%$(VAR)) -VBIN = $(BIN:%=%$(VAR)) - TAO_IDLFLAGS += -Ge 1 #---------------------------------------------------------------------------- # Include macros and targets diff --git a/TAO/tests/POA/Deactivation/Makefile b/TAO/tests/POA/Deactivation/Makefile index 2844b446fcd..a2bb08922fc 100644 --- a/TAO/tests/POA/Deactivation/Makefile +++ b/TAO/tests/POA/Deactivation/Makefile @@ -22,9 +22,6 @@ LSRC = $(PROG_SRCS) SVR_OBJS = testC.o testS.o Deactivation.o BIN = Deactivation -BUILD = $(BIN) -VLDLIBS = $(LDLIBS:%=%$(VAR)) -VBIN = $(BIN:%=%$(VAR)) TAO_IDLFLAGS += -Ge 1 #---------------------------------------------------------------------------- diff --git a/TAO/tests/POA/Destruction/Makefile b/TAO/tests/POA/Destruction/Makefile index 842113c2e06..ccd61a6e377 100644 --- a/TAO/tests/POA/Destruction/Makefile +++ b/TAO/tests/POA/Destruction/Makefile @@ -22,9 +22,6 @@ LSRC = $(PROG_SRCS) SVR_OBJS = testC.o testS.o Destruction.o BIN = Destruction -BUILD = $(BIN) -VLDLIBS = $(LDLIBS:%=%$(VAR)) -VBIN = $(BIN:%=%$(VAR)) TAO_IDLFLAGS += -Ge 1 #---------------------------------------------------------------------------- diff --git a/TAO/tests/POA/Identity/Makefile b/TAO/tests/POA/Identity/Makefile index f6ec39af176..d6cfeefe12b 100644 --- a/TAO/tests/POA/Identity/Makefile +++ b/TAO/tests/POA/Identity/Makefile @@ -16,9 +16,6 @@ LSRC = $(PROG_SRCS) PROG_OBJS = testC.o testS.o Identity.o BIN = Identity -BUILD = $(BIN) -VLDLIBS = $(LDLIBS:%=%$(VAR)) -VBIN = $(BIN:%=%$(VAR)) #---------------------------------------------------------------------------- # Include macros and targets diff --git a/TAO/tests/Param_Test/Makefile b/TAO/tests/Param_Test/Makefile index bbc3771b021..81f8ce28f38 100644 --- a/TAO/tests/Param_Test/Makefile +++ b/TAO/tests/Param_Test/Makefile @@ -66,9 +66,6 @@ SRC = $(addsuffix .cpp,$(SVR_FILES)) \ $(addsuffix .cpp,$(CLI_FILES)) BIN = server client -BUILD = $(BIN) -VLDLIBS = $(LDLIBS:%=%$(VAR)) -VBIN = $(BIN:%=%$(VAR)) #---------------------------------------------------------------------------- # Include macros and targets diff --git a/TAO/tests/Timeout/Makefile b/TAO/tests/Timeout/Makefile index f0bb165b98f..2a6b916660d 100644 --- a/TAO/tests/Timeout/Makefile +++ b/TAO/tests/Timeout/Makefile @@ -22,9 +22,6 @@ SRC = $(addsuffix .cpp, $(BIN) $(IDLFILES) test_i) CLIENT_OBJS = client.o $(addsuffix .o, $(IDLFILES)) SERVER_OBJS = server.o test_i.o $(addsuffix .o, $(IDLFILES)) -BUILD = $(BIN) -VLDLIBS = $(LDLIBS:%=%$(VAR)) -VBIN = $(BIN:%=%$(VAR)) TAO_IDLFLAGS += -Ge 1 #---------------------------------------------------------------------------- # Include macros and targets diff --git a/TAO/tests/Xt_Stopwatch/Makefile b/TAO/tests/Xt_Stopwatch/Makefile index c9bd693f131..99320af2706 100644 --- a/TAO/tests/Xt_Stopwatch/Makefile +++ b/TAO/tests/Xt_Stopwatch/Makefile @@ -22,10 +22,6 @@ SRC = $(addsuffix .cpp, $(BIN) $(IDLFILES) test_i Stopwatch_display Control time CLIENT_OBJS = client.o Control.o testC.o SERVER_OBJS = server.o test_i.o Stopwatch_display.o timer.o $(addsuffix .o, $(IDLFILES)) -BUILD = $(BIN) -VLDLIBS = $(LDLIBS:%=%$(VAR)) -VBIN = $(BIN:%=%$(VAR)) - TAO_IDLFLAGS += -Ge 1 #---------------------------------------------------------------------------- # Include macros and targets diff --git a/TAO/utils/IOR-parser/Makefile b/TAO/utils/IOR-parser/Makefile index cc079ef9b76..979a79a7ebd 100644 --- a/TAO/utils/IOR-parser/Makefile +++ b/TAO/utils/IOR-parser/Makefile @@ -15,8 +15,6 @@ FILES = ior-handler SRC = $(addsuffix .cpp,$(FILES)) OBJ = $(addsuffix .o,$(FILES)) -BUILD = $(VBIN) - TAO_IDLFLAGS += -Ge 1 #---------------------------------------------------------------------------- # Include macros and targets diff --git a/TAO/utils/catior/Makefile b/TAO/utils/catior/Makefile index 35ecd73391e..e4074f475b4 100644 --- a/TAO/utils/catior/Makefile +++ b/TAO/utils/catior/Makefile @@ -18,8 +18,6 @@ BIN = catior SRC= catior.cpp -BUILD = $(VBIN) - TAO_IDLFLAGS += -Ge 1 #---------------------------------------------------------------------------- # Include macros and targets diff --git a/TAO/utils/nslist/Makefile b/TAO/utils/nslist/Makefile index 3c6a59441b4..473a17e5a12 100644 --- a/TAO/utils/nslist/Makefile +++ b/TAO/utils/nslist/Makefile @@ -19,8 +19,6 @@ BIN2 = nslist SRC = nslist.cpp -BUILD = $(VBIN) - TAO_IDLFLAGS += -Ge 1 #### If the TAO orbsvcs library wasn't built with sufficient components, #### don't try to build here. |