Shorten compile commands run by the build system

[tools/e2fsprogs.git] / MCONFIG.in

diff --git a/MCONFIG.in b/MCONFIG.in
index aaaaf07..a0df515 100644 (file)
--- a/MCONFIG.in
+++ b/MCONFIG.in
@@ -48,12 +48,9 @@ datadir = @datadir@
 
 CC = @CC@
 BUILD_CC = @BUILD_CC@
-DEFS = -DLOCALEDIR=\"$(localedir)\" -DROOT_SYSCONFDIR=\"$(root_sysconfdir)\" @DEFS@
 CFLAGS = @CFLAGS@
-CPPFLAGS =  -I$(top_builddir)/lib -I$(top_srcdir)/lib @CPPFLAGS@
-INTL_FLAGS = @INTL_FLAGS@
-ALL_CFLAGS = $(CPPFLAGS) $(DEFS) $(USE_WFLAGS) $(CFLAGS) $(XTRA_CFLAGS) \
-       $(INTL_FLAGS) $(LINUX_INCLUDE) 
+CPPFLAGS = @INCLUDES@
+ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS)
 LDFLAGS = @LDFLAGS@
 ALL_LDFLAGS = $(LDFLAGS) @LDFLAG_DYNAMIC@
 LDFLAGS_STATIC = $(LDFLAGS) @LDFLAG_STATIC@
@@ -127,10 +124,6 @@ DEPPROFILED_LIBUUID = @PROFILED_LIBUUID@
 DEPPROFILED_LIBQUOTA = @PROFILED_LIBQUOTA@
 DEPPROFILED_LIBBLKID = @PROFILED_LIBBLKID@ $(DEPPROFILED_LIBUUID)
 
-# An include directive pointing to a directory holding enough linux-like
-# include files to satisfy some programs here
-LINUX_INCLUDE=@LINUX_INCLUDE@
-
 #
 # A fast substitution command for fixing up man pages, shell scripts, etc.
 #
@@ -159,7 +152,7 @@ WFLAGS=             -std=c99 -D_XOPEN_SOURCE=600 -D_GNU_SOURCE \
                        -UENABLE_NLS
 
 gcc-wall-new:
-       (make USE_WFLAGS="$(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
@@ -197,6 +190,14 @@ $(top_builddir)/config.status: $(top_srcdir)/configure
 $(top_builddir)/MCONFIG: $(top_srcdir)/MCONFIG.in $(top_builddir)/config.status
        cd $(top_builddir); CONFIG_FILES=MCONFIG ./config.status
 
+$(top_builddir)/lib/config.h: $(top_srcdir)/lib/config.h.in \
+                             $(top_builddir)/config.status
+       cd $(top_builddir); CONFIG_FILES=lib/config.h ./config.status
+
+$(top_builddir)/lib/dirpaths.h: $(DEP_SUBSTITUTE) $(top_srcdir)/lib/dirpaths.h.in
+       $(E) "  SUBST $@"
+       $(Q) $(SUBSTITUTE) $(top_srcdir)/lib/dirpaths.h.in $@
+
 $(top_builddir)/lib/substitute_sh: $(top_srcdir)/lib/substitute_sh.in \
                $(top_builddir)/config.status
        cd $(top_builddir); CONFIG_FILES=lib/substitute_sh ./config.status
@@ -210,7 +211,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/MCONFIG \
        cd $(top_builddir); CONFIG_FILES=$(my_dir)/Makefile ./config.status
 
 @MAINTAINER_CMT@$(top_srcdir)/configure: $(top_srcdir)/configure.in
-@MAINTAINER_CMT@       cd $(top_srcdir) && autoconf
+@MAINTAINER_CMT@       cd $(top_srcdir) && autoheader && autoconf
 
 #
 # Make depend magic...