Signed-off-by: Diego Elio 'Flameeyes' Pettenò <flameeyes@xxxxxxxxx> --- Makefile.am | 5 +---- configure.ac | 1 - fsck/Makefile.am | 17 ----------------- fsck/module.am | 17 +++++++++++++++++ 4 files changed, 18 insertions(+), 22 deletions(-) delete mode 100644 fsck/Makefile.am create mode 100644 fsck/module.am diff --git a/Makefile.am b/Makefile.am index bc7527b..ae0d9bf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -67,10 +67,6 @@ if BUILD_MOUNT SUBDIRS += mount endif -if BUILD_FSCK -SUBDIRS += fsck -endif - ACLOCAL_AMFLAGS = -I m4 EXTRA_DIST = \ @@ -106,6 +102,7 @@ tests_helpers_test_md5_SOURCES = tests/helpers/test_md5.c lib/md5.c include lib/module.am include disk-utils/module.am include fdisk/module.am +include fsck/module.am include getopt/module.am clean-local: diff --git a/configure.ac b/configure.ac index 5d2644c..5670aef 100644 --- a/configure.ac +++ b/configure.ac @@ -1132,7 +1132,6 @@ LIBS="" AC_CONFIG_HEADERS(config.h) AC_CONFIG_FILES([ -fsck/Makefile hwclock/Makefile login-utils/Makefile Makefile diff --git a/fsck/Makefile.am b/fsck/Makefile.am deleted file mode 100644 index b0949e2..0000000 --- a/fsck/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -include $(top_srcdir)/config/include-Makefile.am - -sbin_PROGRAMS = fsck -dist_man_MANS = fsck.8 - -fsck_SOURCES = base_device.c fsck.c fsck.h $(top_srcdir)/lib/ismounted.c \ - $(top_srcdir)/lib/fsprobe.c $(top_srcdir)/lib/canonicalize.c -fsck_LDADD = -fsck_CFLAGS = $(AM_CFLAGS) - -if BUILD_LIBBLKID -fsck_LDADD += $(ul_libblkid_la) -fsck_CFLAGS += -I$(ul_libblkid_incdir) -else -fsck_LDADD += $(BLKID_LIBS) -fsck_CFLAGS += $(BLKID_CFLAGS) -endif diff --git a/fsck/module.am b/fsck/module.am new file mode 100644 index 0000000..efd6752 --- /dev/null +++ b/fsck/module.am @@ -0,0 +1,17 @@ +fsck_fsck_SOURCES = fsck/base_device.c fsck/fsck.c fsck/fsck.h \ + lib/ismounted.c lib/fsprobe.c lib/canonicalize.c +fsck_fsck_LDADD = +fsck_fsck_CFLAGS = $(AM_CFLAGS) + +if BUILD_LIBBLKID +fsck_fsck_LDADD += $(ul_libblkid_la) +fsck_fsck_CFLAGS += -I$(ul_libblkid_incdir) +else +fsck_fsck_LDADD += $(BLKID_LIBS) +fsck_fsck_CFLAGS += $(BLKID_CFLAGS) +endif + +if BUILD_FSCK +sbin_PROGRAMS += fsck/fsck +dist_man_MANS += fsck/fsck.8 +endif -- 1.7.1.1 -- To unsubscribe from this list: send the line "unsubscribe util-linux-ng" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
