build: fix CFLAGS for snmp modules

The SNMP modules include <net-snmp/net-snmp-config.h>, which won't be
found in off-searchpath directories without SNMP_CFLAGS.  Unfortunately
in my tests the files were on the search path even without the flags.

(SNMP_LIBS is not needed because only libfrrsnmp calls into net-snmp
functions.)

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

diff --git a/bgpd/Makefile.am b/bgpd/Makefile.am
index af6c8faf03b4358b4e22dc7a8fb405eb5c26f51a..b6ed9a4d6db726e6d18ce453e901ce57ef2eef81 100644 (file)
--- a/bgpd/Makefile.am
+++ b/bgpd/Makefile.am
@@ -107,6 +107,7 @@ module_LTLIBRARIES += bgpd_snmp.la
 endif
 
 bgpd_snmp_la_SOURCES = bgp_snmp.c
+bgpd_snmp_la_CFLAGS = $(WERROR) $(SNMP_CFLAGS)
 bgpd_snmp_la_LDFLAGS = -avoid-version -module -shared -export-dynamic
 bgpd_snmp_la_LIBADD = ../lib/libfrrsnmp.la
 

diff --git a/ospf6d/Makefile.am b/ospf6d/Makefile.am
index 933a97ca8f6ffe5282ab8af0e42fe6e911fcfe96..75dd8ffe460462c3bf4b3479ef43a432c957f0cf 100644 (file)
--- a/ospf6d/Makefile.am
+++ b/ospf6d/Makefile.am
@@ -35,6 +35,7 @@ if SNMP
 module_LTLIBRARIES += ospf6d_snmp.la
 endif
 ospf6d_snmp_la_SOURCES = ospf6_snmp.c
+ospf6d_snmp_la_CFLAGS = $(WERROR) $(SNMP_CFLAGS)
 ospf6d_snmp_la_LDFLAGS = -avoid-version -module -shared -export-dynamic
 ospf6d_snmp_la_LIBADD = ../lib/libfrrsnmp.la
 

diff --git a/ospfd/Makefile.am b/ospfd/Makefile.am
index e9d0ed2192d49ce25d881b3691d7f5a8eb42f764..c6a5ec91d2aca95f1a71bbe864953d9d1bb856ef 100644 (file)
--- a/ospfd/Makefile.am
+++ b/ospfd/Makefile.am
@@ -38,6 +38,7 @@ if SNMP
 module_LTLIBRARIES += ospfd_snmp.la
 endif
 ospfd_snmp_la_SOURCES = ospf_snmp.c
+ospfd_snmp_la_CFLAGS = $(WERROR) $(SNMP_CFLAGS)
 ospfd_snmp_la_LDFLAGS = -avoid-version -module -shared -export-dynamic
 ospfd_snmp_la_LIBADD = ../lib/libfrrsnmp.la
 

diff --git a/ripd/Makefile.am b/ripd/Makefile.am
index 827869121c9c1fb7f855c185632864fc5a7fabb7..9c034f0c381f72758dfb67a18c6863d67af3d886 100644 (file)
--- a/ripd/Makefile.am
+++ b/ripd/Makefile.am
@@ -28,6 +28,7 @@ if SNMP
 module_LTLIBRARIES += ripd_snmp.la
 endif
 ripd_snmp_la_SOURCES = rip_snmp.c
+ripd_snmp_la_CFLAGS = $(WERROR) $(SNMP_CFLAGS)
 ripd_snmp_la_LDFLAGS = -avoid-version -module -shared -export-dynamic
 ripd_snmp_la_LIBADD = ../lib/libfrrsnmp.la
 

diff --git a/zebra/Makefile.am b/zebra/Makefile.am
index af7a513d2fb68abc10b1f799a9a300d61f686c11..3e0de3b4631c7b913b111f7f46760e0d999a7ffa 100644 (file)
--- a/zebra/Makefile.am
+++ b/zebra/Makefile.am
@@ -61,6 +61,7 @@ if SNMP
 module_LTLIBRARIES += zebra_snmp.la
 endif
 zebra_snmp_la_SOURCES = zebra_snmp.c
+zebra_snmp_la_CFLAGS = $(WERROR) $(SNMP_CFLAGS)
 zebra_snmp_la_LDFLAGS = -avoid-version -module -shared -export-dynamic
 zebra_snmp_la_LIBADD = ../lib/libfrrsnmp.la