ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed automake installation, using Robert's 'find' approach for

Browse Source 
flexibility.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@1690 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2008-04-17 05:34:45 +00:00
parent 47f23369e8
commit a03dc10d67
9 changed files with 56 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
configure.ac
View File

@ -400,16 +400,25 @@ AC_SUBST(BULLETTREE)
dnl ================
dnl Create makefiles
dnl ================
AC_CONFIG_FILES([ \
Makefile \
data/Makefile \
doc/Makefile \
doc/players_manual/Makefile \
src/Makefile \
src/robots/Makefile \
src/bullet/Makefile \
src/bullet/src/Makefile \
src/bullet/Demos/OpenGL/Makefile \
AC_CONFIG_FILES([ \
Makefile \
data/Makefile \
data/fonts/Makefile \
data/herrings/Makefile \
data/karts/Makefile \
data/models/Makefile \
data/music/Makefile \
data/po/Makefile \
data/sfx/Makefile \
data/textures/Makefile \
data/tracks/Makefile \
doc/Makefile \
doc/players_manual/Makefile \
src/Makefile \
src/robots/Makefile \
src/bullet/Makefile \
src/bullet/src/Makefile \
src/bullet/Demos/OpenGL/Makefile \
])
AC_OUTPUT
echo -e $SUMMARY

15
data/Makefile.am
View File

@ -1,12 +1,17 @@
# data/
SUBDIRS = fonts herrings karts models music po sfx textures tracks
pkgdatadir = $(datadir)/games/@PACKAGE@/data
pkgdata_DATA = $(wildcard *.dat) $(wildcard *.data) $(wildcard *.herring) \
$(wildcard *.loc) $(wildcard *.drv?) $(wildcard *.projectile) \
$(wildcard *.cup) $(wildcard *.tkkf) $(wildcard *.collectable)\
$(wildcard *.track) CREDITS licenses \
supertuxkart_32.xpm supertuxkart_64.xpm supertuxkart.desktop
pkgdata_DATA = $(shell find $(srcdir) -name "*.data") \
$(shell find $(srcdir) -name "*.herring") \
$(shell find $(srcdir) -name "*.projectile") \
$(shell find $(srcdir) -name "*.cup") \
$(shell find $(srcdir) -name "*.collectable") \
$(shell find $(srcdir) -name "*.projectile") \
CREDITS licenses \
supertuxkart_32.xpm supertuxkart_64.xpm \
supertuxkart.desktop
desktopdir = $(prefix)/share/applications
desktop_DATA = supertuxkart.desktop

6
data/fonts/Makefile.am
View File

@ -1,7 +1,7 @@
# fonts/
# data/fonts/
pkgdatadir = $(datadir)/games/@PACKAGE@/fonts
pkgdatadir = $(datadir)/games/@PACKAGE@/data/fonts
pkgdata_DATA = $(wildcard *.txf)
pkgdata_DATA = $(shell find $(srcdir) -name "*.txf")
EXTRA_DIST = $(pkgdata_DATA)

8
data/herrings/Makefile.am Normal file
View File

@ -0,0 +1,8 @@
# data/herrings/
pkgdatadir = $(datadir)/games/@PACKAGE@/data/herrings
pkgdata_DATA = $(shell find $(srcdir) -name "*.ac")
EXTRA_DIST = $(pkgdata_DATA)

8
data/models/Makefile.am
View File

@ -1,10 +1,8 @@
# models/
# data/models/
pkgdatadir = $(datadir)/games/@PACKAGE@/models
pkgdatadir = $(datadir)/games/@PACKAGE@/data/models
pkgdata_DATA = $(wildcard *.ac)
SUBDIRS = herrings
pkgdata_DATA = $(shell find $(srcdir) -name "*.ac")
EXTRA_DIST = $(pkgdata_DATA)

9
data/po/Makefile.am Normal file
View File

@ -0,0 +1,9 @@
# data/po/
pkgdatadir = $(datadir)/games/@PACKAGE@/data/po
nobase_pkgdata_DATA = $(shell find $(srcdir) -name "*.po") \
$(shell find $(srcdir) -name "*.mo") \
supertuxkart.pot
EXTRA_DIST = $(nobase_pkgdata_DATA)

3
doc/players_manual/Makefile.am
View File

@ -2,6 +2,7 @@
pkgdatadir = $(datadir)/games/@PACKAGE@/doc/players_manual
pkgdata_DATA = manual.html $(wildcard *.png) $(wildcard *.jpg)
pkgdata_DATA = manual.html $(shell find $(srcdir) -name "*.png") \
$(shell find $(srcdir) -name "*.jpg")
EXTRA_DIST = $(pkgdata_DATA)

2
src/Makefile.am
View File

@ -55,7 +55,7 @@ supertuxkart_SOURCES = main.cpp \
highscore_manager.cpp highscore_manager.hpp \
unlock_manager.cpp unlock_manager.hpp \
file_manager.cpp file_manager.hpp \
loader.cpp loadre.hpp \
loader.cpp loader.hpp \
race_manager.cpp race_manager.hpp \
string_utils.cpp string_utils.hpp \
track_manager.cpp track_manager.hpp \

2
src/race_manager.hpp
View File

@ -129,7 +129,7 @@ public:
int getPositionScore(int p) const { return m_score_for_position[p-1]; }
double getOverallTime(int kart) const { return m_kart_status[kart].m_overall_time;}
bool isEliminated(int kart) const { return m_kart_status[kart].m_is_eliminated;}
bool raceHasLaps() const { return m_race_mode!=RM_FOLLOW_LEADER;}
bool raceHasLaps() const { return true;}
void eliminate(int kart) { m_kart_status[kart].m_is_eliminated=true;}
void addFinishedKarts(int num) { m_num_finished_karts += num; }
void PlayerFinishes() { m_num_finished_players++; }