diff options
Diffstat (limited to 'TAO/orbsvcs/tests')
-rw-r--r-- | TAO/orbsvcs/tests/AVStreams/benchmark/Makefile | 2 | ||||
-rw-r--r-- | TAO/orbsvcs/tests/AVStreams/server_discovery/Makefile | 1 | ||||
-rw-r--r-- | TAO/orbsvcs/tests/Concurrency/Makefile | 3 | ||||
-rw-r--r-- | TAO/orbsvcs/tests/CosEC_Multiple/Makefile | 2 | ||||
-rw-r--r-- | TAO/orbsvcs/tests/ImplRepo/Makefile | 2 | ||||
-rw-r--r-- | TAO/orbsvcs/tests/Property/Makefile | 2 | ||||
-rw-r--r-- | TAO/orbsvcs/tests/Sched_Conf/Makefile | 1 | ||||
-rw-r--r-- | TAO/orbsvcs/tests/Simple_Naming/Makefile | 2 | ||||
-rw-r--r-- | TAO/orbsvcs/tests/Time/Makefile | 2 | ||||
-rw-r--r-- | TAO/orbsvcs/tests/Trading/Makefile | 1 |
10 files changed, 0 insertions, 18 deletions
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. |