e2fsck: try to salvage corrupt directory entry blocks

[tools/e2fsprogs.git] / MCONFIG.in

diff --git a/MCONFIG.in b/MCONFIG.in
index 5ed4df0..97758f3 100644 (file)
--- a/MCONFIG.in
+++ b/MCONFIG.in
@@ -29,6 +29,7 @@ man5dir = $(mandir)/man5
 man8dir = $(mandir)/man8
 infodir = @infodir@
 datadir = @datadir@
+pkgconfigdir = $(libdir)/pkgconfig
 
 @SET_MAKE@
 
@@ -52,21 +53,27 @@ datadir = @datadir@
 
 @ifGNUmake@ CHECK=sparse
 @ifGNUmake@ CHECK_OPTS=-Wsparse-all -Wno-transparent-union -Wno-return-void -Wno-undef -Wno-non-pointer-null
+@ifGNUmake@ CPPCHECK=cppcheck
+@ifGNUmake@ CPPCHECK_OPTS=--force --enable=all --quiet
 @ifGNUmake@ ifeq ("$(C)", "2")
 @ifGNUmake@   CHECK_CMD=$(CHECK) $(CHECK_OPTS) -Wbitwise -D__CHECK_ENDIAN__
+@ifGNUmake@   CPPCHECK_CMD=$(CPPCHECK) $(CPPCHECK_OPTS)
 @ifGNUmake@ else
 @ifGNUmake@   ifeq ("$(C)", "1")
 @ifGNUmake@     CHECK_CMD=$(CHECK) $(CHECK_OPTS)
+@ifGNUmake@     CPPCHECK_CMD=$(CPPCHECK) $(CPPCHECK_OPTS)
 @ifGNUmake@    else
 @ifGNUmake@     CHECK_CMD=@true
+@ifGNUmake@     CPPCHECK_CMD=@true
 @ifGNUmake@   endif
 @ifGNUmake@ endif
 
 @ifNotGNUmake@ CHECK_CMD=@true
+@ifNotGNUmake@ CPPHECK_CMD=@true
 
 CC = @CC@
 BUILD_CC = @BUILD_CC@
-CFLAGS = @CFLAGS@
+CFLAGS = @CFLAGS@ @DEFS@
 CPPFLAGS = @INCLUDES@
 ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS)
 LDFLAGS = @LDFLAGS@
@@ -177,7 +184,7 @@ DEP_INSTALL_SYMLINK = $(top_builddir)/util/install-symlink \
 # Run make gcc-wall to do a build with warning messages.
 #
 #
-WFLAGS=                -std=c99 -D_XOPEN_SOURCE=600 -D_GNU_SOURCE \
+WFLAGS=                -std=gnu99 -D_XOPEN_SOURCE=600 -D_GNU_SOURCE \
                        -pedantic $(WFLAGS_EXTRA) \
                        -Wall -W -Wwrite-strings -Wpointer-arith \
                        -Wcast-qual -Wcast-align -Wno-variadic-macros \
@@ -188,11 +195,18 @@ WFLAGS=           -std=c99 -D_XOPEN_SOURCE=600 -D_GNU_SOURCE \
                        -UENABLE_NLS
 
 gcc-wall-new:
-       (make CFLAGS="@CFLAGS@ $(WFLAGS)" > /dev/null) 2>&1 | sed -f $(top_srcdir)/util/gcc-wall-cleanup 
+       ($(MAKE) CFLAGS="@CFLAGS@ $(WFLAGS)" > /dev/null) 2>&1 | sed -f $(top_srcdir)/util/gcc-wall-cleanup
 
 gcc-wall:
-       make clean > /dev/null
-       make gcc-wall-new
+       $(MAKE) clean > /dev/null
+       $(MAKE) gcc-wall-new
+
+static-check:
+       ($(MAKE) C=1 V=1 CFLAGS="@CFLAGS@ $(WFLAGS)") 2>&1 | sed -f $(top_srcdir)/util/static-analysis-cleanup
+
+static-check-all:
+       $(MAKE) clean > /dev/null
+       $(MAKE) static-check
 
 #
 # Installation user and groups
@@ -216,8 +230,9 @@ MANMODE=    444
 
 DEP_LIB_MAKEFILES = $(top_srcdir)/lib/Makefile.library \
        $(top_srcdir)/lib/Makefile.elf-lib  \
-       $(top_srcdir)/lib/Makefile.bsd-lib $(top_srcdir)/lib/Makefile.darwin-lib \
-       $(top_srcdir)/lib/Makefile.solaris-lib $(top_srcdir)/lib/Makefile.checker \
+       $(top_srcdir)/lib/Makefile.bsd-lib \
+       $(top_srcdir)/lib/Makefile.darwin-lib \
+       $(top_srcdir)/lib/Makefile.solaris-lib \
        $(top_srcdir)/lib/Makefile.profile
 
 $(top_builddir)/config.status: $(top_srcdir)/configure
@@ -263,7 +278,7 @@ clean::
 
 .depend: Makefile $(SRCS) $(top_srcdir)/depfix.sed $(top_srcdir)/wordwrap.pl
        if test -n "$(SRCS)" ; then \
-               $(CC) -M $(ALL_CFLAGS) $(SRCS) | \
+               $(CC) -M $(ALL_CFLAGS) $(DEPEND_CFLAGS) $(SRCS) | \
                        $(SED) -f $(top_srcdir)/depfix.sed \
                            -e 's; $(srcdir)/; $$(srcdir)/;g' \
                            -e 's; $(top_srcdir)/; $$(top_srcdir)/;g' \