some changes in the makefile managment

19 years ago · 164d9f7df6
parent e6a243a3a8
commit 164d9f7df6
43 changed files with 352 additions and 13 deletions
--- a/7
+++ b/7
@ -1,8 +1,11 @@
-$Id: ChangeLog,v 1.114 2006/08/20 01:13:17 stpohle Exp $
+$Id: ChangeLog,v 1.115 2006/08/20 01:14:41 stpohle Exp $

-Version 0.11.7.1
+Version 0.11.7.1 (still in progress)
 ================

+- Changed: all data will have thier own Makefile. So "make install" and
+  "make dist" won't copy the CVS dirs.
+
 - Fixed: Second Player Problem
  this fix includes that if a second player was used the game got somehow
  very instable, because there have been no reset of all the game data.
--- a/Makefile.am
+++ b/Makefile.am
@ -3,7 +3,7 @@
 ## If you don't want it to overwrite it,
 ## 	Please disable it in the Anjuta project configuration

-SUBDIRS = include src data
+SUBDIRS = data include src

 bomberclonedocdir = ${prefix}/doc/bomberclone
 bomberclonedoc_DATA = \
--- a/configure.in
+++ b/configure.in
@ -5,7 +5,7 @@ dnl 	Please disable it in the Anjuta project configuration

 AC_INIT(configure.in)
 AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE(bomberclone, 0.11.7)
+AM_INIT_AUTOMAKE(bomberclone, 0.11.7.1)
 AM_CONFIG_HEADER(config.h)

 AC_EXEEXT
@ -259,4 +259,23 @@ src/Makefile
 include/Makefile
 data/Makefile
 data/pixmaps/Makefile
+data/player/Makefile
+data/gfx/Makefile
+data/maps/Makefile
+data/music/Makefile
+data/tileset/Makefile
+data/tileset/cemetery/Makefile
+data/tileset/cucumber/Makefile
+data/tileset/default/Makefile
+data/tileset/hell/Makefile
+data/tileset/radioactive/Makefile
+data/tileset/supermario/Makefile
+data/tileset/uccia_garbage/Makefile
+data/tileset/classic/Makefile
+data/tileset/farm/Makefile
+data/tileset/jungle/Makefile
+data/tileset/modern/Makefile
+data/tileset/sheep/Makefile
+data/tileset/tricked/Makefile
+data/tileset/zbb_frog/Makefile
 ])
--- a/data/Makefile.am
+++ b/data/Makefile.am
@ -1,5 +1,5 @@

-SUBDIRS = pixmaps
+SUBDIRS = pixmaps player maps gfx music tileset

 install: install-recursive
 	@if test ! -d player; then \
@ -20,14 +20,13 @@ install: install-recursive
 	@if test ! -d ${DESTDIR}@PACKAGE_DATA_DIR@; then \
 		mkdir -p ${DESTDIR}@PACKAGE_DATA_DIR@; \
 	fi;
-	cp -rf player ${DESTDIR}@PACKAGE_DATA_DIR@
-	cp -rf maps ${DESTDIR}@PACKAGE_DATA_DIR@
-	cp -rf gfx ${DESTDIR}@PACKAGE_DATA_DIR@
-	cp -rf tileset ${DESTDIR}@PACKAGE_DATA_DIR@
-	cp -rf music ${DESTDIR}@PACKAGE_DATA_DIR@
-	
+#	cp -rf player ${DESTDIR}@PACKAGE_DATA_DIR@
+#	cp -rf maps ${DESTDIR}@PACKAGE_DATA_DIR@
+#	cp -rf gfx ${DESTDIR}@PACKAGE_DATA_DIR@
+#	cp -rf tileset ${DESTDIR}@PACKAGE_DATA_DIR@
+#	cp -rf music ${DESTDIR}@PACKAGE_DATA_DIR@

 uninstall: uninstall-recursive
 	rm -rf ${DESTDIR}@PACKAGE_DATA_DIR@
-	
-EXTRA_DIST = player maps gfx tileset music
+
+EXTRA_DIST =
--- a/data/gfx/.cvsignore
+++ b/data/gfx/.cvsignore
@ -0,0 +1,3 @@
+Makefile
+Makefile.in
+
--- a/data/gfx/Makefile.am
+++ b/data/gfx/Makefile.am
@ -0,0 +1,54 @@
+
+bomberclone_gfxdir = $(prefix)/@NO_PREFIX_PACKAGE_DATA_DIR@/gfx
+
+bomberclone_gfx_DATA = \
+	menu0.png \
+	menu7.png \
+	menubutton1_2.png \
+	menuentry1_0.png \
+	menulist0_4.png \
+	menulist1_2.png \
+	menuselect.png \
+	font0.png \
+	menu1.png \
+	menu8.png \
+	menubutton2_0.png \
+	menuentry1_1.png \
+	menulist0_5.png \
+	menulist1_3.png \
+	font1.png \
+	menu2.png \
+	menubutton0_0.png \
+	menubutton2_1.png \
+	menuentry1_2.png \
+	menulist0_6.png \
+	menulist1_4.png \
+	font2.png \
+	menu3.png \
+	menubutton0_1.png \
+	menubutton2_2.png \
+	menulist0_0.png \
+	menulist0_7.png \
+	menulist1_5.png \
+	logo1.png \
+	menu4.png \
+	menubutton0_2.png \
+	menuentry0_0.png \
+	menulist0_1.png \
+	menulist0_8.png \
+	menulist1_6.png \
+	logo.png \
+    menu5.png \
+	menubutton1_0.png \
+	menuentry0_1.png \
+	menulist0_2.png \
+	menulist1_0.png \
+	menulist1_7.png \
+	menu6.png \
+	menubutton1_1.png \
+	menuentry0_2.png \
+	menulist0_3.png \
+	menulist1_1.png \
+	menulist1_8.png
+
+EXTRA_DIST = $(bomberclone_gfx_DATA)
--- a/data/maps/.cvsignore
+++ b/data/maps/.cvsignore
@ -0,0 +1,3 @@
+Makefile
+Makefile.in
+
--- a/data/maps/Makefile.am
+++ b/data/maps/Makefile.am
@ -0,0 +1,15 @@
+
+bomberclone_mapsdir = $(prefix)/@NO_PREFIX_PACKAGE_DATA_DIR@/maps
+
+bomberclone_maps_DATA = \
+	first.map \
+	firstmap.map \
+	fourth.map \
+	kitutou1.map \
+	kitutou2.map \
+	second.map \
+	smalfull.map \
+	smal.map \
+	third.map
+	
+EXTRA_DIST = $(bomberclone_maps_DATA)
--- a/data/music/.cvsignore
+++ b/data/music/.cvsignore
@ -0,0 +1,3 @@
+Makefile
+Makefile.in
+
--- a/data/music/Makefile.am
+++ b/data/music/Makefile.am
@ -0,0 +1,12 @@
+
+bomberclone_musicdir = $(prefix)/@NO_PREFIX_PACKAGE_DATA_DIR@/music
+
+bomberclone_music_DATA = \
+	cerror-bobmberclone.xm \
+	cerror-bomberclone_numero_2.xm \
+	cinderella_clown.mod \
+	mario_is_a_weenie.xm \
+	slice_me_nice.xm \
+	zb-tnt.xm
+	
+EXTRA_DIST = $(bomberclone_music_DATA)
--- a/data/player/.cvsignore
+++ b/data/player/.cvsignore
@ -0,0 +1,3 @@
+Makefile
+Makefile.in
+
--- a/data/player/Makefile.am
+++ b/data/player/Makefile.am
@ -0,0 +1,18 @@
+
+bomberclone_playerdir = $(prefix)/@NO_PREFIX_PACKAGE_DATA_DIR@/player
+
+bomberclone_player_DATA = \
+	dead0.png \
+	ghost.png \
+	playersick.png \
+	respawn.png \
+	player0.png \
+	player1.png \
+	player2.png \
+	player3.png \
+	player4.png \
+	player5.png \
+	player6.png \
+	player7.png
+
+EXTRA_DIST = $(bomberclone_player_DATA)
--- a/data/tileset/.cvsignore
+++ b/data/tileset/.cvsignore
@ -0,0 +1,3 @@
+Makefile
+Makefile.in
+
--- a/data/tileset/Makefile.am
+++ b/data/tileset/Makefile.am
@ -0,0 +1,4 @@
+
+SUBDIRS = cemetery cucumber default hell radioactive supermario uccia_garbage classic farm jungle modern sheep tricked zbb_frog
+
+EXTRA_DIST =
--- a/data/tileset/cemetery/.cvsignore
+++ b/data/tileset/cemetery/.cvsignore
@ -0,0 +1,3 @@
+Makefile
+Makefile.in
+
--- a/data/tileset/cemetery/Makefile.am
+++ b/data/tileset/cemetery/Makefile.am
@ -0,0 +1,10 @@
+
+bomberclone_tilesetdir = $(prefix)/@NO_PREFIX_PACKAGE_DATA_DIR@/tileset/cementery
+
+bomberclone_tileset_DATA = \
+	background.png \
+	stone96.png \
+	block96.png \
+	map.nfo
+
+EXTRA_DIST = $(bomberclone_tileset_DATA)
--- a/data/tileset/classic/.cvsignore
+++ b/data/tileset/classic/.cvsignore
@ -0,0 +1,3 @@
+Makefile
+Makefile.in
+
--- a/data/tileset/classic/Makefile.am
+++ b/data/tileset/classic/Makefile.am
@ -0,0 +1,9 @@
+
+bomberclone_tilesetdir = $(prefix)/@NO_PREFIX_PACKAGE_DATA_DIR@/tileset/classic
+
+bomberclone_tileset_DATA = \
+	background.png \
+	block.png \
+	stone.png
+
+EXTRA_DIST = $(bomberclone_tileset_DATA)
--- a/data/tileset/cucumber/.cvsignore
+++ b/data/tileset/cucumber/.cvsignore
@ -0,0 +1,3 @@
+Makefile
+Makefile.in
+
--- a/data/tileset/cucumber/Makefile.am
+++ b/data/tileset/cucumber/Makefile.am
@ -0,0 +1,15 @@
+
+bomberclone_tilesetdir = $(prefix)/@NO_PREFIX_PACKAGE_DATA_DIR@/tileset/cucumber
+
+bomberclone_tileset_DATA = \
+	dead.wav \
+	drop.wav \
+	background.png \
+	powerbad.png \
+	powerup.png \
+	block.png \
+	fire.png \
+	powersp.png \
+	stone.png
+
+EXTRA_DIST = $(bomberclone_tileset_DATA)
--- a/data/tileset/default/.cvsignore
+++ b/data/tileset/default/.cvsignore
@ -0,0 +1,3 @@
+Makefile
+Makefile.in
+
--- a/data/tileset/default/Makefile.am
+++ b/data/tileset/default/Makefile.am
@ -0,0 +1,28 @@
+
+bomberclone_tilesetdir = $(prefix)/@NO_PREFIX_PACKAGE_DATA_DIR@/tileset/default
+
+bomberclone_tileset_DATA = \
+	dead.wav \
+	drop.wav \
+	explode.wav \
+	background.png \
+	bomb.png \
+	powerbad.png \
+	powerup.png \
+	pwdeath.png \
+	pwshoe.png \
+	spliquid.png \
+	sppush.png \
+	sptrigger.png \
+	tunnel.png \
+	block.png \
+	fire.png \
+	powersp.png \
+	pwbomb.png \
+	pwfire.png \
+	spkick.png \
+	spmoved.png \
+	sprow.png \
+	stone.png
+
+EXTRA_DIST = $(bomberclone_tileset_DATA)
--- a/data/tileset/farm/.cvsignore
+++ b/data/tileset/farm/.cvsignore
@ -0,0 +1,3 @@
+Makefile
+Makefile.in
+
--- a/data/tileset/farm/Makefile.am
+++ b/data/tileset/farm/Makefile.am
@ -0,0 +1,10 @@
+
+bomberclone_tilesetdir = $(prefix)/@NO_PREFIX_PACKAGE_DATA_DIR@/tileset/farm
+
+bomberclone_tileset_DATA = \
+	background.png \
+	stone.png \
+	block96.png \
+	map.nfo
+
+EXTRA_DIST = $(bomberclone_tileset_DATA)
--- a/data/tileset/hell/.cvsignore
+++ b/data/tileset/hell/.cvsignore
@ -0,0 +1,3 @@
+Makefile
+Makefile.in
+
--- a/data/tileset/hell/Makefile.am
+++ b/data/tileset/hell/Makefile.am
@ -0,0 +1,10 @@
+
+bomberclone_tilesetdir = $(prefix)/@NO_PREFIX_PACKAGE_DATA_DIR@/tileset/hell
+
+bomberclone_tileset_DATA = \
+	background.png \
+	block.png \
+	stone.png \
+	map.nfo
+
+EXTRA_DIST = $(bomberclone_tileset_DATA)
--- a/data/tileset/jungle/.cvsignore
+++ b/data/tileset/jungle/.cvsignore
@ -0,0 +1,3 @@
+Makefile
+Makefile.in
+
--- a/data/tileset/jungle/Makefile.am
+++ b/data/tileset/jungle/Makefile.am
@ -0,0 +1,9 @@
+
+bomberclone_tilesetdir = $(prefix)/@NO_PREFIX_PACKAGE_DATA_DIR@/tileset/jungle
+
+bomberclone_tileset_DATA = \
+	background.png \
+	block.png \
+	stone.png
+
+EXTRA_DIST = $(bomberclone_tileset_DATA)
--- a/data/tileset/modern/.cvsignore
+++ b/data/tileset/modern/.cvsignore
@ -0,0 +1,3 @@
+Makefile
+Makefile.in
+
--- a/data/tileset/modern/Makefile.am
+++ b/data/tileset/modern/Makefile.am
@ -0,0 +1,10 @@
+
+bomberclone_tilesetdir = $(prefix)/@NO_PREFIX_PACKAGE_DATA_DIR@/tileset/modern
+
+bomberclone_tileset_DATA = \
+	dead.wav \
+	background.png \
+	block.png \
+	stone.png
+
+EXTRA_DIST = $(bomberclone_tileset_DATA)
--- a/data/tileset/radioactive/.cvsignore
+++ b/data/tileset/radioactive/.cvsignore
@ -0,0 +1,3 @@
+Makefile
+Makefile.in
+
--- a/data/tileset/radioactive/Makefile.am
+++ b/data/tileset/radioactive/Makefile.am
@ -0,0 +1,9 @@
+
+bomberclone_tilesetdir = $(prefix)/@NO_PREFIX_PACKAGE_DATA_DIR@/tileset/radioactive
+
+bomberclone_tileset_DATA = \
+	background.png \
+	block.png \
+	stone.png
+
+EXTRA_DIST = $(bomberclone_tileset_DATA)
--- a/data/tileset/sheep/.cvsignore
+++ b/data/tileset/sheep/.cvsignore
@ -0,0 +1,3 @@
+Makefile
+Makefile.in
+
--- a/data/tileset/sheep/Makefile.am
+++ b/data/tileset/sheep/Makefile.am
@ -0,0 +1,10 @@
+
+bomberclone_tilesetdir = $(prefix)/@NO_PREFIX_PACKAGE_DATA_DIR@/tileset/sheep
+
+bomberclone_tileset_DATA = \
+	background.png \
+	block.png \
+	stone.png \
+	map.nfo
+
+EXTRA_DIST = $(bomberclone_tileset_DATA)
--- a/data/tileset/supermario/.cvsignore
+++ b/data/tileset/supermario/.cvsignore
@ -0,0 +1,3 @@
+Makefile
+Makefile.in
+
--- a/data/tileset/supermario/Makefile.am
+++ b/data/tileset/supermario/Makefile.am
@ -0,0 +1,9 @@
+
+bomberclone_tilesetdir = $(prefix)/@NO_PREFIX_PACKAGE_DATA_DIR@/tileset/supermario
+
+bomberclone_tileset_DATA = \
+	background.png \
+	block.png \
+	stone.png
+
+EXTRA_DIST = $(bomberclone_tileset_DATA)
--- a/data/tileset/supermario/stonebackup.png
+++ b/data/tileset/supermario/stonebackup.png
--- a/data/tileset/tricked/.cvsignore
+++ b/data/tileset/tricked/.cvsignore
@ -0,0 +1,3 @@
+Makefile
+Makefile.in
+
--- a/data/tileset/tricked/Makefile.am
+++ b/data/tileset/tricked/Makefile.am
@ -0,0 +1,10 @@
+
+bomberclone_tilesetdir = $(prefix)/@NO_PREFIX_PACKAGE_DATA_DIR@/tileset/tricked
+
+bomberclone_tileset_DATA = \
+	dead.wav \
+	background.png \
+	block.png \
+	stone.png
+
+EXTRA_DIST = $(bomberclone_tileset_DATA)
--- a/data/tileset/uccia_garbage/.cvsignore
+++ b/data/tileset/uccia_garbage/.cvsignore
@ -0,0 +1,3 @@
+Makefile
+Makefile.in
+
--- a/data/tileset/uccia_garbage/Makefile.am
+++ b/data/tileset/uccia_garbage/Makefile.am
@ -0,0 +1,10 @@
+
+bomberclone_tilesetdir = $(prefix)/@NO_PREFIX_PACKAGE_DATA_DIR@/tileset/uccia_garbage
+
+bomberclone_tileset_DATA = \
+	dead.wav \
+	background.png \
+	block.png \
+	stone.png
+
+EXTRA_DIST = $(bomberclone_tileset_DATA)
--- a/data/tileset/zbb_frog/.cvsignore
+++ b/data/tileset/zbb_frog/.cvsignore
@ -0,0 +1,3 @@
+Makefile
+Makefile.in
+
--- a/data/tileset/zbb_frog/Makefile.am
+++ b/data/tileset/zbb_frog/Makefile.am
@ -0,0 +1,9 @@
+
+bomberclone_tilesetdir = $(prefix)/@NO_PREFIX_PACKAGE_DATA_DIR@/tileset/zbb_frog
+
+bomberclone_tileset_DATA = \
+	background.png \
+	block.png \
+	stone.png
+
+EXTRA_DIST = $(bomberclone_tileset_DATA)