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 327350d1d3d73911e72eee4a65a65001382757bf..d95721ee2236e33002f182bc48568280e68835d1 100644 (file)
--- a/lib/Makemodule.am
+++ b/lib/Makemodule.am
@@ -18,6 +18,7 @@ libcommon_la_SOURCES = \
        lib/color-names.c \
        lib/crc32.c \
        lib/crc32c.c \
+       lib/crc64.c \
        lib/c_strtod.c \
        lib/encode.c \
        lib/env.c \
@@ -29,20 +30,20 @@ libcommon_la_SOURCES = \
        lib/mbsalign.c \
        lib/mbsedit.c\
        lib/md5.c \
-       lib/pager.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/ttyutils.c \
+       lib/xxhash.c
 
 if LINUX
 libcommon_la_SOURCES += \
        lib/linux_version.c \
-       lib/procutils.c \
        lib/loopdev.c
 endif
 
@@ -58,6 +59,7 @@ 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
 
@@ -94,7 +96,8 @@ check_PROGRAMS += \
        test_strutils \
        test_ttyutils \
        test_timeutils \
-       test_c_strtod
+       test_c_strtod \
+       test_logindefs
 
 
 if LINUX
@@ -103,6 +106,7 @@ check_PROGRAMS += test_cpuset
 endif
 check_PROGRAMS += \
        test_sysfs \
+       test_procfs \
        test_pager \
        test_caputils \
        test_loopdev \
@@ -111,7 +115,6 @@ endif
 
 if HAVE_OPENAT
 if HAVE_DIRFD
-check_PROGRAMS += test_procutils
 check_PROGRAMS += test_path
 endif
 endif
@@ -150,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
@@ -175,13 +175,20 @@ 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
 
@@ -218,3 +225,11 @@ test_loopdev_SOURCES = lib/loopdev.c \
                       $(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