summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs')
-rw-r--r--TAO/orbsvcs/Concurrency_Service/Makefile1
-rw-r--r--TAO/orbsvcs/Dump_Schedule/Makefile1
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/Makefile2
-rw-r--r--TAO/orbsvcs/Naming_Service/Makefile4
-rw-r--r--TAO/orbsvcs/Scheduling_Service/Makefile1
-rw-r--r--TAO/orbsvcs/Time_Service/Makefile2
-rw-r--r--TAO/orbsvcs/Trading_Service/Makefile2
-rw-r--r--TAO/orbsvcs/examples/CosEC/Factory/Makefile2
-rw-r--r--TAO/orbsvcs/orbsvcs/Makefile7
-rw-r--r--TAO/orbsvcs/tests/AVStreams/benchmark/Makefile2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/server_discovery/Makefile1
-rw-r--r--TAO/orbsvcs/tests/Concurrency/Makefile3
-rw-r--r--TAO/orbsvcs/tests/CosEC_Multiple/Makefile2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/Makefile2
-rw-r--r--TAO/orbsvcs/tests/Property/Makefile2
-rw-r--r--TAO/orbsvcs/tests/Sched_Conf/Makefile1
-rw-r--r--TAO/orbsvcs/tests/Simple_Naming/Makefile2
-rw-r--r--TAO/orbsvcs/tests/Time/Makefile2
-rw-r--r--TAO/orbsvcs/tests/Trading/Makefile1
19 files changed, 5 insertions, 35 deletions
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.
View Lorry Controller Status