Start the vvp target config files.

Makefile.in

@@ -16,7 +16,7 @@
 #    59 Temple Place - Suite 330
 #    Boston, MA 02111-1307, USA
 #
-#ident "$Id: Makefile.in,v 1.156 2003/10/14 00:31:31 steve Exp $"
+#ident "$Id: Makefile.in,v 1.157 2003/11/01 04:22:50 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -215,7 +215,9 @@ else
 WIN32_INSTALL = $(bindir)/iverilog-vpi
 endif
 
-install: all installdirs $(libdir)/ivl/ivl@EXEEXT@ $(libdir)/ivl/iverilog.conf $(includedir)/ivl_target.h $(includedir)/_pli_types.h $(includedir)/vpi_user.h $(includedir)/acc_user.h $(includedir)/veriuser.h $(WIN32_INSTALL) $(INSTALL_DOC)
+CONF_INSTALL = $(libdir)/ivl/iverilog.conf
+
+install: all installdirs $(libdir)/ivl/ivl@EXEEXT@  $(CONF_INSTALL) $(includedir)/ivl_target.h $(includedir)/_pli_types.h $(includedir)/vpi_user.h $(includedir)/acc_user.h $(includedir)/veriuser.h $(WIN32_INSTALL) $(INSTALL_DOC)
 	for dir in $(SUBDIRS); do (cd $$dir ; $(MAKE) $@); done
 	for tgt in $(TARGETS); do (cd $$tgt ; $(MAKE) $@); done
 	for dir in vpi ivlpp driver; \
@@ -231,7 +233,7 @@ $(libdir)/ivl/ivl@EXEEXT@: ./ivl@EXEEXT@
 # Install iverilog.conf whenever ivl.exe is installed. This
 # forces iverilog.conf to be treated similarly, in spite of
 # dates in the source bundle.
-$(libdir)/ivl/iverilog.conf: $(libdir)/ivl/ivl@EXEEXT@
+$(libdir)/ivl/iverilog.conf: $(srcdir)/iverilog.conf
 	$(INSTALL_DATA) $(srcdir)/iverilog.conf $(libdir)/ivl/iverilog.conf
 
 $(includedir)/ivl_target.h: $(srcdir)/ivl_target.h

iverilog.conf

@@ -28,6 +28,7 @@
 #
 #     %B  Substitute the base libdir, -B flag of iverilog.
 #
+#     %c  Substitute the path to the installed config file.
 #     %C  Substitute the path to the temporary config file.
 #
 #     %f  Substitute the -f flags from the command line.
@@ -57,10 +58,10 @@
 # These rules support synthesized and non-synthesized variants.
 
 [-tvvp -S]
-<ivl>%B/ivl %[v-v] -C%C %[N-N%N] -tdll -fDLL=%B/vvp.tgt -fVVP_EXECUTABLE=%B/../../bin/vvp -Fsynth2 -Fsynth -Fsyn-rules -Fcprop -Fnodangle %f -- -
+<ivl>%B/ivl %[v-v] -C%c -C%C %[N-N%N] -tdll -fDLL=%B/vvp.tgt -fVVP_EXECUTABLE=%B/../../bin/vvp %f -- -
 
 [-tvvp]
-<ivl>%B/ivl %[v-v] -C%C %[N-N%N] -tdll -fDLL=%B/vvp.tgt -fVVP_EXECUTABLE=%B/../../bin/vvp -Fcprop -Fnodangle %f -- -
+<ivl>%B/ivl %[v-v] -C%c -C%C %[N-N%N] -tdll -fDLL=%B/vvp.tgt -fVVP_EXECUTABLE=%B/../../bin/vvp %f -- -
 
 # This is the XNF code generator.
 

tgt-vvp/Makefile.in

@@ -16,7 +16,7 @@
 #    59 Temple Place - Suite 330
 #    Boston, MA 02111-1307, USA
 #
-#ident "$Id: Makefile.in,v 1.15 2003/02/28 20:21:13 steve Exp $"
+#ident "$Id: Makefile.in,v 1.16 2003/11/01 04:22:51 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -78,11 +78,17 @@ distclean: clean
 
 check: all
 
-install: all installdirs $(libdir)/ivl/vvp.tgt
+install: all installdirs $(libdir)/ivl/vvp.tgt $(libdir)/ivl/vvp.conf $(libdir)/ivl/vvp-s.conf
 
 $(libdir)/ivl/vvp.tgt: ./vvp.tgt
 	$(INSTALL_PROGRAM) ./vvp.tgt $(libdir)/ivl/vvp.tgt
 
+$(libdir)/ivl/vvp.conf: $(srcdir)/vvp.conf
+	$(INSTALL_DATA) $(srcdir)/vvp.conf $(libdir)/ivl/vvp.conf
+
+$(libdir)/ivl/vvp-s.conf: $(srcdir)/vvp-s.conf
+	$(INSTALL_DATA) $(srcdir)/vvp-s.conf $(libdir)/ivl/vvp-s.conf
+
 
 installdirs: ../mkinstalldirs
 	$(srcdir)/../mkinstalldirs $(libdir)/ivl

tgt-vvp/vvp-s.conf

@@ -0,0 +1,5 @@
+functor:synth2
+functor:synth
+functor:syn-rules
+functor:cprop
+functor:nodangle

tgt-vvp/vvp.conf

@@ -0,0 +1,2 @@
+functor:cprop
+functor:nodangle

verilog.spec

@@ -51,6 +51,8 @@ make prefix=$RPM_BUILD_ROOT/usr install
 %attr(-,root,root) /usr/lib/ivl/ivl
 %attr(-,root,root) /usr/lib/ivl/ivlpp
 %attr(-,root,root) /usr/lib/ivl/null.tgt
+%attr(-,root,root) /usr/lib/ivl/vvp.conf
+%attr(-,root,root) /usr/lib/ivl/vvp-s.conf
 %attr(-,root,root) /usr/lib/ivl/vvp.tgt
 %attr(-,root,root) /usr/lib/ivl/fpga.tgt
 %attr(-,root,root) /usr/lib/ivl/iverilog.conf