Applied Yann's patch to allow to build STK in different build

directories.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2482 178a84e3-b1eb-0310-8ba1-8eac791a3b58

configure.ac

@@ -337,7 +337,6 @@ dnl ==============
 dnl Bullet physics
 dnl ==============
 AC_DEFINE([BT_NO_PROFILE], [], [Disable bullet internal profiling])
-CXXFLAGS="$CXXFLAGS -Ibullet/src"
 SUMMARY="$SUMMARY\nUsing bullet physics."
 BULLETTREE="src/bullet"
 
@@ -370,7 +369,6 @@ AC_CHECK_TYPE(socklen_t, [AC_DEFINE(HAS_SOCKLEN_T)], ,
 AC_EGREP_HEADER(MSG_MAXIOVLEN, /usr/include/sys/socket.h, AC_DEFINE(ENET_BUFFER_MAXIMUM, [MSG_MAXIOVLEN]))
 AC_EGREP_HEADER(MSG_MAXIOVLEN, socket.h, AC_DEFINE(ENET_BUFFER_MAXIMUM, [MSG_MAXIOVLEN]))
 
-CXXFLAGS="$CXXFLAGS -Ienet/include"
 enet_LIBS="-Lenet -lenet"
 SUMMARY="$SUMMARY\nUsing enet network support	."
 ENETTREE="src/enet"

src/Makefile.am

@@ -23,7 +23,7 @@ noinst_LIBRARIES         =  libstatic_ssg.a
 libstatic_ssg_a_SOURCES  = static_ssg.cpp static_ssg.hpp
 libstatic_ssg_a_CXXFLAGS = @NOREGMOVE@
 
-AM_CPPFLAGS=-DSUPERTUXKART_DATADIR="\"$(datadir)/games/@PACKAGE@/\""
+AM_CPPFLAGS=-DSUPERTUXKART_DATADIR="\"$(datadir)/games/@PACKAGE@/\"" -I$(srcdir)/bullet/src/ -I$(srcdir)/enet/include/
 
 supertuxkart_SOURCES =     main.cpp  			\
 	vec3.cpp		       vec3.hpp			\
@@ -165,7 +165,7 @@ supertuxkart_SOURCES =     main.cpp  			\
 	ide/vc9/bullet_lib.vcproj  ide/vc9/enet.vcproj		\
 	ide/vc9/README						\
 	Xcode/STK_XCode.xcodeproj/project/pbxproj
-
+#Is this the right place for those non-source files ?
 
 # Link in the specific gcc 4.1 bug work around
 supertuxkart_LDADD = -L. -lstatic_ssg \

src/bullet/Demos/OpenGL/Makefile.am

@@ -9,4 +9,4 @@ libbulletopenglsupport_a_SOURCES	= \
 	BMF_font_helv10.cpp  DebugCastResult.h  GLDebugDrawer.cpp   \
 	GL_ShapeDrawer.h    GlutStuff.cpp       RenderTexture.h
 
-INCLUDES=-I../../src
+AM_CPPFLAGS=-I$(srcdir)/../../src

src/bullet/src/Makefile.am

@@ -16,7 +16,7 @@ libbulletmath_a_SOURCES	= \
 	LinearMath/btVector3.h			LinearMath/btHashMap.h		 \
 	LinearMath/btConvexHull.cpp		LinearMath/btConvexHull.h
 
-libbulletcollision_a_SOURCES := \
+libbulletcollision_a_SOURCES = \
 	btBulletCollisionCommon.h						 \
 	BulletCollision/BroadphaseCollision/btAxisSweep3.cpp			 \
 	BulletCollision/BroadphaseCollision/btAxisSweep3.h			 \

src/enet/Makefile.am

@@ -11,5 +11,5 @@ libenet_a_SOURCES = host.c list.c callbacks.c packet.c peer.c protocol.c unix.c
 	include/enet/protocol.h \
 	include/enet/enet.h 
 
-INCLUDES = -Iinclude/
+AM_CPPFLAGS = -I$(srcdir)/include/