Changed makefile to include line information in generated yacc/bison code (as I had...

[splint.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 00a07ca771f93090acb2f0c65b828c8e77bf0d73..86f467f04b599eb575119043ba280bc9fdfeef4f 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -53,7 +53,7 @@ GRAMSRC = cgrammar.c cscanner.c mtscanner.c mtgrammar.c llgrammar.c signature.c
 OVERFLOWCHSRC = constraintList.c constraintResolve.c \
                 constraintGeneration.c constraintTerm.c \
                 constraintExprData.c constraintExpr.c constraint.c \
-                constraintOutput.c loopHeuristics.c 
+                loopHeuristics.c 
 
 GENERALSRC = exprData.c cstring.c fileloc.c message.c inputStream.c \
              fileTable.c cstringTable.c valueTable.c stateValue.c \
@@ -141,7 +141,7 @@ HEADERSRC = Headers/abstBodyNode.h           Headers/ltokenList.h \
           Headers/declaratorInvNodeList.h  Headers/pairNodeList.h \
           Headers/declaratorNode.h         Headers/paramNode.h \
           Headers/declaratorNodeList.h     Headers/paramNodeList.h \
-          Headers/dmalloc.h                Headers/portab.h \
+          Headers/dmalloc.h                Headers/osd.h \
           Headers/ekind.h                  Headers/pp.h \
           Headers/enumNameList.h           Headers/privateNode.h \
           Headers/enumNameSList.h          Headers/programNode.h \
@@ -211,11 +211,11 @@ HEADERSRC = Headers/abstBodyNode.h           Headers/ltokenList.h \
           Headers/letDeclNodeList.h        Headers/typeNameNodeList.h \
           Headers/lh.h                     Headers/typeNamePack.h \
           Headers/limwr.h                  Headers/typeNode.h \
-          Headers/llbasic.h                Headers/uentry.h \
+          Headers/uentry.h \
           Headers/llerror.h                Headers/uentryList.h \
           Headers/llglobals.h              Headers/usymId.h \
           Headers/llgrammar2.h             Headers/usymIdSet.h \
-          Headers/llgrammar_gen2.h         Headers/usymtab-branch.h \
+          Headers/llgrammar_gen2.h        \
           Headers/llgrammar_gen.h          Headers/usymtab.h \
           Headers/llgrammar.h              Headers/usymtab_interface.h \
           Headers/llmain.h                 Headers/valueMatrix.h \
@@ -229,6 +229,7 @@ HEADERSRC = Headers/abstBodyNode.h           Headers/ltokenList.h \
           Headers/lsymbolList.h            Headers/warnClause.h \
           Headers/lsymbolSet.h             Headers/ynm.h \
           Headers/ltoken.h   Headers/splintMacros.nf  \
+          Headers/typeId.h \
           Headers/pointers.h   Headers/mstring.h   Headers/help.h
 
 
@@ -317,8 +318,7 @@ Headers/cgrammar_tokens.h cgrammar.c: cgrammar.c.der cgrammar.y bison.head bison
          $(CP) cgrammar.c.der cgrammar.c; \
        else \
          echo '* Making cgrammar.c'; \
-         echo '* Expect 157 shift/reduce conflicts and 117 reduce/reduce conflicts.'; \
-         echo '* (see cgrammar.y for explanation)'; \
+          echo '*      Note: Expect 157 shift/reduce conflicts and 123 reduce/reduce conflicts. (see cgrammar.y for explanation)'; \
          $(BISON) $(YFLAGS) cgrammar.y; \
          $(CAT) bison.head cgrammar.tab.c bison.reset | $(SED) 's/YYSTYPE/cgrammar_YYSTYPE/g' | $(SED) 's/lsllex/cgrammar_lsllex/g' > cgrammar.c; \
          $(CP) cgrammar.c cgrammar.c.der; \
@@ -335,7 +335,7 @@ Headers/mtgrammar_tokens.h mtgrammar.c: mtgrammar.y
          $(CP) mtgrammar.c.der mtgrammar.c; \
        else \
          echo '* Making mtgrammar.c'; \
-         echo '* Expect 11 shift/reduce conflicts.'; \
+         echo '*       Note: Expect 11 shift/reduce conflicts.'; \
          $(BISON) $(YFLAGS) -p mt mtgrammar.y; \
          $(CAT) bison.head mtgrammar.tab.c bison.reset >mtgrammar.c; \
          $(CP) mtgrammar.c mtgrammar.c.der; \
@@ -351,7 +351,7 @@ Headers/llgrammar_gen.h Headers/llgrammar_gen2.h llgrammar.c: llgrammar.c.der ll
          $(CP) llgrammar.c.der llgrammar.c; \
        else \
          echo '* Making llgrammar.c'; \
-         echo '* Expect 2 shift/reduce conflicts'; \
+         echo '*       Note: Expect 2 shift/reduce conflicts'; \
          $(BISON) $(YFLAGS) -p yl llgrammar.y; \
          $(CAT) bison.head llgrammar.tab.c bison.reset >llgrammar.c; \
          $(CP) llgrammar.c llgrammar.c.der; \
@@ -385,6 +385,10 @@ nocheck:
 test:
        ${MAKE} ; cd ../test; ${MAKE} --no-print-directory
 
+.PHONY: libs
+libs:
+       ${MAKE} ; cd ../lib; ${MAKE} --no-print-directory
+
 ### Automake generates wrong tags
 .PHONY: etags
 etags:
@@ -393,7 +397,13 @@ etags:
 lintnew: splintme
 
 splintme: 
-       ./splint $(DEFAULT_INCLUDES) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) +singleinclude  $(OVERFLOWCHSRC) $(LINTSRC) $(LCLSRC) -dump lclint +forcehints -misplacedsharequal +showsourceloc -unrecogcomments -supcounts -fcnuse -incondefs -exportlocal -constuse -mts file -mts filerw 
+       ./splint $(DEFAULT_INCLUDES) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) +singleinclude  $(OVERFLOWCHSRC) $(LINTSRC) $(LCLSRC) -dump lclint +forcehints -misplacedsharequal +showsourceloc -fcnuse -incondefs -exportlocal -constuse -mts file -mts filerw -mts tainted
+
+splintmebounds: 
+       ./splint $(DEFAULT_INCLUDES) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) +singleinclude  $(OVERFLOWCHSRC) $(LINTSRC) $(LCLSRC) -dump lclint +forcehints -misplacedsharequal +showsourceloc -fcnuse -incondefs -exportlocal -constuse -mts file -mts filerw -mts tainted +bounds +impboundsconstraints
+
+splintmesupcounts: 
+       ./splint $(DEFAULT_INCLUDES) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) +singleinclude  $(OVERFLOWCHSRC) $(LINTSRC) $(LCLSRC) -dump lclint +forcehints -misplacedsharequal +showsourceloc -unrecogcomments  -fcnuse -incondefs -exportlocal -supcounts -constuse -mts file -mts filerw 
 
 lintbuffercheck: 
        ./splint $(DEFAULT_INCLUDES) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) +singleinclude $(LINTSRC) $(OVERFLOWCHSRC) $(LCLSRC) -dump lclint +forcehints -misplacedsharequal +showsourceloc -unrecogcomments -supcounts -fcnuse -incondefs -exportlocal -constuse -mts file -mts filerw +bounds -DLINTBUFFERCHECK