[Wesnoth-cvs-commits] wesnoth/src Makefile.am

[Philippe Plantier]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Philippe Plantier <address@hidden>      04/10/31 11:58:22

Modified files:
        src            : Makefile.am 

Log message:
        Changed the order of include paths in the Makefile.am file, to make 
sure local
        headers have priority over system ones (fixing the wrong SDL_ttf header 
being
        included)

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/Makefile.am.diff?tr1=1.55&tr2=1.56&r1=text&r2=text

Patches:
Index: wesnoth/src/Makefile.am
diff -u wesnoth/src/Makefile.am:1.55 wesnoth/src/Makefile.am:1.56
--- wesnoth/src/Makefile.am:1.55        Thu Oct 28 00:02:28 2004
+++ wesnoth/src/Makefile.am     Sun Oct 31 11:58:22 2004
@@ -322,13 +322,11 @@
                         widgets/widget.hpp \
                         wesconfig.h
 
-AM_CXXFLAGS = @SDL_CFLAGS@ -DWESNOTH_PATH=\"$(pkgdatadir)\" \
-       -DLOCALEDIR=\"$(LOCALEDIR)\" 
-DHAS_RELATIVE_LOCALEDIR=$(HAS_RELATIVE_LOCALEDIR) \
-       -I sdl_ttf -I../intl -I$(top_srcdir)/intl
-
-AM_CFLAGS = @SDL_CFLAGS@ -DWESNOTH_PATH=\"$(pkgdatadir)\" \
-       -DLOCALEDIR=\"$(LOCALEDIR)\" 
-DHAS_RELATIVE_LOCALEDIR=$(HAS_RELATIVE_LOCALEDIR) \
-       -I sdl_ttf -I../intl -I$(top_srcdir)/intl
+AM_CXXFLAGS = -I sdl_ttf -I../intl -I$(top_srcdir)/intl @SDL_CFLAGS@ 
-DWESNOTH_PATH=\"$(pkgdatadir)\" \
+       -DLOCALEDIR=\"$(LOCALEDIR)\" 
-DHAS_RELATIVE_LOCALEDIR=$(HAS_RELATIVE_LOCALEDIR)
+
+AM_CFLAGS = -I sdl_ttf -I../intl -I$(top_srcdir)/intl @SDL_CFLAGS@ 
-DWESNOTH_PATH=\"$(pkgdatadir)\" \
+       -DLOCALEDIR=\"$(LOCALEDIR)\" 
-DHAS_RELATIVE_LOCALEDIR=$(HAS_RELATIVE_LOCALEDIR)
 
 if X11
     CXXFLAGS += -D_X11 @X_CFLAGS@