diff options
| author | Max Horn | 2010-07-29 13:03:21 +0000 |
|---|---|---|
| committer | Max Horn | 2010-07-29 13:03:21 +0000 |
| commit | d22ebd358dec75762c97f30d8a2fa8630e4268c2 (patch) | |
| tree | 32b2dadd28e717f938695efe8392a8cef2c6ce74 /backends/platform/ds | |
| parent | 2692e55208d8945b24d9a6c451a61856ed601a94 (diff) | |
| download | scummvm-rg350-d22ebd358dec75762c97f30d8a2fa8630e4268c2.tar.gz scummvm-rg350-d22ebd358dec75762c97f30d8a2fa8630e4268c2.tar.bz2 scummvm-rg350-d22ebd358dec75762c97f30d8a2fa8630e4268c2.zip | |
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).
svn-id: r51467
Diffstat (limited to 'backends/platform/ds')
| -rw-r--r-- | backends/platform/ds/module.mk | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/backends/platform/ds/module.mk b/backends/platform/ds/module.mk index 5f186f2528..7298267db4 100644 --- a/backends/platform/ds/module.mk +++ b/backends/platform/ds/module.mk @@ -98,11 +98,10 @@ $(MODULE)/arm9/source/touchkeyboard.o: \ 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))) |