1997-04-26 17:58:21 +04:00
|
|
|
# Beginning of file MCONFIG
|
|
|
|
|
1999-07-03 08:55:36 +04:00
|
|
|
all::
|
|
|
|
|
2000-12-09 05:37:33 +03:00
|
|
|
check::
|
|
|
|
|
1997-04-26 17:58:21 +04:00
|
|
|
SHELL = /bin/sh
|
|
|
|
|
2002-10-31 11:32:34 +03:00
|
|
|
COMPRESS_EXT = gz bz2 bz Z
|
|
|
|
|
1997-04-26 17:58:21 +04:00
|
|
|
prefix = @prefix@
|
Many files:
configure.in: Change how the installation directions are selected.
Previously, we had prefix and usr_prefix, where prefix was '' and
usr_prefix was /usr, and we then defined bindir, ubindir, libdir,
ulibdir, etc. in terms of that. In autoconf 2.12, it's possible to
override bindir, libdir, etc., and so in order to make our
installation directory makefile variables more in line with autoconf
2.12, I've changed all of the various makefiles to use prefix and
root_prefix, where the default Linux definitions are /usr and '',
respectively. What used to be bindir is now root_bindir, and what
used to be ubindir, is now bindir.
MCONFIG.in: Change directories to match with new installation
directory convention (see above). Add Makefile
dependencies for makefile fragments, and define
DEP_LIB_MAKEFILES which library makefiles can use to
define DEP_MAKEFILES, so that the library makefiles will
get regenerated when the makefile fragments change.
Remove the cat?dir variables, since we aren't creating
those directories any more.
Makefile.in: Add top-level uninstall targets.
e2fsprogs-1.12.spec: Add to the RPM package the e2label man page, and
to reflect that fact that we now compile_et and mk_cmds for the
development package.
ChangeLog, Makefile.in:
Makefile.in: Add uninstall target (which is a just a no-op).
version.h, RELEASE-NOTES:
Update to interim version numbers for release purposes.
1998-04-03 20:12:25 +04:00
|
|
|
root_prefix = @root_prefix@
|
1997-04-26 17:58:21 +04:00
|
|
|
exec_prefix = @exec_prefix@
|
2002-05-12 03:17:00 +04:00
|
|
|
root_bindir = @root_bindir@
|
|
|
|
root_sbindir = @root_sbindir@
|
|
|
|
root_libdir = @root_libdir@
|
2006-10-22 08:14:26 +04:00
|
|
|
datarootdir = @datarootdir@
|
Many files:
configure.in: Change how the installation directions are selected.
Previously, we had prefix and usr_prefix, where prefix was '' and
usr_prefix was /usr, and we then defined bindir, ubindir, libdir,
ulibdir, etc. in terms of that. In autoconf 2.12, it's possible to
override bindir, libdir, etc., and so in order to make our
installation directory makefile variables more in line with autoconf
2.12, I've changed all of the various makefiles to use prefix and
root_prefix, where the default Linux definitions are /usr and '',
respectively. What used to be bindir is now root_bindir, and what
used to be ubindir, is now bindir.
MCONFIG.in: Change directories to match with new installation
directory convention (see above). Add Makefile
dependencies for makefile fragments, and define
DEP_LIB_MAKEFILES which library makefiles can use to
define DEP_MAKEFILES, so that the library makefiles will
get regenerated when the makefile fragments change.
Remove the cat?dir variables, since we aren't creating
those directories any more.
Makefile.in: Add top-level uninstall targets.
e2fsprogs-1.12.spec: Add to the RPM package the e2label man page, and
to reflect that fact that we now compile_et and mk_cmds for the
development package.
ChangeLog, Makefile.in:
Makefile.in: Add uninstall target (which is a just a no-op).
version.h, RELEASE-NOTES:
Update to interim version numbers for release purposes.
1998-04-03 20:12:25 +04:00
|
|
|
bindir = @bindir@
|
|
|
|
sbindir = @sbindir@
|
|
|
|
libdir = @libdir@
|
2002-05-12 03:17:00 +04:00
|
|
|
datadir= @datadir@
|
2003-05-04 00:35:17 +04:00
|
|
|
localedir = $(datadir)/locale
|
2002-05-12 03:17:00 +04:00
|
|
|
root_sysconfdir= @root_sysconfdir@
|
Many files:
configure.in: Change how the installation directions are selected.
Previously, we had prefix and usr_prefix, where prefix was '' and
usr_prefix was /usr, and we then defined bindir, ubindir, libdir,
ulibdir, etc. in terms of that. In autoconf 2.12, it's possible to
override bindir, libdir, etc., and so in order to make our
installation directory makefile variables more in line with autoconf
2.12, I've changed all of the various makefiles to use prefix and
root_prefix, where the default Linux definitions are /usr and '',
respectively. What used to be bindir is now root_bindir, and what
used to be ubindir, is now bindir.
MCONFIG.in: Change directories to match with new installation
directory convention (see above). Add Makefile
dependencies for makefile fragments, and define
DEP_LIB_MAKEFILES which library makefiles can use to
define DEP_MAKEFILES, so that the library makefiles will
get regenerated when the makefile fragments change.
Remove the cat?dir variables, since we aren't creating
those directories any more.
Makefile.in: Add top-level uninstall targets.
e2fsprogs-1.12.spec: Add to the RPM package the e2label man page, and
to reflect that fact that we now compile_et and mk_cmds for the
development package.
ChangeLog, Makefile.in:
Makefile.in: Add uninstall target (which is a just a no-op).
version.h, RELEASE-NOTES:
Update to interim version numbers for release purposes.
1998-04-03 20:12:25 +04:00
|
|
|
includedir = @includedir@
|
|
|
|
mandir = @mandir@
|
1999-05-30 01:53:30 +04:00
|
|
|
man1dir = $(mandir)/man1
|
|
|
|
man3dir = $(mandir)/man3
|
2006-03-24 06:00:01 +03:00
|
|
|
man5dir = $(mandir)/man5
|
1999-05-30 01:53:30 +04:00
|
|
|
man8dir = $(mandir)/man8
|
Many files:
configure.in: Change how the installation directions are selected.
Previously, we had prefix and usr_prefix, where prefix was '' and
usr_prefix was /usr, and we then defined bindir, ubindir, libdir,
ulibdir, etc. in terms of that. In autoconf 2.12, it's possible to
override bindir, libdir, etc., and so in order to make our
installation directory makefile variables more in line with autoconf
2.12, I've changed all of the various makefiles to use prefix and
root_prefix, where the default Linux definitions are /usr and '',
respectively. What used to be bindir is now root_bindir, and what
used to be ubindir, is now bindir.
MCONFIG.in: Change directories to match with new installation
directory convention (see above). Add Makefile
dependencies for makefile fragments, and define
DEP_LIB_MAKEFILES which library makefiles can use to
define DEP_MAKEFILES, so that the library makefiles will
get regenerated when the makefile fragments change.
Remove the cat?dir variables, since we aren't creating
those directories any more.
Makefile.in: Add top-level uninstall targets.
e2fsprogs-1.12.spec: Add to the RPM package the e2label man page, and
to reflect that fact that we now compile_et and mk_cmds for the
development package.
ChangeLog, Makefile.in:
Makefile.in: Add uninstall target (which is a just a no-op).
version.h, RELEASE-NOTES:
Update to interim version numbers for release purposes.
1998-04-03 20:12:25 +04:00
|
|
|
infodir = @infodir@
|
|
|
|
datadir = @datadir@
|
2014-05-07 07:05:17 +04:00
|
|
|
pkgconfigdir = $(libdir)/pkgconfig
|
1997-04-26 17:58:21 +04:00
|
|
|
|
|
|
|
@SET_MAKE@
|
|
|
|
|
2009-07-03 02:19:10 +04:00
|
|
|
@ifGNUmake@ V =
|
|
|
|
@ifGNUmake@ ifeq ($(strip $(V)),)
|
|
|
|
@ifGNUmake@ # E = @echo
|
2012-06-13 23:29:13 +04:00
|
|
|
@ifGNUmake@ # ES = echo
|
2009-07-03 02:19:10 +04:00
|
|
|
@ifGNUmake@ # Q = @
|
|
|
|
@ifGNUmake@ E = @E@
|
2012-06-13 23:29:13 +04:00
|
|
|
@ifGNUmake@ ES = @ES@
|
2009-07-03 02:19:10 +04:00
|
|
|
@ifGNUmake@ Q = @Q@
|
|
|
|
@ifGNUmake@ else
|
|
|
|
@ifGNUmake@ E = @\#
|
2012-06-13 23:29:13 +04:00
|
|
|
@ifGNUmake@ ES = \#
|
2009-07-03 02:19:10 +04:00
|
|
|
@ifGNUmake@ Q =
|
|
|
|
@ifGNUmake@ endif
|
2009-07-02 08:11:17 +04:00
|
|
|
|
2009-07-03 02:19:10 +04:00
|
|
|
@ifNotGNUmake@ E = @E@
|
2012-06-13 23:29:13 +04:00
|
|
|
@ifNotGNUmake@ ES = @ES@
|
2009-07-03 02:19:10 +04:00
|
|
|
@ifNotGNUmake@ Q = @Q@
|
2009-07-02 08:11:17 +04:00
|
|
|
|
2013-10-24 04:09:12 +04:00
|
|
|
@ifGNUmake@ CHECK=sparse
|
|
|
|
@ifGNUmake@ CHECK_OPTS=-Wsparse-all -Wno-transparent-union -Wno-return-void -Wno-undef -Wno-non-pointer-null
|
|
|
|
@ifGNUmake@ ifeq ("$(C)", "2")
|
|
|
|
@ifGNUmake@ CHECK_CMD=$(CHECK) $(CHECK_OPTS) -Wbitwise -D__CHECK_ENDIAN__
|
|
|
|
@ifGNUmake@ else
|
|
|
|
@ifGNUmake@ ifeq ("$(C)", "1")
|
|
|
|
@ifGNUmake@ CHECK_CMD=$(CHECK) $(CHECK_OPTS)
|
|
|
|
@ifGNUmake@ else
|
|
|
|
@ifGNUmake@ CHECK_CMD=@true
|
|
|
|
@ifGNUmake@ endif
|
|
|
|
@ifGNUmake@ endif
|
|
|
|
|
|
|
|
@ifNotGNUmake@ CHECK_CMD=@true
|
|
|
|
|
1997-04-26 17:58:21 +04:00
|
|
|
CC = @CC@
|
1999-07-04 00:37:03 +04:00
|
|
|
BUILD_CC = @BUILD_CC@
|
fix cross-compilation support
Commit 2500ebfc89 (util: fix make dependencies for subst) broke cross
compilation because it unconditionally used config.h without setting a
includes path so that the config.h file could be found.
The proposed fix of adding the include path (such as was proposed at
http://patchwork.ozlabs.org/patch/355662/ or in Debian Bug #753375)
isn't really the right way to go, since the information in config.h is
for the target environment, and not the build environment. So using
config.h when building helper programs used as part of the build can
potentially cause more problems than it solves.
In general, build helpers must be written to be as portable as
possible, and to not require any autoconf defined #ifdef's whenever
possible. The subst program broke this rule to (1) address a Coverity
security complaint by using futimes(2) instad of utimes(2) if present,
and (2) to preserve the nanosecond portion of the file timestamp.
Oh, well. We won't be able to do the latter when cross compiling, and
as to the former, if an attacker has write access to your build tree
while you are building programs that will be run as root, you've got
bigger problems. :-)
Fix the problem that commit 2500ebfc89 was trying to address by
explicitly adding @DEFS@ to CFLAGS, so that -DHAVE_CONFIG_H is passed
to make depend. This fixes up the make depend without forcing the use
of config.h when cross-compiling.
Addresses-Debian-Bug: #753375
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Tested-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Cc: Helmut Grohne <helmut@subdivi.de>
Cc: 753375@bugs.debian.org
2014-07-06 04:23:23 +04:00
|
|
|
CFLAGS = @CFLAGS@ @DEFS@
|
2011-09-19 01:34:37 +04:00
|
|
|
CPPFLAGS = @INCLUDES@
|
|
|
|
ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS)
|
1997-04-26 17:58:21 +04:00
|
|
|
LDFLAGS = @LDFLAGS@
|
2008-09-03 07:12:38 +04:00
|
|
|
ALL_LDFLAGS = $(LDFLAGS) @LDFLAG_DYNAMIC@
|
|
|
|
LDFLAGS_STATIC = $(LDFLAGS) @LDFLAG_STATIC@
|
2005-11-10 01:37:07 +03:00
|
|
|
BUILD_CFLAGS = @BUILD_CFLAGS@
|
|
|
|
BUILD_LDFLAGS = @BUILD_LDFLAGS@
|
2011-08-11 22:56:49 +04:00
|
|
|
RDYNAMIC = @RDYNAMIC@
|
2010-05-18 03:21:42 +04:00
|
|
|
LINK_BUILD_FLAGS = @LINK_BUILD_FLAGS@
|
|
|
|
LINK_INSTALL_FLAGS = @LINK_INSTALL_FLAGS@
|
1997-04-26 17:58:21 +04:00
|
|
|
RM = @RM@
|
|
|
|
LN = @LN@
|
1997-04-29 18:51:31 +04:00
|
|
|
LN_S = @LN_S@
|
1997-04-26 17:58:21 +04:00
|
|
|
MV = @MV@
|
|
|
|
CP = @CP@
|
|
|
|
CHMOD = @CHMOD@
|
|
|
|
AR = @AR@
|
|
|
|
AWK = @AWK@
|
|
|
|
SED = @SED@
|
1999-07-04 00:25:58 +04:00
|
|
|
PERL = @PERL@
|
1997-04-26 17:58:21 +04:00
|
|
|
RANLIB = @RANLIB@
|
|
|
|
STRIP = @STRIP@
|
|
|
|
LD = $(PURE) @CC@
|
|
|
|
ARUPD = $(AR) r
|
2004-11-30 18:52:27 +03:00
|
|
|
ARGEN = $(AR) rc
|
2001-05-20 02:02:22 +04:00
|
|
|
LDCONFIG = @LDCONFIG@
|
2004-12-15 05:46:26 +03:00
|
|
|
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
|
|
|
INSTALL_DATA = @INSTALL_DATA@
|
|
|
|
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
|
|
|
MKINSTALLDIRS = @MKINSTALLDIRS@
|
1997-04-26 17:58:21 +04:00
|
|
|
|
1997-04-29 18:28:00 +04:00
|
|
|
#
|
|
|
|
# Library definitions
|
|
|
|
#
|
|
|
|
LIB = $(top_builddir)/lib
|
2008-09-03 07:12:38 +04:00
|
|
|
LIBSS = $(LIB)/libss@LIB_EXT@ @PRIVATE_LIBS_CMT@ @DLOPEN_LIB@
|
2008-09-12 18:15:26 +04:00
|
|
|
LIBCOM_ERR = $(LIB)/libcom_err@LIB_EXT@ @PRIVATE_LIBS_CMT@ @SEM_INIT_LIB@
|
1997-04-29 18:28:00 +04:00
|
|
|
LIBE2P = $(LIB)/libe2p@LIB_EXT@
|
|
|
|
LIBEXT2FS = $(LIB)/libext2fs@LIB_EXT@
|
2009-05-14 16:03:25 +04:00
|
|
|
LIBUUID = @LIBUUID@ @SOCKET_LIB@
|
2011-09-19 21:39:38 +04:00
|
|
|
LIBQUOTA = @STATIC_LIBQUOTA@
|
2009-04-22 17:18:30 +04:00
|
|
|
LIBBLKID = @LIBBLKID@ @PRIVATE_LIBS_CMT@ $(LIBUUID)
|
2003-05-04 00:35:17 +04:00
|
|
|
LIBINTL = @LIBINTL@
|
2014-01-05 05:44:29 +04:00
|
|
|
SYSLIBS = @LIBS@
|
2008-06-08 05:53:35 +04:00
|
|
|
DEPLIBSS = $(LIB)/libss@LIB_EXT@
|
2009-07-02 06:06:51 +04:00
|
|
|
DEPLIBCOM_ERR = $(LIB)/libcom_err@LIB_EXT@
|
2009-05-14 16:03:25 +04:00
|
|
|
DEPLIBUUID = @DEPLIBUUID@
|
2011-09-19 21:39:38 +04:00
|
|
|
DEPLIBQUOTA = @DEPSTATIC_LIBQUOTA@
|
2009-07-02 01:20:24 +04:00
|
|
|
DEPLIBBLKID = @DEPLIBBLKID@ @PRIVATE_LIBS_CMT@ $(DEPLIBUUID)
|
1997-04-29 18:28:00 +04:00
|
|
|
|
2008-04-18 00:54:24 +04:00
|
|
|
STATIC_LIBSS = $(LIB)/libss@STATIC_LIB_EXT@ @DLOPEN_LIB@
|
2008-09-12 18:15:26 +04:00
|
|
|
STATIC_LIBCOM_ERR = $(LIB)/libcom_err@STATIC_LIB_EXT@ @SEM_INIT_LIB@
|
1997-04-29 18:28:00 +04:00
|
|
|
STATIC_LIBE2P = $(LIB)/libe2p@STATIC_LIB_EXT@
|
|
|
|
STATIC_LIBEXT2FS = $(LIB)/libext2fs@STATIC_LIB_EXT@
|
2009-05-14 16:03:25 +04:00
|
|
|
STATIC_LIBUUID = @STATIC_LIBUUID@ @SOCKET_LIB@
|
2011-07-20 22:40:02 +04:00
|
|
|
STATIC_LIBQUOTA = @STATIC_LIBQUOTA@
|
2009-04-22 17:18:30 +04:00
|
|
|
STATIC_LIBBLKID = @STATIC_LIBBLKID@ $(STATIC_LIBUUID)
|
2008-06-08 05:53:35 +04:00
|
|
|
DEPSTATIC_LIBSS = $(LIB)/libss@STATIC_LIB_EXT@
|
2009-07-02 06:06:51 +04:00
|
|
|
DEPSTATIC_LIBCOM_ERR = $(LIB)/libcom_err@STATIC_LIB_EXT@
|
2009-05-14 16:03:25 +04:00
|
|
|
DEPSTATIC_LIBUUID = @DEPSTATIC_LIBUUID@
|
2011-07-20 22:40:02 +04:00
|
|
|
DEPSTATIC_LIBQUOTA = @DEPSTATIC_LIBQUOTA@
|
2010-11-27 03:25:26 +03:00
|
|
|
DEPSTATIC_LIBBLKID = @DEPSTATIC_LIBBLKID@ $(DEPSTATIC_LIBUUID)
|
1997-04-29 18:28:00 +04:00
|
|
|
|
2008-04-18 00:54:24 +04:00
|
|
|
PROFILED_LIBSS = $(LIB)/libss@PROFILED_LIB_EXT@ @DLOPEN_LIB@
|
2008-11-15 20:12:57 +03:00
|
|
|
PROFILED_LIBCOM_ERR = $(LIB)/libcom_err@PROFILED_LIB_EXT@ @SEM_INIT_LIB@
|
1997-04-29 18:28:00 +04:00
|
|
|
PROFILED_LIBE2P = $(LIB)/libe2p@PROFILED_LIB_EXT@
|
|
|
|
PROFILED_LIBEXT2FS = $(LIB)/libext2fs@PROFILED_LIB_EXT@
|
2009-05-14 16:03:25 +04:00
|
|
|
PROFILED_LIBUUID = @PROFILED_LIBUUID@ @SOCKET_LIB@
|
2011-07-20 22:40:02 +04:00
|
|
|
PROFILED_LIBQUOTA = @PROFILED_LIBQUOTA@
|
2009-04-22 17:18:30 +04:00
|
|
|
PROFILED_LIBBLKID = @PROFILED_LIBBLKID@ $(PROFILED_LIBUUID)
|
2009-07-02 06:06:51 +04:00
|
|
|
DEPPROFILED_LIBSS = $(LIB)/libss@PROFILED_LIB_EXT@
|
|
|
|
DEPPROFILED_LIBCOM_ERR = $(LIB)/libcom_err@PROFILED_LIB_EXT@
|
2009-05-14 16:03:25 +04:00
|
|
|
DEPPROFILED_LIBUUID = @PROFILED_LIBUUID@
|
2011-07-20 22:40:02 +04:00
|
|
|
DEPPROFILED_LIBQUOTA = @PROFILED_LIBQUOTA@
|
2010-11-27 03:25:26 +03:00
|
|
|
DEPPROFILED_LIBBLKID = @PROFILED_LIBBLKID@ $(DEPPROFILED_LIBUUID)
|
1997-04-29 18:28:00 +04:00
|
|
|
|
|
|
|
#
|
|
|
|
# A fast substitution command for fixing up man pages, shell scripts, etc.
|
|
|
|
#
|
1997-10-15 06:47:20 +04:00
|
|
|
SUBST_CONF=$(top_builddir)/util/subst.conf
|
|
|
|
SUBSTITUTE= $(top_builddir)/util/subst -f $(SUBST_CONF)
|
2004-04-03 22:53:46 +04:00
|
|
|
SUBSTITUTE_UPTIME= $(top_builddir)/util/subst -t -f $(SUBST_CONF)
|
1997-10-15 06:47:20 +04:00
|
|
|
DEP_SUBSTITUTE= $(top_builddir)/util/subst $(SUBST_CONF)
|
1997-04-29 18:28:00 +04:00
|
|
|
|
1999-07-03 08:55:36 +04:00
|
|
|
$(top_builddir)/util/subst:
|
2000-04-03 07:18:59 +04:00
|
|
|
cd $(top_builddir)/util ; $(MAKE) subst
|
1999-07-03 08:55:36 +04:00
|
|
|
|
2012-05-13 07:13:24 +04:00
|
|
|
#
|
|
|
|
# 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
|
|
|
|
|
1997-04-26 17:58:21 +04:00
|
|
|
#
|
|
|
|
# Warning flags
|
|
|
|
#
|
ChangeLog, MCONFIG.in, configure, configure.in:
MCONFIG.in: Change --enable-gcc-wall handling so that it's no longer a
configure option, but something which is done when the developer uses
the command "make gcc-wall".
configure.in: Remove test for ino_t, since we don't use it any more
(we always use our own ext2_ino_t). Remove --enable-gcc-wall support.
Add test for sys/ioctl.h
.del-types.h.in~ca55114a:
Remove definition of ino_t
ChangeLog, Makefile.in, ext2fs.h, flushb.c, jump.funcs:
flushb.c (ext2fs_sync_device): New function which centralizes all of
the places which might try to use the BLKFLSBUF or FDFLUSH ioctls (and
usually failing to define them since the system header files don't
usually do this for us, and we're trying to avoid usage of kernel
include files now.)
2001-01-11 18:48:50 +03:00
|
|
|
# Run make gcc-wall to do a build with warning messages.
|
1997-04-26 17:58:21 +04:00
|
|
|
#
|
|
|
|
#
|
2006-11-15 07:40:19 +03:00
|
|
|
WFLAGS= -std=c99 -D_XOPEN_SOURCE=600 -D_GNU_SOURCE \
|
|
|
|
-pedantic $(WFLAGS_EXTRA) \
|
2003-11-27 07:18:56 +03:00
|
|
|
-Wall -W -Wwrite-strings -Wpointer-arith \
|
2006-11-15 07:40:19 +03:00
|
|
|
-Wcast-qual -Wcast-align -Wno-variadic-macros \
|
ChangeLog, MCONFIG.in, configure, configure.in:
MCONFIG.in: Change --enable-gcc-wall handling so that it's no longer a
configure option, but something which is done when the developer uses
the command "make gcc-wall".
configure.in: Remove test for ino_t, since we don't use it any more
(we always use our own ext2_ino_t). Remove --enable-gcc-wall support.
Add test for sys/ioctl.h
.del-types.h.in~ca55114a:
Remove definition of ino_t
ChangeLog, Makefile.in, ext2fs.h, flushb.c, jump.funcs:
flushb.c (ext2fs_sync_device): New function which centralizes all of
the places which might try to use the BLKFLSBUF or FDFLUSH ioctls (and
usually failing to define them since the system header files don't
usually do this for us, and we're trying to avoid usage of kernel
include files now.)
2001-01-11 18:48:50 +03:00
|
|
|
-Wstrict-prototypes -Wmissing-prototypes \
|
2003-07-06 08:36:48 +04:00
|
|
|
-Wformat-security -Wformat-nonliteral \
|
2006-11-15 07:40:19 +03:00
|
|
|
-Wmissing-format-attribute -O2 -Wstrict-aliasing \
|
2003-11-27 07:18:56 +03:00
|
|
|
-Wnested-externs -Winline -DNO_INLINE_FUNCS -Wshadow \
|
|
|
|
-UENABLE_NLS
|
ChangeLog, MCONFIG.in, configure, configure.in:
MCONFIG.in: Change --enable-gcc-wall handling so that it's no longer a
configure option, but something which is done when the developer uses
the command "make gcc-wall".
configure.in: Remove test for ino_t, since we don't use it any more
(we always use our own ext2_ino_t). Remove --enable-gcc-wall support.
Add test for sys/ioctl.h
.del-types.h.in~ca55114a:
Remove definition of ino_t
ChangeLog, Makefile.in, ext2fs.h, flushb.c, jump.funcs:
flushb.c (ext2fs_sync_device): New function which centralizes all of
the places which might try to use the BLKFLSBUF or FDFLUSH ioctls (and
usually failing to define them since the system header files don't
usually do this for us, and we're trying to avoid usage of kernel
include files now.)
2001-01-11 18:48:50 +03:00
|
|
|
|
ChangeLog, e2image.c, mke2fs.c, mklost+found.c, tune2fs.c, util.c, uuidgen.c:
e2image.c, mke2fs.c, mklost+found.c, tune2fs.c, util.c, uuidgen.c: Fix
gcc -Wall complaints, including one bug in tune2fs caused by a block
automatic shadowing version of the variable we really wanted to use,
which broke the logic testing to see if the filesystem was mounted.
ChangeLog, MCONFIG.in:
(gcc-wall-new): Added new target which forgoes the make clean so we
only check the newly modified .c files.
2001-01-11 19:08:23 +03:00
|
|
|
gcc-wall-new:
|
2011-09-19 01:34:37 +04:00
|
|
|
(make CFLAGS="@CFLAGS@ $(WFLAGS)" > /dev/null) 2>&1 | sed -f $(top_srcdir)/util/gcc-wall-cleanup
|
ChangeLog, e2image.c, mke2fs.c, mklost+found.c, tune2fs.c, util.c, uuidgen.c:
e2image.c, mke2fs.c, mklost+found.c, tune2fs.c, util.c, uuidgen.c: Fix
gcc -Wall complaints, including one bug in tune2fs caused by a block
automatic shadowing version of the variable we really wanted to use,
which broke the logic testing to see if the filesystem was mounted.
ChangeLog, MCONFIG.in:
(gcc-wall-new): Added new target which forgoes the make clean so we
only check the newly modified .c files.
2001-01-11 19:08:23 +03:00
|
|
|
|
ChangeLog, MCONFIG.in, configure, configure.in:
MCONFIG.in: Change --enable-gcc-wall handling so that it's no longer a
configure option, but something which is done when the developer uses
the command "make gcc-wall".
configure.in: Remove test for ino_t, since we don't use it any more
(we always use our own ext2_ino_t). Remove --enable-gcc-wall support.
Add test for sys/ioctl.h
.del-types.h.in~ca55114a:
Remove definition of ino_t
ChangeLog, Makefile.in, ext2fs.h, flushb.c, jump.funcs:
flushb.c (ext2fs_sync_device): New function which centralizes all of
the places which might try to use the BLKFLSBUF or FDFLUSH ioctls (and
usually failing to define them since the system header files don't
usually do this for us, and we're trying to avoid usage of kernel
include files now.)
2001-01-11 18:48:50 +03:00
|
|
|
gcc-wall:
|
|
|
|
make clean > /dev/null
|
ChangeLog, e2image.c, mke2fs.c, mklost+found.c, tune2fs.c, util.c, uuidgen.c:
e2image.c, mke2fs.c, mklost+found.c, tune2fs.c, util.c, uuidgen.c: Fix
gcc -Wall complaints, including one bug in tune2fs caused by a block
automatic shadowing version of the variable we really wanted to use,
which broke the logic testing to see if the filesystem was mounted.
ChangeLog, MCONFIG.in:
(gcc-wall-new): Added new target which forgoes the make clean so we
only check the newly modified .c files.
2001-01-11 19:08:23 +03:00
|
|
|
make gcc-wall-new
|
1997-04-26 17:58:21 +04:00
|
|
|
|
|
|
|
#
|
|
|
|
# Installation user and groups
|
|
|
|
#
|
|
|
|
BINGRP= bin
|
|
|
|
BINOWN= bin
|
|
|
|
BINMODE= 555
|
|
|
|
INCGRP= bin
|
|
|
|
INCOWN= bin
|
|
|
|
INCMODE= 444
|
|
|
|
LIBOWN= bin
|
|
|
|
LIBGRP= bin
|
|
|
|
LIBMODE= 444
|
|
|
|
MANGRP= bin
|
|
|
|
MANOWN= bin
|
|
|
|
MANMODE= 444
|
|
|
|
|
1997-04-29 18:51:31 +04:00
|
|
|
#
|
|
|
|
# Autoconf magic...
|
|
|
|
#
|
|
|
|
|
2010-05-18 03:21:42 +04:00
|
|
|
DEP_LIB_MAKEFILES = $(top_srcdir)/lib/Makefile.library \
|
|
|
|
$(top_srcdir)/lib/Makefile.elf-lib \
|
2014-04-18 02:05:38 +04:00
|
|
|
$(top_srcdir)/lib/Makefile.bsd-lib \
|
|
|
|
$(top_srcdir)/lib/Makefile.darwin-lib \
|
|
|
|
$(top_srcdir)/lib/Makefile.solaris-lib \
|
2004-11-20 01:06:47 +03:00
|
|
|
$(top_srcdir)/lib/Makefile.profile
|
Many files:
configure.in: Change how the installation directions are selected.
Previously, we had prefix and usr_prefix, where prefix was '' and
usr_prefix was /usr, and we then defined bindir, ubindir, libdir,
ulibdir, etc. in terms of that. In autoconf 2.12, it's possible to
override bindir, libdir, etc., and so in order to make our
installation directory makefile variables more in line with autoconf
2.12, I've changed all of the various makefiles to use prefix and
root_prefix, where the default Linux definitions are /usr and '',
respectively. What used to be bindir is now root_bindir, and what
used to be ubindir, is now bindir.
MCONFIG.in: Change directories to match with new installation
directory convention (see above). Add Makefile
dependencies for makefile fragments, and define
DEP_LIB_MAKEFILES which library makefiles can use to
define DEP_MAKEFILES, so that the library makefiles will
get regenerated when the makefile fragments change.
Remove the cat?dir variables, since we aren't creating
those directories any more.
Makefile.in: Add top-level uninstall targets.
e2fsprogs-1.12.spec: Add to the RPM package the e2label man page, and
to reflect that fact that we now compile_et and mk_cmds for the
development package.
ChangeLog, Makefile.in:
Makefile.in: Add uninstall target (which is a just a no-op).
version.h, RELEASE-NOTES:
Update to interim version numbers for release purposes.
1998-04-03 20:12:25 +04:00
|
|
|
|
1997-04-29 18:51:31 +04:00
|
|
|
$(top_builddir)/config.status: $(top_srcdir)/configure
|
2000-04-03 07:18:59 +04:00
|
|
|
cd $(top_builddir); ./config.status --recheck
|
1997-04-29 18:51:31 +04:00
|
|
|
|
|
|
|
$(top_builddir)/MCONFIG: $(top_srcdir)/MCONFIG.in $(top_builddir)/config.status
|
2000-04-03 07:18:59 +04:00
|
|
|
cd $(top_builddir); CONFIG_FILES=MCONFIG ./config.status
|
1997-04-29 18:51:31 +04:00
|
|
|
|
2011-09-19 01:34:37 +04:00
|
|
|
$(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 $@
|
|
|
|
|
1997-04-29 18:51:31 +04:00
|
|
|
$(top_builddir)/lib/substitute_sh: $(top_srcdir)/lib/substitute_sh.in \
|
|
|
|
$(top_builddir)/config.status
|
2000-04-03 07:18:59 +04:00
|
|
|
cd $(top_builddir); CONFIG_FILES=lib/substitute_sh ./config.status
|
1997-04-29 18:51:31 +04:00
|
|
|
|
1998-03-30 05:11:44 +04:00
|
|
|
$(top_builddir)/util/subst.conf: $(top_srcdir)/util/subst.conf.in \
|
|
|
|
$(top_builddir)/config.status
|
2000-04-03 07:18:59 +04:00
|
|
|
cd $(top_builddir); CONFIG_FILES=util/subst.conf ./config.status
|
1998-03-30 05:11:44 +04:00
|
|
|
|
1997-04-29 18:51:31 +04:00
|
|
|
Makefile: $(srcdir)/Makefile.in $(top_builddir)/MCONFIG \
|
Many files:
configure.in: Change how the installation directions are selected.
Previously, we had prefix and usr_prefix, where prefix was '' and
usr_prefix was /usr, and we then defined bindir, ubindir, libdir,
ulibdir, etc. in terms of that. In autoconf 2.12, it's possible to
override bindir, libdir, etc., and so in order to make our
installation directory makefile variables more in line with autoconf
2.12, I've changed all of the various makefiles to use prefix and
root_prefix, where the default Linux definitions are /usr and '',
respectively. What used to be bindir is now root_bindir, and what
used to be ubindir, is now bindir.
MCONFIG.in: Change directories to match with new installation
directory convention (see above). Add Makefile
dependencies for makefile fragments, and define
DEP_LIB_MAKEFILES which library makefiles can use to
define DEP_MAKEFILES, so that the library makefiles will
get regenerated when the makefile fragments change.
Remove the cat?dir variables, since we aren't creating
those directories any more.
Makefile.in: Add top-level uninstall targets.
e2fsprogs-1.12.spec: Add to the RPM package the e2label man page, and
to reflect that fact that we now compile_et and mk_cmds for the
development package.
ChangeLog, Makefile.in:
Makefile.in: Add uninstall target (which is a just a no-op).
version.h, RELEASE-NOTES:
Update to interim version numbers for release purposes.
1998-04-03 20:12:25 +04:00
|
|
|
$(DEP_MAKEFILE) $(top_builddir)/config.status
|
2000-04-03 07:18:59 +04:00
|
|
|
cd $(top_builddir); CONFIG_FILES=$(my_dir)/Makefile ./config.status
|
1997-04-29 18:51:31 +04:00
|
|
|
|
2005-02-04 18:43:58 +03:00
|
|
|
@MAINTAINER_CMT@$(top_srcdir)/configure: $(top_srcdir)/configure.in
|
2011-09-19 01:34:37 +04:00
|
|
|
@MAINTAINER_CMT@ cd $(top_srcdir) && autoheader && autoconf
|
1997-04-29 18:51:31 +04:00
|
|
|
|
2014-02-23 09:17:09 +04:00
|
|
|
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
|
|
|
|
|
1997-04-26 17:58:21 +04:00
|
|
|
#
|
|
|
|
# Make depend magic...
|
|
|
|
#
|
|
|
|
|
1999-07-04 00:25:58 +04:00
|
|
|
.depend: Makefile $(SRCS) $(top_srcdir)/depfix.sed $(top_srcdir)/wordwrap.pl
|
1997-04-26 17:58:21 +04:00
|
|
|
if test -n "$(SRCS)" ; then \
|
2014-05-23 18:28:04 +04:00
|
|
|
$(CC) -M $(ALL_CFLAGS) $(DEPEND_CFLAGS) $(SRCS) | \
|
1999-07-04 00:25:58 +04:00
|
|
|
$(SED) -f $(top_srcdir)/depfix.sed \
|
1997-04-29 18:51:31 +04:00
|
|
|
-e 's; $(srcdir)/; $$(srcdir)/;g' \
|
|
|
|
-e 's; $(top_srcdir)/; $$(top_srcdir)/;g' \
|
|
|
|
-e 's; $(top_builddir)/; $$(top_builddir)/;g' \
|
|
|
|
-e 's; \./; ;g' \
|
2004-12-15 05:46:26 +03:00
|
|
|
-e '/^#/d' \
|
1999-07-04 00:25:58 +04:00
|
|
|
-e '/^ *\\$$/d' | \
|
|
|
|
$(PERL) $(top_srcdir)/wordwrap.pl > .depend; \
|
1997-04-26 17:58:21 +04:00
|
|
|
else :; fi
|
|
|
|
|
|
|
|
depend:: .depend
|
|
|
|
if test -n "$(SRCS)" ; then \
|
|
|
|
sed -e '/^# +++ Dependency line eater +++/,$$d' \
|
|
|
|
< $(srcdir)/Makefile.in | cat - .depend \
|
|
|
|
> $(srcdir)/Makefile.in.new; \
|
1999-07-04 00:25:58 +04:00
|
|
|
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
|
1997-04-26 17:58:21 +04:00
|
|
|
|
|
|
|
# End of file MCONFIG
|