X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=MCONFIG.in;h=6503fecd7722361f7d5c2646b5ebbdacf3edc13f;hb=059761a9db0e299bad3ac5796c133b783e92a9b3;hp=ca5081c63c362ef9a083d2e0a0899a597b77611a;hpb=2b5901d9c7eb4b60cce5a9726517b8f79e5e0bfc;p=tools%2Fe2fsprogs.git diff --git a/MCONFIG.in b/MCONFIG.in index ca5081c..6503fec 100644 --- a/MCONFIG.in +++ b/MCONFIG.in @@ -14,6 +14,7 @@ exec_prefix = @exec_prefix@ root_bindir = @root_bindir@ root_sbindir = @root_sbindir@ root_libdir = @root_libdir@ +datarootdir = @datarootdir@ bindir = @bindir@ sbindir = @sbindir@ libdir = @libdir@ @@ -24,25 +25,40 @@ includedir = @includedir@ mandir = @mandir@ man1dir = $(mandir)/man1 man3dir = $(mandir)/man3 +man5dir = $(mandir)/man5 man8dir = $(mandir)/man8 infodir = @infodir@ datadir = @datadir@ @SET_MAKE@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ +@ifGNUmake@ V = +@ifGNUmake@ ifeq ($(strip $(V)),) +@ifGNUmake@ # E = @echo +@ifGNUmake@ # Q = @ +@ifGNUmake@ E = @E@ +@ifGNUmake@ Q = @Q@ +@ifGNUmake@ else +@ifGNUmake@ E = @\# +@ifGNUmake@ Q = +@ifGNUmake@ endif + +@ifNotGNUmake@ E = @E@ +@ifNotGNUmake@ Q = @Q@ + CC = @CC@ BUILD_CC = @BUILD_CC@ -DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ CFLAGS = @CFLAGS@ -CPPFLAGS = @CPPFLAGS@ -INTL_FLAGS = @INTL_FLAGS@ -ALL_CFLAGS = $(CPPFLAGS) $(DEFS) $(USE_WFLAGS) $(CFLAGS) $(XTRA_CFLAGS) \ - $(INTL_FLAGS) -I$(top_builddir)/lib -I$(top_srcdir)/lib \ - $(LINUX_INCLUDE) +CPPFLAGS = @INCLUDES@ +ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS) LDFLAGS = @LDFLAGS@ -ALL_LDFLAGS = $(LDFLAGS) +ALL_LDFLAGS = $(LDFLAGS) @LDFLAG_DYNAMIC@ +LDFLAGS_STATIC = $(LDFLAGS) @LDFLAG_STATIC@ +BUILD_CFLAGS = @BUILD_CFLAGS@ +BUILD_LDFLAGS = @BUILD_LDFLAGS@ +RDYNAMIC = @RDYNAMIC@ +LINK_BUILD_FLAGS = @LINK_BUILD_FLAGS@ +LINK_INSTALL_FLAGS = @LINK_INSTALL_FLAGS@ RM = @RM@ LN = @LN@ LN_S = @LN_S@ @@ -57,40 +73,56 @@ RANLIB = @RANLIB@ STRIP = @STRIP@ LD = $(PURE) @CC@ ARUPD = $(AR) r +ARGEN = $(AR) rc LDCONFIG = @LDCONFIG@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +MKINSTALLDIRS = @MKINSTALLDIRS@ # # Library definitions # LIB = $(top_builddir)/lib -LIBSS = $(LIB)/libss@LIB_EXT@ -LIBCOM_ERR = $(LIB)/libcom_err@LIB_EXT@ +LIBSS = $(LIB)/libss@LIB_EXT@ @PRIVATE_LIBS_CMT@ @DLOPEN_LIB@ +LIBCOM_ERR = $(LIB)/libcom_err@LIB_EXT@ @PRIVATE_LIBS_CMT@ @SEM_INIT_LIB@ LIBE2P = $(LIB)/libe2p@LIB_EXT@ LIBEXT2FS = $(LIB)/libext2fs@LIB_EXT@ -LIBUUID = $(LIB)/libuuid@LIB_EXT@ @SOCKET_LIB@ -LIBBLKID = $(LIB)/libblkid@LIB_EXT@ +LIBUUID = @LIBUUID@ @SOCKET_LIB@ +LIBQUOTA = @STATIC_LIBQUOTA@ +LIBBLKID = @LIBBLKID@ @PRIVATE_LIBS_CMT@ $(LIBUUID) LIBINTL = @LIBINTL@ -DEPLIBUUID = $(LIB)/libuuid@LIB_EXT@ +DEPLIBSS = $(LIB)/libss@LIB_EXT@ +DEPLIBCOM_ERR = $(LIB)/libcom_err@LIB_EXT@ +DEPLIBUUID = @DEPLIBUUID@ +DEPLIBQUOTA = @DEPSTATIC_LIBQUOTA@ +DEPLIBBLKID = @DEPLIBBLKID@ @PRIVATE_LIBS_CMT@ $(DEPLIBUUID) -STATIC_LIBSS = $(LIB)/libss@STATIC_LIB_EXT@ -STATIC_LIBCOM_ERR = $(LIB)/libcom_err@STATIC_LIB_EXT@ +STATIC_LIBSS = $(LIB)/libss@STATIC_LIB_EXT@ @DLOPEN_LIB@ +STATIC_LIBCOM_ERR = $(LIB)/libcom_err@STATIC_LIB_EXT@ @SEM_INIT_LIB@ STATIC_LIBE2P = $(LIB)/libe2p@STATIC_LIB_EXT@ STATIC_LIBEXT2FS = $(LIB)/libext2fs@STATIC_LIB_EXT@ -STATIC_LIBUUID = $(LIB)/libuuid@STATIC_LIB_EXT@ @SOCKET_LIB@ -STATIC_LIBBLKID = $(LIB)/libblkid@STATIC_LIB_EXT@ -DEPSTATIC_LIBUUID = $(LIB)/libuuid@STATIC_LIB_EXT@ +STATIC_LIBUUID = @STATIC_LIBUUID@ @SOCKET_LIB@ +STATIC_LIBQUOTA = @STATIC_LIBQUOTA@ +STATIC_LIBBLKID = @STATIC_LIBBLKID@ $(STATIC_LIBUUID) +DEPSTATIC_LIBSS = $(LIB)/libss@STATIC_LIB_EXT@ +DEPSTATIC_LIBCOM_ERR = $(LIB)/libcom_err@STATIC_LIB_EXT@ +DEPSTATIC_LIBUUID = @DEPSTATIC_LIBUUID@ +DEPSTATIC_LIBQUOTA = @DEPSTATIC_LIBQUOTA@ +DEPSTATIC_LIBBLKID = @DEPSTATIC_LIBBLKID@ $(DEPSTATIC_LIBUUID) -PROFILED_LIBSS = $(LIB)/libss@PROFILED_LIB_EXT@ -PROFILED_LIBCOM_ERR = $(LIB)/libcom_err@PROFILED_LIB_EXT@ +PROFILED_LIBSS = $(LIB)/libss@PROFILED_LIB_EXT@ @DLOPEN_LIB@ +PROFILED_LIBCOM_ERR = $(LIB)/libcom_err@PROFILED_LIB_EXT@ @SEM_INIT_LIB@ PROFILED_LIBE2P = $(LIB)/libe2p@PROFILED_LIB_EXT@ PROFILED_LIBEXT2FS = $(LIB)/libext2fs@PROFILED_LIB_EXT@ -PROFILED_LIBUUID = $(LIB)/libuuid@PROFILED_LIB_EXT@ @SOCKET_LIB@ -PROFILED_LIBBLKID = $(LIB)/libblkid@PROFILED_LIB_EXT@ -DEPPROFILED_LIBUUID = $(LIB)/libuuid@PROFILED_LIB_EXT@ - -# An include directive pointing to a directory holding enough linux-like -# include files to satisfy some programs here -LINUX_INCLUDE=@LINUX_INCLUDE@ +PROFILED_LIBUUID = @PROFILED_LIBUUID@ @SOCKET_LIB@ +PROFILED_LIBQUOTA = @PROFILED_LIBQUOTA@ +PROFILED_LIBBLKID = @PROFILED_LIBBLKID@ $(PROFILED_LIBUUID) +DEPPROFILED_LIBSS = $(LIB)/libss@PROFILED_LIB_EXT@ +DEPPROFILED_LIBCOM_ERR = $(LIB)/libcom_err@PROFILED_LIB_EXT@ +DEPPROFILED_LIBUUID = @PROFILED_LIBUUID@ +DEPPROFILED_LIBQUOTA = @PROFILED_LIBQUOTA@ +DEPPROFILED_LIBBLKID = @PROFILED_LIBBLKID@ $(DEPPROFILED_LIBUUID) # # A fast substitution command for fixing up man pages, shell scripts, etc. @@ -104,22 +136,40 @@ $(top_builddir)/util/subst: cd $(top_builddir)/util ; $(MAKE) subst # +# Script for installing symlinks (for shared libraries) +# +$(top_builddir)/util/install-symlink: $(top_srcdir)/util/install-symlink.in \ + $(top_builddir)/config.status + cd $(top_builddir); CONFIG_FILES=util/install-symlink ./config.status + chmod +x $(top_builddir)/util/install-symlink + +$(top_builddir)/util/symlinks: + cd $(top_builddir)/util ; $(MAKE) symlinks + +INSTALL_SYMLINK = /bin/sh $(top_builddir)/util/install-symlink \ + @SYMLINK_RELATIVE@ \ + --symlinks=$(top_builddir)/util/symlinks +DEP_INSTALL_SYMLINK = $(top_builddir)/util/install-symlink \ + $(top_builddir)/util/symlinks + +# # Warning flags # # Run make gcc-wall to do a build with warning messages. # # -WFLAGS= -ansi -D_POSIX_SOURCE -pedantic $(WFLAGS_EXTRA) \ +WFLAGS= -std=c99 -D_XOPEN_SOURCE=600 -D_GNU_SOURCE \ + -pedantic $(WFLAGS_EXTRA) \ -Wall -W -Wwrite-strings -Wpointer-arith \ - -Wcast-qual -Wcast-align \ + -Wcast-qual -Wcast-align -Wno-variadic-macros \ -Wstrict-prototypes -Wmissing-prototypes \ -Wformat-security -Wformat-nonliteral \ - -Wmissing-format-attribute \ + -Wmissing-format-attribute -O2 -Wstrict-aliasing \ -Wnested-externs -Winline -DNO_INLINE_FUNCS -Wshadow \ -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 @@ -145,7 +195,8 @@ MANMODE= 444 # Autoconf magic... # -DEP_LIB_MAKEFILES = $(top_srcdir)/lib/Makefile.elf-lib \ +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.profile @@ -156,6 +207,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 @@ -169,7 +228,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/MCONFIG \ cd $(top_builddir); CONFIG_FILES=$(my_dir)/Makefile ./config.status $(top_srcdir)/configure: $(top_srcdir)/configure.in - cd $(top_srcdir) && autoconf + cd $(top_srcdir) && autoheader && autoconf # # Make depend magic... @@ -183,6 +242,7 @@ $(top_srcdir)/configure: $(top_srcdir)/configure.in -e 's; $(top_srcdir)/; $$(top_srcdir)/;g' \ -e 's; $(top_builddir)/; $$(top_builddir)/;g' \ -e 's; \./; ;g' \ + -e '/^#/d' \ -e '/^ *\\$$/d' | \ $(PERL) $(top_srcdir)/wordwrap.pl > .depend; \ else :; fi