ChangeLog, Makefile.in:

[tools/e2fsprogs.git] / MCONFIG.in

diff --git a/MCONFIG.in b/MCONFIG.in
index 8c10d38..89918ca 100644 (file)
--- a/MCONFIG.in
+++ b/MCONFIG.in
@@ -29,8 +29,10 @@ CC = @CC@
 BUILD_CC = @BUILD_CC@
 DEFS = @DEFS@
 CFLAGS = @CFLAGS@
+CPPFLAGS = @CPPFLAGS@
 ALL_CFLAGS = $(CPPFLAGS) $(DEFS) $(WFLAGS) $(CFLAGS) $(XTRA_CFLAGS) \
-       -I$(top_builddir)/lib -I$(top_srcdir)/lib $(LINUX_INCLUDE) 
+       -I$(top_builddir)/lib -I$(top_srcdir)/lib \
+       -I$(top_srcdir)/include $(LINUX_INCLUDE) 
 LDFLAGS = @LDFLAGS@
 ALL_LDFLAGS = $(LDFLAGS)
 RM = @RM@
@@ -57,18 +59,21 @@ LIBCOM_ERR = $(LIB)/libcom_err@LIB_EXT@
 LIBE2P = $(LIB)/libe2p@LIB_EXT@
 LIBEXT2FS = $(LIB)/libext2fs@LIB_EXT@
 LIBUUID = $(LIB)/libuuid@LIB_EXT@ @SOCKET_LIB@ 
+DEPLIBUUID = $(LIB)/libuuid@LIB_EXT@
 
 STATIC_LIBSS = $(LIB)/libss@STATIC_LIB_EXT@
 STATIC_LIBCOM_ERR = $(LIB)/libcom_err@STATIC_LIB_EXT@
 STATIC_LIBE2P = $(LIB)/libe2p@STATIC_LIB_EXT@
 STATIC_LIBEXT2FS = $(LIB)/libext2fs@STATIC_LIB_EXT@
 STATIC_LIBUUID = $(LIB)/libuuid@STATIC_LIB_EXT@ @SOCKET_LIB@ 
+DEPSTATIC_LIBUUID = $(LIB)/libuuid@STATIC_LIB_EXT@
 
 PROFILED_LIBSS = $(LIB)/libss@PROFILED_LIB_EXT@
 PROFILED_LIBCOM_ERR = $(LIB)/libcom_err@PROFILED_LIB_EXT@
 PROFILED_LIBE2P = $(LIB)/libe2p@PROFILED_LIB_EXT@
 PROFILED_LIBEXT2FS = $(LIB)/libext2fs@PROFILED_LIB_EXT@
 PROFILED_LIBUUID = $(LIB)/libuuid@PROFILED_LIB_EXT@ @SOCKET_LIB@ 
+DEPPROFILED_LIBUUID = $(LIB)/libuuid@PROFILED_LIB_EXT@
 
 #
 # Use these definitions is you use tools 2.x, x < 16
@@ -94,7 +99,7 @@ SUBSTITUTE= $(top_builddir)/util/subst -f $(SUBST_CONF)
 DEP_SUBSTITUTE= $(top_builddir)/util/subst $(SUBST_CONF)
 
 $(top_builddir)/util/subst:
-       $(MAKE) -C $(top_builddir)/util subst
+       cd $(top_builddir)/util ; $(MAKE) subst
 
 #
 # Warning flags
@@ -133,22 +138,22 @@ DEP_LIB_MAKEFILES = $(top_srcdir)/lib/Makefile.elf-lib  \
        $(top_srcdir)/lib/Makefile.checker $(top_srcdir)/lib/Makefile.profile
 
 $(top_builddir)/config.status: $(top_srcdir)/configure
-       (cd $(top_builddir); ./config.status --recheck)
+       cd $(top_builddir); ./config.status --recheck
 
 $(top_builddir)/MCONFIG: $(top_srcdir)/MCONFIG.in $(top_builddir)/config.status
-       (cd $(top_builddir); CONFIG_FILES=MCONFIG ./config.status)
+       cd $(top_builddir); CONFIG_FILES=MCONFIG ./config.status
 
 $(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)
+       cd $(top_builddir); CONFIG_FILES=lib/substitute_sh ./config.status
 
 $(top_builddir)/util/subst.conf: $(top_srcdir)/util/subst.conf.in \
                $(top_builddir)/config.status
-       (cd $(top_builddir); CONFIG_FILES=util/subst.conf ./config.status)
+       cd $(top_builddir); CONFIG_FILES=util/subst.conf ./config.status
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/MCONFIG \
                $(DEP_MAKEFILE) $(top_builddir)/config.status
-       (cd $(top_builddir); CONFIG_FILES=$(my_dir)/Makefile ./config.status)
+       cd $(top_builddir); CONFIG_FILES=$(my_dir)/Makefile ./config.status
 
 $(top_srcdir)/configure: $(top_srcdir)/configure.in
        cd $(top_srcdir) && autoconf