Move ivl and ivlpp to the lib directory.

This commit is contained in:
steve 2000-01-01 20:57:50 +00:00
parent 65e4e9f428
commit 4c274223cf
4 changed files with 15 additions and 15 deletions

View File

@ -18,7 +18,7 @@
# 59 Temple Place - Suite 330 # 59 Temple Place - Suite 330
# Boston, MA 02111-1307, USA # Boston, MA 02111-1307, USA
# #
#ident "$Id: Makefile.in,v 1.32 1999/12/30 17:37:13 steve Exp $" #ident "$Id: Makefile.in,v 1.33 2000/01/01 20:57:50 steve Exp $"
# #
# #
SHELL = /bin/sh SHELL = /bin/sh
@ -116,7 +116,7 @@ parse.h parse.cc: $(srcdir)/parse.y
lexor.cc: $(srcdir)/lexor.lex lexor.cc: $(srcdir)/lexor.lex
flex -PVL -s -olexor.cc $(srcdir)/lexor.lex flex -PVL -s -olexor.cc $(srcdir)/lexor.lex
install: all installdirs $(bindir)/verilog $(bindir)/gverilog $(bindir)/ivl $(mandir)/man1/verilog.1 install: all installdirs $(bindir)/verilog $(bindir)/gverilog $(libdir)/ivl/ivl $(mandir)/man1/verilog.1
cd vpi ; $(MAKE) install cd vpi ; $(MAKE) install
cd vvm ; $(MAKE) install cd vvm ; $(MAKE) install
cd ivlpp ; $(MAKE) install cd ivlpp ; $(MAKE) install
@ -127,9 +127,9 @@ $(bindir)/verilog: ./verilog
$(bindir)/gverilog: ./gverilog $(bindir)/gverilog: ./gverilog
$(INSTALL_PROGRAM) ./gverilog $(bindir)/gverilog $(INSTALL_PROGRAM) ./gverilog $(bindir)/gverilog
$(bindir)/ivl: ivl $(libdir)/ivl/ivl: ./ivl
$(INSTALL_PROGRAM) ./ivl $(bindir)/ivl $(INSTALL_PROGRAM) ./ivl $(libdir)/ivl/ivl
$(STRIP) $(bindir)/ivl $(STRIP) $(libdir)/ivl/ivl
$(mandir)/man1/verilog.1: $(srcdir)/verilog.1 $(mandir)/man1/verilog.1: $(srcdir)/verilog.1
$(INSTALL_DATA) $(srcdir)/verilog.1 $(mandir)/man1/verilog.1 $(INSTALL_DATA) $(srcdir)/verilog.1 $(mandir)/man1/verilog.1
@ -138,7 +138,7 @@ installdirs: mkinstalldirs
$(srcdir)/mkinstalldirs $(bindir) $(mandir)/man1 $(srcdir)/mkinstalldirs $(bindir) $(mandir)/man1
uninstall: uninstall:
rm -f $(bindir)/ivl rm -f $(libdir)/ivl/ivl
rm -f $(bindir)/verilog rm -f $(bindir)/verilog
rm -f $(mandir)/man1/verilog.1 rm -f $(mandir)/man1/verilog.1
cd vpi ; $(MAKE) uninstall cd vpi ; $(MAKE) uninstall

View File

@ -142,7 +142,7 @@ void preprocess(void)
argument = (char *)malloc(256); argument = (char *)malloc(256);
sprintf(argument, "ivlpp %s %s -L -o%s %s", sprintf(argument, LIBDIR "ivl/ivlpp %s %s -L -o%s %s",
P_IF_SET(ivlppdefines), P_IF_SET(ivlppdefines),
P_IF_SET(ivlppincdir), P_IF_SET(ivlppincdir),
tmpPPfile, tmpPPfile,
@ -171,7 +171,7 @@ void compile(void)
/* VPI_MODULE_PATH should be better integrated. */ /* VPI_MODULE_PATH should be better integrated. */
/* HACK */ /* HACK */
sprintf(argument, "ivl %s %s %s %sVPI_MODULE_PATH=%s -o %s %s", sprintf(argument, LIBDIR "/ivl/ivl %s %s %s %sVPI_MODULE_PATH=%s -o %s %s",
P_IF_SET(topmodule), P_IF_SET(topmodule),
target.targetinfo.compsw, target.targetinfo.name, target.targetinfo.compsw, target.targetinfo.name,
VPImodpath.compsw, VPImodpath.name, VPImodpath.compsw, VPImodpath.name,

View File

@ -18,7 +18,7 @@
# 59 Temple Place - Suite 330 # 59 Temple Place - Suite 330
# Boston, MA 02111-1307, USA # Boston, MA 02111-1307, USA
# #
#ident "$Id: Makefile.in,v 1.6 1999/10/16 20:48:15 steve Exp $" #ident "$Id: Makefile.in,v 1.7 2000/01/01 20:57:51 steve Exp $"
# #
# #
SHELL = /bin/sh SHELL = /bin/sh
@ -60,16 +60,16 @@ lexor.c: lexor.lex
parse.h parse.c: parse.y parse.h parse.c: parse.y
bison --verbose -t -d parse.y -o parse.c bison --verbose -t -d parse.y -o parse.c
install: all installdirs $(bindir)/ivlpp install: all installdirs $(libdir)/ivl/ivlpp
$(bindir)/ivlpp: ivlpp $(libdir)/ivl/ivlpp: ivlpp
$(INSTALL_PROGRAM) ./ivlpp $(bindir)/ivlpp $(INSTALL_PROGRAM) ./ivlpp $(libdir)/ivl/ivlpp
installdirs: ../mkinstalldirs installdirs: ../mkinstalldirs
$(srcdir)/../mkinstalldirs $(bindir) $(srcdir)/../mkinstalldirs $(libdir)/ivl
uninstall: uninstall:
rm -f $(bindir)/ivlpp rm -f $(libdir)/ivl/ivlpp
lexor.o: lexor.c parse.h globals.h lexor.o: lexor.c parse.h globals.h
main.o: main.c globals.h main.o: main.c globals.h

View File

@ -21,7 +21,7 @@
# Added support for functors, especially for the XNF target. <steve@icarus.com> # Added support for functors, especially for the XNF target. <steve@icarus.com>
# Setup variables # Setup variables
execPath=@bindir@ execPath=@libdir@/ivl
execIVLPP=${execPath}/ivlpp execIVLPP=${execPath}/ivlpp
execIVL=${execPath}/ivl execIVL=${execPath}/ivl
execCpp=@CXX@ execCpp=@CXX@