summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apps/JAWS/clients/Blobby/Makefile2
-rw-r--r--apps/JAWS/clients/Caching/Makefile2
-rw-r--r--apps/JAWS/stress_testing/Makefile2
-rw-r--r--apps/Orbix-Examples/Event_Comm/Consumer/Makefile2
-rw-r--r--apps/Orbix-Examples/Event_Comm/Supplier/Makefile2
-rw-r--r--examples/ASX/Event_Server/Event_Server/Makefile2
-rw-r--r--examples/ASX/UPIPE_Event_Server/Makefile2
-rw-r--r--examples/Logger/simple-server/Makefile2
-rw-r--r--examples/Mem_Map/IO-tests/Makefile2
-rw-r--r--examples/Naming/Makefile2
-rw-r--r--examples/Reactor/Multicast/Makefile2
-rw-r--r--examples/Service_Configurator/Misc/Makefile2
-rw-r--r--examples/Shared_Malloc/Makefile2
13 files changed, 13 insertions, 13 deletions
diff --git a/apps/JAWS/clients/Blobby/Makefile b/apps/JAWS/clients/Blobby/Makefile
index da923fc5994..883df5f67f7 100644
--- a/apps/JAWS/clients/Blobby/Makefile
+++ b/apps/JAWS/clients/Blobby/Makefile
@@ -18,7 +18,7 @@ LSRC = $(addsuffix .cpp,$(FILES))
LOBJ = $(addsuffix .o,$(FILES))
SHOBJ = $(addsuffix .so,$(FILES))
-LDLIBS = $(addprefix .shobj/,$(SHOBJ))
+LDLIBS = $(addprefix $(VSHDIR),$(SHOBJ))
VLDLIBS = $(LDLIBS:%=%$(VAR))
diff --git a/apps/JAWS/clients/Caching/Makefile b/apps/JAWS/clients/Caching/Makefile
index a62c084cad2..2490dbb4f2a 100644
--- a/apps/JAWS/clients/Caching/Makefile
+++ b/apps/JAWS/clients/Caching/Makefile
@@ -16,7 +16,7 @@ LSRC = $(addsuffix .cpp,$(FILES))
LOBJ = $(addsuffix .o,$(FILES))
SHOBJ = $(addsuffix .so,$(FILES))
-LDLIBS = $(addprefix .shobj/,$(SHOBJ))
+LDLIBS = $(addprefix $(VSHDIR),$(SHOBJ))
VLDLIBS = $(LDLIBS:%=%$(VAR))
diff --git a/apps/JAWS/stress_testing/Makefile b/apps/JAWS/stress_testing/Makefile
index ef85fd09e4e..d941dba1c36 100644
--- a/apps/JAWS/stress_testing/Makefile
+++ b/apps/JAWS/stress_testing/Makefile
@@ -22,7 +22,7 @@ SHOBJ = $(addsuffix .so,$(FILES))
INCLDIRS += -I../..
-LDLIBS = $(addprefix .shobj/,$(SHOBJ))
+LDLIBS = $(addprefix $(VSHDIR),$(SHOBJ))
VLDLIBS = $(LDLIBS:%=%$(VAR))
diff --git a/apps/Orbix-Examples/Event_Comm/Consumer/Makefile b/apps/Orbix-Examples/Event_Comm/Consumer/Makefile
index 792a5390fa5..3752d62134c 100644
--- a/apps/Orbix-Examples/Event_Comm/Consumer/Makefile
+++ b/apps/Orbix-Examples/Event_Comm/Consumer/Makefile
@@ -19,7 +19,7 @@ SHOBJ = $(addsuffix .so,$(FILES))
SRX = ../src/.obj
-LDLIBS = $(addprefix .shobj/,$(LOBJ)) ../src/libEvent_Comm.a
+LDLIBS = $(addprefix $(VSHDIR),$(LOBJ)) ../src/libEvent_Comm.a
VLDLIBS = $(LDLIBS:%=%$(VAR))
BUILD = $(VBIN)
diff --git a/apps/Orbix-Examples/Event_Comm/Supplier/Makefile b/apps/Orbix-Examples/Event_Comm/Supplier/Makefile
index ab70d304067..3b98ef1e7c9 100644
--- a/apps/Orbix-Examples/Event_Comm/Supplier/Makefile
+++ b/apps/Orbix-Examples/Event_Comm/Supplier/Makefile
@@ -19,7 +19,7 @@ SHOBJ = $(addsuffix .so,$(FILES))
SRX = ../src/.obj
-LDLIBS = $(addprefix .shobj/,$(LOBJ)) ../src/libEvent_Comm.a
+LDLIBS = $(addprefix $(VSHDIR),$(LOBJ)) ../src/libEvent_Comm.a
VLDLIBS = $(LDLIBS:%=%$(VAR))
diff --git a/examples/ASX/Event_Server/Event_Server/Makefile b/examples/ASX/Event_Server/Event_Server/Makefile
index 4ae33b56ed4..4a4e666040f 100644
--- a/examples/ASX/Event_Server/Event_Server/Makefile
+++ b/examples/ASX/Event_Server/Event_Server/Makefile
@@ -20,7 +20,7 @@ LSRC = $(addsuffix .cpp,$(FILES))
LOBJ = $(addsuffix .o,$(FILES))
SHOBJ = $(addsuffix .so,$(FILES))
-LDLIBS = $(addprefix .shobj/,$(SHOBJ))
+LDLIBS = $(addprefix $(VSHDIR),$(SHOBJ))
VLDLIBS = $(LDLIBS:%=%$(VAR))
diff --git a/examples/ASX/UPIPE_Event_Server/Makefile b/examples/ASX/UPIPE_Event_Server/Makefile
index dc7048e400d..df9323b18a8 100644
--- a/examples/ASX/UPIPE_Event_Server/Makefile
+++ b/examples/ASX/UPIPE_Event_Server/Makefile
@@ -20,7 +20,7 @@ LSRC = $(addsuffix .cpp,$(FILES))
LOBJ = $(addsuffix .o,$(FILES))
SHOBJ = $(addsuffix .so,$(FILES))
-LDLIBS = $(addprefix .shobj/,$(SHOBJ))
+LDLIBS = $(addprefix $(VSHDIR),$(SHOBJ))
VLDLIBS = $(LDLIBS:%=%$(VAR))
diff --git a/examples/Logger/simple-server/Makefile b/examples/Logger/simple-server/Makefile
index 0655d333648..a7485095c8f 100644
--- a/examples/Logger/simple-server/Makefile
+++ b/examples/Logger/simple-server/Makefile
@@ -17,7 +17,7 @@ LSRC = $(addsuffix .cpp,$(FILES))
LOBJ = $(addsuffix .o,$(FILES))
SHOBJ = $(addsuffix .so,$(FILES))
-LDLIBS = $(addprefix .shobj/,$(SHOBJ))
+LDLIBS = $(addprefix $(VSHDIR),$(SHOBJ))
VLDLIBS = $(LDLIBS:%=%$(VAR))
diff --git a/examples/Mem_Map/IO-tests/Makefile b/examples/Mem_Map/IO-tests/Makefile
index a14ac79fdc9..75336796b6e 100644
--- a/examples/Mem_Map/IO-tests/Makefile
+++ b/examples/Mem_Map/IO-tests/Makefile
@@ -16,7 +16,7 @@ LSRC = $(addsuffix .cpp,$(FILES))
LOBJ = $(addsuffix .o,$(FILES))
SHOBJ = $(addsuffix .so,$(FILES))
-LDLIBS = $(addprefix .shobj/,$(SHOBJ))
+LDLIBS = $(addprefix $(VSHDIR),$(SHOBJ))
VLDLIBS = $(LDLIBS:%=%$(VAR))
diff --git a/examples/Naming/Makefile b/examples/Naming/Makefile
index 669fe69437d..70b13a956b3 100644
--- a/examples/Naming/Makefile
+++ b/examples/Naming/Makefile
@@ -16,7 +16,7 @@ LSRC = $(addsuffix .cpp,$(FILES))
LOBJ = $(addsuffix .o,$(FILES))
SHOBJ = $(addsuffix .so,$(FILES))
-LDLIBS = $(addprefix .shobj/,$(SHOBJ))
+LDLIBS = $(addprefix $(VSHDIR),$(SHOBJ))
VLDLIBS = $(LDLIBS:%=%$(VAR))
diff --git a/examples/Reactor/Multicast/Makefile b/examples/Reactor/Multicast/Makefile
index 5697cce9ff6..5d164bd45ec 100644
--- a/examples/Reactor/Multicast/Makefile
+++ b/examples/Reactor/Multicast/Makefile
@@ -16,7 +16,7 @@ LSRC = $(addsuffix .cpp,$(FILES))
LOBJ = $(addsuffix .o,$(FILES))
SHOBJ = $(addsuffix .so,$(FILES))
-LDLIBS = $(addprefix .shobj/,$(SHOBJ))
+LDLIBS = $(addprefix $(VSHDIR),$(SHOBJ))
VLDLIBS = $(LDLIBS:%=%$(VAR))
diff --git a/examples/Service_Configurator/Misc/Makefile b/examples/Service_Configurator/Misc/Makefile
index a605a27a73a..c550dd8fecc 100644
--- a/examples/Service_Configurator/Misc/Makefile
+++ b/examples/Service_Configurator/Misc/Makefile
@@ -16,7 +16,7 @@ LSRC = $(addsuffix .cpp,$(FILES))
LOBJ = $(addsuffix .o,$(FILES))
SHOBJ = $(addsuffix .so,$(FILES))
-LDLIBS = $(addprefix .shobj/,$(SHOBJ))
+LDLIBS = $(addprefix $(VSHDIR),$(SHOBJ))
VLDLIBS = $(LDLIBS:%=%$(VAR))
diff --git a/examples/Shared_Malloc/Makefile b/examples/Shared_Malloc/Makefile
index c0a2fae7de8..5633a4c14cf 100644
--- a/examples/Shared_Malloc/Makefile
+++ b/examples/Shared_Malloc/Makefile
@@ -19,7 +19,7 @@ LSRC = $(addsuffix .cpp,$(FILES))
LOBJ = $(addsuffix .o,$(FILES))
SHOBJ = $(addsuffix .so,$(FILES))
-LDLIBS = $(addprefix .shobj/,$(SHOBJ))
+LDLIBS = $(addprefix $(VSHDIR),$(SHOBJ))
VLDLIBS = $(LDLIBS:%=%$(VAR))
View Lorry Controller Status