[Supertuxkart-commit] SF.net SVN: supertuxkart:[9772] main/trunk

[<hik...@us...>]

Revision: 9772
          http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=9772&view=rev
Author:   hikerstk
Date:     2011-09-06 06:09:27 +0000 (Tue, 06 Sep 2011)
Log Message:
-----------
Updated autotools building, including distributing of the directories
tools; data/shaders; data/tutorials; and other missing files.

Modified Paths:
--------------
    main/trunk/Makefile.am
    main/trunk/configure.ac
    main/trunk/data/Makefile.am
    main/trunk/src/bullet/Makefile.am
    main/trunk/src/bullet/src/Makefile.am
    main/trunk/src/enet/Makefile.am

Added Paths:
-----------
    main/trunk/data/shaders/Makefile.am
    main/trunk/data/tutorials/Makefile.am
    main/trunk/tools/Makefile.am

Removed Paths:
-------------
    main/trunk/src/bullet/ChangeLog.txt

Property Changed:
----------------
    main/trunk/data/shaders/
    main/trunk/data/tutorials/
    main/trunk/tools/

Modified: main/trunk/Makefile.am
===================================================================
--- main/trunk/Makefile.am	2011-09-06 06:08:14 UTC (rev 9771)
+++ main/trunk/Makefile.am	2011-09-06 06:09:27 UTC (rev 9772)
@@ -1,6 +1,6 @@
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = $(BULLETTREE) $(ENETTREE) src doc data
+SUBDIRS = $(BULLETTREE) $(ENETTREE) src doc data tools
 
 pkgdatadir=$(datadir)/doc/$(PACKAGE)
 dist_pkgdata_DATA=AUTHORS ChangeLog COPYING README autogen.sh m4

Modified: main/trunk/configure.ac
===================================================================
--- main/trunk/configure.ac	2011-09-06 06:08:14 UTC (rev 9771)
+++ main/trunk/configure.ac	2011-09-06 06:09:27 UTC (rev 9772)
@@ -445,15 +445,18 @@
  data/models/Makefile               \
  data/music/Makefile                \
  data/po/Makefile                   \
+ data/shaders/Makefile              \
  data/sfx/Makefile                  \
  data/textures/Makefile             \
  data/tracks/Makefile               \
+ data/tutorials/Makefile            \
  doc/Makefile                       \
  src/Makefile                       \
  src/ide/Makefile                   \
  src/bullet/Makefile                \
  src/bullet/src/Makefile            \
  src/enet/Makefile                  \
+ tools/Makefile                 
 ])
 AC_OUTPUT
 echo -e $SUMMARY

Modified: main/trunk/data/Makefile.am
===================================================================
--- main/trunk/data/Makefile.am	2011-09-06 06:08:14 UTC (rev 9771)
+++ main/trunk/data/Makefile.am	2011-09-06 06:09:27 UTC (rev 9772)
@@ -1,17 +1,14 @@
 # data/
 
-SUBDIRS    = challenges fonts gfx gui karts models music po sfx textures tracks grandprix
+SUBDIRS    = challenges fonts gfx gui karts models music po sfx textures tracks \
+             grandprix tutorials shaders
+
 pkgdatadir = $(datadir)/games/$(PACKAGE)/data
 
 dist_pkgdata_DATA = \
- $(shell find $(srcdir) -name "*.data")                  \
- $(shell find $(srcdir) -name "*.items")                 \
- $(shell find $(srcdir) -name "*.projectile")            \
- $(shell find $(srcdir) -name "*.cup")                   \
  $(shell find $(srcdir) -maxdepth 1 -name "*.challenge") \
- $(shell find $(srcdir) -name "*.collectable")           \
  stk_config.xml  powerup.xml  items.xml                  \
- CREDITS
+ CREDITS run_me.sh 
 
 desktopdir = $(prefix)/share/applications
 desktop_DATA = supertuxkart.desktop


Property changes on: main/trunk/data/shaders
___________________________________________________________________
Added: svn:ignore
   + Makefile
Makefile.in


Added: main/trunk/data/shaders/Makefile.am
===================================================================
--- main/trunk/data/shaders/Makefile.am	                        (rev 0)
+++ main/trunk/data/shaders/Makefile.am	2011-09-06 06:09:27 UTC (rev 9772)
@@ -0,0 +1,7 @@
+# data/shaders/
+
+pkgdatadir = $(datadir)/games/@PACKAGE@/data/shaders
+
+dist_pkgdata_DATA = $(shell find $(srcdir) -name "*.frag") \
+                    $(shell find $(srcdir) -name "*.vert") 
+


Property changes on: main/trunk/data/tutorials
___________________________________________________________________
Added: svn:ignore
   + Makefile.in
Makefile


Added: main/trunk/data/tutorials/Makefile.am
===================================================================
--- main/trunk/data/tutorials/Makefile.am	                        (rev 0)
+++ main/trunk/data/tutorials/Makefile.am	2011-09-06 06:09:27 UTC (rev 9772)
@@ -0,0 +1,6 @@
+# data/po/
+
+pkgdatadir = $(datadir)/games/@PACKAGE@/data/shaders
+
+dist_pkgdata_DATA = $(shell find $(srcdir) -name "*.tutorial") 
+

Deleted: main/trunk/src/bullet/ChangeLog.txt
===================================================================
Modified: main/trunk/src/bullet/Makefile.am
===================================================================
--- main/trunk/src/bullet/Makefile.am	2011-09-06 06:08:14 UTC (rev 9771)
+++ main/trunk/src/bullet/Makefile.am	2011-09-06 06:09:27 UTC (rev 9772)
@@ -1,5 +1,5 @@
 SUBDIRS=src
 
-EXTRA_DIST = BulletLicense.txt ChangeLog.txt copy_bullet_files \
+EXTRA_DIST = BulletLicense.txt Changelog copy_bullet_files \
 	     LICENSE README VERSION
 

Modified: main/trunk/src/bullet/src/Makefile.am
===================================================================
--- main/trunk/src/bullet/src/Makefile.am	2011-09-06 06:08:14 UTC (rev 9771)
+++ main/trunk/src/bullet/src/Makefile.am	2011-09-06 06:09:27 UTC (rev 9772)
@@ -264,6 +264,8 @@
 	BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.h		 \
 	BulletDynamics/ConstraintSolver/btSolverBody.h				 \
 	BulletDynamics/ConstraintSolver/btSolverConstraint.h			 \
+        BulletDynamics/ConstraintSolver/btSorLcp.cpp                             \
+        BulletDynamics/ConstraintSolver/btSorLcp.h                               \
 	BulletDynamics/ConstraintSolver/btTypedConstraint.cpp			 \
 	BulletDynamics/ConstraintSolver/btTypedConstraint.h			 \
         BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.cpp        \

Modified: main/trunk/src/enet/Makefile.am
===================================================================
--- main/trunk/src/enet/Makefile.am	2011-09-06 06:08:14 UTC (rev 9771)
+++ main/trunk/src/enet/Makefile.am	2011-09-06 06:09:27 UTC (rev 9772)
@@ -1,5 +1,6 @@
 noinst_LIBRARIES = libenet.a
-EXTRA_DIST = ChangeLog configure design.txt Doxyfile LICENSE tutorial.txt
+EXTRA_DIST = ChangeLog configure design.txt Doxyfile LICENSE tutorial.txt \
+             $(shell find $(srcdir) -maxdepth 2 -name "*.dox")
 libenet_a_SOURCES = callbacks.c compress.c host.c list.c  packet.c peer.c \
         protocol.c unix.c win32.c \
 	include/enet/callbacks.h \


Property changes on: main/trunk/tools
___________________________________________________________________
Added: svn:ignore
   + Makefile
Makefile.in


Added: main/trunk/tools/Makefile.am
===================================================================
--- main/trunk/tools/Makefile.am	                        (rev 0)
+++ main/trunk/tools/Makefile.am	2011-09-06 06:09:27 UTC (rev 9772)
@@ -0,0 +1,8 @@
+# tools
+
+dist_pkgdata_DATA = \
+ $(shell find . -maxdepth 2 -name "*.cpp") \
+ $(shell find . -maxdepth 2 -name "*.h") \
+ $(shell find . -maxdepth 2 -name "*.sln") \
+ $(shell find . -maxdepth 2 -name "*.vcproj") \
+ $(shell find . -maxdepth 2 -name "po_list") 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.