From 25b1171953ef78b60d4ec82b1788cf0facfaa7df Mon Sep 17 00:00:00 2001 From: P. J. McDermott Date: Sat, 02 Nov 2013 17:01:23 -0400 Subject: Use sdlex_CPPFLAGS. This is instead of AM_CPPFLAGS and sdlex_CFLAGS. --- diff --git a/Makefile.am b/Makefile.am index e263ead..0bdb8da 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,13 +1,11 @@ bin_PROGRAMS = sdlex -AM_CPPFLAGS = - include $(top_srcdir)/src/local.mk include $(top_srcdir)/data/local.mk sdlex_SOURCES = $(src_SOURCES) -sdlex_CFLAGS = $(GCC_CFLAGS) \ +sdlex_CPPFLAGS = $(GCC_CFLAGS) \ $(SDL_CFLAGS) \ $(SDL_IMAGE_CFLAGS) \ $(ZLIB_CFLAGS) \ diff --git a/data/maps/local.mk b/data/maps/local.mk index b86328a..19070a4 100644 --- a/data/maps/local.mk +++ b/data/maps/local.mk @@ -1,6 +1,6 @@ mapsdir = $(pkgdatadir)/maps -AM_CPPFLAGS += -DMAPSDIR=\"$(mapsdir)\" +sdlex_CPPFLAGS += -DMAPSDIR=\"$(mapsdir)\" dist_maps_DATA = \ data/maps/forest1-8bit.tmx \ diff --git a/data/tilesets/local.mk b/data/tilesets/local.mk index e2c4b13..4bda5d2 100644 --- a/data/tilesets/local.mk +++ b/data/tilesets/local.mk @@ -4,7 +4,7 @@ tilesets_sources = \ tilesetsdir = $(pkgdatadir)/tilesets -AM_CPPFLAGS += -DTILESETSDIR=\"$(tilesetsdir)\" +sdlex_CPPFLAGS += -DTILESETSDIR=\"$(tilesetsdir)\" tilesets_DATA = \ data/tilesets/collision.png \ -- cgit v0.9.1