Revert "Failed test"

This reverts commit 66bba22586.

Makefile.am

@@ -3,10 +3,10 @@
 # http://creativecommons.org/publicdomain/zero/1.0/ for more
 # information. This file is offered as-is, without any warranty.
 
-SUBDIRS = src data gfx misc music sound locale
+SUBDIRS = src misc
 
 dist_doc_DATA = README.txt COPYING LICENSES
-EXTRA_DIST = starfighter.sh win32build.sh
+EXTRA_DIST = starfighter.sh win32build.sh data gfx music sound locale misc
 
 if !RUN_IN_PLACE
 

data/Makefile.am

@@ -1,12 +0,0 @@
-# This file has been dedicated to the public domain, to the extent
-# possible under applicable law, via CC0. See
-# http://creativecommons.org/publicdomain/zero/1.0/ for more
-# information. This file is offered as-is, without any warranty.
-
-sfdatadir = $(pkgdatadir)/data
-
-dist_sfdata_DATA = \
-	TakaoPGothic.ttf \
-	credits.txt \
-	ipa_font_license.txt
-

gfx/Makefile.am

@@ -1,197 +0,0 @@
-# This file has been dedicated to the public domain, to the extent
-# possible under applicable law, via CC0. See
-# http://creativecommons.org/publicdomain/zero/1.0/ for more
-# information. This file is offered as-is, without any warranty.
-
-sfgfxdir = $(pkgdatadir)/gfx
-
-dist_sfgfx_DATA = \
-	aimFighter1.png \
-	aimFighter2.png \
-	alienDevice.png \
-	arrowEast.png \
-	arrowNorth.png \
-	arrowNorthEast.png \
-	arrowNorthWest.png \
-	arrowSouth.png \
-	arrowSouthEast.png \
-	arrowSouthWest.png \
-	arrowWest.png \
-	asteroid1.png \
-	asteroid2.png \
-	asteroid3.png \
-	barrier.png \
-	buyIcon.png \
-	cargo1.png \
-	chainLink.png \
-	cloakShip1.png \
-	cloakShip2.png \
-	credits.jpg \
-	cursor.png \
-	dollar.png \
-	drone1.png \
-	drone2.png \
-	dualFighter1.png \
-	dualFighter2.png \
-	elec1.png \
-	elec2.png \
-	elec3.png \
-	elec4.png \
-	eliteFighter1.png \
-	eliteFighter2.png \
-	escort1.png \
-	escort2.png \
-	evilUrsula1.png \
-	evilUrsula2.png \
-	execTrans1.png \
-	execTrans2.png \
-	explode05.png \
-	explode06.png \
-	explode07.png \
-	explode08.png \
-	explode1.png \
-	explode10.png \
-	explode11.png \
-	explode12.png \
-	explode13.png \
-	explode14.png \
-	explode15.png \
-	explode16.png \
-	explode2.png \
-	explode3.png \
-	explode4.png \
-	explode9.png \
-	eyananth.jpg \
-	face_chris.png \
-	face_crew.png \
-	face_kline.png \
-	face_krass.png \
-	face_phoebe.png \
-	face_sid.png \
-	face_ursula.png \
-	firefly-big.png \
-	firefly1.png \
-	firefly2.png \
-	friendArrowEast.png \
-	friendArrowNorth.png \
-	friendArrowNorthEast.png \
-	friendArrowNorthWest.png \
-	friendArrowSouth.png \
-	friendArrowSouthEast.png \
-	friendArrowSouthWest.png \
-	friendArrowWest.png \
-	frigateBody1.png \
-	frigateBody2.png \
-	frigateGun11.png \
-	frigateGun12.png \
-	frigateGun21.png \
-	frigateGun22.png \
-	gameover.png \
-	goodTrans1.png \
-	goodTrans2.png \
-	greenDir.png \
-	heart.png \
-	icon1.png \
-	icon10.png \
-	icon11.png \
-	icon12.png \
-	icon13.png \
-	icon14.png \
-	icon15.png \
-	icon16.png \
-	icon17.png \
-	icon18.png \
-	icon19.png \
-	icon2.png \
-	icon20.png \
-	icon21.png \
-	icon22.png \
-	icon23.png \
-	icon24.png \
-	icon25.png \
-	icon26.png \
-	icon3.png \
-	icon4.png \
-	icon5.png \
-	icon6.png \
-	icon7.png \
-	icon8.png \
-	icon9.png \
-	iconBase.png \
-	kline11.png \
-	kline12.png \
-	klineText.png \
-	merc1.png \
-	merc2.png \
-	mine.png \
-	mineBoss1.png \
-	mineBoss2.png \
-	mineBossWing11.png \
-	mineBossWing12.png \
-	mineBossWing21.png \
-	mineBossWing22.png \
-	mineBossWing31.png \
-	mineBossWing32.png \
-	mineBossWing41.png \
-	mineBossWing42.png \
-	miner1.png \
-	miner2.png \
-	missileBoat1.png \
-	missileBoat2.png \
-	mobileCannon1.png \
-	mobileCannon2.png \
-	mobileShield1.png \
-	mobileShield2.png \
-	mordor.jpg \ore1.png \
-	ore2.png \
-	ore3.png \
-	phoebeText.png \
-	planet_blue.png \
-	planet_green.png \
-	planet_orange.png \
-	planet_red.png \
-	planet_sun.png \
-	plasmaAmmo.png \
-	plasmaDamage.png \
-	plasmaGreen.png \
-	plasmaRate.png \
-	plasmaRed.png \
-	plutoBoss1.png \
-	plutoBoss2.png \
-	pod.png \
-	prlogo.png \
-	rebelCarrier1.png \
-	rebelCarrier2.png \
-	redDir.png \
-	rocket.png \
-	rocket1.png \
-	rocket2.png \
-	rocketAmmo.png \
-	sellIcon.png \
-	sflogo.png \
-	sid1.png \
-	sid2.png \
-	sidText.png \
-	slaveTrans1.png \
-	slaveTrans2.png \
-	smallFont.png \
-	sol.jpg \
-	spirit.jpg \
-	splitBoss11.png \
-	splitBoss12.png \
-	splitBoss21.png \
-	splitBoss22.png \
-	splitBoss31.png \
-	splitBoss32.png \
-	startUp.jpg \
-	stunBolt.png \
-	superCharge.png \
-	targetText.png \
-	transport1.png \
-	transport2.png \
-	tug1.png \
-	tug2.png \
-	ursulaText.png \
-	wingmate1.png \
-	wingmate2.png
-

locale/Makefile.am

@@ -1,16 +0,0 @@
-# This file has been dedicated to the public domain, to the extent
-# possible under applicable law, via CC0. See
-# http://creativecommons.org/publicdomain/zero/1.0/ for more
-# information. This file is offered as-is, without any warranty.
-
-sflocaledir = $(pkgdatadir)/locale
-
-dist_sflocale_DATA = \
-	build.py \
-	genpot.sh \
-	pr-starfighter.pot \
-	en.po
-
-dist_nobase_sflocale_DATA = \
-    en/LC_MESSAGES/pr-starfighter.mo
-

music/Makefile.am

@@ -3,18 +3,9 @@
 # http://creativecommons.org/publicdomain/zero/1.0/ for more
 # information. This file is offered as-is, without any warranty.
 
-sfmusicdir = $(pkgdatadir)/music
+if !RUN_IN_PLACE
 
-dist_sfmusic_DATA = \
+nobase_pkgdata_DATA = *
-	death.ogg \
+
-	frozen_jam.ogg \
+endif
-	last_cyber_dance.ogg \
-	orbital_colossus.ogg \
-	railjet_short.ogg \
-	RE.ogg \
-	rise_of_spirit.ogg \
-	sound_and_silence.ogg \
-	space_dimensions.ogg \
-	through_space.ogg \
-	walking_among_androids.ogg
 

sound/Makefile.am

@@ -3,25 +3,9 @@
 # http://creativecommons.org/publicdomain/zero/1.0/ for more
 # information. This file is offered as-is, without any warranty.
 
-sfsounddir = $(pkgdatadir)/sound
+if !RUN_IN_PLACE
 
-dist_sfsound_DATA = \
+nobase_pkgdata_DATA = *
-	beamLaser.ogg \
+
-	cloak.ogg \
+endif
-	clock.ogg \
-	explode.ogg \
-	explode2.ogg \
-	explode3.ogg \
-	explode4.ogg \
-	flyby.ogg \
-	hyperSpace.ogg \
-	item.ogg \
-	laser.ogg \
-	maledeath.ogg \
-	missile.ogg \
-	missile2.ogg \
-	plasma.ogg \
-	plasma2.ogg \
-	plasma3.ogg \
-	shield.ogg