From a3a6c44e6d763ab8b2f49f8f97013f8d5e5e2424 Mon Sep 17 00:00:00 2001 From: P. J. McDermott Date: Mon, 24 Nov 2014 11:52:06 -0500 Subject: Makefile: Simplify hostprogs-y assignment `make kconfig/mconf` works now as well. --- diff --git a/Makefile b/Makefile index fe82a2b..aa8f013 100644 --- a/Makefile +++ b/Makefile @@ -11,21 +11,10 @@ include $(src)/Makefile $(obj)/.depend: $(wildcard *.h *.c) $(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) -MM *.c > $@ 2>/dev/null || : -ifeq ($(MAKECMDGOALS),xconfig) -hostprogs-y := qconf -endif -ifeq ($(MAKECMDGOALS),gconfig) -hostprogs-y := gconf -endif -ifeq ($(MAKECMDGOALS),menuconfig) -hostprogs-y := mconf -endif -ifeq ($(MAKECMDGOALS),config) -hostprogs-y := conf -endif -ifeq ($(MAKECMDGOALS),nconfig) -hostprogs-y := nconf -endif +hostprogs-y := $(shell printf '%s' '$(MAKECMDGOALS)' | sed \ + -e 's|$(obj)/||;' \ + -e 's/xconfig/qconf/; s/gconfig/gconf/;' \ + -e 's/menuconfig/mconf/; s/config/conf/; s/nconfig/nconf/;') __hostprogs := $(sort $(hostprogs-y) $(hostprogs-m)) -- cgit v0.9.1