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