1Index: kconfig/Makefile 2=================================================================== 3--- kconfig.orig/Makefile 4+++ kconfig/Makefile 5@@ -205,7 +205,35 @@ qconf-cxxobjs := qconf.o 6 qconf-objs := zconf.tab.o 7 gconf-objs := gconf.o zconf.tab.o 8 9-hostprogs-y := conf nconf mconf kxgettext qconf gconf 10+hostprogs-y := conf 11+ 12+ifeq ($(MAKECMDGOALS),nconf) 13+ hostprogs-y += nconf 14+endif 15+ 16+ifeq ($(MAKECMDGOALS),mconf) 17+ hostprogs-y += mconf 18+endif 19+ 20+ifeq ($(MAKECMDGOALS),update-po-config) 21+ hostprogs-y += kxgettext 22+endif 23+ 24+ifeq ($(MAKECMDGOALS),qconf) 25+ qconf-target := 1 26+endif 27+ 28+ifeq ($(MAKECMDGOALS),gconf) 29+ gconf-target := 1 30+endif 31+ 32+ifeq ($(qconf-target),1) 33+ hostprogs-y += qconf 34+endif 35+ 36+ifeq ($(gconf-target),1) 37+ hostprogs-y += gconf 38+endif 39 40 targets += zconf.lex.c 41 clean-files := qconf.moc .tmp_qtcheck .tmp_gtkcheck 42@@ -243,7 +271,7 @@ HOSTLOADLIBES_nconf = $(shell \ 43 || echo "-lmenu -lpanel -lncurses" ) 44 $(obj)/qconf.o: $(obj)/.tmp_qtcheck 45 46-ifeq ($(MAKECMDGOALS),xconfig) 47+ifeq ($(MAKECMDGOALS),qconf) 48 $(obj)/.tmp_qtcheck: $(src)/Makefile 49 -include $(obj)/.tmp_qtcheck 50 51@@ -270,9 +298,8 @@ $(obj)/.tmp_qtcheck: 52 echo "KC_QT_MOC=$$moc" >> $@ 53 endif 54 55+ifeq ($(MAKECMDGOALS),gconf) 56 $(obj)/gconf.o: $(obj)/.tmp_gtkcheck 57- 58-ifeq ($(MAKECMDGOALS),gconfig) 59 -include $(obj)/.tmp_gtkcheck 60 61 # GTK+ needs some extra effort, too... 62@@ -300,11 +327,8 @@ $(obj)/zconf.tab.o: $(obj)/zconf.lex.c 63 64 $(obj)/qconf.o: $(obj)/qconf.moc 65 66-quiet_cmd_moc = MOC $@ 67- cmd_moc = $(KC_QT_MOC) -i $< -o $@ 68- 69 $(obj)/%.moc: $(src)/%.h $(obj)/.tmp_qtcheck 70- $(call cmd,moc) 71+ $(KC_QT_MOC) -i $< -o $@ 72 73 # Extract gconf menu items for i18n support 74 $(obj)/gconf.glade.h: $(obj)/gconf.glade 75