X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=MCONFIG.in;h=95404903d199240ead2df324ef1818af8d28b26a;hb=ad5d34f324b1c84857141761a48ea7f107c200e3;hp=4da61a596b2f74fc2f0691d2a40f08af8ec91c69;hpb=6d4022786dc43e66f0699a72925b946b9d2e4439;p=tools%2Fe2fsprogs.git diff --git a/MCONFIG.in b/MCONFIG.in index 4da61a5..9540490 100644 --- a/MCONFIG.in +++ b/MCONFIG.in @@ -2,8 +2,12 @@ all:: +all-static:: + check:: +fullcheck:: + SHELL = /bin/sh COMPRESS_EXT = gz bz2 bz Z @@ -14,6 +18,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,23 +29,83 @@ includedir = @includedir@ mandir = @mandir@ man1dir = $(mandir)/man1 man3dir = $(mandir)/man3 +man5dir = $(mandir)/man5 man8dir = $(mandir)/man8 infodir = @infodir@ datadir = @datadir@ +pkgconfigdir = $(libdir)/pkgconfig +pkglibdir = $(libdir)/e2fsprogs + +HAVE_UDEV = @have_udev@ +UDEV_RULES_DIR = @pkg_udev_rules_dir@ +HAVE_CROND = @have_crond@ +CROND_DIR = @crond_dir@ +HAVE_SYSTEMD = @have_systemd@ +SYSTEMD_SYSTEM_UNIT_DIR = @systemd_system_unit_dir@ @SET_MAKE@ -CC = @CC@ +@ifGNUmake@ V = +@ifGNUmake@ ifeq ($(strip $(V)),) +@ifGNUmake@ # E = @echo +@ifGNUmake@ # ES = echo +@ifGNUmake@ # Q = @ +@ifGNUmake@ E = @E@ +@ifGNUmake@ ES = @ES@ +@ifGNUmake@ Q = @Q@ +@ifGNUmake@ else +@ifGNUmake@ E = @\# +@ifGNUmake@ ES = \# +@ifGNUmake@ Q = +@ifGNUmake@ endif + +@ifNotGNUmake@ E = @E@ +@ifNotGNUmake@ ES = @ES@ +@ifNotGNUmake@ Q = @Q@ + +@ifGNUmake@ CHECK=sparse +@ifGNUmake@ CHECK_OPTS=-Wsparse-all -Wno-transparent-union -Wno-return-void -Wno-undef -Wno-non-pointer-null +@ifGNUmake@ CPPCHECK=cppcheck +@ifGNUmake@ CPPCHECK_OPTS=--force --enable=all --quiet +@ifGNUmake@ ifeq ("$(C)", "2") +@ifGNUmake@ CHECK_CMD=$(CHECK) $(CHECK_OPTS) -Wbitwise -D__CHECK_ENDIAN__ +@ifGNUmake@ CPPCHECK_CMD=$(CPPCHECK) $(CPPCHECK_OPTS) +@ifGNUmake@ else +@ifGNUmake@ ifeq ("$(C)", "1") +@ifGNUmake@ CHECK_CMD=$(CHECK) $(CHECK_OPTS) +@ifGNUmake@ CPPCHECK_CMD=$(CPPCHECK) $(CPPCHECK_OPTS) +@ifGNUmake@ else +@ifGNUmake@ CHECK_CMD=@true +@ifGNUmake@ CPPCHECK_CMD=@true +@ifGNUmake@ endif +@ifGNUmake@ endif + +@ifNotGNUmake@ CHECK_CMD=true +@ifNotGNUmake@ CPPCHECK_CMD=true + +SANITIZER_CFLAGS = @lto_cflags@ @ubsan_cflags@ @addrsan_cflags@ @threadsan_cflags@ +SANITIZER_LDFLAGS = @lto_ldflags@ @ubsan_ldflags@ @addrsan_ldflags@ @threadsan_ldflags@ + +CC = @PTHREAD_CC@ BUILD_CC = @BUILD_CC@ -DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ +PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ +PTHREAD_LIBS = @PTHREAD_LIBS@ 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) -LDFLAGS = @LDFLAGS@ -ALL_LDFLAGS = $(LDFLAGS) +CFLAGS_SHLIB = @CFLAGS_SHLIB@ +CFLAGS_STLIB = @CFLAGS_STLIB@ +CPPFLAGS = @INCLUDES@ +ALL_CFLAGS = $(CPPFLAGS) $(SANITIZER_CFLAGS) $(CFLAGS) $(PTHREAD_CFLAGS) $(CFLAGS_WARN) @DEFS@ $(LOCAL_CFLAGS) +ALL_CFLAGS_SHLIB = $(CPPFLAGS) $(SANITIZER_CFLAGS) $(CFLAGS_SHLIB) $(PTHREAD_CFLAGS) $(CFLAGS_WARN) @DEFS@ $(LOCAL_CFLAGS) +ALL_CFLAGS_STLIB = $(CPPFLAGS) $(SANITIZER_CFLAGS) $(CFLAGS_STLIB) $(PTHREAD_CFLAGS) $(CFLAGS_WARN) @DEFS@ $(LOCAL_CFLAGS) +LDFLAGS = $(SANITIZER_LDFLAGS) $(PTHREAD_CFLAGS) @LDFLAGS@ +LDFLAGS_SHLIB = $(SANITIZER_LDFLAGS) $(PTHREAD_CFLAGS) @LDFLAGS_SHLIB@ +ALL_LDFLAGS = $(LDFLAGS) @LDFLAG_DYNAMIC@ +LDFLAGS_STATIC = $(SANITIZER_LDFLAGS) $(PTHREAD_CFLAGS) @LDFLAGS_STATIC@ +BUILD_CFLAGS = $(SANITIZER_CFLAGS) @BUILD_CFLAGS@ +BUILD_LDFLAGS = $(SANITIZER_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@ @@ -60,40 +125,54 @@ 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@ +LIBMAGIC = @MAGIC_LIB@ +LIBFUSE = @FUSE_LIB@ +LIBSUPPORT = $(LIBINTL) $(LIB)/libsupport@STATIC_LIB_EXT@ +LIBBLKID = @LIBBLKID@ @PRIVATE_LIBS_CMT@ $(LIBUUID) LIBINTL = @LIBINTL@ -DEPLIBUUID = $(LIB)/libuuid@LIB_EXT@ +SYSLIBS = @LIBS@ @PTHREAD_LIBS@ +DEPLIBSS = $(LIB)/libss@LIB_EXT@ +DEPLIBCOM_ERR = $(LIB)/libcom_err@LIB_EXT@ +DEPLIBUUID = @DEPLIBUUID@ +DEPLIBSUPPORT = $(LIB)/libsupport@STATIC_LIB_EXT@ +DEPLIBBLKID = @DEPLIBBLKID@ @PRIVATE_LIBS_CMT@ $(DEPLIBUUID) +TESTENV = LD_LIBRARY_PATH="$(LIB):$${LD_LIBRARY_PATH}" DYLD_LIBRARY_PATH="$(LIB):$${DYLD_LIBRARY_PATH}" -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_LIBSUPPORT = $(LIBINTL) $(LIBSUPPORT) +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_LIBSUPPORT = $(DEPLIBSUPPORT) +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_LIBSUPPORT = $(LIBINTL) $(LIB)/libsupport@PROFILED_LIB_EXT@ +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_LIBSUPPORT = $(PROFILED_LIBSUPPORT) +DEPPROFILED_LIBBLKID = @PROFILED_LIBBLKID@ $(DEPPROFILED_LIBUUID) # # A fast substitution command for fixing up man pages, shell scripts, etc. @@ -107,26 +186,58 @@ $(top_builddir)/util/subst: cd $(top_builddir)/util ; $(MAKE) subst # +# Script for generating utf8data.h +# +MKUTF8DATA=$(top_builddir)/util/mkutf8data + +$(top_builddir)/util/mkutf8data: + $(MAKE) -C $(top_builddir)/util mkutf8data + +# +# 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=gnu99 -D_XOPEN_SOURCE=600 -D_GNU_SOURCE $(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_WARN="$(WFLAGS)" > /dev/null) 2>&1 gcc-wall: - make clean > /dev/null - make gcc-wall-new + $(MAKE) clean > /dev/null + $(MAKE) gcc-wall-new + +static-check: + ($(MAKE) C=1 V=1 CFLAGS="$(ALL_CFLAGS) $(WFLAGS)") 2>&1 + +static-check-all: + $(MAKE) clean > /dev/null + $(MAKE) static-check # # Installation user and groups @@ -148,9 +259,11 @@ MANMODE= 444 # Autoconf magic... # -DEP_LIB_MAKEFILES = $(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 \ +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.profile $(top_builddir)/config.status: $(top_srcdir)/configure @@ -159,6 +272,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 @@ -171,8 +292,16 @@ 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 +$(top_srcdir)/configure: $(top_srcdir)/configure.ac + cd $(top_srcdir) && autoheader && autoconf + +coverage.txt: Makefile $(SRCS) + if test -n "$(SRCS)"; then \ + gcov -s $(top_srcdir) -o . $(SRCS) > coverage.txt 2>&1 ; \ + fi + +clean:: + $(RM) -f *.gcda *.gcov *.gcno coverage.txt # # Make depend magic... @@ -180,7 +309,7 @@ $(top_srcdir)/configure: $(top_srcdir)/configure.in .depend: Makefile $(SRCS) $(top_srcdir)/depfix.sed $(top_srcdir)/wordwrap.pl if test -n "$(SRCS)" ; then \ - $(CC) -M $(ALL_CFLAGS) $(SRCS) | \ + $(CC) -M $(ALL_CFLAGS) $(DEPEND_CFLAGS) $(SRCS) | \ $(SED) -f $(top_srcdir)/depfix.sed \ -e 's; $(srcdir)/; $$(srcdir)/;g' \ -e 's; $(top_srcdir)/; $$(top_srcdir)/;g' \