diff options
| author | Sam Ravnborg <sam@ravnborg.org> | 2003-08-18 21:08:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.osdl.org> | 2003-08-18 21:08:36 -0700 |
| commit | 3503ee60e85c62df562ead03ef2b705d20e9e6a1 (patch) | |
| tree | 27f315cefcbd4dfc5ccc7aa0ee6162b643f1ea5b /scripts | |
| parent | 6108d0da52031edb1ad5eb4e0cf30c638ba28664 (diff) | |
| download | history-3503ee60e85c62df562ead03ef2b705d20e9e6a1.tar.gz | |
[PATCH] fix make xconfig
When the *config targets were moved to scripts/kconfig/Makefile
the graphical configurator support broke.
The following patch is a minimal fix, required to restore support
of 'make xconfig' and 'make gconfig'.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/kconfig/Makefile | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index 613838e57933e..ba0978d5cf0d6 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -65,12 +65,20 @@ host-progs := conf mconf qconf gconf conf-objs := conf.o libkconfig.so mconf-objs := mconf.o libkconfig.so -ifeq ($(MAKECMDGOALS),$(obj)/qconf) +ifeq ($(MAKECMDGOALS),xconfig) + qconf-target := 1 +endif +ifeq ($(MAKECMDGOALS),gconfig) + gconf-target := 1 +endif + + +ifeq ($(qconf-target),1) qconf-cxxobjs := qconf.o qconf-objs := kconfig_load.o endif -ifeq ($(MAKECMDGOALS),$(obj)/gconf) +ifeq ($(gconf-target),1) gconf-objs := gconf.o kconfig_load.o endif @@ -91,7 +99,7 @@ $(obj)/conf.o $(obj)/mconf.o $(obj)/qconf.o $(obj)/gconf.o: $(obj)/zconf.tab.h $(obj)/qconf.o: $(obj)/.tmp_qtcheck -ifeq ($(MAKECMDGOALS),$(obj)/qconf) +ifeq ($(qconf-target),1) MOC = $(QTDIR)/bin/moc -include $(obj)/.tmp_qtcheck @@ -121,7 +129,7 @@ endif $(obj)/gconf.o: $(obj)/.tmp_gtkcheck -ifeq ($(MAKECMDGOALS),$(obj)/gconf) +ifeq ($(gconf-target),1) -include $(obj)/.tmp_gtkcheck # GTK needs some extra effort, too... |