Reduced data duplication in module.mk files; added module.mk files for null and x11 backends; added engines/module.mk

svn-id: r20584

11 files changed, 355 insertions, 287 deletions

diff --git a/engines/gob/module.mk b/engines/gob/module.mk
index c8188d78b2..252e80de6c 100644
--- a/engines/gob/module.mk
+++ b/engines/gob/module.mk
@@ -1,32 +1,32 @@
 MODULE := engines/gob
 
 MODULE_OBJS := \
-	engines/gob/anim.o \
-	engines/gob/cdrom.o \
-	engines/gob/dataio.o \
-	engines/gob/draw.o \
-	engines/gob/driver_vga.o \
-	engines/gob/game.o \
-	engines/gob/global.o \
-	engines/gob/gob.o \
-	engines/gob/goblin.o \
-	engines/gob/init.o \
-	engines/gob/inter.o \
-	engines/gob/inter_v1.o \
-	engines/gob/inter_v2.o \
-	engines/gob/map.o \
-	engines/gob/mult.o \
-	engines/gob/music.o \
-	engines/gob/pack.o \
-	engines/gob/palanim.o \
-	engines/gob/parse.o \
-	engines/gob/parse_v1.o \
-	engines/gob/parse_v2.o \
-	engines/gob/scenery.o \
-	engines/gob/sound.o \
-	engines/gob/timer.o \
-	engines/gob/util.o \
-	engines/gob/video.o
+	anim.o \
+	cdrom.o \
+	dataio.o \
+	draw.o \
+	driver_vga.o \
+	game.o \
+	global.o \
+	gob.o \
+	goblin.o \
+	init.o \
+	inter.o \
+	inter_v1.o \
+	inter_v2.o \
+	map.o \
+	mult.o \
+	music.o \
+	pack.o \
+	palanim.o \
+	parse.o \
+	parse_v1.o \
+	parse_v2.o \
+	scenery.o \
+	sound.o \
+	timer.o \
+	util.o \
+	video.o
 
 MODULE_DIRS += \
 	engines/gob
diff --git a/engines/kyra/module.mk b/engines/kyra/module.mk
index 943c628831..d19e5f13e7 100644
--- a/engines/kyra/module.mk
+++ b/engines/kyra/module.mk
@@ -1,25 +1,25 @@
 MODULE := engines/kyra
 
 MODULE_OBJS := \
-	engines/kyra/kyra.o \
-	engines/kyra/resource.o \
-	engines/kyra/screen.o \
-	engines/kyra/script_v1.o \
-	engines/kyra/script.o \
-	engines/kyra/seqplayer.o \
-	engines/kyra/sound.o \
-	engines/kyra/staticres.o \
-	engines/kyra/sprites.o \
-	engines/kyra/wsamovie.o \
-	engines/kyra/debugger.o \
-	engines/kyra/animator.o \
-	engines/kyra/gui.o \
-	engines/kyra/sequences_v1.o \
-	engines/kyra/items.o \
-	engines/kyra/scene.o \
-	engines/kyra/text.o \
-	engines/kyra/timer.o \
-	engines/kyra/saveload.o
+	kyra.o \
+	resource.o \
+	screen.o \
+	script_v1.o \
+	script.o \
+	seqplayer.o \
+	sound.o \
+	staticres.o \
+	sprites.o \
+	wsamovie.o \
+	debugger.o \
+	animator.o \
+	gui.o \
+	sequences_v1.o \
+	items.o \
+	scene.o \
+	text.o \
+	timer.o \
+	saveload.o
 
 MODULE_DIRS += \
 	engines/kyra
diff --git a/engines/lure/module.mk b/engines/lure/module.mk
index 8b83531bd7..f742b116dc 100644
--- a/engines/lure/module.mk
+++ b/engines/lure/module.mk
@@ -1,27 +1,27 @@
 MODULE := engines/lure
 
 MODULE_OBJS := \
-	engines/lure/animseq.o \
-	engines/lure/debug-input.o \
-	engines/lure/debug-methods.o \
-	engines/lure/decode.o \
-	engines/lure/disk.o \
-	engines/lure/events.o \
-	engines/lure/game.o \
-	engines/lure/hotspots.o \
-	engines/lure/intro.o \
-	engines/lure/lure.o \
-	engines/lure/memory.o \
-	engines/lure/menu.o \
-	engines/lure/palette.o \
-	engines/lure/res.o \
-	engines/lure/res_struct.o \
-	engines/lure/room.o \
-	engines/lure/screen.o \
-	engines/lure/scripts.o \
-	engines/lure/strings.o \
-	engines/lure/surface.o \
-	engines/lure/system.o
+	animseq.o \
+	debug-input.o \
+	debug-methods.o \
+	decode.o \
+	disk.o \
+	events.o \
+	game.o \
+	hotspots.o \
+	intro.o \
+	lure.o \
+	memory.o \
+	menu.o \
+	palette.o \
+	res.o \
+	res_struct.o \
+	room.o \
+	screen.o \
+	scripts.o \
+	strings.o \
+	surface.o \
+	system.o
 
 MODULE_DIRS += \
 	engines/lure
diff --git a/engines/module.mk b/engines/module.mk
new file mode 100644
index 0000000000..3b16263df7
--- /dev/null
+++ b/engines/module.mk
@@ -0,0 +1,68 @@
+ifdef DISABLE_SCUMM
+DEFINES += -DDISABLE_SCUMM
+else
+MODULES += engines/scumm
+
+ifdef DISABLE_SCUMM_7_8
+DEFINES += -DDISABLE_SCUMM_7_8
+endif
+
+ifdef DISABLE_HE
+DEFINES += -DDISABLE_HE
+endif
+
+endif
+
+ifdef DISABLE_SIMON
+DEFINES += -DDISABLE_SIMON
+else
+MODULES += engines/simon
+endif
+
+ifdef DISABLE_SKY
+DEFINES += -DDISABLE_SKY
+else
+MODULES += engines/sky
+endif
+
+ifdef DISABLE_SWORD1
+DEFINES += -DDISABLE_SWORD1
+else
+MODULES += engines/sword1
+endif
+
+ifdef DISABLE_SWORD2
+DEFINES += -DDISABLE_SWORD2
+else
+MODULES += engines/sword2
+endif
+
+ifdef DISABLE_QUEEN
+DEFINES += -DDISABLE_QUEEN
+else
+MODULES += engines/queen
+endif
+
+ifdef DISABLE_SAGA
+DEFINES += -DDISABLE_SAGA
+else 
+MODULES += engines/saga
+endif
+
+ifdef DISABLE_KYRA
+DEFINES += -DDISABLE_KYRA
+else 
+MODULES += engines/kyra
+endif
+
+ifdef DISABLE_GOB
+DEFINES += -DDISABLE_GOB
+else 
+MODULES += engines/gob
+endif
+
+ifdef DISABLE_LURE
+DEFINES += -DDISABLE_LURE
+else
+MODULES += engines/lure
+endif
diff --git a/engines/queen/module.mk b/engines/queen/module.mk
index be3c5707e6..dc8aa7bcdc 100644
--- a/engines/queen/module.mk
+++ b/engines/queen/module.mk
@@ -1,26 +1,26 @@
 MODULE := engines/queen
 
 MODULE_OBJS := \
-	engines/queen/bankman.o \
-	engines/queen/command.o \
-	engines/queen/credits.o \
-	engines/queen/cutaway.o \
-	engines/queen/debug.o \
-	engines/queen/display.o \
-	engines/queen/graphics.o \
-	engines/queen/grid.o \
-	engines/queen/input.o \
-	engines/queen/journal.o \
-	engines/queen/logic.o \
-	engines/queen/music.o \
-	engines/queen/musicdata.o \
-	engines/queen/queen.o \
-	engines/queen/resource.o \
-	engines/queen/restables.o \
-	engines/queen/sound.o \
-	engines/queen/state.o \
-	engines/queen/talk.o \
-	engines/queen/walk.o
+	bankman.o \
+	command.o \
+	credits.o \
+	cutaway.o \
+	debug.o \
+	display.o \
+	graphics.o \
+	grid.o \
+	input.o \
+	journal.o \
+	logic.o \
+	music.o \
+	musicdata.o \
+	queen.o \
+	resource.o \
+	restables.o \
+	sound.o \
+	state.o \
+	talk.o \
+	walk.o
 
 MODULE_DIRS += \
 	engines/queen
diff --git a/engines/saga/module.mk b/engines/saga/module.mk
index 3d39108444..97780c1aae 100644
--- a/engines/saga/module.mk
+++ b/engines/saga/module.mk
@@ -1,36 +1,36 @@
 MODULE := engines/saga
 
 MODULE_OBJS := \
-	engines/saga/actor.o \
-	engines/saga/animation.o \
-	engines/saga/console.o \
-	engines/saga/events.o \
-	engines/saga/font.o \
-	engines/saga/font_map.o \
-	engines/saga/game.o \
-	engines/saga/gfx.o \
-	engines/saga/ihnm_introproc.o \
-	engines/saga/image.o \
-	engines/saga/interface.o \
-	engines/saga/isomap.o \
-	engines/saga/ite_introproc.o \
-	engines/saga/itedata.o \
-	engines/saga/objectmap.o \
-	engines/saga/puzzle.o \
-	engines/saga/palanim.o \
-	engines/saga/render.o \
-	engines/saga/rscfile.o \
-	engines/saga/saga.o \
-	engines/saga/saveload.o \
-	engines/saga/scene.o \
-	engines/saga/script.o \
-	engines/saga/sfuncs.o \
-	engines/saga/sndres.o \
-	engines/saga/sprite.o \
-	engines/saga/sthread.o \
-	engines/saga/input.o \
-	engines/saga/music.o \
-	engines/saga/sound.o
+	actor.o \
+	animation.o \
+	console.o \
+	events.o \
+	font.o \
+	font_map.o \
+	game.o \
+	gfx.o \
+	ihnm_introproc.o \
+	image.o \
+	interface.o \
+	isomap.o \
+	ite_introproc.o \
+	itedata.o \
+	objectmap.o \
+	puzzle.o \
+	palanim.o \
+	render.o \
+	rscfile.o \
+	saga.o \
+	saveload.o \
+	scene.o \
+	script.o \
+	sfuncs.o \
+	sndres.o \
+	sprite.o \
+	sthread.o \
+	input.o \
+	music.o \
+	sound.o
 
 MODULE_DIRS += \
 	engines/saga
diff --git a/engines/scumm/module.mk b/engines/scumm/module.mk
index 6bf42512b3..fa56739dde 100644
--- a/engines/scumm/module.mk
+++ b/engines/scumm/module.mk
@@ -1,96 +1,96 @@
 MODULE := engines/scumm
 
 MODULE_OBJS := \
-	engines/scumm/actor.o \
-	engines/scumm/akos.o \
-	engines/scumm/base-costume.o \
-	engines/scumm/bomp.o \
-	engines/scumm/boxes.o \
-	engines/scumm/camera.o \
-	engines/scumm/charset.o \
-	engines/scumm/costume.o \
-	engines/scumm/cursor.o \
-	engines/scumm/debugger.o \
-	engines/scumm/dialogs.o \
-	engines/scumm/gfx.o \
-	engines/scumm/imuse.o \
-	engines/scumm/imuse_player.o \
-	engines/scumm/input.o \
-	engines/scumm/instrument.o \
-	engines/scumm/help.o \
-	engines/scumm/midiparser_ro.o \
-	engines/scumm/midiparser_eup.o \
-	engines/scumm/object.o \
-	engines/scumm/palette.o \
-	engines/scumm/player_mod.o \
-	engines/scumm/player_v1.o \
-	engines/scumm/player_nes.o \
-	engines/scumm/player_v2.o \
-	engines/scumm/player_v2a.o \
-	engines/scumm/player_v3a.o \
-	engines/scumm/resource.o \
-	engines/scumm/resource_v2.o \
-	engines/scumm/resource_v3.o \
-	engines/scumm/resource_v4.o \
-	engines/scumm/room.o \
-	engines/scumm/saveload.o \
-	engines/scumm/script.o \
-	engines/scumm/script_c64.o \
-	engines/scumm/script_v2.o \
-	engines/scumm/script_v5.o \
-	engines/scumm/script_v6.o \
-	engines/scumm/script_v6he.o \
-	engines/scumm/scumm.o \
-	engines/scumm/sound.o \
-	engines/scumm/sound_he.o \
-	engines/scumm/string.o \
-	engines/scumm/usage_bits.o \
-	engines/scumm/util.o \
-	engines/scumm/vars.o \
-	engines/scumm/verbs.o \
-	engines/scumm/thumbnail.o
+	actor.o \
+	akos.o \
+	base-costume.o \
+	bomp.o \
+	boxes.o \
+	camera.o \
+	charset.o \
+	costume.o \
+	cursor.o \
+	debugger.o \
+	dialogs.o \
+	gfx.o \
+	imuse.o \
+	imuse_player.o \
+	input.o \
+	instrument.o \
+	help.o \
+	midiparser_ro.o \
+	midiparser_eup.o \
+	object.o \
+	palette.o \
+	player_mod.o \
+	player_v1.o \
+	player_nes.o \
+	player_v2.o \
+	player_v2a.o \
+	player_v3a.o \
+	resource.o \
+	resource_v2.o \
+	resource_v3.o \
+	resource_v4.o \
+	room.o \
+	saveload.o \
+	script.o \
+	script_c64.o \
+	script_v2.o \
+	script_v5.o \
+	script_v6.o \
+	script_v6he.o \
+	scumm.o \
+	sound.o \
+	sound_he.o \
+	string.o \
+	usage_bits.o \
+	util.o \
+	vars.o \
+	verbs.o \
+	thumbnail.o
 
 ifndef DISABLE_SCUMM_7_8
 MODULE_OBJS += \
-	engines/scumm/nut_renderer.o \
-	engines/scumm/script_v8.o \
-	engines/scumm/imuse_digi/dimuse.o \
-	engines/scumm/imuse_digi/dimuse_bndmgr.o \
-	engines/scumm/imuse_digi/dimuse_codecs.o \
-	engines/scumm/imuse_digi/dimuse_music.o \
-	engines/scumm/imuse_digi/dimuse_sndmgr.o \
-	engines/scumm/imuse_digi/dimuse_script.o \
-	engines/scumm/imuse_digi/dimuse_track.o \
-	engines/scumm/imuse_digi/dimuse_tables.o \
-	engines/scumm/insane/insane.o \
-	engines/scumm/insane/insane_ben.o \
-	engines/scumm/insane/insane_enemy.o \
-	engines/scumm/insane/insane_scenes.o \
-	engines/scumm/insane/insane_iact.o \
-	engines/scumm/smush/chunk.o \
-	engines/scumm/smush/codec1.o \
-	engines/scumm/smush/codec37.o \
-	engines/scumm/smush/codec47.o \
-	engines/scumm/smush/imuse_channel.o \
-	engines/scumm/smush/smush_player.o \
-	engines/scumm/smush/saud_channel.o \
-	engines/scumm/smush/smush_mixer.o \
-	engines/scumm/smush/smush_font.o
+	nut_renderer.o \
+	script_v8.o \
+	imuse_digi/dimuse.o \
+	imuse_digi/dimuse_bndmgr.o \
+	imuse_digi/dimuse_codecs.o \
+	imuse_digi/dimuse_music.o \
+	imuse_digi/dimuse_sndmgr.o \
+	imuse_digi/dimuse_script.o \
+	imuse_digi/dimuse_track.o \
+	imuse_digi/dimuse_tables.o \
+	insane/insane.o \
+	insane/insane_ben.o \
+	insane/insane_enemy.o \
+	insane/insane_scenes.o \
+	insane/insane_iact.o \
+	smush/chunk.o \
+	smush/codec1.o \
+	smush/codec37.o \
+	smush/codec47.o \
+	smush/imuse_channel.o \
+	smush/smush_player.o \
+	smush/saud_channel.o \
+	smush/smush_mixer.o \
+	smush/smush_font.o
 endif
 
 ifndef DISABLE_HE
 MODULE_OBJS += \
-	engines/scumm/floodfill_he.o \
-	engines/scumm/logic_he.o \
-	engines/scumm/palette_he.o \
-	engines/scumm/resource_v7he.o \
-	engines/scumm/script_v7he.o \
-	engines/scumm/script_v72he.o \
-	engines/scumm/script_v80he.o \
-	engines/scumm/script_v90he.o \
-	engines/scumm/script_v100he.o \
-	engines/scumm/sprite_he.o \
-	engines/scumm/wiz_he.o
+	floodfill_he.o \
+	logic_he.o \
+	palette_he.o \
+	resource_v7he.o \
+	script_v7he.o \
+	script_v72he.o \
+	script_v80he.o \
+	script_v90he.o \
+	script_v100he.o \
+	sprite_he.o \
+	wiz_he.o
 endif
 
 MODULE_DIRS += \
diff --git a/engines/simon/module.mk b/engines/simon/module.mk
index 3323f3a0de..dfc61371f2 100644
--- a/engines/simon/module.mk
+++ b/engines/simon/module.mk
@@ -1,21 +1,21 @@
 MODULE := engines/simon
 
 MODULE_OBJS := \
-	engines/simon/charset.o \
-	engines/simon/cursor.o \
-	engines/simon/debug.o \
-	engines/simon/debugger.o \
-	engines/simon/game.o \
-	engines/simon/icons.o \
-	engines/simon/items.o \
-	engines/simon/midi.o \
-	engines/simon/midiparser_s1d.o \
-	engines/simon/res.o \
-	engines/simon/saveload.o \
-	engines/simon/sound.o \
-	engines/simon/simon.o \
-	engines/simon/verb.o \
-	engines/simon/vga.o \
+	charset.o \
+	cursor.o \
+	debug.o \
+	debugger.o \
+	game.o \
+	icons.o \
+	items.o \
+	midi.o \
+	midiparser_s1d.o \
+	res.o \
+	saveload.o \
+	sound.o \
+	simon.o \
+	verb.o \
+	vga.o \
 
 MODULE_DIRS += \
 	engines/simon
diff --git a/engines/sky/module.mk b/engines/sky/module.mk
index 875cf65e47..6858725c5d 100644
--- a/engines/sky/module.mk
+++ b/engines/sky/module.mk
@@ -1,27 +1,27 @@
 MODULE := engines/sky
 
 MODULE_OBJS := \
-	engines/sky/autoroute.o \
-	engines/sky/compact.o \
-	engines/sky/control.o \
-	engines/sky/debug.o \
-	engines/sky/disk.o \
-	engines/sky/grid.o \
-	engines/sky/hufftext.o \
-	engines/sky/intro.o \
-	engines/sky/logic.o \
-	engines/sky/mouse.o \
-	engines/sky/rnc_deco.o \
-	engines/sky/screen.o \
-	engines/sky/sky.o \
-	engines/sky/sound.o \
-	engines/sky/text.o \
-	engines/sky/music/adlibchannel.o \
-	engines/sky/music/adlibmusic.o \
-	engines/sky/music/gmchannel.o \
-	engines/sky/music/gmmusic.o \
-	engines/sky/music/mt32music.o \
-	engines/sky/music/musicbase.o
+	autoroute.o \
+	compact.o \
+	control.o \
+	debug.o \
+	disk.o \
+	grid.o \
+	hufftext.o \
+	intro.o \
+	logic.o \
+	mouse.o \
+	rnc_deco.o \
+	screen.o \
+	sky.o \
+	sound.o \
+	text.o \
+	music/adlibchannel.o \
+	music/adlibmusic.o \
+	music/gmchannel.o \
+	music/gmmusic.o \
+	music/mt32music.o \
+	music/musicbase.o
 
 MODULE_DIRS += \
 	engines/sky \
diff --git a/engines/sword1/module.mk b/engines/sword1/module.mk
index 9f4b3f2c3a..124158bfad 100644
--- a/engines/sword1/module.mk
+++ b/engines/sword1/module.mk
@@ -1,24 +1,24 @@
 MODULE := engines/sword1
 
 MODULE_OBJS := \
-	engines/sword1/animation.o \
-	engines/sword1/control.o \
-	engines/sword1/credits.o \
-	engines/sword1/debug.o \
-	engines/sword1/eventman.o \
-	engines/sword1/logic.o \
-	engines/sword1/memman.o \
-	engines/sword1/menu.o \
-	engines/sword1/mouse.o \
-	engines/sword1/music.o \
-	engines/sword1/objectman.o \
-	engines/sword1/resman.o \
-	engines/sword1/router.o \
-	engines/sword1/screen.o \
-	engines/sword1/sound.o \
-	engines/sword1/staticres.o \
-	engines/sword1/sword1.o \
-	engines/sword1/text.o
+	animation.o \
+	control.o \
+	credits.o \
+	debug.o \
+	eventman.o \
+	logic.o \
+	memman.o \
+	menu.o \
+	mouse.o \
+	music.o \
+	objectman.o \
+	resman.o \
+	router.o \
+	screen.o \
+	sound.o \
+	staticres.o \
+	sword1.o \
+	text.o
 
 MODULE_DIRS += \
 	engines/sword1 
diff --git a/engines/sword2/module.mk b/engines/sword2/module.mk
index 2ee3f39ebb..007f71d90f 100644
--- a/engines/sword2/module.mk
+++ b/engines/sword2/module.mk
@@ -1,40 +1,40 @@
 MODULE := engines/sword2
 
 MODULE_OBJS := \
-	engines/sword2/_mouse.o \
-	engines/sword2/animation.o \
-	engines/sword2/anims.o \
-	engines/sword2/build_display.o \
-	engines/sword2/console.o \
-	engines/sword2/controls.o \
-	engines/sword2/d_draw.o \
-	engines/sword2/debug.o \
-	engines/sword2/events.o \
-	engines/sword2/function.o \
-	engines/sword2/icons.o \
-	engines/sword2/interpreter.o \
-	engines/sword2/layers.o \
-	engines/sword2/logic.o \
-	engines/sword2/maketext.o \
-	engines/sword2/memory.o \
-	engines/sword2/menu.o \
-	engines/sword2/mouse.o \
-	engines/sword2/music.o \
-	engines/sword2/palette.o \
-	engines/sword2/protocol.o \
-	engines/sword2/rdwin.o \
-	engines/sword2/render.o \
-	engines/sword2/resman.o \
-	engines/sword2/router.o \
-	engines/sword2/save_rest.o \
-	engines/sword2/scroll.o \
-	engines/sword2/sound.o \
-	engines/sword2/speech.o \
-	engines/sword2/sprite.o \
-	engines/sword2/startup.o \
-	engines/sword2/sword2.o \
-	engines/sword2/sync.o \
-	engines/sword2/walker.o
+	_mouse.o \
+	animation.o \
+	anims.o \
+	build_display.o \
+	console.o \
+	controls.o \
+	d_draw.o \
+	debug.o \
+	events.o \
+	function.o \
+	icons.o \
+	interpreter.o \
+	layers.o \
+	logic.o \
+	maketext.o \
+	memory.o \
+	menu.o \
+	mouse.o \
+	music.o \
+	palette.o \
+	protocol.o \
+	rdwin.o \
+	render.o \
+	resman.o \
+	router.o \
+	save_rest.o \
+	scroll.o \
+	sound.o \
+	speech.o \
+	sprite.o \
+	startup.o \
+	sword2.o \
+	sync.o \
+	walker.o
 
 MODULE_DIRS += \
 	engines/sword2