X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=MCONFIG.in;h=3f26b5e743033202f59989027de29c2611d63189;hb=54be2ccc2251784fd771590a5e72827afd82df40;hp=1d02cd2bc7e7f36d77d371d623b341ed1c851426;hpb=50e1e10fa0ac12a3e2a9d20a75ee9041873cda96;p=tools%2Fe2fsprogs.git

diff --git a/MCONFIG.in b/MCONFIG.in
index 1d02cd2..3f26b5e 100644
--- a/MCONFIG.in
+++ b/MCONFIG.in
@@ -17,6 +17,7 @@ man1dir = $(usr_prefix)/man/man1
 man8dir = $(usr_prefix)/man/man8
 cat1dir = $(usr_prefix)/man/cat1
 cat8dir = $(usr_prefix)/man/cat8
+infodir = $(usr_prefix)/info
 
 @SET_MAKE@
 
@@ -24,12 +25,14 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 CC = @CC@
 DEFS = @DEFS@
-LIBS = @LIBS@
-CFLAGS = $(CPPFLAGS) $(DEFS) $(WFLAGS) @CFLAGS@ $(XTRA_CFLAGS) \
+CFLAGS = @CFLAGS@
+ALL_CFLAGS = $(CPPFLAGS) $(DEFS) $(WFLAGS) $(CFLAGS) $(XTRA_CFLAGS) \
 	-I$(top_builddir)/lib -I$(top_srcdir)/lib $(LINUX_INCLUDE) 
 LDFLAGS = @LDFLAGS@
+ALL_LDFLAGS = $(LDFLAGS)
 RM = @RM@
 LN = @LN@
+LN_S = @LN_S@
 MV = @MV@
 CP = @CP@
 CHMOD = @CHMOD@
@@ -42,6 +45,28 @@ LD = $(PURE) @CC@
 ARUPD = $(AR) r
 
 #
+# Library definitions
+#
+LIB = $(top_builddir)/lib
+LIBSS = $(LIB)/libss@LIB_EXT@
+LIBCOM_ERR = $(LIB)/libcom_err@LIB_EXT@
+LIBE2P = $(LIB)/libe2p@LIB_EXT@
+LIBEXT2FS = $(LIB)/libext2fs@LIB_EXT@
+LIBUUID = $(LIB)/libuuid@LIB_EXT@ @SOCKET_LIB@ 
+
+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@ 
+
+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@ 
+
+#
 # Use these definitions is you use tools 2.x, x < 16
 #
 #DLL_BIN=/usr/dll/bin
@@ -58,6 +83,13 @@ JUMP_PREFIX=/usr/bin/jump
 LINUX_INCLUDE=@LINUX_INCLUDE@
 
 #
+# A fast substitution command for fixing up man pages, shell scripts, etc.
+#
+SUBST_CONF=$(top_builddir)/util/subst.conf
+SUBSTITUTE= $(top_builddir)/util/subst -f $(SUBST_CONF)
+DEP_SUBSTITUTE= $(top_builddir)/util/subst $(SUBST_CONF)
+
+#
 # Warning flags
 #
 # Uncomment WFLAGS if you want really anal GCC warning messages
@@ -65,7 +97,7 @@ LINUX_INCLUDE=@LINUX_INCLUDE@
 #
 @W@WFLAGS=		-ansi -D_POSIX_SOURCE -pedantic \
 @W@			-Wall -Wwrite-strings -Wpointer-arith \
-@W@			-Wcast-qual -Wenum-clash -Wcast-align -Wtraditional \
+@W@			-Wcast-qual -Wcast-align -Wtraditional \
 @W@			-Wstrict-prototypes -Wmissing-prototypes \
 @W@			-Wnested-externs -Winline -DNO_INLINE_FUNCS -Wshadow 
 
@@ -88,18 +120,39 @@ MANMODE=	444
 all::
 
 #
+# Autoconf magic...
+#
+
+$(top_builddir)/config.status: $(top_srcdir)/configure
+	(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)
+
+$(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)
+
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/MCONFIG \
+		$(top_builddir)/config.status
+	(cd $(top_builddir); CONFIG_FILES=$(my_dir)/Makefile ./config.status)
+
+$(top_srcdir)/configure: $(top_srcdir)/configure.in
+	cd $(top_srcdir) && autoconf
+
+#
 # Make depend magic...
 #
 
 .depend: Makefile $(SRCS) $(top_srcdir)/depfix.sed
 	if test -n "$(SRCS)" ; then \
-		$(CC) -M $(CFLAGS) $(SRCS) | \
-			sed -f $(top_srcdir)/depfix.sed | \
-			sed -e 's; $(srcdir)/; $$(srcdir)/;g' | \
-			sed -e 's; $(top_srcdir)/; $$(top_srcdir)/;g' | \
-			sed -e 's; $(top_builddir)/; $$(top_builddir)/;g' | \
-			sed -e 's; \./; ;g' | \
-		grep -v "  \\\\$$" > .depend; \
+		$(CC) -M $(ALL_CFLAGS) $(SRCS) | \
+			sed -f $(top_srcdir)/depfix.sed \
+			    -e 's; $(srcdir)/; $$(srcdir)/;g' \
+			    -e 's; $(top_srcdir)/; $$(top_srcdir)/;g' \
+			    -e 's; $(top_builddir)/; $$(top_builddir)/;g' \
+			    -e 's; \./; ;g' \
+			    -e '/^ *\\$$/d' > .depend; \
 	else :; fi
 
 depend:: .depend
@@ -111,8 +164,4 @@ depend:: .depend
 	$(MV) $(srcdir)/Makefile.in.new $(srcdir)/Makefile.in; \
 	else :; fi
 
-
-
-
-
 # End of file MCONFIG