Fixed problem with make dist so that packages can be made and distributed.

Commented out the sizesigns test case because the files for it were not in CVS.

diff --git a/src/Makefile.am b/src/Makefile.am
index 762d60b1a8febbdae5217ea6da81f5413dcf6602..fb928d69aa06f851184bc7f979c184bd750f577b 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -228,7 +228,8 @@ HEADERSRC = Headers/abstBodyNode.h           Headers/ltokenList.h \
           Headers/lsymbol.h                Headers/version.h \
           Headers/lsymbolList.h            Headers/warnClause.h \
           Headers/lsymbolSet.h             Headers/ynm.h \
-          Headers/ltoken.h   Headers/splintMacros.nf  
+          Headers/ltoken.h   Headers/splintMacros.nf  \
+          Headers/pointers.h   Headers/mstring.h   Headers/help.h
 
 
 IFILES =  ctbase.i  cttable.i  exprDataQuite.i
@@ -236,7 +237,8 @@ IFILES =  ctbase.i  cttable.i  exprDataQuite.i
 ## Non-built files we need to distribute
 EXTRA_DIST =  $(BISON_SRC) bison.head bison.reset $(HEADERSRC)  \
             flags.def cscanner.l flex.head flex.reset $(IFILES) \
- Headers/256_random_numbers.nf  Headers/splintMacros.nf        Headers/reservedNames.nf Makefile.binary.am   Makefile.binary.in
+ Headers/256_random_numbers.nf  Headers/splintMacros.nf        Headers/reservedNames.nf
+#Makefile.binary.am   Makefile.binary.in
 
 
 #Files that are used on systems that do not have bison or yacc

diff --git a/src/Makefile.in b/src/Makefile.in
index 071e95d58d3ed5b2e067f78fe6817031fb3a90b5..03e788f16563fa4f94f2cf566f2b3662d1be14f7 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -324,15 +324,17 @@ HEADERSRC = Headers/abstBodyNode.h           Headers/ltokenList.h \
           Headers/lsymbol.h                Headers/version.h \
           Headers/lsymbolList.h            Headers/warnClause.h \
           Headers/lsymbolSet.h             Headers/ynm.h \
-          Headers/ltoken.h   Headers/splintMacros.nf  
+          Headers/ltoken.h   Headers/splintMacros.nf  \
+          Headers/pointers.h   Headers/mstring.h   Headers/help.h
 
 
 IFILES = ctbase.i  cttable.i  exprDataQuite.i
 
 EXTRA_DIST = $(BISON_SRC) bison.head bison.reset $(HEADERSRC)  \
             flags.def cscanner.l flex.head flex.reset $(IFILES) \
- Headers/256_random_numbers.nf  Headers/splintMacros.nf        Headers/reservedNames.nf Makefile.binary.am   Makefile.binary.in
+ Headers/256_random_numbers.nf  Headers/splintMacros.nf        Headers/reservedNames.nf
 
+#Makefile.binary.am   Makefile.binary.in
 
 #Files that are used on systems that do not have bison or yacc
 DER_BISON_FILES = signature.c.der  cgrammar.c.der  mtgrammar.c.der \

diff --git a/test/Makefile.am b/test/Makefile.am
index 4ec559c6ea71749b98ae60997789a230c824f6fd..8b5b85b3217e36694861b9c5a2dc7ffa5e0bb374 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -126,13 +126,17 @@ $(SPLINT):
 
 CLEANOUTPUT = $(GREP) -v "Splint 3." | $(GREP) -v "$(SPLINT)" | $(GREP) -v "^make.*\[[1-9]*\]:" | $(GREP) -v "^gmake.*\[[1-9]*\]:" |   $(GREP) -v "^gmake -e" |  $(GREP) -v "^make -e" |$(GREP) -v "config.status: creating test/Makefile" | $(GREP) -v "cd .. && " | $(GREP) -v "CONFIG_HEADERS=" | $(GREP) -v "CONFIG_FILES="
 
+#drl 12/07/2002 These rules for .c and .expect files don't make sense
+# and they are confusing make dist so I'm taking them out.
+
 ## Not real C code
 
-.c.expect:
-       $(MAKE) $* |& $(CLEANOUTPUT) >$*.expect && cat $*.expect
+#.c.expect:
+#      $(MAKE) $* |& $(CLEANOUTPUT) >$*.expect && cat $*.expect
+#
+#.c.diff:
+#      $(MAKE) $* |& $(CLEANOUTPUT) >$*.out && diff $*.expect $*.out
 
-.c.diff:
-       $(MAKE) $* |& $(CLEANOUTPUT) >$*.out && diff $*.expect $*.out
 
 #drl temporally take this out.
 #.PHONY: expects
@@ -726,12 +730,14 @@ shifts:
        -$(SPLINTR) shifts.c -shiftimplementation -expect 3
        -$(SPLINTR) shifts.c -shiftnegative -expect 1
 
+#drl comment this out until sizesigns is added to cvs
+
 ### evans - added 2002-08-17: check warnings with arbitrary integral types
-sizesigns:
-       -$(SPLINTR) +strict sizesigns.c
-       -$(SPLINTR) +strict +ignoresigns sizesigns.c
-       -$(SPLINTR) +strict +matcharbitraryintegral sizesigns.c
-       -$(SPLINTR) +strict +matcharbitraryintegral +ignoresignz sizesigns.c
+#sizesigns:
+#      -$(SPLINTR) +strict sizesigns.c
+#      -$(SPLINTR) +strict +ignoresigns sizesigns.c
+#      -$(SPLINTR) +strict +matcharbitraryintegral sizesigns.c
+#      -$(SPLINTR) +strict +matcharbitraryintegral +ignoresignz sizesigns.c
 
 .PHONY: slovaknames
 slovaknames:
@@ -1229,7 +1235,6 @@ EXTRA_DIST =  ./abst_t.lcl \
               ./simplebufferConstraintTests/test3.c \
               ./simplebufferConstraintTests/test7.c \
               ./sizeoftest/sizeof.c \
-              ./sizeoftest/Makefile.c \
               ./sizeoftest/sizeofConst.c \
               ./strchr/strchr.c \
               ./suppressfile/test.c \
@@ -1503,7 +1508,7 @@ EXTRA_DIST =  ./abst_t.lcl \
               ./tests2.5/immutable.h \
               ./tests2.5/impabsmodule.h \
               ./tests2.5/socket.h \
-              ./Makefile-test.os2 \
+              ./Makefile.os2 \
               ./db1/Makefile \
               ./db2/Makefile \
               ./db3/Makefile \
@@ -1535,7 +1540,6 @@ EXTRA_DIST =  ./abst_t.lcl \
                 utypes.expect widestrings.expect  widestrings.c  \
                 functionmacro.expect functionmacro.c  info.c info.expect \
                 loopexec.c looptesteffect.c mergenull.c shifts.c \
-               sizesigns.c sizesigns.expect \
                 manual.expect ./manual/Makefile \
                 ./manual/annotglobs.c  ./manual/bool.c  ./manual/bool.h  ./manual/clauses.c  ./manual/employee.h  ./manual/exposure.c  ./manual/globals.c  ./manual/ignore.c  ./manual/implicit.c  ./manual/intSet.h  ./manual/list.c  ./manual/loop.c  ./manual/macros.c  ./manual/modify.c  ./manual/mstring.c  ./manual/mstring.h  ./manual/mstringnn.c  ./manual/multiError.c  ./manual/names.c  ./manual/noeffect.c  ./manual/null.c  ./manual/only.c  ./manual/order.c  ./manual/palindrome.c  ./manual/palindrome.h  ./manual/refs.c  ./manual/returned.c  ./manual/rgb.c  ./manual/rstring.c  ./manual/rstring.h  ./manual/sample.c  ./manual/setChar.c  ./manual/setname.c  ./manual/setname.h  ./manual/special.c  ./manual/stack.c  ./manual/sumsquares.c  ./manual/switch.c  ./manual/testpal.c  ./manual/types.c  ./manual/unique.c  ./manual/usedef.c  ./manual/bounds.c \
                   arraydims.expect arraydims.c \
@@ -1543,3 +1547,5 @@ EXTRA_DIST =  ./abst_t.lcl \
                   divzero.expect parentype.expect \
                   divzero.c parentype.c \
 stringliteral.expect  stringliteral.c
+
+#              sizesigns.c sizesigns.expect \

diff --git a/test/Makefile.in b/test/Makefile.in
index 54e0891b60fe37df6f4567c1348b6101f64f5656..f7893e4f7da75502742bd8af0959b2801425ee2e 100644 (file)
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -161,6 +161,15 @@ QUICKTESTS = db3
 CLEANOUTPUT = $(GREP) -v "Splint 3." | $(GREP) -v "$(SPLINT)" | $(GREP) -v "^make.*\[[1-9]*\]:" | $(GREP) -v "^gmake.*\[[1-9]*\]:" |   $(GREP) -v "^gmake -e" |  $(GREP) -v "^make -e" |$(GREP) -v "config.status: creating test/Makefile" | $(GREP) -v "cd .. && " | $(GREP) -v "CONFIG_HEADERS=" | $(GREP) -v "CONFIG_FILES="
 
 
+#drl 12/07/2002 These rules for .c and .expect files don't make sense
+# and they are confusing make dist so I'm taking them out.
+
+#.c.expect:
+#      $(MAKE) $* |& $(CLEANOUTPUT) >$*.expect && cat $*.expect
+#
+#.c.diff:
+#      $(MAKE) $* |& $(CLEANOUTPUT) >$*.out && diff $*.expect $*.out
+
 #drl temporally take this out.
 #.PHONY: expects
 #expects:
@@ -467,7 +476,6 @@ EXTRA_DIST = ./abst_t.lcl \
               ./simplebufferConstraintTests/test3.c \
               ./simplebufferConstraintTests/test7.c \
               ./sizeoftest/sizeof.c \
-              ./sizeoftest/Makefile.c \
               ./sizeoftest/sizeofConst.c \
               ./strchr/strchr.c \
               ./suppressfile/test.c \
@@ -741,7 +749,7 @@ EXTRA_DIST = ./abst_t.lcl \
               ./tests2.5/immutable.h \
               ./tests2.5/impabsmodule.h \
               ./tests2.5/socket.h \
-              ./Makefile-test.os2 \
+              ./Makefile.os2 \
               ./db1/Makefile \
               ./db2/Makefile \
               ./db3/Makefile \
@@ -773,7 +781,6 @@ EXTRA_DIST = ./abst_t.lcl \
                 utypes.expect widestrings.expect  widestrings.c  \
                 functionmacro.expect functionmacro.c  info.c info.expect \
                 loopexec.c looptesteffect.c mergenull.c shifts.c \
-               sizesigns.c sizesigns.expect \
                 manual.expect ./manual/Makefile \
                 ./manual/annotglobs.c  ./manual/bool.c  ./manual/bool.h  ./manual/clauses.c  ./manual/employee.h  ./manual/exposure.c  ./manual/globals.c  ./manual/ignore.c  ./manual/implicit.c  ./manual/intSet.h  ./manual/list.c  ./manual/loop.c  ./manual/macros.c  ./manual/modify.c  ./manual/mstring.c  ./manual/mstring.h  ./manual/mstringnn.c  ./manual/multiError.c  ./manual/names.c  ./manual/noeffect.c  ./manual/null.c  ./manual/only.c  ./manual/order.c  ./manual/palindrome.c  ./manual/palindrome.h  ./manual/refs.c  ./manual/returned.c  ./manual/rgb.c  ./manual/rstring.c  ./manual/rstring.h  ./manual/sample.c  ./manual/setChar.c  ./manual/setname.c  ./manual/setname.h  ./manual/special.c  ./manual/stack.c  ./manual/sumsquares.c  ./manual/switch.c  ./manual/testpal.c  ./manual/types.c  ./manual/unique.c  ./manual/usedef.c  ./manual/bounds.c \
                   arraydims.expect arraydims.c \
@@ -791,7 +798,6 @@ DIST_COMMON = Makefile.am Makefile.in
 all: all-am
 
 .SUFFIXES:
-.SUFFIXES: .c .diff .expect
 $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
        cd $(top_srcdir) && \
          $(AUTOMAKE) --foreign  test/Makefile
@@ -943,12 +949,6 @@ $(SPLINTTESTS): $(SPLINT)
 $(SPLINT):
        cd $(top_builddir)/src; $(MAKE)
 
-.c.expect:
-       $(MAKE) $* |& $(CLEANOUTPUT) >$*.expect && cat $*.expect
-
-.c.diff:
-       $(MAKE) $* |& $(CLEANOUTPUT) >$*.out && diff $*.expect $*.out
-
 .PHONY: quicktest
 quicktest:
        $(CheckSystemDir)       
@@ -1525,12 +1525,14 @@ shifts:
        -$(SPLINTR) shifts.c -shiftimplementation -expect 3
        -$(SPLINTR) shifts.c -shiftnegative -expect 1
 
+#drl comment this out until sizesigns is added to cvs
+
 ### evans - added 2002-08-17: check warnings with arbitrary integral types
-sizesigns:
-       -$(SPLINTR) +strict sizesigns.c
-       -$(SPLINTR) +strict +ignoresigns sizesigns.c
-       -$(SPLINTR) +strict +matcharbitraryintegral sizesigns.c
-       -$(SPLINTR) +strict +matcharbitraryintegral +ignoresignz sizesigns.c
+#sizesigns:
+#      -$(SPLINTR) +strict sizesigns.c
+#      -$(SPLINTR) +strict +ignoresigns sizesigns.c
+#      -$(SPLINTR) +strict +matcharbitraryintegral sizesigns.c
+#      -$(SPLINTR) +strict +matcharbitraryintegral +ignoresignz sizesigns.c
 
 .PHONY: slovaknames
 slovaknames:
@@ -1720,6 +1722,8 @@ buffertest:
 .PHONY: $(SUBDIRTESTS)
 $(SUBDIRTESTS):
        cd $@; $(MAKE) SPLINT="$(SPLINTRNNEST)"
+
+#              sizesigns.c sizesigns.expect \
 # 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: