diff options
| author | Jan Engelhardt <jengelh@medozas.de> | 2010-11-05 19:25:16 +0100 |
|---|---|---|
| committer | Jan Engelhardt <jengelh@medozas.de> | 2010-11-05 19:32:04 +0100 |
| commit | 99d59b94d6ec46dddb05e518f253a983f0450e3f (patch) | |
| tree | 4a166a87063a374f049e42474beca26243e0d378 /output | |
| parent | a12a31bfbbd314a2fcb3437f9211a53bd2a97c00 (diff) | |
build: propagate global CFLAGS
We must not override CFLAGS, because that will break when the user
overrides CFLAGS again at make time (which he is entitled to). So,
name our CFLAGS regular_CFLAGS, and also include that across all
Makefiles so that they are actually uesd for all the code.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Diffstat (limited to 'output')
| -rw-r--r-- | output/Makefile.am | 1 | ||||
| -rw-r--r-- | output/dbi/Makefile.am | 1 | ||||
| -rw-r--r-- | output/mysql/Makefile.am | 1 | ||||
| -rw-r--r-- | output/pcap/Makefile.am | 1 | ||||
| -rw-r--r-- | output/pgsql/Makefile.am | 1 | ||||
| -rw-r--r-- | output/sqlite3/Makefile.am | 1 |
6 files changed, 6 insertions, 0 deletions
diff --git a/output/Makefile.am b/output/Makefile.am index 2c35054..34ffb2d 100644 --- a/output/Makefile.am +++ b/output/Makefile.am @@ -1,4 +1,5 @@ AM_CPPFLAGS = -I$(top_srcdir)/include +AM_CFLAGS = ${regular_CFLAGS} LIBS="" SUBDIRS= pcap mysql pgsql sqlite3 dbi diff --git a/output/dbi/Makefile.am b/output/dbi/Makefile.am index 0e68cd3..1ee8f2a 100644 --- a/output/dbi/Makefile.am +++ b/output/dbi/Makefile.am @@ -1,5 +1,6 @@ AM_CPPFLAGS = -I$(top_srcdir)/include $(DBI_INC) +AM_CFLAGS = ${regular_CFLAGS} LIBS=$(DBI_LIB) if HAVE_DBI diff --git a/output/mysql/Makefile.am b/output/mysql/Makefile.am index 8da758b..a98cdeb 100644 --- a/output/mysql/Makefile.am +++ b/output/mysql/Makefile.am @@ -1,4 +1,5 @@ AM_CPPFLAGS = -I$(top_srcdir)/include $(MYSQL_INC) +AM_CFLAGS = ${regular_CFLAGS} LIBS=$(MYSQL_LIB) if HAVE_MYSQL diff --git a/output/pcap/Makefile.am b/output/pcap/Makefile.am index ac89cfe..59cb3f6 100644 --- a/output/pcap/Makefile.am +++ b/output/pcap/Makefile.am @@ -1,5 +1,6 @@ AM_CPPFLAGS = -I$(top_srcdir)/include $(PCAP_INC) +AM_CFLAGS = ${regular_CFLAGS} LIBS=$(PCAP_LIB) if HAVE_PCAP diff --git a/output/pgsql/Makefile.am b/output/pgsql/Makefile.am index 99947bc..32be79b 100644 --- a/output/pgsql/Makefile.am +++ b/output/pgsql/Makefile.am @@ -1,5 +1,6 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(PQINCPATH) +AM_CFLAGS = ${regular_CFLAGS} LIBS=$(PQLIBS) if HAVE_PGSQL diff --git a/output/sqlite3/Makefile.am b/output/sqlite3/Makefile.am index d8bedc9..d14398c 100644 --- a/output/sqlite3/Makefile.am +++ b/output/sqlite3/Makefile.am @@ -1,4 +1,5 @@ AM_CPPFLAGS = -I$(top_srcdir)/include $(SQLITE3_INC) +AM_CFLAGS = ${regular_CFLAGS} LIBS=$(SQLITE3_LIB) if HAVE_SQLITE3 |