diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP index e25c5b2ed..501650ac8 100644 --- a/MANIFEST.SKIP +++ b/MANIFEST.SKIP @@ -24,6 +24,8 @@ src/Makefile_obj$ include/verilated.mk$ config.cache$ config.status$ +verilator.log +verilator.tex verilator_bin.* .vcsmx_rebuild$ autom4te\.cache/ diff --git a/Makefile.in b/Makefile.in index e03881905..734fdba92 100644 --- a/Makefile.in +++ b/Makefile.in @@ -129,7 +129,6 @@ DISTFILES_INC = $(INFOS) .gitignore Artistic COPYING COPYING.LESSER \ test_regress/t/*.pl \ test_regress/t/*.pf \ test_regress/t/*.v* \ - verilator.* \ INST_PROJ_FILES = \ bin/verilator \ @@ -212,14 +211,15 @@ verilator.txt: bin/verilator verilator.html: bin/verilator pod2html $< >$@ -verilator.pdf: bin/verilator $(DISTCONFIG) +# PDF needs DIST variables; but having configure.ac as dependency isn't detected +verilator.pdf: bin/verilator Makefile pod2latex --full --out verilator.tex bin/verilator cat < verilator.tex \ | sed 's/\\begin{document}/\\usepackage[left=1.7in,right=1.7in,top=1.3in,bottom=1.3in]{geometry}\n\\begin{document}/' \ | sed 's/\\begin{document}/\\usepackage[pdftex,bookmarks=true,bookmarksnumbered=true,hypertexnames=false,breaklinks=true,linkbordercolor={0 0 1}]{hyperref}\n\\begin{document}/' \ | sed 's/\\begin{document}/\\usepackage{fancyhdr} \\pagestyle{fancy}\n\\begin{document}/' \ | sed 's/\\begin{document}/\\setlength{\\parindent}{0pt} \\setlength{\\parskip}{\\baselineskip}\n\\begin{document}/' \ - | sed 's/\\begin{document}/\\title{$(DISTTITLE)} \\date{${DISTDATE}} \\author{Wilson Snyder\\\\ http:\/\/www.veripool.org}\n\\begin{document}/' \ + | sed 's/\\begin{document}/\\title{$(DISTTITLE)} \\date{} \\author{Wilson Snyder\\\\ http:\/\/www.veripool.org}\n\\begin{document}/' \ | sed 's/\\begin{document}/\\lhead[$(DISTTITLE)]{$(DISTTITLE)}\n\\begin{document}/' \ | sed 's/\\tableofcontents/\\begin{titlepage} \\maketitle \\end{titlepage}\n\\tableofcontents/' \ > verilator2.tex @@ -447,15 +447,13 @@ dist-file-list: ###################################################################### # Distributions -DISTCONFIG = ${srcdir}/src/config_build.h.in +DISTCONFIG = ${srcdir}/configure.ac -DISTTITLE := $(shell sed -e '/DTVERSION/!d' -e 's/[^0-9]*\([0-9.a-z]*\).*/verilator-\1/' -e 's/v/V/' -e q $(DISTCONFIG)) -DISTNAME := $(shell sed -e '/DTVERSION/!d' -e 's/[^0-9]*\([0-9.a-z]*\).*/verilator-\1/' -e q $(DISTCONFIG)) -DISTDATEPRE := $(shell sed -e '/DTVERSION/!d' -e 's/.*\([1-2][0-9][0-9][0-9].[0-9]*[0-9].[0-9]*[0-9]\).*/\1/' -e q $(DISTCONFIG)) +DISTTITLE := $(shell sed -e '/^AC_INIT/!d' -e 's/[^0-9]*\([0-9.a-z]*\).*/verilator-\1/' -e 's/v/V/' -e q $(DISTCONFIG)) +DISTNAME := $(shell sed -e '/^AC_INIT/!d' -e 's/[^0-9]*\([0-9.a-z]*\).*/verilator-\1/' -e q $(DISTCONFIG)) DISTNAMEREV := $(shell sed -e '/DTVERSION/!d' -e 's/.*verilator_\([^"]*\).*/\1/' -e q src/config_rev.h) DISTTAGNAME := $(subst .,_,$(subst -,_,$(DISTNAME))) -DISTDATE := $(subst /,-,$(DISTDATEPRE)) tag: svnorcvs tag $(DISTTAGNAME) diff --git a/configure.ac b/configure.ac index df4bf127b..07d5b1c58 100644 --- a/configure.ac +++ b/configure.ac @@ -4,10 +4,12 @@ # redistribute it and/or modify it under the terms of either the GNU Lesser # General Public License Version 3 or the Perl Artistic License Version 2.0. -AC_INIT(src/Verilator.cpp) +AC_INIT([Verilator],[3.822 devel]) AC_CONFIG_HEADER(src/config_build.h) AC_CONFIG_FILES(Makefile src/Makefile src/Makefile_obj include/verilated.mk) +AC_MSG_RESULT([configuring for $PACKAGE_STRING]) + # Special Substitutions AC_ARG_ENABLE([defenv], [AS_HELP_STRING([--disable-defenv], diff --git a/src/config_build.h.in b/src/config_build.h.in index 92a26b275..0226da86f 100644 --- a/src/config_build.h.in +++ b/src/config_build.h.in @@ -25,7 +25,10 @@ //********************************************************************** //**** Version and host name -#define DTVERSION "Verilator 3.822 devel" +// Autoconf substitutes this with the strings from AC_INIT. +#define PACKAGE_STRING "" + +#define DTVERSION PACKAGE_STRING //********************************************************************** //**** Functions