summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1997-08-21 21:57:40 +0000
committerlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1997-08-21 21:57:40 +0000
commit58c4fbca13d28bc03f87aaecadbbdbfb574b610b (patch)
tree74a26e8514a3c7673ee4265d61ef3f432a812e24
parentcbea0372c293c997f55b8f78d53b1f61d3e085fc (diff)
downloadATCD-58c4fbca13d28bc03f87aaecadbbdbfb574b610b.tar.gz
use VLDLIBS instead of LIBS in PRELIB now that -lACE is only contained in VLDLIBS
Diffstat
-rw-r--r--include/makeinclude/platform_chorus.GNU2
-rw-r--r--include/makeinclude/platform_hpux_gcc.GNU2
-rw-r--r--include/makeinclude/platform_linux.GNU2
-rw-r--r--include/makeinclude/platform_linux_lxpthread.GNU2
-rw-r--r--include/makeinclude/platform_linux_lxpthreads.GNU2
-rw-r--r--include/makeinclude/platform_linux_pthread.GNU2
-rw-r--r--include/makeinclude/platform_m88k.GNU2
-rw-r--r--include/makeinclude/platform_osf1_4.0_g++.GNU2
-rw-r--r--include/makeinclude/platform_sco-nothread.GNU2
-rw-r--r--include/makeinclude/platform_sco5.0.0-mit-pthread.GNU2
-rw-r--r--include/makeinclude/platform_sco5.0.0-nothread.GNU2
-rw-r--r--include/makeinclude/platform_sunos4_g++.GNU2
-rw-r--r--include/makeinclude/platform_sunos5_g++.GNU2
-rw-r--r--include/makeinclude/platform_sunos5_x86_g++.GNU2
-rw-r--r--include/makeinclude/platform_unixware_g++.GNU2
-rw-r--r--include/makeinclude/platform_vxworks5.x_ghs.GNU2
16 files changed, 16 insertions, 16 deletions
diff --git a/include/makeinclude/platform_chorus.GNU b/include/makeinclude/platform_chorus.GNU
index efce4c7d7c3..620f5e2328c 100644
--- a/include/makeinclude/platform_chorus.GNU
+++ b/include/makeinclude/platform_chorus.GNU
@@ -36,7 +36,7 @@ ARFLAGS = srv
RANLIB = $(XDIR)/bin/ranlib
PRELIB = (echo "main() { }" > gcctemp.c && \
$(COMPILE.cc) -o gcctemp.o gcctemp.c && \
- $(LD) $^ $(LDFLAGS) $(LIBS); \
+ $(LD) $^ $(LDFLAGS) $(VLDLIBS); \
status=$$?; rm -f gcctemp.* a.out; exit $$status)
#### don't build shared objects:
BUILD = $(VOBJS) $(VLIB) $(VBIN)
diff --git a/include/makeinclude/platform_hpux_gcc.GNU b/include/makeinclude/platform_hpux_gcc.GNU
index a1458830e0a..7c346fe6f45 100644
--- a/include/makeinclude/platform_hpux_gcc.GNU
+++ b/include/makeinclude/platform_hpux_gcc.GNU
@@ -22,5 +22,5 @@ SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
SHLIBBUILD = $(SOLINK.cc) -o $@ $(VSHOBJS1)
PRELIB = (echo "main() { }" > gcctemp.c && \
$(COMPILE.cc) $(PIC) -o gcctemp.o gcctemp.c && \
- $(LINK.cc) -o gcctemp gcctemp.o $^ $(LDFLAGS) $(LIBS); \
+ $(LINK.cc) -o gcctemp gcctemp.o $^ $(LDFLAGS) $(VLDLIBS); \
status=$$?; exit $$status)
diff --git a/include/makeinclude/platform_linux.GNU b/include/makeinclude/platform_linux.GNU
index c29ecc90974..c2949e1377b 100644
--- a/include/makeinclude/platform_linux.GNU
+++ b/include/makeinclude/platform_linux.GNU
@@ -20,5 +20,5 @@ SOFLAGS = $(CPPFLAGS) -shared
SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
PRELIB = (echo "int main() { return 0; }" > gcctemp.c && \
$(COMPILE.cc) -o gcctemp.o gcctemp.c && \
- $(LINK.cc) -o gcctemp gcctemp.o $^ $(LDFLAGS) $(LIBS); \
+ $(LINK.cc) -o gcctemp gcctemp.o $^ $(LDFLAGS) $(VLDLIBS); \
status=$$?; exit $$status)
diff --git a/include/makeinclude/platform_linux_lxpthread.GNU b/include/makeinclude/platform_linux_lxpthread.GNU
index 0d3720734c2..a7b5698a17f 100644
--- a/include/makeinclude/platform_linux_lxpthread.GNU
+++ b/include/makeinclude/platform_linux_lxpthread.GNU
@@ -29,5 +29,5 @@ SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
ESOBUILD = $(COMPILEESO.cc) $(PIC) -shared -o $(VSHDIR)$*.so $<
PRELIB = (echo "int main() { return 0; }" > gcctemp.c && \
$(COMPILE.cc) -o gcctemp.o gcctemp.c && \
- $(LINK.cc) -o gcctemp gcctemp.o $^ $(LDFLAGS) $(LIBS); \
+ $(LINK.cc) -o gcctemp gcctemp.o $^ $(LDFLAGS) $(VLDLIBS); \
status=$$?; exit $$status)
diff --git a/include/makeinclude/platform_linux_lxpthreads.GNU b/include/makeinclude/platform_linux_lxpthreads.GNU
index 0d3720734c2..a7b5698a17f 100644
--- a/include/makeinclude/platform_linux_lxpthreads.GNU
+++ b/include/makeinclude/platform_linux_lxpthreads.GNU
@@ -29,5 +29,5 @@ SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
ESOBUILD = $(COMPILEESO.cc) $(PIC) -shared -o $(VSHDIR)$*.so $<
PRELIB = (echo "int main() { return 0; }" > gcctemp.c && \
$(COMPILE.cc) -o gcctemp.o gcctemp.c && \
- $(LINK.cc) -o gcctemp gcctemp.o $^ $(LDFLAGS) $(LIBS); \
+ $(LINK.cc) -o gcctemp gcctemp.o $^ $(LDFLAGS) $(VLDLIBS); \
status=$$?; exit $$status)
diff --git a/include/makeinclude/platform_linux_pthread.GNU b/include/makeinclude/platform_linux_pthread.GNU
index ba593f762b7..ca437ec247f 100644
--- a/include/makeinclude/platform_linux_pthread.GNU
+++ b/include/makeinclude/platform_linux_pthread.GNU
@@ -26,5 +26,5 @@ SOFLAGS = $(CPPFLAGS) -shared
SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
PRELIB = (echo "int main() { return 0; }" > gcctemp.c && \
$(COMPILE.cc) -o gcctemp.o gcctemp.c && \
- $(LINK.cc) -o gcctemp gcctemp.o $^ $(LDFLAGS) $(LIBS); \
+ $(LINK.cc) -o gcctemp gcctemp.o $^ $(LDFLAGS) $(VLDLIBS); \
status=$$?; exit $$status)
diff --git a/include/makeinclude/platform_m88k.GNU b/include/makeinclude/platform_m88k.GNU
index c92fdadd503..fc1d5302b14 100644
--- a/include/makeinclude/platform_m88k.GNU
+++ b/include/makeinclude/platform_m88k.GNU
@@ -24,5 +24,5 @@ SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<; \
$(SOLINK.cc) -o $@ -h $@ $(LDFLAGS) $(VSHDIR)$*.o
PRELIB = (echo "int main() { return 0; }" > gcctemp.c && \
$(COMPILE.cc) -o gcctemp.o gcctemp.c && \
- $(LINK.cc) -o gcctemp gcctemp.o $^ $(LDFLAGS) $(LIBS); \
+ $(LINK.cc) -o gcctemp gcctemp.o $^ $(LDFLAGS) $(VLDLIBS); \
status=$$?; rm -f gcctemp*; exit $$status)
diff --git a/include/makeinclude/platform_osf1_4.0_g++.GNU b/include/makeinclude/platform_osf1_4.0_g++.GNU
index a55d81e5296..2b2c1c61ada 100644
--- a/include/makeinclude/platform_osf1_4.0_g++.GNU
+++ b/include/makeinclude/platform_osf1_4.0_g++.GNU
@@ -20,6 +20,6 @@ SOFLAGS = -shared $(CPPFLAGS)
SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
PRELIB = (echo "main() { }" > gcctemp.c && \
$(COMPILE.cc) -o gcctemp.o gcctemp.c && \
- $(LINK.cc) -o gcctemp gcctemp.o $^ $(LDFLAGS) $(LIBS); \
+ $(LINK.cc) -o gcctemp gcctemp.o $^ $(LDFLAGS) $(VLDLIBS); \
status=$$?; rm -f gcctemp*; exit $$status)
diff --git a/include/makeinclude/platform_sco-nothread.GNU b/include/makeinclude/platform_sco-nothread.GNU
index e5c6473477e..6fc211b951e 100644
--- a/include/makeinclude/platform_sco-nothread.GNU
+++ b/include/makeinclude/platform_sco-nothread.GNU
@@ -17,5 +17,5 @@ SOFLAGS = $(CPPFLAGS)
SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
PRELIB = (echo "int main() { return 0; }" > gcctemp.c && \
$(COMPILE.cc) -o gcctemp.o gcctemp.c && \
- $(LINK.cc) -o gcctemp gcctemp.o $^ $(LDFLAGS) $(LIBS); \
+ $(LINK.cc) -o gcctemp gcctemp.o $^ $(LDFLAGS) $(VLDLIBS); \
status=$$?; exit $$status)
diff --git a/include/makeinclude/platform_sco5.0.0-mit-pthread.GNU b/include/makeinclude/platform_sco5.0.0-mit-pthread.GNU
index dac730a1073..d4984737bc6 100644
--- a/include/makeinclude/platform_sco5.0.0-mit-pthread.GNU
+++ b/include/makeinclude/platform_sco5.0.0-mit-pthread.GNU
@@ -28,5 +28,5 @@ SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
# SOLINK = $(SOLINK.cc) -o $@ $(LDFLAGS) $<
PRELIB = (echo "main() { }" > gcctemp.c && \
$(COMPILE.cc) -o gcctemp.o gcctemp.c && \
- $(LINK.cc) -o gcctemp gcctemp.o $^ $(LDFLAGS) $(LDLIBS) $(LIBS); \
+ $(LINK.cc) -o gcctemp gcctemp.o $^ $(LDFLAGS) $(LDLIBS) $(VLDLIBS); \
status=$$?; exit $$status)
diff --git a/include/makeinclude/platform_sco5.0.0-nothread.GNU b/include/makeinclude/platform_sco5.0.0-nothread.GNU
index 66af1d0356f..1728cd20737 100644
--- a/include/makeinclude/platform_sco5.0.0-nothread.GNU
+++ b/include/makeinclude/platform_sco5.0.0-nothread.GNU
@@ -20,5 +20,5 @@ SOFLAGS = $(CPPFLAGS) -b elf -fpic -G
SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
PRELIB = (echo "main() { }" > gcctemp.c && \
$(COMPILE.cc) -o gcctemp.o gcctemp.c && \
- $(LINK.cc) -o gcctemp gcctemp.o $^ $(LDFLAGS) $(LIBS); \
+ $(LINK.cc) -o gcctemp gcctemp.o $^ $(LDFLAGS) $(VLDLIBS); \
status=$$?; exit $$status)
diff --git a/include/makeinclude/platform_sunos4_g++.GNU b/include/makeinclude/platform_sunos4_g++.GNU
index 91d5fa8ac05..492a6ccc310 100644
--- a/include/makeinclude/platform_sunos4_g++.GNU
+++ b/include/makeinclude/platform_sunos4_g++.GNU
@@ -22,5 +22,5 @@ SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
# SOLINK = $(SOLINK.cc) -o $@ $(LDFLAGS) $<
PRELIB = (echo "int main() { return 0; }" > gcctemp.c && \
$(COMPILE.cc) -o gcctemp.o gcctemp.c && \
- $(LINK.cc) -o gcctemp gcctemp.o $^ $(LDFLAGS) $(LIBS); \
+ $(LINK.cc) -o gcctemp gcctemp.o $^ $(LDFLAGS) $(VLDLIBS); \
status=$$?; rm -f gcctemp*; exit $$status)
diff --git a/include/makeinclude/platform_sunos5_g++.GNU b/include/makeinclude/platform_sunos5_g++.GNU
index 0c288ff65f9..6f7b86a63de 100644
--- a/include/makeinclude/platform_sunos5_g++.GNU
+++ b/include/makeinclude/platform_sunos5_g++.GNU
@@ -24,5 +24,5 @@ SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
# SOLINK = $(SOLINK.cc) -o $@ $(LDFLAGS) $<
PRELIB = (echo "int main() { return 0; }" > gcctemp.c && \
$(COMPILE.cc) -o gcctemp.o gcctemp.c && \
- $(LINK.cc) -o gcctemp gcctemp.o $^ $(LDFLAGS) $(LIBS); \
+ $(LINK.cc) -o gcctemp gcctemp.o $^ $(LDFLAGS) $(VLDLIBS); \
status=$$?; rm -f gcctemp*; exit $$status)
diff --git a/include/makeinclude/platform_sunos5_x86_g++.GNU b/include/makeinclude/platform_sunos5_x86_g++.GNU
index 23e1b64aaeb..c8c9c6b8c9c 100644
--- a/include/makeinclude/platform_sunos5_x86_g++.GNU
+++ b/include/makeinclude/platform_sunos5_x86_g++.GNU
@@ -24,5 +24,5 @@ SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
# SOLINK = $(SOLINK.cc) -o $@ $(LDFLAGS) $<
PRELIB = (echo "int main() { return 0; }" > gcctemp.c && \
$(COMPILE.cc) -o gcctemp.o gcctemp.c && \
- $(LINK.cc) -o gcctemp gcctemp.o $^ $(LDFLAGS) $(LIBS); \
+ $(LINK.cc) -o gcctemp gcctemp.o $^ $(LDFLAGS) $(VLDLIBS); \
status=$$?; rm -f gcctemp*; exit $$status)
diff --git a/include/makeinclude/platform_unixware_g++.GNU b/include/makeinclude/platform_unixware_g++.GNU
index 7bf82bf5331..679a6ab6be0 100644
--- a/include/makeinclude/platform_unixware_g++.GNU
+++ b/include/makeinclude/platform_unixware_g++.GNU
@@ -23,5 +23,5 @@ SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
# SOLINK = $(SOLINK.cc) -o $@ $(LDFLAGS) $<
PRELIB = (echo "int main() { return 0; }" > gcctemp.c && \
$(COMPILE.cc) -o gcctemp.o gcctemp.c && \
- $(LINK.cc) -o gcctemp gcctemp.o $^ $(LDFLAGS) $(LIBS); \
+ $(LINK.cc) -o gcctemp gcctemp.o $^ $(LDFLAGS) $(VLDLIBS); \
status=$$?; rm -f gcctemp*; exit $$status)
diff --git a/include/makeinclude/platform_vxworks5.x_ghs.GNU b/include/makeinclude/platform_vxworks5.x_ghs.GNU
index 8313f127b06..4ebf3758b6e 100644
--- a/include/makeinclude/platform_vxworks5.x_ghs.GNU
+++ b/include/makeinclude/platform_vxworks5.x_ghs.GNU
@@ -17,7 +17,7 @@ ARFLAGS = rv
RANLIB = /bin/true
PRELIB = (echo "int main() { return 0; }" > gcctemp.c && \
$(COMPILE.cc) -o gcctemp.o gcctemp.c && \
- $(CXX) $(INCLDIRS) $^ $(LDFLAGS) $(LIBS); \
+ $(CXX) $(INCLDIRS) $^ $(LDFLAGS) $(VLDLIBS); \
status=$$?; rm -f gcctemp.c a.out*; exit $$status)
#### don't build shared objects:
View Lorry Controller Status