Centralize common AM_CFLAGS/LDFLAGS in configure.ac

Signed-off-by: Michael Jeanson <mjeanson@debian.org>

diff --git a/configure.ac b/configure.ac
index f638c3f1d0cdb5ff22ab83b8cafb66b1d50da28a..b2a6a78e2956a39bb3c4f00c05100c1dafd84352 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -31,17 +31,29 @@ AC_SUBST(textlibdir)
 AC_ARG_ENABLE([coverage],
   AS_HELP_STRING([--enable-coverage],
                 [build with coverage flags activated (default is no)]))
-AM_CONDITIONAL(WANT_COVERAGE, test x"$enable_coverage" = xyes)
+
+AS_IF([test x"$enable_coverage" = xyes], [
+  COVERAGE_CFLAGS="-O0 -ggdb -fprofile-arcs -ftest-coverage -fprofile-generate"
+  COVERAGE_LDFLAGS="-fprofile-generate"
+])
 
 AC_ARG_ENABLE([asan],
   AS_HELP_STRING([--enable-asan],
                 [build with libasan (default is no)]))
-AM_CONDITIONAL(WANT_ASAN, test x"$enable_asan" = xyes)
+
+AS_IF([test x"$enable_asan" = xyes], [
+  ASAN_CFLAGS="-O0 -ggdb -fsanitize=address"
+  ASAN_LDFLAGS="-fsanitize=address"
+])
 
 AC_ARG_ENABLE([ubsan],
   AS_HELP_STRING([--enable-ubsan],
                 [build with libubsan (default is no)]))
-AM_CONDITIONAL(WANT_UBSAN, test x"$enable_ubsan" = xyes)
+
+AS_IF([test x"$enable_ubsan" = xyes], [
+  UBSAN_CFLAGS="-O0 -ggdb -fsanitize=undefined"
+  UBSAN_LDFLAGS="-fsanitize=undefined"
+])
 
 AC_ARG_ENABLE([receive-strip],
   AS_HELP_STRING([--enable-receive-strip],
@@ -56,6 +68,15 @@ PKG_CHECK_MODULES([ATF], [atf-c], [HAVE_ATF=1], [NO_ATF=1])
 AC_CHECK_PROG([KYUA], [kyua], [HAVE_KYUA=1])
 AM_CONDITIONAL([TESTS], [test "x$HAVE_ATF" = x1 -a "x$HAVE_KYUA" = x1 ])
 
+AM_CPPFLAGS="-I\$(top_srcdir)/include -DDEFAULTTEXTDIR='\"\$(textlibdir)\"'"
+AC_SUBST(AM_CPPFLAGS)
+
+AM_CFLAGS="-g -Wall -std=gnu99 -D_GNU_SOURCE=1 -Wextra -pedantic -Wsign-compare $COVERAGE_CFLAGS $ASAN_CFLAGS $UBSAN_CFLAGS"
+AC_SUBST(AM_CFLAGS)
+
+AM_LDFLAGS="$COVERAGE_LDFLAGS $ASAN_LDFLAGS $UBSAN_LDFLAGS"
+AC_SUBST(AM_LDFLAGS)
+
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([src/Makefile])
 AC_CONFIG_FILES([src/mlmmj-make-ml])

diff --git a/contrib/receivestrip/Makefile.am b/contrib/receivestrip/Makefile.am
index 279abfd461873fad9d2761ff4ef82e34562254ad..9a6dec211ecf117bad3a5b020e251f3dd384ac1d 100644 (file)
--- a/contrib/receivestrip/Makefile.am
+++ b/contrib/receivestrip/Makefile.am
@@ -2,21 +2,6 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-AM_CFLAGS = -g -Wall -pedantic -Wsign-compare -DDEFAULTTEXTDIR='"@textlibdir@"' -I$(srcdir)/../../include
-AM_LDFLAGS =
-if WANT_COVERAGE
-AM_CFLAGS += -O0 -ggdb -fprofile-arcs -ftest-coverage -fprofile-generate
-AM_LDFLAGS += -fprofile-generate
-endif
-if WANT_ASAN
-AM_CFLAGS += -O0 -ggdb -fsanitize=address
-AM_LDFLAGS += -fsanitize=address
-endif
-if WANT_UBSAN
-AM_CFLAGS += -O0 -ggdb -fsanitize=undefined
-AM_LDFLAGS += -fsanitize=undefined
-endif
-
 if WANT_RECEIVESTRIP
   bin_PROGRAMS = mlmmj-receive-strip
 endif

diff --git a/src/Makefile.am b/src/Makefile.am
index a424d3427c32ed97d1304f4ef65e2c2f3ab65736..7ab219d353d7ae9925bed2023bb1b1f083347fe4 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,21 +2,6 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-AM_CFLAGS = -g -Wall -std=gnu99 -D_GNU_SOURCE=1 -Wextra -pedantic -Wsign-compare -DDEFAULTTEXTDIR='"@textlibdir@"' -I$(srcdir)/../include
-AM_LDFLAGS =
-if WANT_COVERAGE
-AM_CFLAGS += -O0 -ggdb -fprofile-arcs -ftest-coverage -fprofile-generate
-AM_LDFLAGS += -fprofile-generate
-endif
-if WANT_ASAN
-AM_CFLAGS += -O0 -ggdb -fsanitize=address
-AM_LDFLAGS += -fsanitize=address
-endif
-if WANT_UBSAN
-AM_CFLAGS += -O0 -ggdb -fsanitize=undefined
-AM_LDFLAGS += -fsanitize=undefined
-endif
-
 bin_PROGRAMS = mlmmj-send mlmmj-receive mlmmj-process mlmmj-sub \
                mlmmj-unsub mlmmj-bounce mlmmj-maintd mlmmj-list
 

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5d4785dbbbc651dfa5557edb5900dbd2764a0f39..661272778ef93ab559751fe25d2e3f948e17363a 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -10,21 +10,8 @@ fakesmtpd_SOURCES=   fakesmtpd.c
 EXTRA_DIST = *.sh *.h
 CLEANFILES= $(test_scripts:.sh=)
 
-AM_CFLAGS = -g -Wall -std=gnu11 -D_GNU_SOURCE=1 -Wextra -pedantic -Wsign-compare -DDEFAULTTEXTDIR='"@textlibdir@"' -I$(srcdir)/../include @ATF_CFLAGS@
+AM_CFLAGS += @ATF_CFLAGS@
 mlmmj_LDADD =  $(top_builddir)/src/libmlmmj.a @ATF_LIBS@ -lrt
-AM_LDFLAGS =
-if WANT_COVERAGE
-AM_CFLAGS += -O0 -ggdb -fprofile-arcs -ftest-coverage -fprofile-generate
-AM_LDFLAGS += -fprofile-generate
-endif
-if WANT_ASAN
-AM_CFLAGS += -O0 -ggdb -fsanitize=address
-AM_LDFLAGS += -fsanitize=address
-endif
-if WANT_UBSAN
-AM_CFLAGS += -O0 -ggdb -fsanitize=undefined
-AM_LDFLAGS += -fsanitize=undefined
-endif
 
 test_scripts = mlmmj-send.sh \
                functional-tests.sh \