[Scummvm-cvs-logs] SF.net SVN: scummvm:[51467] scummvm/trunk/backends/platform

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Thu Jul 29 15:03:21 CEST 2010 

Revision: 51467
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51467&view=rev
Author:   fingolfin
Date:     2010-07-29 13:03:21 +0000 (Thu, 29 Jul 2010)

Log Message:
-----------
BUILD: Unify how MODULE_DIRS is computed for backends

This should help avoid situations where MODULE_DIRS is not set to a
complete list of build dirs (which causes troubles with the automatic
header dependency detection logic).

On the long run, we should replace the relevant code by a macro or also
use rules.mk for this (with yet another if/else case add to it).

Modified Paths:
--------------
    scummvm/trunk/backends/platform/android/module.mk
    scummvm/trunk/backends/platform/dc/module.mk
    scummvm/trunk/backends/platform/ds/module.mk
    scummvm/trunk/backends/platform/gp2x/module.mk
    scummvm/trunk/backends/platform/gp2xwiz/module.mk
    scummvm/trunk/backends/platform/iphone/module.mk
    scummvm/trunk/backends/platform/linuxmoto/module.mk
    scummvm/trunk/backends/platform/n64/module.mk
    scummvm/trunk/backends/platform/null/module.mk
    scummvm/trunk/backends/platform/ps2/module.mk
    scummvm/trunk/backends/platform/psp/module.mk
    scummvm/trunk/backends/platform/samsungtv/module.mk
    scummvm/trunk/backends/platform/sdl/module.mk
    scummvm/trunk/backends/platform/wii/module.mk
    scummvm/trunk/backends/platform/wince/module.mk

Modified: scummvm/trunk/backends/platform/android/module.mk
===================================================================
--- scummvm/trunk/backends/platform/android/module.mk	2010-07-29 13:02:30 UTC (rev 51466)
+++ scummvm/trunk/backends/platform/android/module.mk	2010-07-29 13:03:21 UTC (rev 51467)
@@ -3,12 +3,11 @@
 MODULE_OBJS := \
 	android.o asset-archive.o video.o
 
-MODULE_DIRS += \
-	backends/platform/android/
+# We don't use rules.mk but rather manually update OBJS and MODULE_DIRS.
+MODULE_OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS))
+OBJS := $(MODULE_OBJS) $(OBJS)
+MODULE_DIRS += $(sort $(dir $(MODULE_OBJS)))
 
-# We don't use the rules.mk here on purpose
-OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS)) $(OBJS)
-
 JAVA_SRC = \
 	$(MODULE)/org/inodes/gus/scummvm/ScummVM.java \
 	$(MODULE)/org/inodes/gus/scummvm/ScummVMApplication.java \

Modified: scummvm/trunk/backends/platform/dc/module.mk
===================================================================
--- scummvm/trunk/backends/platform/dc/module.mk	2010-07-29 13:02:30 UTC (rev 51466)
+++ scummvm/trunk/backends/platform/dc/module.mk	2010-07-29 13:03:21 UTC (rev 51467)
@@ -3,8 +3,7 @@
 MODULE_OBJS :=	dcmain.o time.o display.o audio.o input.o selector.o icon.o \
 	label.o vmsave.o softkbd.o dcloader.o cache.o dc-fs.o
 
-MODULE_DIRS += \
-        backends/platform/dc/
-
-# We don't use the rules.mk here on purpose
-OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS)) $(OBJS)
+# We don't use rules.mk but rather manually update OBJS and MODULE_DIRS.
+MODULE_OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS))
+OBJS := $(MODULE_OBJS) $(OBJS)
+MODULE_DIRS += $(sort $(dir $(MODULE_OBJS)))

Modified: scummvm/trunk/backends/platform/ds/module.mk
===================================================================
--- scummvm/trunk/backends/platform/ds/module.mk	2010-07-29 13:02:30 UTC (rev 51466)
+++ scummvm/trunk/backends/platform/ds/module.mk	2010-07-29 13:03:21 UTC (rev 51467)
@@ -98,11 +98,10 @@
 
 
 MODULE_DIRS += \
-	backends/platform/ds/ \
 	backends/platform/ds/arm7/source/ \
 	backends/platform/ds/arm7/source/libcartreset/ \
-	backends/platform/ds/arm9/source/ \
-	backends/platform/ds/arm9/source/fat/
 
-# We don't use the rules.mk here on purpose
-OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS)) $(OBJS)
+# We don't use rules.mk but rather manually update OBJS and MODULE_DIRS.
+MODULE_OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS))
+OBJS := $(MODULE_OBJS) $(OBJS)
+MODULE_DIRS += $(sort $(dir $(MODULE_OBJS)))

Modified: scummvm/trunk/backends/platform/gp2x/module.mk
===================================================================
--- scummvm/trunk/backends/platform/gp2x/module.mk	2010-07-29 13:02:30 UTC (rev 51466)
+++ scummvm/trunk/backends/platform/gp2x/module.mk	2010-07-29 13:03:21 UTC (rev 51467)
@@ -7,8 +7,7 @@
 	graphics.o \
 	gp2x.o \
 
-MODULE_DIRS += \
-	backends/platform/gp2x/
-
-# We don't use the rules.mk here on purpose
-OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS)) $(OBJS)
+# We don't use rules.mk but rather manually update OBJS and MODULE_DIRS.
+MODULE_OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS))
+OBJS := $(MODULE_OBJS) $(OBJS)
+MODULE_DIRS += $(sort $(dir $(MODULE_OBJS)))

Modified: scummvm/trunk/backends/platform/gp2xwiz/module.mk
===================================================================
--- scummvm/trunk/backends/platform/gp2xwiz/module.mk	2010-07-29 13:02:30 UTC (rev 51466)
+++ scummvm/trunk/backends/platform/gp2xwiz/module.mk	2010-07-29 13:03:21 UTC (rev 51467)
@@ -6,11 +6,10 @@
 	gp2xwiz-hw.o \
 	gp2xwiz-main.o
 
-MODULE_DIRS += \
-	backends/platform/gp2xwiz/ 
+# We don't use rules.mk but rather manually update OBJS and MODULE_DIRS.
+MODULE_OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS))
+OBJS := $(MODULE_OBJS) $(OBJS)
+MODULE_DIRS += $(sort $(dir $(MODULE_OBJS)))
 
-# We don't use the rules.mk here on purpose
-OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS)) $(OBJS)
-
 # Hack to ensure the SDL backend is built so we can use OSystem_SDL.
 -include $(srcdir)/backends/platform/sdl/module.mk
\ No newline at end of file

Modified: scummvm/trunk/backends/platform/iphone/module.mk
===================================================================
--- scummvm/trunk/backends/platform/iphone/module.mk	2010-07-29 13:02:30 UTC (rev 51466)
+++ scummvm/trunk/backends/platform/iphone/module.mk	2010-07-29 13:03:21 UTC (rev 51467)
@@ -10,8 +10,7 @@
 	iphone_keyboard.o \
 	blit_arm.o
 
-MODULE_DIRS += \
-	backends/platform/iphone/
-
-# We don't use the rules.mk here on purpose
-OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS)) $(OBJS)
+# We don't use rules.mk but rather manually update OBJS and MODULE_DIRS.
+MODULE_OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS))
+OBJS := $(MODULE_OBJS) $(OBJS)
+MODULE_DIRS += $(sort $(dir $(MODULE_OBJS)))

Modified: scummvm/trunk/backends/platform/linuxmoto/module.mk
===================================================================
--- scummvm/trunk/backends/platform/linuxmoto/module.mk	2010-07-29 13:02:30 UTC (rev 51466)
+++ scummvm/trunk/backends/platform/linuxmoto/module.mk	2010-07-29 13:03:21 UTC (rev 51467)
@@ -7,11 +7,10 @@
 	linuxmoto-sdl.o \
 	hardwarekeys.o
 
-MODULE_DIRS += \
-	backends/platform/linuxmoto/
+# We don't use rules.mk but rather manually update OBJS and MODULE_DIRS.
+MODULE_OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS))
+OBJS := $(MODULE_OBJS) $(OBJS)
+MODULE_DIRS += $(sort $(dir $(MODULE_OBJS)))
 
-# We don't use the rules.mk here on purpose
-OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS)) $(OBJS)
-
 # HACK: The linuxmoto backend is based on the SDL one, so we load that, too.
 include $(srcdir)/backends/platform/sdl/module.mk

Modified: scummvm/trunk/backends/platform/n64/module.mk
===================================================================
--- scummvm/trunk/backends/platform/n64/module.mk	2010-07-29 13:02:30 UTC (rev 51466)
+++ scummvm/trunk/backends/platform/n64/module.mk	2010-07-29 13:03:21 UTC (rev 51467)
@@ -3,8 +3,7 @@
 MODULE_OBJS := \
 	nintendo64.o
 
-MODULE_DIRS += \
-	backends/platform/n64/
-
-# We don't use the rules.mk here on purpose
-OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS)) $(OBJS)
+# We don't use rules.mk but rather manually update OBJS and MODULE_DIRS.
+MODULE_OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS))
+OBJS := $(MODULE_OBJS) $(OBJS)
+MODULE_DIRS += $(sort $(dir $(MODULE_OBJS)))

Modified: scummvm/trunk/backends/platform/null/module.mk
===================================================================
--- scummvm/trunk/backends/platform/null/module.mk	2010-07-29 13:02:30 UTC (rev 51466)
+++ scummvm/trunk/backends/platform/null/module.mk	2010-07-29 13:03:21 UTC (rev 51467)
@@ -3,8 +3,7 @@
 MODULE_OBJS := \
 	null.o
 
-MODULE_DIRS += \
-	backends/platform/null/
-
-# We don't use the rules.mk here on purpose
-OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS)) $(OBJS)
+# We don't use rules.mk but rather manually update OBJS and MODULE_DIRS.
+MODULE_OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS))
+OBJS := $(MODULE_OBJS) $(OBJS)
+MODULE_DIRS += $(sort $(dir $(MODULE_OBJS)))

Modified: scummvm/trunk/backends/platform/ps2/module.mk
===================================================================
--- scummvm/trunk/backends/platform/ps2/module.mk	2010-07-29 13:02:30 UTC (rev 51466)
+++ scummvm/trunk/backends/platform/ps2/module.mk	2010-07-29 13:03:21 UTC (rev 51467)
@@ -18,8 +18,7 @@
     ps2time.o \
 	ps2debug.o
 
-MODULE_DIRS += \
-	backends/platform/ps2/
-
-# We don't use the rules.mk here on purpose
-OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS)) $(OBJS)
+# We don't use rules.mk but rather manually update OBJS and MODULE_DIRS.
+MODULE_OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS))
+OBJS := $(MODULE_OBJS) $(OBJS)
+MODULE_DIRS += $(sort $(dir $(MODULE_OBJS)))

Modified: scummvm/trunk/backends/platform/psp/module.mk
===================================================================
--- scummvm/trunk/backends/platform/psp/module.mk	2010-07-29 13:02:30 UTC (rev 51466)
+++ scummvm/trunk/backends/platform/psp/module.mk	2010-07-29 13:03:21 UTC (rev 51467)
@@ -19,8 +19,7 @@
 	mp3.o \
 	tests.o
 
-MODULE_DIRS += \
-	backends/platform/psp/
-
-# We don't use the rules.mk here on purpose
-OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS)) $(OBJS)
+# We don't use rules.mk but rather manually update OBJS and MODULE_DIRS.
+MODULE_OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS))
+OBJS := $(MODULE_OBJS) $(OBJS)
+MODULE_DIRS += $(sort $(dir $(MODULE_OBJS)))

Modified: scummvm/trunk/backends/platform/samsungtv/module.mk
===================================================================
--- scummvm/trunk/backends/platform/samsungtv/module.mk	2010-07-29 13:02:30 UTC (rev 51466)
+++ scummvm/trunk/backends/platform/samsungtv/module.mk	2010-07-29 13:03:21 UTC (rev 51467)
@@ -5,8 +5,7 @@
 	main.o \
 	samsungtv.o
 
-MODULE_DIRS += \
-	backends/platform/samsungtv/
-
-# We don't use the rules.mk here on purpose
-OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS)) $(OBJS)
+# We don't use rules.mk but rather manually update OBJS and MODULE_DIRS.
+MODULE_OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS))
+OBJS := $(MODULE_OBJS) $(OBJS)
+MODULE_DIRS += $(sort $(dir $(MODULE_OBJS)))

Modified: scummvm/trunk/backends/platform/sdl/module.mk
===================================================================
--- scummvm/trunk/backends/platform/sdl/module.mk	2010-07-29 13:02:30 UTC (rev 51466)
+++ scummvm/trunk/backends/platform/sdl/module.mk	2010-07-29 13:03:21 UTC (rev 51467)
@@ -7,8 +7,7 @@
 	main.o \
 	sdl.o
 
-MODULE_DIRS += \
-	backends/platform/sdl/
-
-# We don't use the rules.mk here on purpose
-OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS)) $(OBJS)
+# We don't use rules.mk but rather manually update OBJS and MODULE_DIRS.
+MODULE_OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS))
+OBJS := $(MODULE_OBJS) $(OBJS)
+MODULE_DIRS += $(sort $(dir $(MODULE_OBJS)))

Modified: scummvm/trunk/backends/platform/wii/module.mk
===================================================================
--- scummvm/trunk/backends/platform/wii/module.mk	2010-07-29 13:02:30 UTC (rev 51466)
+++ scummvm/trunk/backends/platform/wii/module.mk	2010-07-29 13:03:21 UTC (rev 51467)
@@ -8,8 +8,7 @@
 	osystem_sfx.o \
 	osystem_events.o
 
-MODULE_DIRS += \
-	backends/platform/wii/
-
-# We don't use the rules.mk here on purpose
-OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS)) $(OBJS)
+# We don't use rules.mk but rather manually update OBJS and MODULE_DIRS.
+MODULE_OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS))
+OBJS := $(MODULE_OBJS) $(OBJS)
+MODULE_DIRS += $(sort $(dir $(MODULE_OBJS)))

Modified: scummvm/trunk/backends/platform/wince/module.mk
===================================================================
--- scummvm/trunk/backends/platform/wince/module.mk	2010-07-29 13:02:30 UTC (rev 51466)
+++ scummvm/trunk/backends/platform/wince/module.mk	2010-07-29 13:03:21 UTC (rev 51467)
@@ -28,10 +28,7 @@
 	PocketSCUMM.o \
 	smartLandScale.o
 
-MODULE_DIRS += \
-	backends/platform/wince/ \
-	backends/platform/wince/CEgui/ \
-	backends/platform/wince/CEkeys/
-
-# We don't use the rules.mk here on purpose
-OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS)) $(OBJS)
+# We don't use rules.mk but rather manually update OBJS and MODULE_DIRS.
+MODULE_OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS))
+OBJS := $(MODULE_OBJS) $(OBJS)
+MODULE_DIRS += $(sort $(dir $(MODULE_OBJS)))


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