aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2007-10-11 05:11:38 -0400
committerThomas Gleixner <tglx@linutronix.de>2007-10-11 05:11:38 -0400
commit2eb4c95094d927f2eb094f720222cc5a9cc22fd3 (patch)
tree0168c900dc23f44ed184f6cc749b882944d890a5 /Makefile
parent6752ed90da032af72f2f1fa23d1abf0889b56db0 (diff)
Kbuild: prepare scope and tags for arch/x86
Preparatory patch for the source merge of arch/i386 and arch/x86_64 into arch/x86. Make scope and tags aware of SRCARCH Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile11
1 files changed, 8 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 61e178ff0c1b..f2067e337d4d 100644
--- a/Makefile
+++ b/Makefile
@@ -1293,18 +1293,23 @@ ifeq ($(ALLSOURCE_ARCHS),)
1293ifeq ($(ARCH),um) 1293ifeq ($(ARCH),um)
1294ALLINCLUDE_ARCHS := $(ARCH) $(SUBARCH) 1294ALLINCLUDE_ARCHS := $(ARCH) $(SUBARCH)
1295else 1295else
1296ALLINCLUDE_ARCHS := $(ARCH) 1296ALLINCLUDE_ARCHS := $(SRCARCH)
1297endif 1297endif
1298else 1298else
1299#Allow user to specify only ALLSOURCE_PATHS on the command line, keeping existing behavour. 1299#Allow user to specify only ALLSOURCE_PATHS on the command line, keeping existing behavour.
1300ALLINCLUDE_ARCHS := $(ALLSOURCE_ARCHS) 1300ALLINCLUDE_ARCHS := $(ALLSOURCE_ARCHS)
1301endif 1301endif
1302 1302
1303# Take care of arch/x86
1304ifeq ($(ARCH), $(SRCARCH))
1303ALLSOURCE_ARCHS := $(ARCH) 1305ALLSOURCE_ARCHS := $(ARCH)
1306else
1307ALLSOURCE_ARCHS := $(ARCH) $(SRCARCH)
1308endif
1304 1309
1305define find-sources 1310define find-sources
1306 ( for ARCH in $(ALLSOURCE_ARCHS) ; do \ 1311 ( for ARCH in $(ALLSOURCE_ARCHS) ; do \
1307 find $(__srctree)arch/$${ARCH} $(RCS_FIND_IGNORE) \ 1312 find $(__srctree)arch/$${SRCARCH} $(RCS_FIND_IGNORE) \
1308 -name $1 -print; \ 1313 -name $1 -print; \
1309 done ; \ 1314 done ; \
1310 find $(__srctree)security/selinux/include $(RCS_FIND_IGNORE) \ 1315 find $(__srctree)security/selinux/include $(RCS_FIND_IGNORE) \
@@ -1313,7 +1318,7 @@ define find-sources
1313 \( -name config -o -name 'asm-*' \) -prune \ 1318 \( -name config -o -name 'asm-*' \) -prune \
1314 -o -name $1 -print; \ 1319 -o -name $1 -print; \
1315 for ARCH in $(ALLINCLUDE_ARCHS) ; do \ 1320 for ARCH in $(ALLINCLUDE_ARCHS) ; do \
1316 find $(__srctree)include/asm-$${ARCH} $(RCS_FIND_IGNORE) \ 1321 find $(__srctree)include/asm-$${SRCARCH} $(RCS_FIND_IGNORE) \
1317 -name $1 -print; \ 1322 -name $1 -print; \
1318 done ; \ 1323 done ; \
1319 find $(__srctree)include/asm-generic $(RCS_FIND_IGNORE) \ 1324 find $(__srctree)include/asm-generic $(RCS_FIND_IGNORE) \