diff --git a/Makefile.in b/Makefile.in index a2eeb300c..63da1540f 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.169.2.3 2006/05/01 20:11:56 steve Exp $" +#ident "$Id: Makefile.in,v 1.169.2.4 2006/05/08 04:33:35 steve Exp $" # # SHELL = /bin/sh @@ -54,6 +54,8 @@ INSTALL_DATA = @INSTALL_DATA@ STRIP = @STRIP@ LEX = @LEX@ YACC = @YACC@ +MAN = @MAN@ +PS2PDF = @PS2PDF@ CPPFLAGS = @ident_support@ @DEFS@ -I. -I$(srcdir) @CPPFLAGS@ CXXFLAGS = -Wall @CXXFLAGS@ @@ -186,15 +188,25 @@ 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) iverilog-vpi.ps: $(srcdir)/iverilog-vpi.man - man -t $(srcdir)/iverilog-vpi.man > iverilog-vpi.ps + $(MAN) -t $(srcdir)/iverilog-vpi.man > iverilog-vpi.ps iverilog-vpi.pdf: iverilog-vpi.ps - ps2pdf iverilog-vpi.ps iverilog-vpi.pdf + $(PS2PDF) iverilog-vpi.ps iverilog-vpi.pdf +# Build and install the iverilog-vpi.pdf only if there is a man +# program *and* a ps2pdf program. ifeq (@WIN32@,yes) +ifeq ($(MAN),none) +INSTALL_DOC = $(mandir)/man1/iverilog-vpi.1 +else +ifeq ($(PS2PDF),none) +INSTALL_DOC = $(mandir)/man1/iverilog-vpi.1 +else INSTALL_DOC = $(prefix)/iverilog-vpi.pdf $(mandir)/man1/iverilog-vpi.1 -INSTALL_DOCDIR = $(mandir)/man1 all: dep iverilog-vpi.pdf +endif +endif +INSTALL_DOCDIR = $(mandir)/man1 else INSTALL_DOC = $(mandir)/man1/iverilog-vpi.1 INSTALL_DOCDIR = $(mandir)/man1 diff --git a/configure.in b/configure.in index 7cc37d156..f1eec543f 100644 --- a/configure.in +++ b/configure.in @@ -9,6 +9,9 @@ AC_PROG_CC AC_PROG_CXX AC_CHECK_TOOL(STRIP, strip, true) AC_CHECK_PROGS(XGPERF,gperf,none) +AC_CHECK_PROGS(MAN,man,none) +AC_CHECK_PROGS(PS2PDF,ps2pdf,none) + if test "$XGPERF" = "none" then echo "" diff --git a/driver/Makefile.in b/driver/Makefile.in index 55188f594..4bd277339 100644 --- a/driver/Makefile.in +++ b/driver/Makefile.in @@ -16,7 +16,7 @@ # 59 Temple Place - Suite 330 # Boston, MA 02111-1307, USA # -#ident "$Id: Makefile.in,v 1.24.2.1 2005/02/23 18:40:23 steve Exp $" +#ident "$Id: Makefile.in,v 1.24.2.2 2006/05/08 04:33:35 steve Exp $" # # SHELL = /bin/sh @@ -40,6 +40,8 @@ CC = @CC@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ +MAN = @MAN@ +PS2PDF = @PS2PDF@ CPPFLAGS = @ident_support@ -I. -I.. -I$(srcdir)/.. -I$(srcdir) -DVERSION='"$(VERSION)"' @CPPFLAGS@ @DEFS@ CFLAGS = -Wall @CFLAGS@ @@ -76,15 +78,23 @@ cflexor.o: cflexor.c cfparse.h cfparse_misc.h globals.h cfparse.o: cfparse.c globals.h cfparse_misc.h iverilog.ps: $(srcdir)/iverilog.man - man -t $(srcdir)/iverilog.man > iverilog.ps + $(MAN) -t $(srcdir)/iverilog.man > iverilog.ps iverilog.pdf: iverilog.ps - ps2pdf iverilog.ps iverilog.pdf + $(PS2PDF) iverilog.ps iverilog.pdf ifeq (@WIN32@,yes) +ifeq ($(MAN),none) +INSTALL_DOC = $(mandir)/man1/iverilog.1 +else +ifeq ($(PS2PDF),none) +INSTALL_DOC = $(mandir)/man1/iverilog.1 +else INSTALL_DOC = $(prefix)/iverilog.pdf $(mandir)/man1/iverilog.1 -INSTALL_DOCDIR = $(mandir)/man1 all: iverilog.pdf +endif +endif +INSTALL_DOCDIR = $(mandir)/man1 else INSTALL_DOC = $(mandir)/man1/iverilog.1 INSTALL_DOCDIR = $(mandir)/man1 diff --git a/lexor.lex b/lexor.lex index aea31b876..ca782727c 100644 --- a/lexor.lex +++ b/lexor.lex @@ -1,4 +1,6 @@ +%option never-interactive + %{ /* * Copyright (c) 1998-2000 Stephen Williams (steve@icarus.com) @@ -19,7 +21,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #ifdef HAVE_CVS_IDENT -#ident "$Id: lexor.lex,v 1.86.2.2 2005/09/09 02:13:15 steve Exp $" +#ident "$Id: lexor.lex,v 1.86.2.3 2006/05/08 04:33:35 steve Exp $" #endif # include "config.h" diff --git a/mingw.txt b/mingw.txt index fcb1aab5e..d2529bec8 100644 --- a/mingw.txt +++ b/mingw.txt @@ -2,7 +2,7 @@ MINGW PORT OF ICARUS VERILOG - Copyright 2003 Stephen Williams + Copyright 2006 Stephen Williams Icarus Verilog source can be compiled with the mingw C/C++ compilers @@ -12,11 +12,11 @@ or without Cygwin, so this is the preferred Windows distribution form. The configure scripts automatically detect that the compilers in use are the mingw compilers and will configure the Makefiles appropriately. -However, the mingw tools do not include all the other tools around the -compiler, including the shell interpreter for the configure script, -bison, flex, gperf, etc. Therefore, you still need Cygwin to compile -Icarus Verilog, even if you don't need the Cygwin compilers. There are -also a few precompiled library prerequisites that you need. +The mingw patch doesn't contain tools beyond the compiler, but there +is the "msys" package that the makers of Mingw publish that has enough +extra tools to get most everything else working. There are a few extra +packages needed beyond mingw and msys, and the following instructions +explain how to get them and install them. * Some Preliminary Comments -- PLEASE READ ME -- @@ -29,6 +29,13 @@ software development can do this, but some patience (and access to the Internet) is required. You may choose to print these instructions. FOR BEST RESULTS, FOLLOW THESE INSTRUCTIONS CAREFULLY. +NOTE that if you have Cygwin installed, it is best to not use a cygwin +window to do the build, as the Cygwin tools will intermix with the +mingw tools such that it is hard to be sure you are using the right +compiler. Thus, it is recommended that these steps be *not* done in a +Cygwin window. Use an MSYS window instead, and be careful that your +msys/mingw tools are not masked by paths that point to Cygwin binaries. + I have no plans to intentionally support MSVC++ compilation. Don't ask. * Summary of Prerequisites @@ -37,13 +44,13 @@ This is a brief list of prerequisite packages, along with the URL where each can be found. In most cases, the specific version is not critical, but these are the versions I use. - Cygwin - Mingw32-3.1.0 + msys-1.0 + msysDTK-1.0 + Mingw32-5.x readline-4.2-20010727.zip - bzip2-1.0.2-bin.zip - zlib-1.1.4-bin.zip - bzip2-1.0.2-lib.zip - zlib-1.1.4-lib.zip + bzip2-1.0.3 + zlib-1.2.3 + gperf-3.0.1 The above table lists the packages required. It is convenient to install them in the above order. Many of these packages are also @@ -56,59 +63,38 @@ installation of Icarus Verilog is complete. These are only needed to build the compiler. The Mingw32 package can be used to compile VPI modules if you choose. -* Install Cygwin +* Install MSYS and msysDTK -So, step 1 is "Download and Install Cygwin." See the web page -http://www.cygwin.com for instructions and the files to do -this. Cygwin *is* a kool package, and is worth having anyhow. There is -a convenient setup program that you download first. You execute the -setup program, and that prompts you to select the package you want. +The msys package is available from the mingw download site. This is +not the compiler but a collection of *nix tools ported to Windows and +wrapped in a convenient installer. The msys package is all the various +basic tools (shells, file utils, etc) and the msysDTK is extra +developer tools other then the compiler. -You need in particular the Cygwin base, bison (see notes) flex, make -and gperf. If you are compiling from CVS, you also need cvs, rcs and -automake packages. You will also need tar and gunzip, but these are -hard to not install. I recommend installing the "which" package as -well. Beyond the basics, be sure to install these Cygwin packages: +Download the msys-1.x.x.exe and msysdtc-1.x.x.exe binaries. These are +self-installing packages. Install msys first, and then msysDTC. Most +likely, you want to install them in c:/msys. (The msysDTK is installed +in the same location, as it is an add-on.) - bison (*not* 1.875. See Notes.) - flex - ghostscript (makes the documentation) - gperf - gzip - make - strip - tar (tar and gunzip for unpacking the source) - unzip (For unpacking zip compressed packages.) - which +This install should be easy and reliable. - NOTES: - bison-1.875 is broken, it generates invalid C/C++ code. You - don't want that version for anything you do. If you have that - version (use "bison -V" to check the version) then use the - Cygwin setup program to get a different version. I've downgraded - to 1.75 and couldn't be happier. In fact, a whole host of insane - bison bugs can be avoided that way. - - There is a mingw32 runtime package included in the Cygwin - distribution. You do *not* need that, as you will be getting - everything from the mingw32 distribution itself. - -Other then the install of mingw32, most of the remaining steps are -best done in a Cygwin window. When you installed Cygwin, a start menu -entry was created to allow you to start up the Cygwin window. I'll use -the string "$ " to represent a command prompt in this window, because -that is the usual bash prompt. +The installation will leave an "msys" icon on your desktop and in the +mingw sub-menu of your Start menu. This icon brings up a shell window +(a command line) that has paths all set up for executing msys and +mingw commands. This is what you will want to use while executing +commands below. * Install Mingw32 The obvious step 2, then, is install the mingw compilers. These can be -found at the web page . The Mingw-3.x.x version -comes prepackaged in a convenient, Windows style, installer. I -recommend you download this package instead of picking and choosing -bits. +found at the web page . The Mingw-5.x.x package +is a convenient remote installer. Download this program and run +it. The installer will ask wich components you want to install. You +need only the base C compiler and the C++ compiler. (You may install +other languages if you wish.) When I install Mingw32 (using the installer) I typically set a -destination directory of d:\mingw-3.1.0 or the like. You will be using +destination directory of d:\mingw or the like. You will be using that path later. NOTES: @@ -128,68 +114,73 @@ with simplified Windows installers, but they are pretty easy to install by hand. Icarus Verilog uses the readline-4.2 package from that collection. -Since I installed Mingw32 in d:\mingw-2.0.0, I also created a -Mingw-packages directory called d:\mingw-packages. The install, then, +Since I installed Mingw32 in c:\mingw, I also created a +Mingw-packages directory called c:\mingw-packages. The install, then, is as easy as this: - - $ cd d:/mingw-packages + + $ cd c:/mingw-packages $ unzip readline-4.2-20010727.zip [lots of inflating...] +There is no need to adjust your execution path for this package as we +are only using a library out of here. However, do remember the +directory name, as you will need it later. + Done. On to the next packages. * Install GnuWin32 Packages The GnuWin32 project is a collections of open source programs and libraries ported to Windows. These also work well with the Mingw -compiler, and in fact Icarus Verilog uses a few libraries from this +compiler, and in fact Icarus Verilog uses a few pieces from this collection. You will need these gnuwin32 packages to compile Icarus Verilog: - bzip2-1.0.2-lib.zip - bzip2-1.0.2-bin.zip - zlib-1.1.4-lib.zip - zlib-1.1.4-bin.zip + bzip2-1.0.3.exe + zlib-1.2.3.exe + gperf-3.0.1.exe I suggest creating a common directory for holding all your gnuwin32 -packages. I use D:\gnuwin32. +packages. I use C:\gnuwin32. The download page at the gnuwin32 site +has a "setup" link for each of these packages. Click the setup to +download the installer for each of the desired programes, then execute +the downloaded .exe files to invoke the installer. Install into the +c:\gunwin32 directory. -After downloading these packages, put the .zip files in your gnuwin32 -directory and install them like so: + NOTES: + You need the binaries and the developer files, but you do not + need the source to these packages. The installer gives you the + choise. - - $ cd d:/gnuwin32 - $ unzip bzip2-1.0.2-bin.zip - [lots of inflating...] - $ unzip bzip2-1.0.2-lib.zip - [lots of inflating...] - $ unzip zlib-1.1.4-bin.zip - [lots of inflating...] - $ unzip zlib-1.1.4-lib.zip - [lots of inflating...] - -Done. +After you are done installing the gnuwin32 tools, you should add the +c:\gnuwin32\bin directory (assuming you installed in c:\gnuwin32) to +your Windows path. The msys shell will pikc up your Windows +path. * Unpack Icarus Verilog source Unpack the compressed tar file (.tar.gz) of the source with a command like this: - $ gunzip -d verilog-20030303.tar.gz | tar xvf - + $ gunzip -d verilog-xxxxxxxx.tar.gz | tar xvf - -This will create a directory "verilog-20030303" that contains all the +This will create a directory "verilog-xxxxxxxx" that contains all the source for Icarus Verilog. Descend into that directory, as that is where we will work from now on. - $ cd verilog-20030303 + $ cd verilog-xxxxxxxx - NOTE: + NOTES: The exact name of the file will vary according to the snapshot. The 20030303 name is only an example. + Unpack the source into a directory that has no spaces. The + makefiles included in the source get confused by white space in + directory names. + * Configure Icarus Verilog Now we are all set to configure and compile Icarus Verilog. Choose a @@ -201,12 +192,10 @@ without white space. Now, configure the source to make the makefiles and configuration details. Run these commands: - $ CC=mingw32-gcc - $ CXX=mingw32-g++ - $ CPPFLAGS="-Id:/gnuwin32/include -Id:/mingw-packages/include" - $ LDFLAGS="-Ld:/gnuwin32/lib -Ld:/mingw-packages/include" - $ export CPPFLAGS LDFLAGS CC CXX - $ ./configure --prefix=d:/iverilog --host=mingw32 + $ CPPFLAGS="-Ic:/gnuwin32/include -Ic:/mingw-packages/include" + $ LDFLAGS="-Lc:/gnuwin32/lib -Lc:/mingw-packages/include" + $ export CPPFLAGS LDFLAGS + $ ./configure --prefix=c:/iverilog NOTES: The CPPFLAGS and LDFLAGS variables tell configure where @@ -217,11 +206,6 @@ details. Run these commands: Your PATH variable was set in the previous step. - The CC and CXX variables explicitly select the mingw32 - compilers. This is important. Without this step, you may wind up - compiling with the cygwin compiler, and that is definitely *not* - what you want. - Use forward slashes as directory characters. All the various tools prefer the forward slash. @@ -260,10 +244,10 @@ directory you chose) and away you go. You may find that you need to put some of the prerequisite DLLs into the d:\iverilog\bin directory. These include: - d:\mingw-2.0.0\bin\mingw10.dll - d:\mingw-packages\bin\libreadline.dll - d:\gnuwin32\bin\bzip2.dll - d:\gnuwin32\bin\zlib.dll + c:\mingw\bin\mingw10.dll + c:\mingw-packages\bin\libreadline.dll + c:\gnuwin32\bin\bzip2.dll + c:\gnuwin32\bin\zlib.dll If you already have these in your Windows path (i.e. your system32 directory) then you do not need to copy them into the iverilog @@ -272,14 +256,14 @@ files. * Running Icarus Verilog -Finally, put the D:\iverilog\bin directory in your Windows path, and +Finally, put the C:\iverilog\bin directory in your Windows path, and you should be able to run the iverilog and vvp commands to your heart's content. Currently, the iverilog.exe uses the path to itself to locate the libraries and modules associated with itself. In other words, if you -execute the D:\iverilog\bin\iverilog.exe program, it will locate its -subparts in the D:\iverilog directory and subdirectories below +execute the C:\iverilog\bin\iverilog.exe program, it will locate its +subparts in the C:\iverilog directory and subdirectories below that. This means you can move the Icarus Verilog installation by simply moving the root directory and all its contents. diff --git a/tgt-edif/Makefile.in b/tgt-edif/Makefile.in index b83a7f3cf..db575a21d 100644 --- a/tgt-edif/Makefile.in +++ b/tgt-edif/Makefile.in @@ -24,7 +24,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -#ident "$Id: Makefile.in,v 1.1.2.2 2005/09/25 16:35:36 steve Exp $" +#ident "$Id: Makefile.in,v 1.1.2.3 2006/05/08 04:33:36 steve Exp $" # # SHELL = /bin/sh @@ -47,6 +47,8 @@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ RANLIB = @RANLIB@ +MAN = @MAN@ +PS2pdf = @ps2pdf@ CPPFLAGS = @ident_support@ -I.. -I$(srcdir) -I$(srcdir)/.. @CPPFLAGS@ @DEFS@ @PICFLAG@ CFLAGS = -Wall @CFLAGS@ @@ -82,10 +84,10 @@ libedif_tgt.a: $O $(RANLIB) libedif_tgt.a iverilog-edif.ps: $(srcdir)/iverilog-edif.man - man -t $(srcdir)/iverilog-edif.man > iverilog-edif.ps + $(MAN) -t $(srcdir)/iverilog-edif.man > iverilog-edif.ps iverilog-edif.pdf: iverilog-edif.ps - ps2pdf iverilog-edif.ps iverilog-edif.pdf + $(PS2PDF) iverilog-edif.ps iverilog-edif.pdf Makefile: Makefile.in config.status @@ -101,11 +103,18 @@ distclean: clean check: all ifeq (@WIN32@,yes) -#INSTALL_DOC = $(prefix)/iverilog-edif.pdf $(mandir)/man1/iverilog-edif.1 -#INSTALL_DOCDIR = $(mandir)/man1 -all: iverilog-edif.pdf +ifeq ($(MAN),none) +INSTALL_DOC = else +ifeq ($(PS2PDF),none) #INSTALL_DOC = $(mandir)/man1/iverilog-edif.1 +else +#INSTALL_DOC = $(prefix)/iverilog-edif.pdf $(mandir)/man1/iverilog-edif.1 +#all: iverilog-edif.pdf +endif +endif +else +#INSTALL_DOC = $(prefix)/iverilog-edif.pdf $(mandir)/man1/iverilog-edif.1 #INSTALL_DOCDIR = $(mandir)/man1 endif diff --git a/tgt-edif/configure.in b/tgt-edif/configure.in index 9e047dc3f..d1b25240c 100644 --- a/tgt-edif/configure.in +++ b/tgt-edif/configure.in @@ -5,6 +5,8 @@ dnl Checks for programs. AC_PROG_CC AC_PROG_RANLIB AC_PROG_INSTALL +AC_CHECK_PROGS(MAN,man,none) +AC_CHECK_PROGS(PS2PDF,ps2pdf,none) AC_CANONICAL_HOST # $host diff --git a/tgt-fpga/Makefile.in b/tgt-fpga/Makefile.in index 757f078c4..25605311b 100644 --- a/tgt-fpga/Makefile.in +++ b/tgt-fpga/Makefile.in @@ -17,7 +17,7 @@ # 59 Temple Place - Suite 330 # Boston, MA 02111-1307, USA # -#ident "$Id: Makefile.in,v 1.16.2.1 2005/02/23 18:40:24 steve Exp $" +#ident "$Id: Makefile.in,v 1.16.2.2 2006/05/08 04:33:36 steve Exp $" # # SHELL = /bin/sh @@ -39,6 +39,8 @@ CC = @CC@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ +MAN = @MAN@ +PS2PDF = @PS2PDF@ CPPFLAGS = @ident_support@ -I.. -I$(srcdir) -I$(srcdir)/.. @CPPFLAGS@ @DEFS@ @PICFLAG@ CFLAGS = -Wall @CFLAGS@ @@ -88,9 +90,17 @@ distclean: clean check: all ifeq (@WIN32@,yes) +ifeq ($(MAN),none) +INSTALL_DOC = $(mandir)/man1/iverilog-fpga.1 +else +ifeq (@PS2PDF@,none) +INSTALL_DOC = $(mandir)/man1/iverilog-fpga.1 +else INSTALL_DOC = $(prefix)/iverilog-fpga.pdf $(mandir)/man1/iverilog-fpga.1 -INSTALL_DOCDIR = $(mandir)/man1 all: iverilog-fpga.pdf +endif +endif +INSTALL_DOCDIR = $(mandir)/man1 else INSTALL_DOC = $(mandir)/man1/iverilog-fpga.1 INSTALL_DOCDIR = $(mandir)/man1 diff --git a/tgt-fpga/configure.in b/tgt-fpga/configure.in index 4ce303724..daa6c05d8 100644 --- a/tgt-fpga/configure.in +++ b/tgt-fpga/configure.in @@ -5,6 +5,8 @@ dnl Checks for programs. AC_PROG_CC AC_PROG_INSTALL +AC_CHECK_PROGS(MAN,man,none) +AC_CHECK_PROGS(PS2PDF,ps2pdf,none) AC_CANONICAL_HOST # $host diff --git a/vpi/lxt_write.c b/vpi/lxt_write.c index 0ae0c49ef..d091d2662 100644 --- a/vpi/lxt_write.c +++ b/vpi/lxt_write.c @@ -22,6 +22,11 @@ #include "lxt_write.h" +#if defined(_MSC_VER) || defined(__MINGW32__) +#define fseeko fseek +#define ftello ftell +#endif + /************************ splay ************************/ static int dslxt_success; diff --git a/vvp/Makefile.in b/vvp/Makefile.in index 157e8db58..238e10d18 100644 --- a/vvp/Makefile.in +++ b/vvp/Makefile.in @@ -16,7 +16,7 @@ # 59 Temple Place - Suite 330 # Boston, MA 02111-1307, USA # -#ident "$Id: Makefile.in,v 1.61.2.2 2006/02/19 00:11:35 steve Exp $" +#ident "$Id: Makefile.in,v 1.61.2.3 2006/05/08 04:33:36 steve Exp $" # # SHELL = /bin/sh @@ -45,6 +45,8 @@ STRIP = @STRIP@ RANLIB = @RANLIB@ LEX = @LEX@ YACC = @YACC@ +MAN = @MAN@ +PS2PDF = @PS2PDF@ CPPFLAGS = @ident_support@ -I. -I.. -I $(srcdir) -I$(srcdir)/.. @CPPFLAGS@ @DEFS@ CXXFLAGS = -Wall @CXXFLAGS@ @@ -167,12 +169,20 @@ lexor.cc: $(srcdir)/lexor.lex $(LEX) -s -olexor.cc $(srcdir)/lexor.lex vvp.pdf: $(srcdir)/vvp.man - man -t $(srcdir)/vvp.man | ps2pdf - vvp.pdf + $(MAN) -t $(srcdir)/vvp.man | $(PS2PDF) - vvp.pdf ifeq (@WIN32@,yes) +ifeq ($(MAN),none) +INSTALL_DOC = $(mandir)/man1/vvp.1 +else +ifeq ($(PS2PDF),none) +INSTALL_DOC = $(mandir)/man1/vvp.1 +else INSTALL_DOC = $(prefix)/vvp.pdf $(mandir)/man1/vvp.1 -INSTALL_DOCDIR = $(mandir)/man1 all: vvp.pdf +endif +endif +INSTALL_DOCDIR = $(mandir)/man1 else INSTALL_DOC = $(mandir)/man1/vvp.1 INSTALL_DOCDIR = $(mandir)/man1 diff --git a/vvp/configure.in b/vvp/configure.in index af930c3a7..2ae3e358e 100644 --- a/vvp/configure.in +++ b/vvp/configure.in @@ -5,6 +5,8 @@ AC_PROG_CC AC_PROG_CXX AC_PROG_RANLIB AC_CHECK_TOOL(STRIP, strip, true) +AC_CHECK_PROGS(MAN,man,none) +AC_CHECK_PROGS(PS2PDF,ps2pdf,none) AC_EXEEXT AC_SUBST(EXEEXT) diff --git a/vvp/lexor.lex b/vvp/lexor.lex index 56af55ade..f612febca 100644 --- a/vvp/lexor.lex +++ b/vvp/lexor.lex @@ -1,4 +1,4 @@ - +%option never-interactive %{ /* * Copyright (c) 2001 Stephen Williams (steve@icarus.com) @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #ifdef HAVE_CVS_IDENT -#ident "$Id: lexor.lex,v 1.43.2.2 2006/03/26 23:09:00 steve Exp $" +#ident "$Id: lexor.lex,v 1.43.2.3 2006/05/08 04:33:36 steve Exp $" #endif # include "parse_misc.h" @@ -185,6 +185,9 @@ int yywrap() /* * $Log: lexor.lex,v $ + * Revision 1.43.2.3 2006/05/08 04:33:36 steve + * Update to use only Mingw for build. + * * Revision 1.43.2.2 2006/03/26 23:09:00 steve * Add the .demux device. *