From: drl7x Date: Wed, 9 Jan 2002 06:34:04 +0000 (+0000) Subject: Added doc/Makefile.am to get make dist to work. X-Git-Tag: splint-3_0_1_2~14 X-Git-Url: http://andersk.mit.edu/gitweb/splint.git/commitdiff_plain/3739432e0566b867843a4e08ddf315bb83c33eac Added doc/Makefile.am to get make dist to work. --- diff --git a/Makefile.in b/Makefile.in index 95ccebd..db74836 100644 --- a/Makefile.in +++ b/Makefile.in @@ -83,7 +83,7 @@ install_sh = @install_sh@ AUTOMAKE_OPTIONS = 1.5 foreign -SUBDIRS = src lib imports test +SUBDIRS = src lib imports test doc subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs @@ -95,10 +95,10 @@ RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ uninstall-info-recursive all-recursive install-data-recursive \ install-exec-recursive installdirs-recursive install-recursive \ uninstall-recursive check-recursive installcheck-recursive -DIST_COMMON = README install.html ./stamp-h.in Makefile.am Makefile.in acinclude.m4 \ - aclocal.m4 config.hin config/config.guess config/config.sub \ - config/depcomp config/install-sh config/missing \ - config/mkinstalldirs configure configure.ac +DIST_COMMON = README ./stamp-h.in ChangeLog Makefile.am Makefile.in \ + acinclude.m4 aclocal.m4 config.hin config/config.guess \ + config/config.sub config/depcomp config/install-sh \ + config/missing config/mkinstalldirs configure configure.ac DIST_SUBDIRS = $(SUBDIRS) all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -403,10 +403,6 @@ uninstall-info: uninstall-info-recursive uninstall uninstall-am uninstall-info-am \ uninstall-info-recursive uninstall-recursive -.PHONY: test -test: - cd test; ${MAKE} - # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/configure b/configure index 67d5526..a97a55d 100755 --- a/configure +++ b/configure @@ -3077,7 +3077,7 @@ cat >>confdefs.h <<\EOF #define UNIX 1 EOF -ac_config_files="$ac_config_files Makefile imports/Makefile lib/Makefile src/Makefile test/Makefile" +ac_config_files="$ac_config_files Makefile imports/Makefile lib/Makefile src/Makefile test/Makefile doc/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -3403,9 +3403,10 @@ do "lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;; "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "test/Makefile" ) CONFIG_FILES="$CONFIG_FILES test/Makefile" ;; + "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.hin" ;; - *) { { echo "$as_me:3408: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:3409: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -3651,7 +3652,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:3654: creating $ac_file" >&5 + { echo "$as_me:3655: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -3669,7 +3670,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:3672: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:3673: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -3682,7 +3683,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:3685: error: cannot find input file: $f" >&5 + { { echo "$as_me:3686: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -3743,7 +3744,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue * ) ac_file_in=$ac_file.in ;; esac - test x"$ac_file" != x- && { echo "$as_me:3746: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:3747: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -3754,7 +3755,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:3757: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:3758: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -3767,7 +3768,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:3770: error: cannot find input file: $f" >&5 + { { echo "$as_me:3771: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -3884,7 +3885,7 @@ cat >>$CONFIG_STATUS <<\EOF rm -f $tmp/in if test x"$ac_file" != x-; then if cmp -s $ac_file $tmp/config.h 2>/dev/null; then - { echo "$as_me:3887: $ac_file is unchanged" >&5 + { echo "$as_me:3888: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ diff --git a/configure.ac b/configure.ac index 5e3eb1a..70b6203 100644 --- a/configure.ac +++ b/configure.ac @@ -174,7 +174,7 @@ dnl test/tests2.2/Makefile dnl test/db1/Makefile]) AC_CONFIG_FILES([Makefile imports/Makefile lib/Makefile src/Makefile - test/Makefile]) + test/Makefile doc/Makefile]) AC_OUTPUT diff --git a/doc/Makefile.am b/doc/Makefile.am new file mode 100644 index 0000000..8b067ae --- /dev/null +++ b/doc/Makefile.am @@ -0,0 +1,10 @@ +## Note: starting comments with ## means they don't end up in Makefile + +AUTOMAKE_OPTIONS = 1.5 foreign + +#this is just a hack to get make dist to work. + +## Include them in the distribution +EXTRA_DIST = splint.1 + +all: \ No newline at end of file diff --git a/doc/Makefile.in b/doc/Makefile.in new file mode 100644 index 0000000..1105bad --- /dev/null +++ b/doc/Makefile.in @@ -0,0 +1,208 @@ +# Makefile.in generated automatically by automake 1.5 from Makefile.am. + +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +SHELL = @SHELL@ + +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ + +bindir = @bindir@ +sbindir = @sbindir@ +libexecdir = @libexecdir@ +datadir = @datadir@ +sysconfdir = @sysconfdir@ +sharedstatedir = @sharedstatedir@ +localstatedir = @localstatedir@ +libdir = @libdir@ +infodir = @infodir@ +mandir = @mandir@ +includedir = @includedir@ +oldincludedir = /usr/include +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = .. + +ACLOCAL = @ACLOCAL@ +AUTOCONF = @AUTOCONF@ +AUTOMAKE = @AUTOMAKE@ +AUTOHEADER = @AUTOHEADER@ + +INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_HEADER = $(INSTALL_DATA) +transform = @program_transform_name@ +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +host_alias = @host_alias@ +host_triplet = @host@ +AMTAR = @AMTAR@ +AWK = @AWK@ +BISON = @BISON@ +CAT = @CAT@ +CC = @CC@ +CP = @CP@ +CPP = @CPP@ +DEPDIR = @DEPDIR@ +DIFF = @DIFF@ +EXEEXT = @EXEEXT@ +GREP = @GREP@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LCLOBJ = @LCLOBJ@ +LEX = @LEX@ +LN_S = @LN_S@ +MV = @MV@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +RM = @RM@ +VERSION = @VERSION@ +am__include = @am__include@ +am__quote = @am__quote@ +install_sh = @install_sh@ + +AUTOMAKE_OPTIONS = 1.5 foreign + + +#this is just a hack to get make dist to work. +EXTRA_DIST = splint.1 +subdir = doc +mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +DIST_SOURCES = +DIST_COMMON = Makefile.am Makefile.in +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --foreign doc/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && \ + CONFIG_HEADERS= CONFIG_LINKS= \ + CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status +uninstall-info-am: +tags: TAGS +TAGS: + + +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + +top_distdir = .. +distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + +distdir: $(DISTFILES) + @for file in $(DISTFILES); do \ + if test -f $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + $(mkinstalldirs) "$(distdir)/$$dir"; \ + fi; \ + if test -d $$d/$$file; then \ + cp -pR $$d/$$file $(distdir) \ + || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile + +installdirs: + +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic mostlyclean-am + +distclean: distclean-am + +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +info: info-am + +info-am: + +install-data-am: + +install-exec-am: + +install-info: install-info-am + +install-man: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic + +uninstall-am: uninstall-info-am + +.PHONY: all all-am check check-am clean clean-generic distclean \ + distclean-generic distdir dvi dvi-am info info-am install \ + install-am install-data install-data-am install-exec \ + install-exec-am install-info install-info-am install-man \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic uninstall uninstall-am uninstall-info-am + + +all: +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/src/Makefile.in b/src/Makefile.in index f7a3514..ab1fda4 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -575,7 +575,7 @@ CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ CFLAGS = @CFLAGS@ DIST_SOURCES = $(lcl_SOURCES) $(splint_SOURCES) -DIST_COMMON = ChangeLog Makefile.am Makefile.in +DIST_COMMON = Makefile.am Makefile.in SOURCES = $(lcl_SOURCES) $(splint_SOURCES) all: $(BUILT_SOURCES) diff --git a/test/Makefile b/test/Makefile index 158e558..87a418c 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1325,7 +1325,7 @@ mystrncat: .PHONY: noeffect noeffect: - ${SPLINT} -nof noeffect.c +allmacros +checks -expect 3 + ${SPLINTP} noeffect.c +allmacros +checks -expect 3 ### ### 2002-01-01: null1.c: expect increased to 15 because out must be defined diff --git a/test/ansireserved.out b/test/ansireserved.out index 7df490f..cb9a30b 100644 --- a/test/ansireserved.out +++ b/test/ansireserved.out @@ -54,11 +54,11 @@ ansireserved.c:9: Name EVANS is reserved for future library extensions. Macros (ISO99:7.26.3) ansireserved.c:1:5: Name decimal_point is reserved for the standard library ansireserved.c:2:5: Function srand inconsistently declared as variable: int - load file ansi.lcd:898:1: Specification of srand as function: + load file standard.lcd:898:1: Specification of srand as function: [function (unsigned int) returns void] ansireserved.c:2:5: Name srand is reserved for the standard library ansireserved.c:3:5: Function labs inconsistently declared as variable: int - load file ansi.lcd:920:1: Specification of labs as function: + load file standard.lcd:920:1: Specification of labs as function: [function (long int) returns long int] ansireserved.c:3:5: Name labs is reserved for the standard library ansireserved.c:4:5: Name _x is in the implementation name space (any identifier diff --git a/test/external.out b/test/external.out index 7b702e6..b69d78d 100644 --- a/test/external.out +++ b/test/external.out @@ -42,11 +42,11 @@ external.c:5:5: External identifier small2 is not distinguishable from small1 external.c:4:5: Declaration of small1 external.c:7:5: External identifier longfunction1 is not distinguishable from LONG_MAX in the first 3 characters because alphabetical case is ignored - load file ansi.lcd:786:1: Specification of LONG_MAX + load file standard.lcd:786:1: Specification of LONG_MAX One or more additional indistinguishable external names not reported external.c:8:5: External identifier longfunction2 is not distinguishable from LONG_MAX in the first 3 characters because alphabetical case is ignored - load file ansi.lcd:786:1: Specification of LONG_MAX + load file standard.lcd:786:1: Specification of LONG_MAX One or more additional indistinguishable external names not reported Finished checking --- 4 code warnings, as expected diff --git a/test/null6.lcd b/test/null6.lcd index 6e79355..9ec0a01 100644 --- a/test/null6.lcd +++ b/test/null6.lcd @@ -1,5 +1,5 @@ ;;; Splint Library null6.lcd -;;Splint 3.0.1.1 --- 07 Jan 2002 +;;Splint 3.0.1.1 --- 09 Jan 2002 ;;lib:298 ;;ctTable 0 u-2 19 38 @@ -1843,6 +1843,6 @@ r ;; Modules access lltX_bool#1@ types#1@ -ansi#9@ +standard#9@ null6#11@ ;;End diff --git a/test/tests2.5/newlint.lcd b/test/tests2.5/newlint.lcd index a921ab0..eb3bb27 100644 --- a/test/tests2.5/newlint.lcd +++ b/test/tests2.5/newlint.lcd @@ -1,5 +1,5 @@ ;;; Splint Library newlint.lcd -;;Splint 3.0.1.1 --- 07 Jan 2002 +;;Splint 3.0.1.1 --- 09 Jan 2002 ;;lib:298 ;;ctTable 0 u-2 19 38 @@ -1849,5 +1849,5 @@ r ;; Modules access lltX_bool#1@ types#1@ -ansi#9@ +standard#9@ ;;End