Permalink
Browse files

Rearrange VPI support libraries.

  • Loading branch information...
1 parent 264e629 commit 32f3881344fbd065ec22571dd8214a594db2052a steve committed Mar 14, 2001
View
@@ -16,7 +16,7 @@
# 59 Temple Place - Suite 330
# Boston, MA 02111-1307, USA
#
-#ident "$Id: Makefile.in,v 1.92 2001/03/11 00:29:38 steve Exp $"
+#ident "$Id: Makefile.in,v 1.93 2001/03/14 19:27:44 steve Exp $"
#
#
SHELL = /bin/sh
@@ -60,6 +60,7 @@ endif
all: ivl@EXEEXT@
+ for dir in $(SUBDIRS); do (cd $$dir ; $(MAKE) all); done
cd vvm ; $(MAKE) all
cd vpi ; $(MAKE) all
cd ivlpp ; $(MAKE) all
@@ -83,9 +84,12 @@ clean:
cd ivlpp ; $(MAKE) clean
cd tgt-verilog ; $(MAKE) clean
cd tgt-stub ; $(MAKE) clean
+ for dir in $(SUBDIRS); do (cd $$dir ; $(MAKE) clean); done
for tgt in $(TARGETS); do (cd $$tgt ; $(MAKE) clean); done
distclean: clean
+ for dir in $(SUBDIRS); do (cd $$dir ; $(MAKE) distclean); done
+ for tgt in $(TARGETS); do (cd $$tgt ; $(MAKE) distclean); done
rm -f vvm/Makefile
rm -f vpi/Makefile
rm -f ivlpp/Makefile
@@ -155,11 +159,12 @@ lexor_keyword.cc: lexor_keyword.gperf
gperf -o -i 7 -C -k 1-3,$$ -L ANSI-C -H keyword_hash -N check_identifier -t $(srcdir)/lexor_keyword.gperf > lexor_keyword.cc || (rm -f lexor_keyword.cc ; false)
-install: all installdirs $(libdir)/ivl/ivl@EXEEXT@ $(libdir)/ivl/iverilog.conf $(includedir)/ivl_target.h
+install: all installdirs $(libdir)/ivl/ivl@EXEEXT@ $(libdir)/ivl/iverilog.conf $(includedir)/ivl_target.h $(includedir)/vpi_user.h
cd vvm ; $(MAKE) install
cd vpi ; $(MAKE) install
cd ivlpp ; $(MAKE) install
cd driver ; $(MAKE) install
+ for tgt in $(SUBDIRS); do (cd $$tgt ; $(MAKE) install); done
for tgt in $(TARGETS); do (cd $$tgt ; $(MAKE) install); done
$(libdir)/ivl/ivl@EXEEXT@: ./ivl@EXEEXT@
@@ -172,6 +177,9 @@ $(libdir)/ivl/iverilog.conf: $(srcdir)/iverilog.conf
$(includedir)/ivl_target.h: $(srcdir)/ivl_target.h
$(INSTALL_DATA) $(srcdir)/ivl_target.h $(includedir)/ivl_target.h
+$(includedir)/vpi_user.h: $(srcdir)/vpi_user.h
+ $(INSTALL_DATA) $(srcdir)/vpi_user.h $(includedir)/vpi_user.h
+
installdirs: mkinstalldirs
$(srcdir)/mkinstalldirs $(bindir) $(includedir) $(libdir)/ivl
@@ -180,10 +188,12 @@ uninstall:
rm -f $(bindir)/verilog
rm -f $(bindir)/gverilog@EXEEXT@
rm -f $(includedir)/ivl_target.h
+ rm -f $(includedir)/vpi_user.h
cd driver ; $(MAKE) uninstall
cd vpi ; $(MAKE) uninstall
cd vvm ; $(MAKE) uninstall
cd ivlpp ; $(MAKE) uninstall
+ for tgt in $(SUBDIRS); do (cd $$tgt ; $(MAKE) uninstall); done
for tgt in $(TARGETS); do (cd $$tgt ; $(MAKE) uninstall); done
View
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+#
+# This shell script exists to run autoconf on source distributions
+# that are pulled from CVS. The configure scripts are not included
+# in CVS, and there are several configure.in files, so it is easiest
+# to just run this script to autoconf wherever needed.
+#
+echo "Autoconf in root..."
+autoconf
+
+for dir
+in vpip vvp
+do
+ echo "Autoconf in $dir..."
+ ( cd $dir ; autoconf )
+done
View
@@ -148,6 +148,6 @@ AC_SUBST(shared)
AC_MSG_RESULT($shared)
-AC_CONFIG_SUBDIRS(vvp)
+AC_CONFIG_SUBDIRS(vpip vvp)
AC_OUTPUT(Makefile vpi/Makefile ivlpp/Makefile vvm/Makefile driver/Makefile tgt-null/Makefile tgt-stub/Makefile tgt-verilog/Makefile tgt-pal/Makefile)
View
@@ -18,7 +18,7 @@
# 59 Temple Place - Suite 330
# Boston, MA 02111-1307, USA
#
-#ident "$Id: Makefile.in,v 1.21 2001/02/16 00:26:38 steve Exp $"
+#ident "$Id: Makefile.in,v 1.22 2001/03/14 19:27:44 steve Exp $"
#
#
SHELL = /bin/sh
@@ -50,16 +50,16 @@ all: system.vpi
%.o: %.c
@[ -d dep ] || mkdir dep
- $(CC) -Wall $(CPPFLAGS) $(CFLAGS) -I$(srcdir) -MD -c $< -o $*.o
+ $(CC) -Wall $(CPPFLAGS) $(CFLAGS) -I$(srcdir) -I$(srcdir)/../vpip -MD -c $< -o $*.o
mv $*.d dep
O = sys_table.o sys_display.o sys_finish.o sys_random.o \
sys_readmem.o sys_readmem_lex.o sys_time.o sys_vcd.o \
mt19937int.o
ifeq (@CYGWIN@,yes)
- SYSTEM_VPI_LDFLAGS=-Wl,--enable-auto-image-base -L../vvm -lvvm -lvpip
- VPI_DEPLIBS=../vvm/libvpip.a
+ SYSTEM_VPI_LDFLAGS=-Wl,--enable-auto-image-base -L../vvm -lvvm -L../vpip -lvpip
+ VPI_DEPLIBS=../vpip/libvpip.a
else
SYSTEM_VPI_LDFLAGS=
VPI_DEPLIBS=
@@ -74,23 +74,17 @@ sys_readmem_lex.c: sys_readmem_lex.lex
clean:
rm -f *.o dep/*.d
-install: all installdirs $(libdir)/ivl/system.vpi \
- $(includedir)/vpi_user.h
+install: all installdirs $(libdir)/ivl/system.vpi
$(libdir)/ivl/system.vpi: ./system.vpi
$(INSTALL_PROGRAM) ./system.vpi $(libdir)/ivl/system.vpi
$(STRIP) $(libdir)/ivl/system.vpi
-$(includedir)/vpi_user.h: $(srcdir)/vpi_user.h
- $(INSTALL_DATA) $(srcdir)/vpi_user.h $(includedir)/vpi_user.h
-
-
installdirs: ../mkinstalldirs
- $(srcdir)/../mkinstalldirs $(includedir) $(bindir) $(libdir)/ivl
+ $(srcdir)/../mkinstalldirs $(libdir)/ivl
uninstall:
rm -f $(libdir)/ivl/system.vpi
- rm -f $(includedir)/vpi_user.h
-include $(patsubst %.o, dep/%.d, $O)
Oops, something went wrong.

0 comments on commit 32f3881

Please sign in to comment.