Put all -I and -D flags into CPPFLAGS

git-svn-id: svn://svn.code.sf.net/p/fuego/code/trunk@568 2e953b5c-c64d-0410-be54-f773e93e544c
svn2github · Oct 3, 2008 · 2b283f9 · 2b283f9
1 parent a7baeaa
commit 2b283f9
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 21 deletions.
diff --git a/fuegomain/Makefile.am b/fuegomain/Makefile.am
@@ -9,7 +9,6 @@ noinst_HEADERS = \
 FuegoMainEngine.h \
 FuegoMainUtil.h
 
-fuego_CXXFLAGS = -DUNIX=1 $(BOOST_CPPFLAGS)
 fuego_LDFLAGS = $(BOOST_LDFLAGS) $(BOOST_THREAD_LIB)
 
 fuego_LDADD = \
@@ -24,6 +23,11 @@ fuego_DEPENDENCIES = \
 ../smartgame/libfuego_smartgame.a \
 ../gtpengine/libfuego_gtpengine.a
 
-INCLUDES = -I@top_srcdir@/gtpengine -I@top_srcdir@/smartgame -I@top_srcdir@/go -I@top_srcdir@/gouct
+fuego_CPPFLAGS = \
+-DUNIX=1 $(BOOST_CPPFLAGS) \
+-I@top_srcdir@/gtpengine \
+-I@top_srcdir@/smartgame \
+-I@top_srcdir@/go \
+-I@top_srcdir@/gouct
 
 DISTCLEANFILES = *~
diff --git a/fuegotest/Makefile.am b/fuegotest/Makefile.am
@@ -7,7 +7,6 @@ FuegoTestMain.cpp
 noinst_HEADERS = \
 FuegoTestEngine.h
 
-fuego_test_CXXFLAGS = -DUNIX=1 $(BOOST_CPPFLAGS)
 fuego_test_LDFLAGS = $(BOOST_LDFLAGS) $(BOOST_THREAD_LIB)
 
 fuego_test_LDADD = \
@@ -24,6 +23,12 @@ fuego_test_DEPENDENCIES = \
 ../smartgame/libfuego_smartgame.a \
 ../gtpengine/libfuego_gtpengine.a
 
-INCLUDES = -I@top_srcdir@/gtpengine -I@top_srcdir@/smartgame -I@top_srcdir@/go -I@top_srcdir@/simpleplayers -I@top_srcdir@/gouct
+fuego_test_CPPFLAGS = \
+-DUNIX=1 $(BOOST_CPPFLAGS) \
+-I@top_srcdir@/gtpengine \
+-I@top_srcdir@/smartgame \
+-I@top_srcdir@/go \
+-I@top_srcdir@/simpleplayers \
+-I@top_srcdir@/gouct
 
 DISTCLEANFILES = *~
diff --git a/go/Makefile.am b/go/Makefile.am
@@ -82,8 +82,9 @@ GoStaticLadder.h \
 GoStaticSafetySolver.h \
 GoTimeControl.h
 
-libfuego_go_a_CXXFLAGS = -DUNIX=1 $(BOOST_CPPFLAGS)
-
-INCLUDES = -I@top_srcdir@/gtpengine -I@top_srcdir@/smartgame
+libfuego_go_a_CPPFLAGS = \
+-DUNIX=1 $(BOOST_CPPFLAGS) \
+-I@top_srcdir@/gtpengine \
+-I@top_srcdir@/smartgame
 
 DISTCLEANFILES = *~
diff --git a/gouct/Makefile.am b/gouct/Makefile.am
@@ -31,8 +31,10 @@ GoUctRootFilter.h \
 GoUctSearch.h \
 GoUctUtil.h
 
-libfuego_gouct_a_CXXFLAGS = -DUNIX=1 $(BOOST_CPPFLAGS)
-
-INCLUDES = -I@top_srcdir@/gtpengine -I@top_srcdir@/smartgame -I@top_srcdir@/go
+libfuego_gouct_a_CPPFLAGS = \
+-DUNIX=1 $(BOOST_CPPFLAGS) \
+-I@top_srcdir@/gtpengine \
+-I@top_srcdir@/smartgame \
+-I@top_srcdir@/go
 
 DISTCLEANFILES = *~
diff --git a/gtpengine/Makefile.am b/gtpengine/Makefile.am
@@ -6,8 +6,6 @@ GtpEngine.cpp
 noinst_HEADERS = \
 GtpEngine.h
 
-libfuego_gtpengine_a_CXXFLAGS = $(BOOST_CPPFLAGS)
-
-INCLUDES = 
+libfuego_gtpengine_a_CPPFLAGS = $(BOOST_CPPFLAGS)
 
 DISTCLEANFILES = *~
diff --git a/simpleplayers/Makefile.am b/simpleplayers/Makefile.am
@@ -32,8 +32,10 @@ SpSafePlayer.h \
 SpSimplePlayer.h \
 SpUtil.h
 
-libfuego_simpleplayers_a_CXXFLAGS = -DUNIX=1 $(BOOST_CPPFLAGS)
-
-INCLUDES = -I@top_srcdir@/gtpengine -I@top_srcdir@/smartgame -I@top_srcdir@/go
+libfuego_simpleplayers_a_CPPFLAGS = \
+-DUNIX=1 $(BOOST_CPPFLAGS) \
+-I@top_srcdir@/gtpengine \
+-I@top_srcdir@/smartgame \
+-I@top_srcdir@/go
 
 DISTCLEANFILES = *~
diff --git a/smartgame/Makefile.am b/smartgame/Makefile.am
@@ -111,8 +111,8 @@ SgUctTreeUtil.h \
 SgUtil.h \
 SgWrite.h
 
-libfuego_smartgame_a_CXXFLAGS = -DUNIX=1 $(BOOST_CPPFLAGS)
-
-INCLUDES = -I@top_srcdir@/gtpengine
+libfuego_smartgame_a_CPPFLAGS = \
+-DUNIX=1 $(BOOST_CPPFLAGS) \
+-I@top_srcdir@/gtpengine
 
 DISTCLEANFILES = *~
diff --git a/unittestmain/Makefile.am b/unittestmain/Makefile.am
@@ -56,7 +56,6 @@ fuego_unittest_SOURCES = \
 ../smartgame/test/SgWriteTest.cpp \
 ../unittestmain/UnitTestMain.cpp
 
-fuego_unittest_CXXFLAGS = -DUNIX=1 $(BOOST_CPPFLAGS)
 fuego_unittest_LDFLAGS = $(BOOST_LDFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LIB) $(BOOST_THREAD_LIB)
 
 fuego_unittest_LDADD = \
@@ -73,6 +72,12 @@ fuego_unittest_DEPENDENCIES = \
 ../smartgame/libfuego_smartgame.a \
 ../gtpengine/libfuego_gtpengine.a
 
-INCLUDES = -I@top_srcdir@/gtpengine -I@top_srcdir@/smartgame -I@top_srcdir@/go -I@top_srcdir@/simpleplayers -I@top_srcdir@/gouct
+fuego_unittest_CPPFLAGS = \
+-DUNIX=1 $(BOOST_CPPFLAGS) \
+-I@top_srcdir@/gtpengine \
+-I@top_srcdir@/smartgame \
+-I@top_srcdir@/go \
+-I@top_srcdir@/simpleplayers \
+-I@top_srcdir@/gouct
 
 DISTCLEANFILES = *~