]> git.ipfire.org Git - thirdparty/nftables.git/commitdiff
build: Restore per object CFLAGS
authorPhil Sutter <phil@nwl.cc>
Wed, 10 Jan 2018 12:43:21 +0000 (13:43 +0100)
committerPablo Neira Ayuso <pablo@netfilter.org>
Wed, 10 Jan 2018 14:39:49 +0000 (15:39 +0100)
As per the automake manual, create internal libraries for parser and
mini-gmp sources so per-object flags can be set.

Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
src/Makefile.am

index 7581ec2090092150d47b5e682498c0c7b5e53981..7fa72a8ea5bc26b1a835867f08de3fe5e16c2739 100644 (file)
@@ -22,9 +22,6 @@ AM_CFLAGS = -Wall                                                             \
 
 AM_YFLAGS = -d
 
-# yacc and lex generate dirty code
-parser_bison.o scanner.o: AM_CFLAGS += -Wno-missing-prototypes -Wno-missing-declarations -Wno-implicit-function-declaration -Wno-nested-externs -Wno-undef -Wno-redundant-decls
-
 BUILT_SOURCES = parser_bison.h
 
 noinst_LTLIBRARIES = libnftables.la
@@ -56,19 +53,29 @@ libnftables_la_SOURCES =                    \
                iface.c                         \
                services.c                      \
                mergesort.c                     \
-               scanner.l                       \
                tcpopt.c                        \
-               parser_bison.y                  \
                libnftables.c
 
-if BUILD_MINIGMP
-mini-gmp.o: AM_CFLAGS += -Wno-sign-compare
+# yacc and lex generate dirty code
+noinst_LTLIBRARIES += libparser.la
+libparser_la_SOURCES = parser_bison.y scanner.l
+libparser_la_CFLAGS = ${AM_CFLAGS} \
+                     -Wno-missing-prototypes \
+                     -Wno-missing-declarations \
+                     -Wno-implicit-function-declaration \
+                     -Wno-nested-externs \
+                     -Wno-undef \
+                     -Wno-redundant-decls
+
+libnftables_la_LIBADD = ${LIBMNL_LIBS} ${LIBNFTNL_LIBS} libparser.la
 
-libnftables_la_SOURCES += mini-gmp.c
+if BUILD_MINIGMP
+noinst_LTLIBRARIES += libminigmp.la
+libminigmp_la_SOURCES = mini-gmp.c
+libminigmp_la_CFLAGS = ${AM_CFLAGS} -Wno-sign-compare
+libnftables_la_LIBADD += libminigmp.la
 endif
 
-libnftables_la_LIBADD = ${LIBMNL_LIBS} ${LIBNFTNL_LIBS}
-
 if BUILD_XTABLES
 libnftables_la_SOURCES += xt.c
 libnftables_la_LIBADD += ${XTABLES_LIBS}