diff --git a/Makefile.in b/Makefile.in index 7fd98cca6..8eb4c246b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -16,7 +16,7 @@ # 59 Temple Place - Suite 330 # Boston, MA 02111-1307, USA # -#ident "$Id: Makefile.in,v 1.84 2000/12/02 05:30:08 steve Exp $" +#ident "$Id: Makefile.in,v 1.85 2000/12/02 05:57:46 steve Exp $" # # SHELL = /bin/sh @@ -65,7 +65,7 @@ check: all ./check | grep 'Hello, World' clean: - rm -f *.o parse.cc parse.cc.output parse.h dep/*.d lexor.cc lexor_keyword.cc verilog ivl@EXEEXT@ libivl.a + rm -f *.o parse.cc parse.cc.output parse.h dep/*.d lexor.cc lexor_keyword.cc ivl@EXEEXT@ libivl.a cd vvm ; $(MAKE) clean cd vpi ; $(MAKE) clean cd driver ; $(MAKE) clean @@ -103,19 +103,6 @@ $(FF) $(TT) Makefile: Makefile.in config.status ./config.status -# Make the actual verilog program from the script template. This -# simply invloves editing the substitution strings in the script into -# the configured copy. -tmp1 = bindir -tmp2 = libdir -tmp3 = includedir -tmp4 = CXX -verilog: $(srcdir)/verilog.sh - sed -e 's;@$(tmp1)@;@bindir@;' \ - -e 's;@$(tmp2)@;@libdir@;' \ - -e 's;@$(tmp3)@;@includedir@;' \ - -e 's;@dllib@;@DLLIB@;' \ - -e 's;@$(tmp4)@;@CXX@;' < $< > $@ ifeq (@CYGWIN@,yes) ivl@EXEEXT@: $O ivl.def @@ -179,7 +166,7 @@ installdirs: mkinstalldirs uninstall: rm -f $(libdir)/ivl/ivl@EXEEXT@ - rm -f $(bindir)/verilog@EXEEXT@ + rm -f $(bindir)/verilog rm -f $(bindir)/gverilog@EXEEXT@ rm -f $(includedir)/ivl_target.h cd driver ; $(MAKE) uninstall diff --git a/verilog.sh b/verilog.sh deleted file mode 100644 index 4ed0be0de..000000000 --- a/verilog.sh +++ /dev/null @@ -1,133 +0,0 @@ -#!/bin/sh - -# verilog - A wrapper shell script for ivl -# Copyright (C) 1999 Stefan Petersen (spe@geda.seul.org) -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -# Added support for the -t flag, for odd-ball target types. -# Added support for functors, especially for the XNF target. - -# Setup variables -execPath=@libdir@/ivl -execIVLPP=${execPath}/ivlpp -execIVL=${execPath}/ivl -execCpp=@CXX@ - -tmpDir=/tmp -tmpPPFile=${tmpDir}/ivl$$.pp -tmpCCFile=${tmpDir}/ivl$$.cc - -includedir=@includedir@ -libdir=@libdir@ -VPIModulePath=@libdir@/ivl - -target="vvm" -targetSuffix="" -functors="" -flags="" - -# If VPI module path aren't set up, warn at least -#if test -z "${VPI_MODULE_PATH}" ; then -# echo "Missing environment variable VPI_MODULE_PATH."; -# echo "To be able to execute, set VPI_MODULE_PATH to ${VPIModulePath}"; -#fi - -# Try to extract given parameters -parameter=`getopt D:I:Xxf:m:o:s:t: "$@"` -eval set -- "${parameter}" -while true ; do - - case "$1" in - -D) extDefines="${extDefines} -D$2" ; shift 2 ;; - -I) extIncPath="${extIncPath} -I $2" ; shift 2 ;; - -X) target="xnf" ; shift ;; - -f) flags="$flags -f$2" ; shift 2 ;; - -m) flags="$flags -m$2" ; shift 2 ;; - -o) outputFile=$2 ; shift 2 ;; - -s) topModule="-s $2 " ; shift 2 ;; - -t) target="$2" ; shift 2 ;; - -x) execute="true"; shift ;; - --) shift ; break ;; - *) echo "Internal error! Arg is $1 " ; exit 1 ;; - esac - -done - -# The rest is filenames -verilogFile=$@; - -flags="$flags -fVPI_MODULE_PATH=${VPIModulePath}" - -if test -z "${verilogFile}" ; then - echo "Missing infile"; - echo "verilog [-Dmacro[=defn]] [-Iincludepath] [-X] [-x] [-o outputfilename] [-s topmodule] sourcefile[s]" ; - exit 1; -fi - -# Choose a target file suffix based on the target type. -case "$target" in - vvm) targetSuffix="" ;; - xnf) targetSuffix=".xnf" - functors="-Fsynth -Fnodangle -Fxnfio" ;; - *) targetSuffix=".$target" ;; -esac - - -# If no output file is given should we guess one or...? -# Assumes a few silly things if several files are given -if test -z "${outputFile}" ; then - outputFile=`echo ${verilogFile} | sed -e 's;.* ;;' | sed -e 's;\..*$;;'` - outputFile="${outputFile}${targetSuffix}" ; -fi - -# Preprocess -${execIVLPP} ${extDefines} ${extIncPath} -L -o ${tmpPPFile} ${verilogFile} -if test $? -ne 0 ; then - echo "Preprocessing failed. Terminating compilation." - rm -f ${tmpPPFile} - exit 1 -fi - - -# Compile preprocessed verilog file -${execIVL} -t ${target} -o ${tmpCCFile} ${topModule} ${functors} ${flags} ${tmpPPFile} -if test $? -ne 0 ; then - echo "Verilog compilation failed. Terminating compilation." - rm -f ${tmpCCFile} - exit 1 -fi -rm -f ${tmpPPFile} - - -case "${target}" in - - "xnf") mv ${tmpCCFile} ${outputFile} ;; - - "vvm") ${execCpp} -rdynamic -I${includedir} -L${libdir} ${tmpCCFile} -o ${outputFile} -lvvm @dllib@ ; - if test $? -ne 0 ; then - echo "C++ compilation failed. Terminating compilation." - rm -f ${tmpCCFile} - exit 1 - fi - rm -f ${tmpCCFile} ;; - - *) mv ${tmpCCFile} ${outputFile} ;; - -esac - -if test ${execute} ; then - ./${outputFile} -fi