summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.ac2
-rw-r--r--libfdisk/src/Makemodule.am2
-rw-r--r--libmount/src/Makemodule.am2
-rw-r--r--libsmartcols/samples/Makemodule.am20
-rw-r--r--text-utils/Makemodule.am2
5 files changed, 17 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac
index 961c1ab84..7b6a9e725 100644
--- a/configure.ac
+++ b/configure.ac
@@ -134,6 +134,8 @@ AC_SUBST([WARN_CFLAGS])
UL_WARN_ADD([-Wno-clobbered], [BSD_WARN_CFLAGS])
AC_SUBST([BSD_WARN_CFLAGS])
+UL_WARN_ADD([-Wno-unused-parameter], [NO_UNUSED_WARN_CFLAGS])
+AC_SUBST([NO_UNUSED_WARN_CFLAGS])
dnl libtool-2
LT_INIT
diff --git a/libfdisk/src/Makemodule.am b/libfdisk/src/Makemodule.am
index 1f607b58d..fddf6d990 100644
--- a/libfdisk/src/Makemodule.am
+++ b/libfdisk/src/Makemodule.am
@@ -72,7 +72,7 @@ check_PROGRAMS += \
test_fdisk_utils \
test_fdisk_version
-libfdisk_tests_cflags = -DTEST_PROGRAM $(libfdisk_la_CFLAGS)
+libfdisk_tests_cflags = -DTEST_PROGRAM $(libfdisk_la_CFLAGS) $(NO_UNUSED_WARN_CFLAGS)
libfdisk_tests_ldflags = libuuid.la -static
libfdisk_tests_ldadd = $(LDADD) libfdisk.la $(UUID_LIBS)
diff --git a/libmount/src/Makemodule.am b/libmount/src/Makemodule.am
index 460a1fc83..b07a931d4 100644
--- a/libmount/src/Makemodule.am
+++ b/libmount/src/Makemodule.am
@@ -85,7 +85,7 @@ check_PROGRAMS += \
test_mount_monitor \
test_mount_debug
-libmount_tests_cflags = -DTEST_PROGRAM $(libmount_la_CFLAGS)
+libmount_tests_cflags = -DTEST_PROGRAM $(libmount_la_CFLAGS) $(NO_UNUSED_WARN_CFLAGS)
libmount_tests_ldflags = libblkid.la -static
libmount_tests_ldadd = $(LDADD) libmount.la $(UUID_LIBS) $(REALTIME_LIBS)
diff --git a/libsmartcols/samples/Makemodule.am b/libsmartcols/samples/Makemodule.am
index 50c680c43..be74fc393 100644
--- a/libsmartcols/samples/Makemodule.am
+++ b/libsmartcols/samples/Makemodule.am
@@ -5,19 +5,23 @@ check_PROGRAMS += \
sample-scols-wrap \
sample-scols-continuous
+sample_scols_cflags = $(AM_CFLAGS) $(NO_UNUSED_WARN_CFLAGS) \
+ -I$(ul_libsmartcols_incdir)
+sample_scols_ldadd = $(LDADD) libsmartcols.la
+
sample_scols_tree_SOURCES = libsmartcols/samples/tree.c
-sample_scols_tree_LDADD = $(LDADD) libsmartcols.la libcommon.la
-sample_scols_tree_CFLAGS = $(AM_CFLAGS) -I$(ul_libsmartcols_incdir)
+sample_scols_tree_LDADD = $(sample_scols_ldadd) libcommon.la
+sample_scols_tree_CFLAGS = $(sample_scols_cflags)
sample_scols_title_SOURCES = libsmartcols/samples/title.c
-sample_scols_title_LDADD = $(LDADD) libsmartcols.la
-sample_scols_title_CFLAGS = $(AM_CFLAGS) -I$(ul_libsmartcols_incdir)
+sample_scols_title_LDADD = $(sample_scols_ldadd)
+sample_scols_title_CFLAGS = $(sample_scols_cflags)
sample_scols_wrap_SOURCES = libsmartcols/samples/wrap.c
-sample_scols_wrap_LDADD = $(LDADD) libsmartcols.la
-sample_scols_wrap_CFLAGS = $(AM_CFLAGS) -I$(ul_libsmartcols_incdir)
+sample_scols_wrap_LDADD = $(sample_scols_ldadd)
+sample_scols_wrap_CFLAGS = $(sample_scols_cflags)
sample_scols_continuous_SOURCES = libsmartcols/samples/continuous.c
-sample_scols_continuous_LDADD = $(LDADD) libsmartcols.la libcommon.la
-sample_scols_continuous_CFLAGS = $(AM_CFLAGS) -I$(ul_libsmartcols_incdir)
+sample_scols_continuous_LDADD = $(sample_scols_ldadd) libcommon.la
+sample_scols_continuous_CFLAGS = $(sample_scols_cflags)
diff --git a/text-utils/Makemodule.am b/text-utils/Makemodule.am
index 91295bf98..e42704dfe 100644
--- a/text-utils/Makemodule.am
+++ b/text-utils/Makemodule.am
@@ -97,7 +97,7 @@ endif
check_PROGRAMS += test_more
test_more_SOURCES = $(more_SOURCES)
-test_more_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM
+test_more_CFLAGS = -DTEST_PROGRAM $(more_CFLAGS)
test_more_LDADD = $(more_LDADD)
endif # BUILD_MORE