build-sys: convert lib/ to module

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/Makefile.am b/Makefile.am
index 1e5ac615f52340968d7fe3c9a704601d813ec564..138da8eb6389d207b8b02f5bfea0cb44f518944e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 include $(top_srcdir)/config/include-Makefile.am
 
 dist_noinst_HEADERS =
-
+noinst_PROGRAMS =
 
 SHLIBS_DIRS =
 
@@ -25,7 +25,6 @@ SUBDIRS = \
        disk-utils \
        fdisk \
        getopt \
-       lib \
        login-utils \
        misc-utils \
        po \
@@ -66,6 +65,7 @@ EXTRA_DIST = \
 
 
 include include/Makemodule.am
+include lib/Makemodule.am
 
 
 # Arrange so that .tarball-version appears only in the distribution

diff --git a/configure.ac b/configure.ac
index 055a7de4ca3973f7a4afdd2ec1744f4e6a57d78e..dc25684c25b38ab4386e660b197c9082670d5717 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1304,7 +1304,6 @@ disk-utils/Makefile
 fdisk/Makefile
 getopt/Makefile
 hwclock/Makefile
-lib/Makefile
 libblkid/Makefile
 libblkid/blkid.pc
 libblkid/docs/Makefile

diff --git a/lib/Makefile.am b/lib/Makefile.am
deleted file mode 100644 (file)
index 01b59dc..0000000
--- a/lib/Makefile.am
+++ /dev/null
@@ -1,61 +0,0 @@
-include $(top_srcdir)/config/include-Makefile.am
-
-AM_CPPFLAGS += -DTEST_PROGRAM
-
-noinst_PROGRAMS = \
-       test_at \
-       test_blkdev \
-       test_canonicalize \
-       test_fileutils \
-       test_ismounted \
-       test_mangle \
-       test_pager \
-       test_procutils \
-       test_randutils \
-       test_strutils \
-       test_tt \
-       test_wholedisk
-
-if LINUX
-if HAVE_CPU_SET_T
-noinst_PROGRAMS += test_cpuset
-endif
-noinst_PROGRAMS += test_sysfs test_loopdev
-endif
-
-test_blkdev_SOURCES = blkdev.c
-test_ismounted_SOURCES = ismounted.c
-test_wholedisk_SOURCES = wholedisk.c
-test_mangle_SOURCES = mangle.c
-test_pager_SOURCES = pager.c
-
-test_at_SOURCES = at.c
-test_at_CFLAGS = -DTEST_PROGRAM_AT
-
-test_strutils_SOURCES = strutils.c
-test_randutils_SOURCES = randutils.c
-test_procutils_SOURCES = procutils.c
-
-if LINUX
-test_cpuset_SOURCES = cpuset.c
-test_sysfs_SOURCES = sysfs.c at.c
-test_sysfs_CFLAGS = -DTEST_PROGRAM_SYSFS
-
-test_loopdev_SOURCES = \
-       loopdev.c \
-       $(test_sysfs_SOURCES) \
-       $(top_srcdir)/lib/canonicalize.c \
-       $(top_srcdir)/lib/linux_version.c
-
-test_loopdev_CFLAGS = -DTEST_PROGRAM_LOOPDEV
-endif
-
-test_fileutils_SOURCES = fileutils.c
-test_tt_SOURCES = tt.c $(top_srcdir)/lib/mbsalign.c
-
-test_canonicalize_SOURCES = canonicalize.c
-test_canonicalize_CFLAGS = -DTEST_PROGRAM_CANONICALIZE
-
-if LINUX
-test_blkdev_SOURCES += linux_version.c
-endif

diff --git a/lib/Makemodule.am b/lib/Makemodule.am
new file mode 100644 (file)
index 0000000..f60edeb
--- /dev/null
+++ b/lib/Makemodule.am
@@ -0,0 +1,64 @@
+
+AM_CPPFLAGS += -DTEST_PROGRAM
+
+noinst_PROGRAMS += \
+       test_at \
+       test_blkdev \
+       test_canonicalize \
+       test_fileutils \
+       test_ismounted \
+       test_mangle \
+       test_pager \
+       test_procutils \
+       test_randutils \
+       test_strutils \
+       test_tt \
+       test_wholedisk
+
+if LINUX
+if HAVE_CPU_SET_T
+noinst_PROGRAMS += test_cpuset
+endif
+noinst_PROGRAMS += \
+       test_sysfs \
+       test_loopdev
+endif
+
+test_blkdev_SOURCES = lib/blkdev.c
+test_ismounted_SOURCES = lib/ismounted.c
+test_wholedisk_SOURCES = lib/wholedisk.c
+test_mangle_SOURCES = lib/mangle.c
+
+test_at_SOURCES = lib/at.c
+test_at_CFLAGS = -DTEST_PROGRAM_AT
+
+test_strutils_SOURCES = lib/strutils.c
+test_randutils_SOURCES = lib/randutils.c
+test_procutils_SOURCES = lib/procutils.c
+
+if LINUX
+test_cpuset_SOURCES = lib/cpuset.c
+test_sysfs_SOURCES = lib/sysfs.c lib/at.c
+test_pager_SOURCES = lib/pager.c
+test_sysfs_CFLAGS = -DTEST_PROGRAM_SYSFS
+
+test_loopdev_SOURCES = \
+       $(test_sysfs_SOURCES) \
+       lib/loopdev.c \
+       lib/canonicalize.c \
+       lib/linux_version.c
+
+test_loopdev_CFLAGS = -DTEST_PROGRAM_LOOPDEV
+endif
+
+test_fileutils_SOURCES = lib/fileutils.c
+test_tt_SOURCES = \
+       lib/tt.c \
+       lib/mbsalign.c
+
+test_canonicalize_SOURCES = lib/canonicalize.c
+test_canonicalize_CFLAGS = -DTEST_PROGRAM_CANONICALIZE
+
+if LINUX
+test_blkdev_SOURCES += lib/inux_version.c
+endif