From 69628415466c62092f1b796254e744882dcabc30 Mon Sep 17 00:00:00 2001
From: steve <steve>
Date: Sat, 28 Oct 2000 17:27:59 +0000
Subject: [PATCH]  Split vpip for everybody.

---
 configure.in    |  1 -
 driver/main.c   | 13 +++++--------
 vvm/Makefile.in | 38 +++++++++++++++++++++-----------------
 3 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/configure.in b/configure.in
index 86528205b..679125d02 100644
--- a/configure.in
+++ b/configure.in
@@ -40,7 +40,6 @@ PICFLAG=-fPIC
 
 if test ! -z "$CYGWIN" ; then
   PICFLAG=
-  AC_DEFINE(USE_LIBVPIP)
 fi
 
 AC_SUBST(CYGWIN)
diff --git a/driver/main.c b/driver/main.c
index 63be1cc88..dc0069ec0 100644
--- a/driver/main.c
+++ b/driver/main.c
@@ -17,7 +17,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #if !defined(WINNT)
-#ident "$Id: main.c,v 1.3 2000/10/28 03:47:25 steve Exp $"
+#ident "$Id: main.c,v 1.4 2000/10/28 17:28:16 steve Exp $"
 #endif
 
 #include <stdio.h>
@@ -41,12 +41,6 @@
 # define RDYNAMIC "-rdynamic"
 #endif
 
-#ifdef USE_LIBVPIP
-# define LIBVPIP "-lvpip"
-#else
-# define LIBVPIP ""
-#endif
-
 # include  "globals.h"
 
 const char*base = IVL_ROOT;
@@ -145,7 +139,7 @@ static int t_vvm(char*cmd, unsigned ncmd)
       }
 
       sprintf(tmp, "%s -O " RDYNAMIC " -fno-exceptions -o %s -I%s "
-	      "-L%s %s.cc -lvvm " LIBVPIP "%s", CXX, opath, IVL_INC, IVL_LIB,
+	      "-L%s %s.cc -lvvm -lvpip %s", CXX, opath, IVL_INC, IVL_LIB,
 	      opath, DLLIB);
 
       if (verbose_flag)
@@ -456,6 +450,9 @@ int main(int argc, char **argv)
 
 /*
  * $Log: main.c,v $
+ * Revision 1.4  2000/10/28 17:28:16  steve
+ *  Split vpip for everybody.
+ *
  * Revision 1.3  2000/10/28 03:47:25  steve
  *  Use the conf file to generate the vvm ivl string.
  *
diff --git a/vvm/Makefile.in b/vvm/Makefile.in
index 1a46be162..dbb9ac81d 100644
--- a/vvm/Makefile.in
+++ b/vvm/Makefile.in
@@ -18,7 +18,7 @@
 #    59 Temple Place - Suite 330
 #    Boston, MA 02111-1307, USA
 #
-#ident "$Id: Makefile.in,v 1.37 2000/10/06 23:11:39 steve Exp $"
+#ident "$Id: Makefile.in,v 1.38 2000/10/28 17:27:59 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -60,28 +60,26 @@ vpi_mcd.o vpi_vlog_info.o
 
 
 ifeq (@CYGWIN@,yes)
-# In the DOS world, we need to split out the vpip object file.
+# In the DOS world, we make libvpip differently.
 all: libvvm.a libvpip.a vpip.dll
 
-libvvm.a: $O
-	rm -f $@
-	ar cvq $@ $O
-
 libvpip.a vpip.dll: $P vpip.def
 	$(CC) -shared -Wl,--enable-auto-image-base,--out-implib,libvpip.a -o vpip.dll vpip.def $P
 
 else
 
-all: libvvm.a
+all: libvvm.a libvpip.a
 
-libvvm.a: $O vpip.o
+libvpip.a: $P
+	ld -r -o vpip.o $P
 	rm -f $@
-	ar cvq $@ $O vpip.o
-
-vpip.o : $P
-	ld -r -o $@ $P	
+	ar cvq $@ vpip.o
 endif
 
+libvvm.a: $O
+	rm -f $@
+	ar cvq $@ $O
+
 %.o: %.cc
 	@[ -d dep ] || mkdir dep
 	$(CXX) -Wall -fno-exceptions $(CPPFLAGS) $(CXXFLAGS) -MD -c $< -o $*.o
@@ -98,6 +96,7 @@ clean:
 
 install:: all installdirs \
 	$(libdir)/libvvm.a \
+	$(libdir)/libvpip.a \
 	$(includedir)/vvm.h \
 	$(includedir)/vpi_priv.h \
 	$(includedir)/vvm_func.h \
@@ -110,16 +109,16 @@ install:: all installdirs \
 $(libdir)/libvvm.a: ./libvvm.a
 	$(INSTALL_DATA) ./libvvm.a $(libdir)/libvvm.a
 
-ifeq (@CYGWIN@,yes)
-install :: $(libdir)/libvpip.a \
-	$(bindir)/vpip.dll
-
 $(libdir)/libvpip.a: ./libvpip.a
 	$(INSTALL_DATA) ./libvpip.a $(libdir)/libvpip.a
 
+ifeq (@CYGWIN@,yes)
+install :: $(bindir)/vpip.dll
+
 $(bindir)/vpip.dll: ./vpip.dll
 	$(INSTALL_PROGRAM) ./vpip.dll $(bindir)/vpip.dll
 	$(STRIP) $(bindir)/vpip.dll
+
 endif
 
 $(includedir)/vvm.h: $(srcdir)/vvm.h
@@ -149,8 +148,9 @@ $(includedir)/vpi_priv.h: $(srcdir)/vpi_priv.h
 installdirs: mkinstalldirs
 	$(srcdir)/mkinstalldirs $(includedir) $(libdir)
 
-uninstall:
+uninstall::
 	rm -f $(libdir)/libvvm.a
+	rm -f $(libdir)/libvpip.a
 	rm -f $(includedir)/vvm.h
 	rm -f $(includedir)/vvm_calltf.h
 	rm -f $(includedir)/vvm_func.h
@@ -160,5 +160,9 @@ uninstall:
 	rm -f $(includedir)/vvm_thread.h
 	rm -f $(includedir)/vpi_priv.h
 
+ifeq (@CYGWIN@,yes)
+uninstall::
+	rm -f $(bindir)/vpip.dll
+endif
 
 -include $(patsubst %.o, dep/%.d, $O $P)