diff options
| author | Jeremy Sowden <jeremy@azazel.net> | 2021-11-14 15:52:22 +0000 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2021-11-15 11:42:41 +0100 |
| commit | 6056f33fd46e5964ff9fd82cb88de213b4174642 (patch) | |
| tree | 1aee78f1dbe8dbb661466afd4509918a794d9480 /output | |
| parent | 820438083eb04abf8efc722fbbe0fdab7c88163d (diff) | |
build: add Make_global.am for common flags
Move `${regular_CFLAGS}` from configure.ac to Make_global.am, renaming
it to `AM_CFLAGS`. Add `AM_CPPFGLAGS` to include
`$(top_srcdir)/include`. Include the new file in the Makefiles that
require it.
Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'output')
| -rw-r--r-- | output/Makefile.am | 8 | ||||
| -rw-r--r-- | output/dbi/Makefile.am | 4 | ||||
| -rw-r--r-- | output/ipfix/Makefile.am | 3 | ||||
| -rw-r--r-- | output/mysql/Makefile.am | 5 | ||||
| -rw-r--r-- | output/pcap/Makefile.am | 4 | ||||
| -rw-r--r-- | output/pgsql/Makefile.am | 4 | ||||
| -rw-r--r-- | output/sqlite3/Makefile.am | 5 |
7 files changed, 17 insertions, 16 deletions
diff --git a/output/Makefile.am b/output/Makefile.am index 7ba8217..879c317 100644 --- a/output/Makefile.am +++ b/output/Makefile.am @@ -1,6 +1,8 @@ -AM_CPPFLAGS = -I$(top_srcdir)/include ${LIBNETFILTER_ACCT_CFLAGS} \ - ${LIBNETFILTER_CONNTRACK_CFLAGS} ${LIBNETFILTER_LOG_CFLAGS} -AM_CFLAGS = ${regular_CFLAGS} +include $(top_srcdir)/Make_global.am + +AM_CPPFLAGS += ${LIBNETFILTER_ACCT_CFLAGS} \ + ${LIBNETFILTER_CONNTRACK_CFLAGS} \ + ${LIBNETFILTER_LOG_CFLAGS} SUBDIRS= pcap mysql pgsql sqlite3 dbi ipfix diff --git a/output/dbi/Makefile.am b/output/dbi/Makefile.am index f413cab..38db0a2 100644 --- a/output/dbi/Makefile.am +++ b/output/dbi/Makefile.am @@ -1,6 +1,6 @@ +include $(top_srcdir)/Make_global.am -AM_CPPFLAGS = -I$(top_srcdir)/include $(DBI_INC) -AM_CFLAGS = ${regular_CFLAGS} +AM_CPPFLAGS += $(DBI_INC) if HAVE_DBI diff --git a/output/ipfix/Makefile.am b/output/ipfix/Makefile.am index cacda26..7354f6b 100644 --- a/output/ipfix/Makefile.am +++ b/output/ipfix/Makefile.am @@ -1,5 +1,4 @@ -AM_CPPFLAGS = -I$(top_srcdir)/include -AM_CFLAGS = $(regular_CFLAGS) +include $(top_srcdir)/Make_global.am pkglib_LTLIBRARIES = ulogd_output_IPFIX.la diff --git a/output/mysql/Makefile.am b/output/mysql/Makefile.am index c24208c..3839a13 100644 --- a/output/mysql/Makefile.am +++ b/output/mysql/Makefile.am @@ -1,5 +1,6 @@ -AM_CPPFLAGS = -I$(top_srcdir)/include $(MYSQL_INC) -AM_CFLAGS = ${regular_CFLAGS} +include $(top_srcdir)/Make_global.am + +AM_CPPFLAGS += $(MYSQL_INC) if HAVE_MYSQL diff --git a/output/pcap/Makefile.am b/output/pcap/Makefile.am index c1723a6..a022bf0 100644 --- a/output/pcap/Makefile.am +++ b/output/pcap/Makefile.am @@ -1,6 +1,4 @@ - -AM_CPPFLAGS = -I$(top_srcdir)/include -AM_CFLAGS = ${regular_CFLAGS} +include $(top_srcdir)/Make_global.am if HAVE_PCAP diff --git a/output/pgsql/Makefile.am b/output/pgsql/Makefile.am index bdaf1d2..fbc0d04 100644 --- a/output/pgsql/Makefile.am +++ b/output/pgsql/Makefile.am @@ -1,6 +1,6 @@ +include $(top_srcdir)/Make_global.am -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(PQINCPATH) -AM_CFLAGS = ${regular_CFLAGS} +AM_CPPFLAGS += -I$(PQINCPATH) if HAVE_PGSQL diff --git a/output/sqlite3/Makefile.am b/output/sqlite3/Makefile.am index 62af267..e00e1d6 100644 --- a/output/sqlite3/Makefile.am +++ b/output/sqlite3/Makefile.am @@ -1,5 +1,6 @@ -AM_CPPFLAGS = -I$(top_srcdir)/include ${libsqlite3_CFLAGS} -AM_CFLAGS = ${regular_CFLAGS} +include $(top_srcdir)/Make_global.am + +AM_CPPFLAGS += ${libsqlite3_CFLAGS} if HAVE_SQLITE3 |