From e8f7acb0d34ed0eeb4262dcf6c54208979616b06 Mon Sep 17 00:00:00 2001
From: Karel Zak
Date: Wed, 4 Jan 2017 11:44:37 +0100
Subject: lib: use unique ifdefs for tests

Let's use unique TEST_PROGRAM_<NAME> ifdefs to make build system more
robust.

Signed-off-by: Karel Zak <kzak@redhat.com>
---
 lib/Makemodule.am | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'lib/Makemodule.am')

diff --git a/lib/Makemodule.am b/lib/Makemodule.am
index f5f7d0bbf..4bc6d5f02 100644
--- a/lib/Makemodule.am
+++ b/lib/Makemodule.am
@@ -84,7 +84,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,44 +92,44 @@ 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_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_ISMOUNTED
 test_ismounted_LDADD = $(LDADD) libcommon.la
 
 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_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_COLORS $(TINFO_CFLAGS)
 test_colors_LDADD = $(LDADD) $(TINFO_LIBS)
 
 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
 
 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
-- 
cgit v1.2.3-55-g7522