Commit 9fd4c892 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] ikconfig - Makefile update

From: "Randy.Dunlap" <rddunlap@osdl.org>

Please merge this makefile update from Sam.
From: Sam Ravnborg <sam@ravnborg.org>

Remark, I removed dependencies for configs.o - the are generated by kbuild
anyway. Only generated files needs explicit dependencies.
parent d625bd72
...@@ -20,9 +20,6 @@ obj-$(CONFIG_BSD_PROCESS_ACCT) += acct.o ...@@ -20,9 +20,6 @@ obj-$(CONFIG_BSD_PROCESS_ACCT) += acct.o
obj-$(CONFIG_COMPAT) += compat.o obj-$(CONFIG_COMPAT) += compat.o
obj-$(CONFIG_IKCONFIG) += configs.o obj-$(CONFIG_IKCONFIG) += configs.o
# files to be removed upon make clean
clean-files := ikconfig.h
ifneq ($(CONFIG_IA64),y) ifneq ($(CONFIG_IA64),y)
# According to Alan Modra <alan@linuxcare.com.au>, the -fno-omit-frame-pointer is # According to Alan Modra <alan@linuxcare.com.au>, the -fno-omit-frame-pointer is
# needed for x86 only. Why this used to be enabled for all architectures is beyond # needed for x86 only. Why this used to be enabled for all architectures is beyond
...@@ -32,8 +29,12 @@ ifneq ($(CONFIG_IA64),y) ...@@ -32,8 +29,12 @@ ifneq ($(CONFIG_IA64),y)
CFLAGS_sched.o := $(PROFILING) -fno-omit-frame-pointer CFLAGS_sched.o := $(PROFILING) -fno-omit-frame-pointer
endif endif
$(obj)/ikconfig.h: scripts/mkconfigs .config Makefile quiet_cmd_ikconfig = IKCFG $@
$(CONFIG_SHELL) scripts/mkconfigs .config Makefile > $(obj)/ikconfig.h cmd_ikconfig = $(CONFIG_SHELL) $< .config $(srctree)/Makefile > $@
targets += ikconfig.h
$(obj)/ikconfig.h: scripts/mkconfigs .config Makefile FORCE
$(call if_changed,ikconfig)
$(obj)/configs.o: $(obj)/ikconfig.h $(obj)/configs.c \ $(obj)/configs.o: $(obj)/ikconfig.h
include/linux/version.h include/linux/compile.h
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment