From 10368e5a5bab8020718651ad189853a2a6f40ee0 Mon Sep 17 00:00:00 2001 From: hikerstk Date: Tue, 19 Feb 2008 03:06:57 +0000 Subject: [PATCH] Bugfixes to get 'make dist' to work: 1) file names longer than 99 characters require [tar-ustar] option in AM_INIT_AUTOMAKE 2) Added some missing bullet files. git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@1523 178a84e3-b1eb-0310-8ba1-8eac791a3b58 --- configure.ac | 4 ++-- src/bullet/src/Makefile.am | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 49cdd522d..f804a9a83 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autogen.sh to produce a configure script. -AC_INIT +AC_INIT(supertuxkart, SVN) AC_CONFIG_SRCDIR([src/main.cpp]) dnl Require at least automake 2.59 @@ -11,7 +11,7 @@ dnl Initialize the automake stuff dnl set the $host variable based on local machine/os dnl ================================================ AC_CANONICAL_TARGET -AM_INIT_AUTOMAKE(supertuxkart, SVN) +AM_INIT_AUTOMAKE([tar-ustar]) dnl ===================================================== diff --git a/src/bullet/src/Makefile.am b/src/bullet/src/Makefile.am index 0a07cc2b2..6b5348ce5 100644 --- a/src/bullet/src/Makefile.am +++ b/src/bullet/src/Makefile.am @@ -16,6 +16,7 @@ libbulletmath_a_SOURCES = \ LinearMath/btVector3.h libbulletcollision_a_SOURCES := \ + btBulletCollisionCommon.h \ BulletCollision/BroadphaseCollision/btAxisSweep3.cpp \ BulletCollision/BroadphaseCollision/btAxisSweep3.h \ BulletCollision/BroadphaseCollision/btBroadphaseInterface.h \ @@ -43,7 +44,7 @@ libbulletcollision_a_SOURCES := \ BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp \ BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h \ BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp \ - BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm..h \ + BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h \ BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp \ BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h \ BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp \ @@ -157,6 +158,8 @@ libbulletcollision_a_SOURCES := \ BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h libbulletdynamics_a_SOURCES = \ + Bullet-C-Api.h \ + btBulletDynamicsCommon.h \ BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp \ BulletDynamics/ConstraintSolver/btConeTwistConstraint.h \ BulletDynamics/ConstraintSolver/btConstraintSolver.h \