diff options
| author | Simon Busch <morphis@gravedo.de> | 2012-05-02 15:44:43 +0200 |
|---|---|---|
| committer | Simon Busch <morphis@gravedo.de> | 2012-05-02 15:44:43 +0200 |
| commit | ebfe677aa0772dfd2d426a78322009b7ba32bccf (patch) | |
| tree | 982163c85eb0ecb413463b3856a58bcdb427645b | |
| parent | 0c9dd5212bc23681e1cc6f0f8d529f484602642b (diff) | |
| download | cornucopia-ebfe677aa0772dfd2d426a78322009b7ba32bccf.tar.gz cornucopia-ebfe677aa0772dfd2d426a78322009b7ba32bccf.tar.bz2 cornucopia-ebfe677aa0772dfd2d426a78322009b7ba32bccf.zip | |
fsodatad: use CFLAGS instead of CPPFLAGS
| -rw-r--r-- | fsodatad/src/bin/Makefile.am | 4 | ||||
| -rw-r--r-- | fsodatad/src/lib/Makefile.am | 6 | ||||
| -rw-r--r-- | fsodatad/src/plugins/world/Makefile.am | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/fsodatad/src/bin/Makefile.am b/fsodatad/src/bin/Makefile.am index 20fc7691..d51763d9 100644 --- a/fsodatad/src/bin/Makefile.am +++ b/fsodatad/src/bin/Makefile.am @@ -1,7 +1,7 @@ include $(top_srcdir)/Makefile.decl NULL = -AM_CPPFLAGS = \ +AM_CFLAGS = \ -include $(CONFIG_HEADER) \ -DG_LOG_DOMAIN=\"fsodata\" \ $(NULL) @@ -16,7 +16,7 @@ fsodatad_VALAFLAGS = \ --save-temps \ --basedir $(top_srcdir) \ $(NULL) -fsodatad_CPPFLAGS = \ +fsodatad_CFLAGS = \ $(FSO_CFLAGS) \ $(GLIB_CFLAGS) \ $(NULL) diff --git a/fsodatad/src/lib/Makefile.am b/fsodatad/src/lib/Makefile.am index f9a93fc2..d7638d46 100644 --- a/fsodatad/src/lib/Makefile.am +++ b/fsodatad/src/lib/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.decl NULL = -AM_CPPFLAGS = \ +AM_CFLAGS = \ -include $(CONFIG_HEADER) \ -DG_LOG_DOMAIN=\"fsodata.lib\" \ $(NULL) @@ -10,7 +10,7 @@ AM_VALAFLAGS = if WANT_DEBUG AM_VALAFLAGS += -g -D DEBUG -AM_CPPFLAGS += -ggdb -O0 +AM_CFLAGS += -ggdb -O0 endif modlibexecdir = $(libdir)/cornucopia/modules/fsodata @@ -28,7 +28,7 @@ libfsodata_la_VALAFLAGS = \ --header fsodata.h \ --library fsodata-2.0 \ $(NULL) -libfsodata_la_CPPFLAGS = \ +libfsodata_la_CFLAGS = \ -I$(top_srcdir) \ $(FSO_CFLAGS) \ $(XML_CFLAGS) \ diff --git a/fsodatad/src/plugins/world/Makefile.am b/fsodatad/src/plugins/world/Makefile.am index 782f3032..447aad2a 100644 --- a/fsodatad/src/plugins/world/Makefile.am +++ b/fsodatad/src/plugins/world/Makefile.am @@ -1,7 +1,7 @@ include $(top_srcdir)/Makefile.decl NULL = -AM_CPPFLAGS = \ +AM_CFLAGS = \ -include $(CONFIG_HEADER) \ -DG_LOG_DOMAIN=\"fsodata.world\" \ $(NULL) @@ -9,7 +9,7 @@ AM_VALAFLAGS = if WANT_DEBUG AM_VALAFLAGS += -g -D DEBUG -AM_CPPFLAGS += -ggdb -O0 +AM_CFLAGS += -ggdb -O0 endif modlibexecdir = $(libdir)/cornucopia/modules/fsodata @@ -24,7 +24,7 @@ world_la_VALAFLAGS = \ --pkg fsoframework-2.0 \ --pkg fsodata-2.0 \ $(NULL) -world_la_CPPFLAGS = \ +world_la_CFLAGS = \ -I$(top_srcdir)/src/lib \ $(FSO_GLIB_CFLAGS) \ $(FSO_CFLAGS) \ |