Fixes for win32

[splint.git] / src / Makefile.in

diff --git a/src/Makefile.in b/src/Makefile.in
index 65226c07ee8bf69c06079b846454e90c0fe8a2c8..a7663b8d65ecf9de0658e9a2caeaea606a85539f 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -145,7 +145,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 \
@@ -307,11 +307,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 \
@@ -476,8 +476,7 @@ am__objects_17 = exprNode.$(OBJEXT) exprChecks.$(OBJEXT) \
 am__objects_18 = constraintList.$(OBJEXT) constraintResolve.$(OBJEXT) \
        constraintGeneration.$(OBJEXT) constraintTerm.$(OBJEXT) \
        constraintExprData.$(OBJEXT) constraintExpr.$(OBJEXT) \
-       constraint.$(OBJEXT) constraintOutput.$(OBJEXT) \
-       loopHeuristics.$(OBJEXT)
+       constraint.$(OBJEXT) loopHeuristics.$(OBJEXT)
 am__objects_19 =
 am__objects_20 = $(am__objects_19)
 am__objects_21 = $(am__objects_7) $(am__objects_16) $(am__objects_17) \
@@ -505,7 +504,6 @@ am__depfiles_maybe = depfiles
 @AMDEP_TRUE@   ./$(DEPDIR)/constraintExprData.Po \
 @AMDEP_TRUE@   ./$(DEPDIR)/constraintGeneration.Po \
 @AMDEP_TRUE@   ./$(DEPDIR)/constraintList.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/constraintOutput.Po \
 @AMDEP_TRUE@   ./$(DEPDIR)/constraintResolve.Po \
 @AMDEP_TRUE@   ./$(DEPDIR)/constraintTerm.Po \
 @AMDEP_TRUE@   ./$(DEPDIR)/context.Po ./$(DEPDIR)/cpperror.Po \
@@ -694,7 +692,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/constraintExprData.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/constraintGeneration.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/constraintList.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/constraintOutput.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/constraintResolve.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/constraintTerm.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/context.Po@am__quote@
@@ -1059,7 +1056,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 '*      Note: Expect 157 shift/reduce conflicts and 123 reduce/reduce conflicts. (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; \
@@ -1073,7 +1070,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; \
@@ -1087,7 +1084,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; \
@@ -1115,6 +1112,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:
@@ -1123,7 +1124,7 @@ etags:
 lintnew: splintme
 
 splintme: 
-       ./splint $(DEFAULT_INCLUDES) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) +singleinclude  $(OVERFLOWCHSRC) $(LINTSRC) $(LCLSRC) -dump lclint +forcehints -misplacedsharequal +showsourceloc -unrecogcomments -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 
 
 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