[Scummvm-cvs-logs] SF.net SVN: scummvm: [23275] scummvm/trunk
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Sat Jun 24 10:48:52 CEST 2006
Revision: 23275
Author: fingolfin
Date: 2006-06-24 01:48:11 -0700 (Sat, 24 Jun 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=23275&view=rev
Log Message:
-----------
* 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)
Modified Paths:
--------------
scummvm/trunk/Makefile
scummvm/trunk/Makefile.common
scummvm/trunk/README
scummvm/trunk/backends/module.mk
scummvm/trunk/backends/null/module.mk
scummvm/trunk/backends/sdl/module.mk
scummvm/trunk/backends/x11/module.mk
scummvm/trunk/base/module.mk
scummvm/trunk/common/module.mk
scummvm/trunk/configure
scummvm/trunk/engines/agi/module.mk
scummvm/trunk/engines/cine/module.mk
scummvm/trunk/engines/gob/module.mk
scummvm/trunk/engines/kyra/module.mk
scummvm/trunk/engines/lure/module.mk
scummvm/trunk/engines/queen/module.mk
scummvm/trunk/engines/saga/module.mk
scummvm/trunk/engines/scumm/module.mk
scummvm/trunk/engines/simon/module.mk
scummvm/trunk/engines/sky/module.mk
scummvm/trunk/engines/sword1/module.mk
scummvm/trunk/engines/sword2/module.mk
scummvm/trunk/graphics/module.mk
scummvm/trunk/gui/module.mk
scummvm/trunk/sound/module.mk
scummvm/trunk/sound/softsynth/mt32/module.mk
scummvm/trunk/tools/module.mk
Added Paths:
-----------
scummvm/trunk/rules.mk
Removed Paths:
-------------
scummvm/trunk/common.rules
Modified: scummvm/trunk/Makefile
===================================================================
--- scummvm/trunk/Makefile 2006-06-24 08:07:48 UTC (rev 23274)
+++ scummvm/trunk/Makefile 2006-06-24 08:48:11 UTC (rev 23275)
@@ -16,7 +16,7 @@
MODULE_DIRS :=
# Load the make rules generated by configure
-include config.mak
+include config.mk
CXXFLAGS:= -Wall $(CXXFLAGS)
CXXFLAGS+= -O -Wuninitialized
@@ -38,7 +38,7 @@
include $(srcdir)/Makefile.common
# check if configure has been run or has been changed since last run
-config.mak: $(srcdir)/configure
+config.mk: $(srcdir)/configure
@echo "You need to run ./configure before you can run make"
@echo "Either you haven't run it before or it has changed."
@exit 1
Modified: scummvm/trunk/Makefile.common
===================================================================
--- scummvm/trunk/Makefile.common 2006-06-24 08:07:48 UTC (rev 23274)
+++ scummvm/trunk/Makefile.common 2006-06-24 08:48:11 UTC (rev 23275)
@@ -81,7 +81,7 @@
distclean: clean
$(RM_REC) $(DEPDIRS)
- $(RM) build.rules config.h config.mak config.log
+ $(RM) build.rules config.h config.mk config.log
clean:
$(RM) $(OBJS) $(EXECUTABLE)
Modified: scummvm/trunk/README
===================================================================
--- scummvm/trunk/README 2006-06-24 08:07:48 UTC (rev 23274)
+++ scummvm/trunk/README 2006-06-24 08:48:11 UTC (rev 23275)
@@ -1478,7 +1478,7 @@
* Type ./configure --host=ppc-amigaos
* If you got an error about sdl-config, use --with-sdl-prefix
parameter to set the path.
- * Check 'config.mak' file and if everything seems to fine:
+ * Check 'config.mk' file and if everything seems to be fine:
* Run 'make'.
* Cross-compiling with Linux may be as easy.
Modified: scummvm/trunk/backends/module.mk
===================================================================
--- scummvm/trunk/backends/module.mk 2006-06-24 08:07:48 UTC (rev 23274)
+++ scummvm/trunk/backends/module.mk 2006-06-24 08:48:11 UTC (rev 23275)
@@ -14,15 +14,5 @@
midi/seq.o \
midi/windows.o
-MODULE_DIRS += \
- backends \
- backends/fs \
- backends/fs/posix \
- backends/fs/morphos \
- backends/fs/windows \
- backends/fs/amigaos4 \
- backends/fs/dc \
- backends/midi
-
# Include common rules
-include $(srcdir)/common.rules
+include $(srcdir)/rules.mk
Modified: scummvm/trunk/backends/null/module.mk
===================================================================
--- scummvm/trunk/backends/null/module.mk 2006-06-24 08:07:48 UTC (rev 23274)
+++ scummvm/trunk/backends/null/module.mk 2006-06-24 08:48:11 UTC (rev 23275)
@@ -4,7 +4,7 @@
null.o
MODULE_DIRS += \
- backends/null
+ backends/null/
-# We don't use the common.rules here on purpose
+# We don't use the rules.mk here on purpose
OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS)) $(OBJS)
Modified: scummvm/trunk/backends/sdl/module.mk
===================================================================
--- scummvm/trunk/backends/sdl/module.mk 2006-06-24 08:07:48 UTC (rev 23274)
+++ scummvm/trunk/backends/sdl/module.mk 2006-06-24 08:48:11 UTC (rev 23275)
@@ -6,7 +6,7 @@
sdl.o
MODULE_DIRS += \
- backends/sdl
+ backends/sdl/
-# We don't use the common.rules here on purpose
+# We don't use the rules.mk here on purpose
OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS)) $(OBJS)
Modified: scummvm/trunk/backends/x11/module.mk
===================================================================
--- scummvm/trunk/backends/x11/module.mk 2006-06-24 08:07:48 UTC (rev 23274)
+++ scummvm/trunk/backends/x11/module.mk 2006-06-24 08:48:11 UTC (rev 23275)
@@ -4,7 +4,7 @@
x11.o
MODULE_DIRS += \
- backends/x11
+ backends/x11/
-# We don't use the common.rules here on purpose
+# We don't use the rules.mk here on purpose
OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS)) $(OBJS)
Modified: scummvm/trunk/base/module.mk
===================================================================
--- scummvm/trunk/base/module.mk 2006-06-24 08:07:48 UTC (rev 23274)
+++ scummvm/trunk/base/module.mk 2006-06-24 08:48:11 UTC (rev 23275)
@@ -7,8 +7,5 @@
plugins.o \
version.o
-MODULE_DIRS += \
- base
-
# Include common rules
-include $(srcdir)/common.rules
+include $(srcdir)/rules.mk
Modified: scummvm/trunk/common/module.mk
===================================================================
--- scummvm/trunk/common/module.mk 2006-06-24 08:07:48 UTC (rev 23274)
+++ scummvm/trunk/common/module.mk 2006-06-24 08:48:11 UTC (rev 23275)
@@ -16,8 +16,5 @@
system.o \
unzip.o
-MODULE_DIRS += \
- common
-
# Include common rules
-include $(srcdir)/common.rules
+include $(srcdir)/rules.mk
Deleted: scummvm/trunk/common.rules
===================================================================
--- scummvm/trunk/common.rules 2006-06-24 08:07:48 UTC (rev 23274)
+++ scummvm/trunk/common.rules 2006-06-24 08:48:11 UTC (rev 23275)
@@ -1,49 +0,0 @@
-# Common build rules, used by the sub modules and their module.mk files
-
-# Copy the list of objects to a new variable. The name of the new variable
-# contains the module name, a trick we use so we can keep multiple different
-# module object lists, one for each module.
-MODULE_OBJS-$(MODULE) := $(addprefix $(MODULE)/, $(MODULE_OBJS))
-
-ifdef PLUGIN
-# Plugin build rule
-# TODO: Right now, for Mac OS X only. We either will have to generate this
-# via the configure script, or put in some 'if' statements to choose from
-# one of several build rules
-PLUGIN-$(MODULE) := plugins/$(PLUGIN_PREFIX)$(notdir $(MODULE))$(PLUGIN_SUFFIX)
-$(PLUGIN-$(MODULE)): $(MODULE_OBJS-$(MODULE)) $(PLUGIN_EXTRA_DEPS)
- $(MKDIR) plugins
- $(CXX) $(PLUGIN_LDFLAGS) $(filter-out $(PLUGIN_EXTRA_DEPS),$+) -o $@
-PLUGIN:=
-plugins: $(PLUGIN-$(MODULE))
-
-# Pseudo target for comfort, allows for "make common", "make gui" etc.
-$(MODULE): $(PLUGIN-$(MODULE))
-
-else
-
-MODULE_LIB-$(MODULE) := $(MODULE)/lib$(notdir $(MODULE)).a
-
-# If not building as a plugin, add the object files to the main OBJS list
-OBJS += $(MODULE_LIB-$(MODULE))
-
-# Convenience library target
-$(MODULE_LIB-$(MODULE)): $(MODULE_OBJS-$(MODULE))
- -$(RM) $@
- $(AR) $@ $+
- $(RANLIB) $@
-
-# Pseudo target for comfort, allows for "make common", "make gui" etc.
-$(MODULE): $(MODULE_LIB-$(MODULE))
-
-endif
-
-
-# Clean target, removes all object files. This looks a bit hackish, as we have to
-# copy the content of MODULE_OBJS to another unique variable (the next module.mk
-# will overwrite it after all). The same for the libMODULE.a library file.
-clean: clean-$(MODULE)
-clean-$(MODULE): clean-% :
- -$(RM) $(MODULE_OBJS-$*) $(MODULE_LIB-$*) $(PLUGIN-$*)
-
-.PHONY: clean-$(MODULE) $(MODULE)
Modified: scummvm/trunk/configure
===================================================================
--- scummvm/trunk/configure 2006-06-24 08:07:48 UTC (rev 23274)
+++ scummvm/trunk/configure 2006-06-24 08:48:11 UTC (rev 23275)
@@ -1393,8 +1393,8 @@
#endif /* CONFIG_H */
EOF
-echo "Creating config.mak"
-cat > config.mak << EOF
+echo "Creating config.mk"
+cat > config.mk << EOF
# -------- Generated by configure -----------
CXX := $CXX
Modified: scummvm/trunk/engines/agi/module.mk
===================================================================
--- scummvm/trunk/engines/agi/module.mk 2006-06-24 08:07:48 UTC (rev 23274)
+++ scummvm/trunk/engines/agi/module.mk 2006-06-24 08:48:11 UTC (rev 23275)
@@ -30,13 +30,10 @@
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
Modified: scummvm/trunk/engines/cine/module.mk
===================================================================
--- scummvm/trunk/engines/cine/module.mk 2006-06-24 08:07:48 UTC (rev 23274)
+++ scummvm/trunk/engines/cine/module.mk 2006-06-24 08:48:11 UTC (rev 23275)
@@ -23,13 +23,10 @@
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
Modified: scummvm/trunk/engines/gob/module.mk
===================================================================
--- scummvm/trunk/engines/gob/module.mk 2006-06-24 08:07:48 UTC (rev 23274)
+++ scummvm/trunk/engines/gob/module.mk 2006-06-24 08:48:11 UTC (rev 23275)
@@ -44,13 +44,10 @@
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
Modified: scummvm/trunk/engines/kyra/module.mk
===================================================================
--- scummvm/trunk/engines/kyra/module.mk 2006-06-24 08:07:48 UTC (rev 23274)
+++ scummvm/trunk/engines/kyra/module.mk 2006-06-24 08:48:11 UTC (rev 23275)
@@ -26,13 +26,10 @@
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
Modified: scummvm/trunk/engines/lure/module.mk
===================================================================
--- scummvm/trunk/engines/lure/module.mk 2006-06-24 08:07:48 UTC (rev 23274)
+++ scummvm/trunk/engines/lure/module.mk 2006-06-24 08:48:11 UTC (rev 23275)
@@ -23,14 +23,11 @@
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
Modified: scummvm/trunk/engines/queen/module.mk
===================================================================
--- scummvm/trunk/engines/queen/module.mk 2006-06-24 08:07:48 UTC (rev 23274)
+++ scummvm/trunk/engines/queen/module.mk 2006-06-24 08:48:11 UTC (rev 23275)
@@ -22,13 +22,10 @@
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
Modified: scummvm/trunk/engines/saga/module.mk
===================================================================
--- scummvm/trunk/engines/saga/module.mk 2006-06-24 08:07:48 UTC (rev 23274)
+++ scummvm/trunk/engines/saga/module.mk 2006-06-24 08:48:11 UTC (rev 23275)
@@ -32,13 +32,10 @@
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
Modified: scummvm/trunk/engines/scumm/module.mk
===================================================================
--- scummvm/trunk/engines/scumm/module.mk 2006-06-24 08:07:48 UTC (rev 23274)
+++ scummvm/trunk/engines/scumm/module.mk 2006-06-24 08:48:11 UTC (rev 23275)
@@ -99,14 +99,6 @@
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 @@
endif
# Include common rules
-include $(srcdir)/common.rules
+include $(srcdir)/rules.mk
Modified: scummvm/trunk/engines/simon/module.mk
===================================================================
--- scummvm/trunk/engines/simon/module.mk 2006-06-24 08:07:48 UTC (rev 23274)
+++ scummvm/trunk/engines/simon/module.mk 2006-06-24 08:48:11 UTC (rev 23275)
@@ -24,13 +24,10 @@
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
Modified: scummvm/trunk/engines/sky/module.mk
===================================================================
--- scummvm/trunk/engines/sky/module.mk 2006-06-24 08:07:48 UTC (rev 23274)
+++ scummvm/trunk/engines/sky/module.mk 2006-06-24 08:48:11 UTC (rev 23275)
@@ -23,15 +23,10 @@
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
Modified: scummvm/trunk/engines/sword1/module.mk
===================================================================
--- scummvm/trunk/engines/sword1/module.mk 2006-06-24 08:07:48 UTC (rev 23274)
+++ scummvm/trunk/engines/sword1/module.mk 2006-06-24 08:48:11 UTC (rev 23275)
@@ -20,13 +20,10 @@
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
Modified: scummvm/trunk/engines/sword2/module.mk
===================================================================
--- scummvm/trunk/engines/sword2/module.mk 2006-06-24 08:07:48 UTC (rev 23274)
+++ scummvm/trunk/engines/sword2/module.mk 2006-06-24 08:48:11 UTC (rev 23275)
@@ -33,13 +33,10 @@
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
Modified: scummvm/trunk/graphics/module.mk
===================================================================
--- scummvm/trunk/graphics/module.mk 2006-06-24 08:07:48 UTC (rev 23274)
+++ scummvm/trunk/graphics/module.mk 2006-06-24 08:48:11 UTC (rev 23275)
@@ -41,10 +41,5 @@
endif
-MODULE_DIRS += \
- graphics \
- graphics/fonts \
- graphics/scaler
-
# Include common rules
-include $(srcdir)/common.rules
+include $(srcdir)/rules.mk
Modified: scummvm/trunk/gui/module.mk
===================================================================
--- scummvm/trunk/gui/module.mk 2006-06-24 08:07:48 UTC (rev 23274)
+++ scummvm/trunk/gui/module.mk 2006-06-24 08:48:11 UTC (rev 23275)
@@ -23,8 +23,5 @@
ThemeNew.o \
theme-config.o
-MODULE_DIRS += \
- gui
-
# Include common rules
-include $(srcdir)/common.rules
+include $(srcdir)/rules.mk
Copied: scummvm/trunk/rules.mk (from rev 23272, scummvm/trunk/common.rules)
===================================================================
--- scummvm/trunk/rules.mk (rev 0)
+++ scummvm/trunk/rules.mk 2006-06-24 08:48:11 UTC (rev 23275)
@@ -0,0 +1,53 @@
+# Common build rules, used by the sub modules and their module.mk files
+
+# Copy the list of objects to a new variable. The name of the new variable
+# contains the module name, a trick we use so we can keep multiple different
+# module object lists, one for each module.
+MODULE_OBJS-$(MODULE) := $(addprefix $(MODULE)/, $(MODULE_OBJS))
+
+# Add all involved directories to the MODULE_DIRS list
+MODULE_DIRS += $(sort $(dir $(MODULE_OBJS-$(MODULE))))
+
+
+ifdef PLUGIN
+# Plugin build rule
+# TODO: Right now, for Mac OS X only. We either will have to generate this
+# via the configure script, or put in some 'if' statements to choose from
+# one of several build rules
+PLUGIN-$(MODULE) := plugins/$(PLUGIN_PREFIX)$(notdir $(MODULE))$(PLUGIN_SUFFIX)
+$(PLUGIN-$(MODULE)): $(MODULE_OBJS-$(MODULE)) $(PLUGIN_EXTRA_DEPS)
+ $(MKDIR) plugins
+ $(CXX) $(PLUGIN_LDFLAGS) $(filter-out $(PLUGIN_EXTRA_DEPS),$+) -o $@
+PLUGIN:=
+plugins: $(PLUGIN-$(MODULE))
+
+# Pseudo target for comfort, allows for "make common", "make gui" etc.
+$(MODULE): $(PLUGIN-$(MODULE))
+
+else
+
+MODULE_LIB-$(MODULE) := $(MODULE)/lib$(notdir $(MODULE)).a
+
+# If not building as a plugin, add the object files to the main OBJS list
+OBJS += $(MODULE_LIB-$(MODULE))
+
+# Convenience library target
+$(MODULE_LIB-$(MODULE)): $(MODULE_OBJS-$(MODULE))
+ -$(RM) $@
+ $(AR) $@ $+
+ $(RANLIB) $@
+
+# Pseudo target for comfort, allows for "make common", "make gui" etc.
+$(MODULE): $(MODULE_LIB-$(MODULE))
+
+endif
+
+
+# Clean target, removes all object files. This looks a bit hackish, as we have to
+# copy the content of MODULE_OBJS to another unique variable (the next module.mk
+# will overwrite it after all). The same for the libMODULE.a library file.
+clean: clean-$(MODULE)
+clean-$(MODULE): clean-% :
+ -$(RM) $(MODULE_OBJS-$*) $(MODULE_LIB-$*) $(PLUGIN-$*)
+
+.PHONY: clean-$(MODULE) $(MODULE)
Modified: scummvm/trunk/sound/module.mk
===================================================================
--- scummvm/trunk/sound/module.mk 2006-06-24 08:07:48 UTC (rev 23274)
+++ scummvm/trunk/sound/module.mk 2006-06-24 08:48:11 UTC (rev 23275)
@@ -23,9 +23,5 @@
softsynth/fluidsynth.o \
softsynth/mt32.o \
-MODULE_DIRS += \
- sound \
- sound/softsynth
-
# Include common rules
-include $(srcdir)/common.rules
+include $(srcdir)/rules.mk
Modified: scummvm/trunk/sound/softsynth/mt32/module.mk
===================================================================
--- scummvm/trunk/sound/softsynth/mt32/module.mk 2006-06-24 08:07:48 UTC (rev 23274)
+++ scummvm/trunk/sound/softsynth/mt32/module.mk 2006-06-24 08:48:11 UTC (rev 23275)
@@ -10,8 +10,5 @@
tables.o \
freeverb.o
-MODULE_DIRS += \
- sound/softsynth/mt32
-
# Include common rules
-include $(srcdir)/common.rules
+include $(srcdir)/rules.mk
Modified: scummvm/trunk/tools/module.mk
===================================================================
--- scummvm/trunk/tools/module.mk 2006-06-24 08:07:48 UTC (rev 23274)
+++ scummvm/trunk/tools/module.mk 2006-06-24 08:48:11 UTC (rev 23275)
@@ -1,7 +1,7 @@
MODULE := tools
MODULE_DIRS += \
- tools
+ tools/
#######################################################################
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list