Merge branch 'libblkid/vxfs/cleanup' of https://github.com/t-8ch/util-linux

[thirdparty/util-linux.git] / lib / Makemodule.am

diff --git a/lib/Makemodule.am b/lib/Makemodule.am
index e2e3e4f7c6d76eb3eac4cfb6a6f00c028c467ab8..d95721ee2236e33002f182bc48568280e68835d1 100644 (file)
--- a/lib/Makemodule.am
+++ b/lib/Makemodule.am
@@ -9,34 +9,37 @@
 # Note that you need "make install-strip" (or proper rpm / Debian build)
 # to generate binaries with only relevant stuff.
 #
-noinst_LTLIBRARIES += libcommon.la
+EXTRA_LTLIBRARIES += libcommon.la
 libcommon_la_CFLAGS = $(AM_CFLAGS)
 libcommon_la_SOURCES = \
        lib/blkdev.c \
        lib/buffer.c \
        lib/canonicalize.c \
+       lib/color-names.c \
        lib/crc32.c \
        lib/crc32c.c \
-       lib/env.c \
-       lib/idcache.c \
+       lib/crc64.c \
+       lib/c_strtod.c \
        lib/encode.c \
+       lib/env.c \
        lib/fileutils.c \
-       lib/color-names.c \
+       lib/idcache.c \
+       lib/jsonwrt.c \
        lib/mangle.c \
        lib/match.c \
        lib/mbsalign.c \
        lib/mbsedit.c\
        lib/md5.c \
-       lib/pager.c \
-       lib/procutils.c \
        lib/pwdutils.c \
        lib/randutils.c \
+       lib/sha1.c \
+       lib/sha256.c \
+       lib/signames.c \
        lib/strutils.c \
+       lib/strv.c \
        lib/timeutils.c \
        lib/ttyutils.c \
-       lib/strv.c \
-       lib/sha1.c \
-       lib/signames.c
+       lib/xxhash.c
 
 if LINUX
 libcommon_la_SOURCES += \
@@ -56,10 +59,11 @@ if HAVE_OPENAT
 if HAVE_DIRFD
 libcommon_la_SOURCES += lib/path.c
 libcommon_la_SOURCES += lib/sysfs.c
+libcommon_la_SOURCES += lib/procfs.c
 endif
 endif
 
-noinst_LTLIBRARIES += libtcolors.la
+EXTRA_LTLIBRARIES += libtcolors.la
 libtcolors_la_CFLAGS = $(AM_CFLAGS)
 libtcolors_la_SOURCES = lib/colors.c lib/color-names.c include/colors.h include/color-names.h
 libtcolors_la_LIBADD =
@@ -74,14 +78,15 @@ libtcolors_la_CFLAGS += $(NCURSES_CFLAGS)
 endif
 endif # !HAVE_TINFO
 
-dist_man_MANS += lib/terminal-colors.d.5
-
+MANPAGES += lib/terminal-colors.d.5
+dist_noinst_DATA += lib/terminal-colors.d.5.adoc
 
 check_PROGRAMS += \
        test_blkdev \
        test_buffer \
        test_canonicalize \
        test_colors \
+       test_fileeq \
        test_fileutils \
        test_ismounted \
        test_pwdutils \
@@ -90,7 +95,9 @@ check_PROGRAMS += \
        test_remove_env \
        test_strutils \
        test_ttyutils \
-       test_timeutils
+       test_timeutils \
+       test_c_strtod \
+       test_logindefs
 
 
 if LINUX
@@ -99,16 +106,23 @@ check_PROGRAMS += test_cpuset
 endif
 check_PROGRAMS += \
        test_sysfs \
-       test_pager
+       test_procfs \
+       test_pager \
+       test_caputils \
+       test_loopdev \
+       test_linux_version
 endif
 
 if HAVE_OPENAT
 if HAVE_DIRFD
-check_PROGRAMS += test_procutils
 check_PROGRAMS += test_path
 endif
 endif
 
+test_caputils_SOURCES = lib/caputils.c
+test_caputils_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_CAPUTILS
+test_caputils_LDADD = $(LDADD) libcommon.la
+
 test_ttyutils_SOURCES = lib/ttyutils.c
 test_ttyutils_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_TTYUTILS
 test_ttyutils_LDADD = $(LDADD) libcommon.la
@@ -127,6 +141,9 @@ test_mangle_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_MANGLE
 test_strutils_SOURCES = lib/strutils.c
 test_strutils_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_STRUTILS
 
+test_c_strtod_SOURCES = lib/c_strtod.c
+test_c_strtod_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM
+
 test_colors_SOURCES = lib/colors.c lib/color-names.c
 test_colors_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_COLORS
 test_colors_LDADD = $(LDADD) libtcolors.la
@@ -136,9 +153,6 @@ test_randutils_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_RANDUTILS
 
 if HAVE_OPENAT
 if HAVE_DIRFD
-test_procutils_SOURCES = lib/procutils.c
-test_procutils_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_PROCUTILS
-
 test_path_SOURCES = lib/path.c lib/fileutils.c
 if HAVE_CPU_SET_T
 test_path_SOURCES += lib/cpuset.c
@@ -161,21 +175,30 @@ if LINUX
 test_cpuset_SOURCES = lib/cpuset.c
 test_cpuset_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_CPUSET
 
-test_sysfs_SOURCES = lib/sysfs.c lib/path.c lib/fileutils.c
+test_sysfs_SOURCES = lib/sysfs.c lib/path.c lib/fileutils.c lib/buffer.c lib/mbsalign.c
 if HAVE_CPU_SET_T
 test_sysfs_SOURCES += lib/cpuset.c
 endif
 test_sysfs_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_SYSFS
 test_sysfs_LDADD = $(LDADD)
 
+test_procfs_SOURCES = lib/procfs.c lib/path.c lib/fileutils.c lib/strutils.c
+if HAVE_CPU_SET_T
+test_procfs_SOURCES += lib/cpuset.c
+endif
+test_procfs_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_PROCFS
+test_procfs_LDADD = $(LDADD)
+
 test_pager_SOURCES = lib/pager.c
 test_pager_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_PAGER
 
-check_PROGRAMS += test_linux_version
 test_linux_version_SOURCES = lib/linux_version.c
 test_linux_version_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_LINUXVERSION
 endif
 
+test_fileeq_SOURCES = lib/fileeq.c
+test_fileeq_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_FILEEQ
+
 test_fileutils_SOURCES = lib/fileutils.c
 test_fileutils_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_FILEUTILS
 
@@ -191,5 +214,22 @@ test_pwdutils_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM
 test_remove_env_SOURCES = lib/env.c
 test_remove_env_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM
 
-test_buffer_SOURCES = lib/buffer.c
+test_buffer_SOURCES = lib/buffer.c lib/mbsalign.c
 test_buffer_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_BUFFER
+
+if LINUX
+test_loopdev_SOURCES = lib/loopdev.c \
+                      lib/blkdev.c \
+                      lib/linux_version.c \
+                      $(test_sysfs_SOURCES) \
+                      $(test_canonicalize_SOURCES)
+test_loopdev_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_LOOPDEV
+endif
+
+
+test_logindefs_SOURCES = lib/logindefs.c
+test_logindefs_CPPFLAGS = -DTEST_PROGRAM $(AM_CPPFLAGS)
+test_logindefs_LDADD = $(LDADD) libcommon.la
+if HAVE_ECONF
+test_logindefs_LDADD += -leconf
+endif