po: merge changes

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

diff --git a/lib/Makemodule.am b/lib/Makemodule.am
index f5f7d0bbf6e2a0d04d34987f95e800056de169ed..2166d038423d6657597a8d6fbcc5198d2ecaadd6 100644 (file)
--- a/lib/Makemodule.am
+++ b/lib/Makemodule.am
@@ -5,6 +5,7 @@ libcommon_la_SOURCES = \
        lib/blkdev.c \
        lib/canonicalize.c \
        lib/crc32.c \
+       lib/crc32c.c \
        lib/env.c \
        lib/idcache.c \
        lib/fileutils.c \
@@ -13,16 +14,21 @@ libcommon_la_SOURCES = \
        lib/mangle.c \
        lib/match.c \
        lib/mbsalign.c \
+       lib/mbsedit.c\
        lib/md5.c \
        lib/pager.c \
+       lib/parse-date.y \
        lib/path.c \
+       lib/pwdutils.c \
        lib/randutils.c \
        lib/setproctitle.c \
        lib/strutils.c \
        lib/timeutils.c \
        lib/ttyutils.c \
        lib/exec_shell.c \
-       lib/strv.c
+       lib/strv.c \
+       lib/sha1.c \
+       lib/signames.c
 
 if LINUX
 libcommon_la_SOURCES += \
@@ -48,9 +54,19 @@ libcommon_la_SOURCES += lib/sysfs.c
 endif
 
 noinst_LTLIBRARIES += libtcolors.la
-libtcolors_la_CFLAGS = $(AM_CFLAGS) $(TINFO_CFLAGS)
-libtcolors_la_LIBADD = $(TINFO_LIBS)
+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 =
+# tinfo or ncurses are optional
+if HAVE_TINFO
+libtcolors_la_LIBADD += $(TINFO_LIBS)
+libtcolors_la_CFLAGS += $(TINFO_CFLAGS)
+else
+if HAVE_NCURSES
+libtcolors_la_LIBADD += $(NCURSES_LIBS)
+libtcolors_la_CFLAGS += $(NCURSES_CFLAGS)
+endif
+endif # !HAVE_TINFO
 
 dist_man_MANS += lib/terminal-colors.d.5
 
@@ -61,7 +77,7 @@ check_PROGRAMS += \
        test_colors \
        test_fileutils \
        test_ismounted \
-       test_linux_version \
+       test_pwdutils \
        test_mangle \
        test_randutils \
        test_strutils \
@@ -84,7 +100,7 @@ check_PROGRAMS += test_procutils
 endif
 
 test_ttyutils_SOURCES = lib/ttyutils.c
-test_ttyutils_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM
+test_ttyutils_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_TTYUTILS
 test_ttyutils_LDADD = $(LDADD) libcommon.la
 
 test_blkdev_SOURCES = lib/blkdev.c
@@ -92,47 +108,51 @@ test_blkdev_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_BLKDEV
 test_blkdev_LDADD = $(LDADD) libcommon.la
 
 test_ismounted_SOURCES = lib/ismounted.c
-test_ismounted_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM
-test_ismounted_LDADD = $(LDADD) libcommon.la
+test_ismounted_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_ISMOUNTED
+test_ismounted_LDADD = libcommon.la $(LDADD)
 
 test_mangle_SOURCES = lib/mangle.c
-test_mangle_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM
+test_mangle_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_MANGLE
 
 test_strutils_SOURCES = lib/strutils.c
-test_strutils_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM
+test_strutils_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_STRUTILS
 
 test_colors_SOURCES = lib/colors.c lib/color-names.c
-test_colors_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM $(TINFO_CFLAGS)
-test_colors_LDADD = $(LDADD) $(TINFO_LIBS)
+test_colors_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_COLORS
+test_colors_LDADD = $(LDADD) libtcolors.la
 
 test_randutils_SOURCES = lib/randutils.c
-test_randutils_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM
+test_randutils_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_RANDUTILS
 
 if HAVE_OPENAT
 test_procutils_SOURCES = lib/procutils.c
-test_procutils_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM
+test_procutils_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_PROCUTILS
 endif
 
 if LINUX
 test_cpuset_SOURCES = lib/cpuset.c
-test_cpuset_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM
+test_cpuset_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_CPUSET
 
 test_sysfs_SOURCES = lib/sysfs.c
 test_sysfs_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_SYSFS
 test_sysfs_LDADD = $(LDADD) libcommon.la
 
 test_pager_SOURCES = lib/pager.c
-test_pager_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM
+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
+test_linux_version_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_LINUXVERSION
 endif
 
 test_fileutils_SOURCES = lib/fileutils.c
-test_fileutils_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM
+test_fileutils_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_FILEUTILS
 
 test_canonicalize_SOURCES = lib/canonicalize.c
 test_canonicalize_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_CANONICALIZE
 
 test_timeutils_SOURCES = lib/timeutils.c lib/strutils.c
 test_timeutils_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_TIMEUTILS
+
+test_pwdutils_SOURCES = lib/pwdutils.c
+test_pwdutils_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM