X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=MCONFIG.in;h=2e1ac56a0e4f029f17930a716a56f87cc1f0d398;hb=546a1ff18cc912003883ff67ba3e87c69f700fc4;hp=1d02cd2bc7e7f36d77d371d623b341ed1c851426;hpb=50e1e10fa0ac12a3e2a9d20a75ee9041873cda96;p=tools%2Fe2fsprogs.git diff --git a/MCONFIG.in b/MCONFIG.in index 1d02cd2..2e1ac56 100644 --- a/MCONFIG.in +++ b/MCONFIG.in @@ -1,45 +1,81 @@ # Beginning of file MCONFIG +all:: + +check:: + SHELL = /bin/sh prefix = @prefix@ +root_prefix = @root_prefix@ exec_prefix = @exec_prefix@ -usr_prefix = @usr_prefix@ -bindir = $(exec_prefix)/bin -ubindir = $(usr_prefix)/bin -sbindir = $(exec_prefix)/sbin -usbindir = $(usr_prefix)/sbin -libdir = $(exec_prefix)/lib -ulibdir = $(usr_prefix)/lib -includedir = $(usr_prefix)/include -mandir = $(usr_prefix)/man -man1dir = $(usr_prefix)/man/man1 -man8dir = $(usr_prefix)/man/man8 -cat1dir = $(usr_prefix)/man/cat1 -cat8dir = $(usr_prefix)/man/cat8 +root_bindir = $(root_prefix)/bin +root_sbindir = $(root_prefix)/sbin +root_libdir = $(root_prefix)/lib +bindir = @bindir@ +sbindir = @sbindir@ +libdir = @libdir@ +includedir = @includedir@ +mandir = @mandir@ +man1dir = $(mandir)/man1 +man3dir = $(mandir)/man3 +man8dir = $(mandir)/man8 +infodir = @infodir@ +datadir = @datadir@ @SET_MAKE@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ CC = @CC@ +BUILD_CC = @BUILD_CC@ DEFS = @DEFS@ -LIBS = @LIBS@ -CFLAGS = $(CPPFLAGS) $(DEFS) $(WFLAGS) @CFLAGS@ $(XTRA_CFLAGS) \ +CFLAGS = @CFLAGS@ +CPPFLAGS = @CPPFLAGS@ +ALL_CFLAGS = $(CPPFLAGS) $(DEFS) $(USE_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@ AR = @AR@ AWK = @AWK@ SED = @SED@ +PERL = @PERL@ RANLIB = @RANLIB@ STRIP = @STRIP@ LD = $(PURE) @CC@ ARUPD = $(AR) r +LDCONFIG = @LDCONFIG@ + +# +# 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@ +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 @@ -58,16 +94,33 @@ 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) + +$(top_builddir)/util/subst: + cd $(top_builddir)/util ; $(MAKE) subst + +# # Warning flags # -# Uncomment WFLAGS if you want really anal GCC warning messages +# Run make gcc-wall to do a build with warning messages. # # -@W@WFLAGS= -ansi -D_POSIX_SOURCE -pedantic \ -@W@ -Wall -Wwrite-strings -Wpointer-arith \ -@W@ -Wcast-qual -Wenum-clash -Wcast-align -Wtraditional \ -@W@ -Wstrict-prototypes -Wmissing-prototypes \ -@W@ -Wnested-externs -Winline -DNO_INLINE_FUNCS -Wshadow +WFLAGS= -ansi -D_POSIX_SOURCE -pedantic \ + -Wall -Wwrite-strings -Wpointer-arith \ + -Wcast-qual -Wcast-align -Wtraditional \ + -Wstrict-prototypes -Wmissing-prototypes \ + -Wnested-externs -Winline -DNO_INLINE_FUNCS -Wshadow + +gcc-wall-new: + (make USE_WFLAGS="$(WFLAGS)" > /dev/null) 2>&1 | sed -f $(top_srcdir)/util/gcc-wall-cleanup + +gcc-wall: + make clean > /dev/null + make gcc-wall-new # # Installation user and groups @@ -85,21 +138,49 @@ MANGRP= bin MANOWN= bin MANMODE= 444 -all:: +# +# Autoconf magic... +# + +DEP_LIB_MAKEFILES = $(top_srcdir)/lib/Makefile.elf-lib \ + $(top_srcdir)/lib/Makefile.dll-lib $(top_srcdir)/lib/Makefile.bsd-lib \ + $(top_srcdir)/lib/Makefile.checker $(top_srcdir)/lib/Makefile.profile + +$(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 + +$(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 + +Makefile: $(srcdir)/Makefile.in $(top_builddir)/MCONFIG \ + $(DEP_MAKEFILE) $(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 +.depend: Makefile $(SRCS) $(top_srcdir)/depfix.sed $(top_srcdir)/wordwrap.pl 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' | \ + $(PERL) $(top_srcdir)/wordwrap.pl > .depend; \ else :; fi depend:: .depend @@ -107,12 +188,11 @@ depend:: .depend sed -e '/^# +++ Dependency line eater +++/,$$d' \ < $(srcdir)/Makefile.in | cat - .depend \ > $(srcdir)/Makefile.in.new; \ - $(MV) $(srcdir)/Makefile.in $(srcdir)/Makefile.in.old; \ - $(MV) $(srcdir)/Makefile.in.new $(srcdir)/Makefile.in; \ - else :; fi - - - - + if cmp -s $(srcdir)/Makefile.in $(srcdir)/Makefile.in.new ; then \ + $(RM) $(srcdir)/Makefile.in.new ; \ + else \ + $(MV) $(srcdir)/Makefile.in $(srcdir)/Makefile.in.old; \ + $(MV) $(srcdir)/Makefile.in.new $(srcdir)/Makefile.in; \ + fi ; else :; fi # End of file MCONFIG