From b66a74d5f7a79f42a932e1ca74ca894e6c54c0f8 Mon Sep 17 00:00:00 2001 From: levine Date: Fri, 22 Aug 1997 02:43:28 +0000 Subject: use -lACE LIBS instead of VLDLIBS so that target library isn't included in PRELIB --- include/makeinclude/platform_chorus.GNU | 2 +- include/makeinclude/platform_hpux_gcc.GNU | 2 +- include/makeinclude/platform_linux.GNU | 2 +- include/makeinclude/platform_linux_lxpthread.GNU | 2 +- include/makeinclude/platform_linux_lxpthreads.GNU | 2 +- include/makeinclude/platform_linux_pthread.GNU | 2 +- include/makeinclude/platform_m88k.GNU | 2 +- include/makeinclude/platform_osf1_4.0_g++.GNU | 2 +- include/makeinclude/platform_sco-nothread.GNU | 2 +- include/makeinclude/platform_sco5.0.0-mit-pthread.GNU | 2 +- include/makeinclude/platform_sco5.0.0-nothread.GNU | 2 +- include/makeinclude/platform_sunos4_g++.GNU | 2 +- include/makeinclude/platform_sunos5_g++.GNU | 2 +- include/makeinclude/platform_sunos5_x86_g++.GNU | 2 +- include/makeinclude/platform_unixware_g++.GNU | 2 +- include/makeinclude/platform_vxworks5.x_ghs.GNU | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/include/makeinclude/platform_chorus.GNU b/include/makeinclude/platform_chorus.GNU index 620f5e2328c..e586291a1a1 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) $(VLDLIBS); \ + $(LD) $^ $(LDFLAGS) -lACE $(LIBS); \ 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 7c346fe6f45..3071cada756 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) $(VLDLIBS); \ + $(LINK.cc) -o gcctemp gcctemp.o $^ $(LDFLAGS) -lACE $(LIBS); \ status=$$?; exit $$status) diff --git a/include/makeinclude/platform_linux.GNU b/include/makeinclude/platform_linux.GNU index c2949e1377b..d41234aad1f 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) $(VLDLIBS); \ + $(LINK.cc) -o gcctemp gcctemp.o $^ $(LDFLAGS) -lACE $(LIBS); \ status=$$?; exit $$status) diff --git a/include/makeinclude/platform_linux_lxpthread.GNU b/include/makeinclude/platform_linux_lxpthread.GNU index a7b5698a17f..c56c8995b2a 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) $(VLDLIBS); \ + $(LINK.cc) -o gcctemp gcctemp.o $^ $(LDFLAGS) -lACE $(LIBS); \ status=$$?; exit $$status) diff --git a/include/makeinclude/platform_linux_lxpthreads.GNU b/include/makeinclude/platform_linux_lxpthreads.GNU index a7b5698a17f..c56c8995b2a 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) $(VLDLIBS); \ + $(LINK.cc) -o gcctemp gcctemp.o $^ $(LDFLAGS) -lACE $(LIBS); \ status=$$?; exit $$status) diff --git a/include/makeinclude/platform_linux_pthread.GNU b/include/makeinclude/platform_linux_pthread.GNU index ca437ec247f..868f90b5b53 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) $(VLDLIBS); \ + $(LINK.cc) -o gcctemp gcctemp.o $^ $(LDFLAGS) -lACE $(LIBS); \ status=$$?; exit $$status) diff --git a/include/makeinclude/platform_m88k.GNU b/include/makeinclude/platform_m88k.GNU index fc1d5302b14..40afb25b446 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) $(VLDLIBS); \ + $(LINK.cc) -o gcctemp gcctemp.o $^ $(LDFLAGS) -lACE $(LIBS); \ 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 2b2c1c61ada..e121e19ca80 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) $(VLDLIBS); \ + $(LINK.cc) -o gcctemp gcctemp.o $^ $(LDFLAGS) -lACE $(LIBS); \ status=$$?; rm -f gcctemp*; exit $$status) diff --git a/include/makeinclude/platform_sco-nothread.GNU b/include/makeinclude/platform_sco-nothread.GNU index 6fc211b951e..62cccf8bbce 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) $(VLDLIBS); \ + $(LINK.cc) -o gcctemp gcctemp.o $^ $(LDFLAGS) -lACE $(LIBS); \ 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 d4984737bc6..8c1d564fbdf 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) $(VLDLIBS); \ + $(LINK.cc) -o gcctemp gcctemp.o $^ $(LDFLAGS) $(LDLIBS) -lACE $(LIBS); \ status=$$?; exit $$status) diff --git a/include/makeinclude/platform_sco5.0.0-nothread.GNU b/include/makeinclude/platform_sco5.0.0-nothread.GNU index 1728cd20737..c65dd84d1f6 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) $(VLDLIBS); \ + $(LINK.cc) -o gcctemp gcctemp.o $^ $(LDFLAGS) -lACE $(LIBS); \ status=$$?; exit $$status) diff --git a/include/makeinclude/platform_sunos4_g++.GNU b/include/makeinclude/platform_sunos4_g++.GNU index 492a6ccc310..49bba40d30e 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) $(VLDLIBS); \ + $(LINK.cc) -o gcctemp gcctemp.o $^ $(LDFLAGS) -lACE $(LIBS); \ status=$$?; rm -f gcctemp*; exit $$status) diff --git a/include/makeinclude/platform_sunos5_g++.GNU b/include/makeinclude/platform_sunos5_g++.GNU index 6f7b86a63de..f8374f05076 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) $(VLDLIBS); \ + $(LINK.cc) -o gcctemp gcctemp.o $^ $(LDFLAGS) -lACE $(LIBS); \ 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 c8c9c6b8c9c..38b98e1477f 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) $(VLDLIBS); \ + $(LINK.cc) -o gcctemp gcctemp.o $^ $(LDFLAGS) -lACE $(LIBS); \ status=$$?; rm -f gcctemp*; exit $$status) diff --git a/include/makeinclude/platform_unixware_g++.GNU b/include/makeinclude/platform_unixware_g++.GNU index 679a6ab6be0..490b1a460ea 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) $(VLDLIBS); \ + $(LINK.cc) -o gcctemp gcctemp.o $^ $(LDFLAGS) -lACE $(LIBS); \ 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 4ebf3758b6e..3162738ad82 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) $(VLDLIBS); \ + $(CXX) $(INCLDIRS) $^ $(LDFLAGS) -lACE $(LIBS); \ status=$$?; rm -f gcctemp.c a.out*; exit $$status) #### don't build shared objects: -- cgit v1.2.1