diff options
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | lib/Makefile.am | 61 | ||||
| -rw-r--r-- | lib/Makemodule.am | 64 |
4 files changed, 66 insertions, 64 deletions
diff --git a/Makefile.am b/Makefile.am index 1e5ac615f..138da8eb6 100644 --- 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 055a7de4c..dc25684c2 100644 --- 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 index 01b59dc5a..000000000 --- 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 index 000000000..f60edeb65 --- /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 |