diff options
author | Dave Jones <davej@redhat.com> | 2011-08-09 19:32:10 -0400 |
---|---|---|
committer | Dave Jones <davej@redhat.com> | 2011-08-09 19:32:10 -0400 |
commit | 8ce7027f6178d22e8a5c81aa690e790c0a9c2846 (patch) | |
tree | 093d04f79954c132268340fd2065ea8dea522ac5 /Makefile.config | |
parent | 7a3b2689bf509717753eb3f7456b0b5419ff5b56 (diff) | |
download | kernel-8ce7027f6178d22e8a5c81aa690e790c0a9c2846.tar.gz kernel-8ce7027f6178d22e8a5c81aa690e790c0a9c2846.tar.xz kernel-8ce7027f6178d22e8a5c81aa690e790c0a9c2846.zip |
Split out the 32bit only options from x86-32
Remove unnecessary duplicates, consolidate.
This should reduce having to set the same option twice on 32/64.
Diffstat (limited to 'Makefile.config')
-rw-r--r-- | Makefile.config | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/Makefile.config b/Makefile.config index 53812fa9b..086685496 100644 --- a/Makefile.config +++ b/Makefile.config @@ -32,16 +32,22 @@ temp-generic: config-generic temp-debug-generic: config-generic cat config-generic config-debug > temp-debug-generic -temp-x86-generic: config-x86-generic temp-generic +temp-x86-32: config-x86-32-generic config-x86-generic perl merge.pl $^ > $@ -temp-x86-debug-generic: config-x86-generic temp-debug-generic +temp-x86-32-generic: temp-x86-32 temp-generic perl merge.pl $^ > $@ -temp-x86_64-generic: config-x86_64-generic temp-generic +temp-x86-debug-generic: temp-x86-32 temp-debug-generic perl merge.pl $^ > $@ -temp-x86_64-debug-generic: config-x86_64-generic temp-debug-generic +temp-x86-64: config-x86_64-generic config-x86-generic + perl merge.pl $^ > $@ + +temp-x86_64-generic: temp-x86-64 temp-generic + perl merge.pl $^ > $@ + +temp-x86_64-debug-generic: temp-x86-64 temp-debug-generic perl merge.pl $^ > $@ temp-sparc64-generic: config-sparc64-generic temp-generic @@ -62,13 +68,13 @@ temp-s390-generic: config-s390x temp-generic temp-ia64-generic: config-ia64-generic temp-generic perl merge.pl $^ > $@ -kernel-$(VERSION)-i686-PAE.config: config-i686-PAE temp-x86-generic +kernel-$(VERSION)-i686-PAE.config: config-i686-PAE temp-x86-32-generic perl merge.pl $^ i386 > $@ kernel-$(VERSION)-i686-PAEdebug.config: config-i686-PAE temp-x86-debug-generic perl merge.pl $^ i386 > $@ -kernel-$(VERSION)-i686.config: /dev/null temp-x86-generic +kernel-$(VERSION)-i686.config: /dev/null temp-x86-32-generic perl merge.pl $^ i386 > $@ kernel-$(VERSION)-i686-debug.config: /dev/null temp-x86-debug-generic |