X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.SH;h=fa075db2ade466ace32371205adf85f6ffe00986;hb=a4d60858fc3c717ec83cbdceb029a69fc535e3f8;hp=5f4cf007a6fee0717e5c50941d70791fcc084570;hpb=5cf1bec94acfda2c63b79cbc3b0bce4e6fe08b97;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/Makefile.SH b/Makefile.SH
index 5f4cf00..fa075db 100644
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -355,12 +355,12 @@ obj3 = doop$(OBJ_EXT) doio$(OBJ_EXT) regexec$(OBJ_EXT) utf8$(OBJ_EXT) taint$(OBJ
 obj = $(obj1) $(obj2) $(obj3) $(ARCHOBJS)
 
 lintflags = \
-    -bh \
+    -bhn \
     -p \
     -s \
     -Ncheck=%all \
     -Nlevel=4 \
-    -errfmt=simple \
+    -errfmt=src \
     -errtags \
     -erroff=E_BAD_PTR_CAST \
     -erroff=E_BLOCK_DECL_UNUSED \
@@ -370,7 +370,15 @@ lintflags = \
     -erroff=E_EXPR_NULL_EFFECT \
     -erroff=E_BAD_PTR_INT_COMBINATION \
     -erroff=E_LOOP_EMPTY \
-    *.c
+    -erroff=E_TRUE_LOGICAL_EXPR \
+    -erroff=E_FALSE_LOGICAL_EXPR \
+    -erroff=E_INDISTING_FROM_TRUNC \
+    -erroff=E_POINTER_TO_OBJECT \
+    -erroff=E_ASSIGN_NARROW_CONV \
+    -erroff=E_BAD_SIGN_EXTEND \
+    -erroff=E_INCL_NUSD \
+    -erroff=E_MAIN_PARAM \
+    -Wfoo.flow
 
 .c$(OBJ_EXT):
 	$(CCCMD) $(PLDLFLAGS) $*.c
@@ -650,7 +658,7 @@ perl.valgrind.config: config.sh
 perl.config.dashg:
 	@echo "Checking optimize='-g' in config.sh..."
 	@grep "^optimize="     config.sh
-	@grep "^optimize='-g'" config.sh >/dev/null || exit 1
+	@egrep "^optimize='(-g|.*-g[1-3].*)'" config.sh >/dev/null || exit 1
 
 perl.third.config: config.sh
 	@echo "To build perl.third you must Configure -Doptimize=-g -Uusemymalloc, checking..."
@@ -762,9 +770,10 @@ preplibrary: miniperl$(EXE_EXT) $(CONFIGPM) lib/lib.pm $(PREPLIBRARY_LIBPERL)
 # (If trying to create a new port and having problems with the configpm script,
 # try 'make minitest' and/or commenting out the tests at the end of configpm.)
 $(CONFIGPM): config.sh miniperl$(EXE_EXT) configpm Porting/Glossary
-	$(LDLIBPTH) ./miniperl -Ilib configpm --heavy=heavy.tmp configpm.tmp
+	$(LDLIBPTH) ./miniperl -Ilib configpm --heavy=lib/Config_heavy.pl configpm.tmp
 	sh mv-if-diff configpm.tmp lib/Config.pm
-	sh mv-if-diff heavy.tmp lib/Config_heavy.pl
+
+lib/Config.pm: lib/Config_heavy.pl
 
 lib/ExtUtils/Miniperl.pm: miniperlmain.c miniperl$(EXE_EXT) minimod.pl $(CONFIGPM)
 	$(LDLIBPTH) ./miniperl minimod.pl > minimod.tmp
@@ -1036,8 +1045,8 @@ _cleaner2:
 	rm -f lib/ExtUtils/ParseXS/t/XSTest.c
 	rm -f lib/ExtUtils/ParseXS/t/XSTest$(OBJ_EXT)
 	rm -f lib/ExtUtils/ParseXS/t/XSTest$(DLSUFFIX)
-	-rmdir lib/B lib/Data
-	-rmdir lib/Filter/Util lib/IO/Socket lib/IO
+	-rmdir lib/B lib/Compress lib/Data
+	-rmdir lib/Filter/Util lib/IO/Socket
 	-rmdir lib/List lib/MIME lib/Scalar lib/Sys 
 	-rmdir lib/threads lib/XS
 
@@ -1053,7 +1062,7 @@ _verycleaner:
 .PHONY: lint
 lint: $(c)
 	rm -f *.ln
-	lint $(lintflags) -DPERL_CORE -D_REENTRANT -DDEBUGGING -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(c) perly.c
+	lint $(lintflags) -DPERL_CORE -D_REENTRANT -DDEBUGGING -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(c)
 
 # Need to unset during recursion to go out of loop.
 # The README below ensures that the dependency list is never empty and
@@ -1295,7 +1304,7 @@ tags:	TAGS
 	perl emacs/e2ctags.pl TAGS > tags
 
 ctags:
-	ctags -f Tags --totals --languages=c --langmap=c:+.h *.c *.h
+	ctags -f Tags -N --totals --languages=c --langmap=c:+.h *.c *.h
 
 # AUTOMATICALLY GENERATED MAKE DEPENDENCIES--PUT NOTHING BELOW THIS LINE
 # If this runs make out of memory, delete /usr/include lines.