From 9a955180a4179237d3474a73c6829a6554a9bc09 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Sat, 24 Jun 2006 08:48:11 +0000 Subject: * Renamed config.mak to config.mk * Renamed common.rules to rules.mk * Removed explicit declaration of MODULE_DIRS in various spots (instead we let rules.mk compute it) svn-id: r23275 --- engines/agi/module.mk | 5 +---- engines/cine/module.mk | 5 +---- engines/gob/module.mk | 5 +---- engines/kyra/module.mk | 5 +---- engines/lure/module.mk | 5 +---- engines/queen/module.mk | 5 +---- engines/saga/module.mk | 5 +---- engines/scumm/module.mk | 10 +--------- engines/simon/module.mk | 5 +---- engines/sky/module.mk | 7 +------ engines/sword1/module.mk | 5 +---- engines/sword2/module.mk | 5 +---- 12 files changed, 12 insertions(+), 55 deletions(-) (limited to 'engines') diff --git a/engines/agi/module.mk b/engines/agi/module.mk index a5a81f2b15..b155a12c9b 100644 --- a/engines/agi/module.mk +++ b/engines/agi/module.mk @@ -30,13 +30,10 @@ MODULE_OBJS = \ view.o \ words.o -MODULE_DIRS += \ - engines/agi - # This module can be built as a plugin ifdef BUILD_PLUGINS PLUGIN := 1 endif # Include common rules -include $(srcdir)/common.rules +include $(srcdir)/rules.mk diff --git a/engines/cine/module.mk b/engines/cine/module.mk index dd26b39785..88106bb51b 100644 --- a/engines/cine/module.mk +++ b/engines/cine/module.mk @@ -23,13 +23,10 @@ MODULE_OBJS = \ unpack.o \ various.o -MODULE_DIRS += \ - engines/cine - # This module can be built as a plugin ifdef BUILD_PLUGINS PLUGIN := 1 endif # Include common rules -include $(srcdir)/common.rules +include $(srcdir)/rules.mk diff --git a/engines/gob/module.mk b/engines/gob/module.mk index 4841db606d..c892039015 100644 --- a/engines/gob/module.mk +++ b/engines/gob/module.mk @@ -44,13 +44,10 @@ MODULE_OBJS := \ video_v1.o \ video_v2.o -MODULE_DIRS += \ - engines/gob - # This module can be built as a plugin ifdef BUILD_PLUGINS PLUGIN := 1 endif # Include common rules -include $(srcdir)/common.rules +include $(srcdir)/rules.mk diff --git a/engines/kyra/module.mk b/engines/kyra/module.mk index dbede17bf6..2b83e6dc26 100644 --- a/engines/kyra/module.mk +++ b/engines/kyra/module.mk @@ -26,13 +26,10 @@ MODULE_OBJS := \ vqa.o \ wsamovie.o -MODULE_DIRS += \ - engines/kyra - # This module can be built as a plugin ifdef BUILD_PLUGINS PLUGIN := 1 endif # Include common rules -include $(srcdir)/common.rules +include $(srcdir)/rules.mk diff --git a/engines/lure/module.mk b/engines/lure/module.mk index f742b116dc..35a39e9774 100644 --- a/engines/lure/module.mk +++ b/engines/lure/module.mk @@ -23,14 +23,11 @@ MODULE_OBJS := \ surface.o \ system.o -MODULE_DIRS += \ - engines/lure - # This module can be built as a plugin ifdef BUILD_PLUGINS PLUGIN := 1 endif # Include common rules -include $(srcdir)/common.rules +include $(srcdir)/rules.mk diff --git a/engines/queen/module.mk b/engines/queen/module.mk index dc8aa7bcdc..f603e0a736 100644 --- a/engines/queen/module.mk +++ b/engines/queen/module.mk @@ -22,13 +22,10 @@ MODULE_OBJS := \ talk.o \ walk.o -MODULE_DIRS += \ - engines/queen - # This module can be built as a plugin ifdef BUILD_PLUGINS PLUGIN := 1 endif # Include common rules -include $(srcdir)/common.rules +include $(srcdir)/rules.mk diff --git a/engines/saga/module.mk b/engines/saga/module.mk index 97780c1aae..205e243a72 100644 --- a/engines/saga/module.mk +++ b/engines/saga/module.mk @@ -32,13 +32,10 @@ MODULE_OBJS := \ music.o \ sound.o -MODULE_DIRS += \ - engines/saga - # This module can be built as a plugin ifdef BUILD_PLUGINS PLUGIN := 1 endif # Include common rules -include $(srcdir)/common.rules +include $(srcdir)/rules.mk diff --git a/engines/scumm/module.mk b/engines/scumm/module.mk index faf263e1f0..ab81e835dc 100644 --- a/engines/scumm/module.mk +++ b/engines/scumm/module.mk @@ -99,14 +99,6 @@ MODULE_OBJS += \ he/wiz_he.o endif -MODULE_DIRS += \ - engines/scumm \ - engines/scumm/he \ - engines/scumm/imuse \ - engines/scumm/imuse_digi \ - engines/scumm/insane \ - engines/scumm/smush - # This module can be built as a plugin ifdef BUILD_PLUGINS PLUGIN := 1 @@ -115,4 +107,4 @@ PLUGIN_LDFLAGS += -lz endif # Include common rules -include $(srcdir)/common.rules +include $(srcdir)/rules.mk diff --git a/engines/simon/module.mk b/engines/simon/module.mk index 4006a99ebc..dfd6a3e56b 100644 --- a/engines/simon/module.mk +++ b/engines/simon/module.mk @@ -24,13 +24,10 @@ MODULE_OBJS := \ vga.o \ window.o \ -MODULE_DIRS += \ - engines/simon - # This module can be built as a plugin ifdef BUILD_PLUGINS PLUGIN := 1 endif # Include common rules -include $(srcdir)/common.rules +include $(srcdir)/rules.mk diff --git a/engines/sky/module.mk b/engines/sky/module.mk index 6858725c5d..7d53615bd0 100644 --- a/engines/sky/module.mk +++ b/engines/sky/module.mk @@ -23,15 +23,10 @@ MODULE_OBJS := \ music/mt32music.o \ music/musicbase.o -MODULE_DIRS += \ - engines/sky \ - engines/sky/music \ - engines/sky/compacts - # This module can be built as a plugin ifdef BUILD_PLUGINS PLUGIN := 1 endif # Include common rules -include $(srcdir)/common.rules +include $(srcdir)/rules.mk diff --git a/engines/sword1/module.mk b/engines/sword1/module.mk index 124158bfad..5db32e57c1 100644 --- a/engines/sword1/module.mk +++ b/engines/sword1/module.mk @@ -20,13 +20,10 @@ MODULE_OBJS := \ sword1.o \ text.o -MODULE_DIRS += \ - engines/sword1 - # This module can be built as a plugin ifdef BUILD_PLUGINS PLUGIN := 1 endif # Include common rules -include $(srcdir)/common.rules +include $(srcdir)/rules.mk diff --git a/engines/sword2/module.mk b/engines/sword2/module.mk index f5e79af317..25d73ab775 100644 --- a/engines/sword2/module.mk +++ b/engines/sword2/module.mk @@ -33,13 +33,10 @@ MODULE_OBJS := \ sync.o \ walker.o -MODULE_DIRS += \ - engines/sword2 - # This module can be built as a plugin ifdef BUILD_PLUGINS PLUGIN := 1 endif # Include common rules -include $(srcdir)/common.rules +include $(srcdir)/rules.mk -- cgit v1.2.3