Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 022af62d authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Michal Marek
Browse files

kbuild: refactor script/kconfig/Makefile



Now it is harmless to add all host programs to hostprogs-y.

Signed-off-by: default avatarMasahiro Yamada <yamada.m@jp.panasonic.com>
Signed-off-by: default avatarMichal Marek <mmarek@suse.cz>
parent 97e3226e
Loading
Loading
Loading
Loading
+3 −31
Original line number Original line Diff line number Diff line
@@ -157,35 +157,7 @@ qconf-cxxobjs := qconf.o
qconf-objs	:= zconf.tab.o
qconf-objs	:= zconf.tab.o
gconf-objs	:= gconf.o zconf.tab.o
gconf-objs	:= gconf.o zconf.tab.o


hostprogs-y := conf
hostprogs-y := conf nconf mconf kxgettext qconf gconf

ifeq ($(MAKECMDGOALS),nconfig)
	hostprogs-y += nconf
endif

ifeq ($(MAKECMDGOALS),menuconfig)
	hostprogs-y += mconf
endif

ifeq ($(MAKECMDGOALS),update-po-config)
	hostprogs-y += kxgettext
endif

ifeq ($(MAKECMDGOALS),xconfig)
	qconf-target := 1
endif
ifeq ($(MAKECMDGOALS),gconfig)
	gconf-target := 1
endif


ifeq ($(qconf-target),1)
	hostprogs-y += qconf
endif

ifeq ($(gconf-target),1)
	hostprogs-y += gconf
endif


clean-files	:= qconf.moc .tmp_qtcheck .tmp_gtkcheck
clean-files	:= qconf.moc .tmp_qtcheck .tmp_gtkcheck
clean-files	+= zconf.tab.c zconf.lex.c zconf.hash.c gconf.glade.h
clean-files	+= zconf.tab.c zconf.lex.c zconf.hash.c gconf.glade.h
@@ -224,7 +196,7 @@ HOSTLOADLIBES_nconf = $(shell \
				|| echo "-lmenu -lpanel -lncurses"  )
				|| echo "-lmenu -lpanel -lncurses"  )
$(obj)/qconf.o: $(obj)/.tmp_qtcheck
$(obj)/qconf.o: $(obj)/.tmp_qtcheck


ifeq ($(qconf-target),1)
ifeq ($(MAKECMDGOALS),xconfig)
$(obj)/.tmp_qtcheck: $(src)/Makefile
$(obj)/.tmp_qtcheck: $(src)/Makefile
-include $(obj)/.tmp_qtcheck
-include $(obj)/.tmp_qtcheck


@@ -281,7 +253,7 @@ endif


$(obj)/gconf.o: $(obj)/.tmp_gtkcheck
$(obj)/gconf.o: $(obj)/.tmp_gtkcheck


ifeq ($(gconf-target),1)
ifeq ($(MAKECMDGOALS),gconfig)
-include $(obj)/.tmp_gtkcheck
-include $(obj)/.tmp_gtkcheck


# GTK needs some extra effort, too...
# GTK needs some extra effort, too...