From ddba06904ce8597133ae959cf7c1cdcce652cd86 Mon Sep 17 00:00:00 2001
From: steve <steve>
Date: Mon, 6 Oct 2003 21:27:05 +0000
Subject: [PATCH]  Put libveriuser into a single .o file.

---
 cadpli/Makefile.in       |  8 ++++----
 cadpli/configure.in      | 14 --------------
 libveriuser/Makefile.in  | 11 +++++++----
 libveriuser/configure.in |  2 +-
 4 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/cadpli/Makefile.in b/cadpli/Makefile.in
index f8c37bad4..b08b856c9 100644
--- a/cadpli/Makefile.in
+++ b/cadpli/Makefile.in
@@ -16,7 +16,7 @@
 #    59 Temple Place - Suite 330
 #    Boston, MA 02111-1307, USA
 #
-#ident "$Id: Makefile.in,v 1.5 2003/10/02 21:30:40 steve Exp $"
+#ident "$Id: Makefile.in,v 1.6 2003/10/06 21:27:05 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -62,13 +62,13 @@ dep:
 
 O = cadpli.o
 
-SYSTEM_VPI_LDFLAGS = @whole_archive@ ../libveriuser/libveriuser.a @no_whole_archive@ -L../vvp -lvpi
+SYSTEM_VPI_LDFLAGS = -L../vvp -lvpi
 ifeq (@WIN32@,yes)
     SYSTEM_VPI_LDFLAGS += -liberty
 endif
 
-cadpli.vpl: $O ../vvp/libvpi.a ../libveriuser/libveriuser.a
-	$(CC) @shared@ -o $@ $O $(SYSTEM_VPI_LDFLAGS)
+cadpli.vpl: $O ../vvp/libvpi.a ../libveriuser/libveriuser.o
+	$(CC) @shared@ -o $@ $O ../libveriuser/libveriuser.o $(SYSTEM_VPI_LDFLAGS)
 
 clean:
 	rm -rf *.o dep cadpli.vpl
diff --git a/cadpli/configure.in b/cadpli/configure.in
index ff155b4bd..41d95ad3d 100644
--- a/cadpli/configure.in
+++ b/cadpli/configure.in
@@ -64,19 +64,12 @@ AC_MSG_RESULT($PICFLAG)
 AC_MSG_CHECKING("for -rdynamic compiler flag")
 
 rdynamic=-rdynamic
-whole_archive=-Wl,-whole-archive
-no_whole_archive=-Wl,-no-whole-archive
 case "${host}" in
 
     *-*-netbsd*)
 	rdynamic="-Wl,--export-dynamic"
 	;;
 
-    *-*-openbsd*)
-	whole_archive=""
-	no_whole_archive=""
-	;;
-
     *-*-solaris*)
 	rdynamic=""
 	;;
@@ -91,19 +84,12 @@ case "${host}" in
 
     *-*-darwin*)
 	rdynamic="-Wl,-all_load"
-	whole_archive=""
-	no_whole_archive=""
 	;;
 
 esac
 AC_SUBST(rdynamic)
-AC_SUBST(whole_archive)
-AC_SUBST(no_whole_archive)
 AC_MSG_RESULT($rdynamic)
 
-AC_MSG_CHECKING("for -whole-archive compiler flags")
-AC_MSG_RESULT($whole_archive $no_whole_archive)
-
 AC_MSG_CHECKING("for shared library link flag")
 shared=-shared
 case "${host}" in
diff --git a/libveriuser/Makefile.in b/libveriuser/Makefile.in
index e76b60d53..ae153987f 100644
--- a/libveriuser/Makefile.in
+++ b/libveriuser/Makefile.in
@@ -16,7 +16,7 @@
 #    59 Temple Place - Suite 330
 #    Boston, MA 02111-1307, USA
 #
-#ident "$Id: Makefile.in,v 1.28 2003/10/02 19:33:44 steve Exp $"
+#ident "$Id: Makefile.in,v 1.29 2003/10/06 21:27:05 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -65,9 +65,12 @@ check: all
 Makefile: Makefile.in config.status
 	./config.status
 
-libveriuser.a: $O
+libveriuser.o: $O
+	$(LD) -r -o $@ $O
+
+libveriuser.a: libveriuser.o
 	rm -f $@
-	ar cvq $@ $O
+	ar cvq $@ libveriuser.o
 	$(RANLIB) $@
 
 dep:
@@ -79,7 +82,7 @@ dep:
 
 
 clean:
-	rm -rf *.o dep libveriuser.a
+	rm -rf *.o dep libveriuser.a libveriuser.o
 
 distclean: clean
 	rm -f Makefile config.status config.log config.cache
diff --git a/libveriuser/configure.in b/libveriuser/configure.in
index 4ddd685e0..3bafa5ae4 100644
--- a/libveriuser/configure.in
+++ b/libveriuser/configure.in
@@ -22,7 +22,7 @@ case "${host}" in
 	;;
 esac
 
-AC_MSG_CHECKING("for flag to make position independent code")
+AC_MSG_CHECKING(for flag to make position independent code)
 PICFLAG=-fPIC
 case "${host}" in