build: scripts/config - update to kconfig-v5.14

[openwrt/staging/hauke.git] / scripts / config / Makefile

diff --git a/scripts/config/Makefile b/scripts/config/Makefile
index 89e761a45e474f8ecdc05a8ee2dcd5e41207a084..5976a91b9abf8dd529c4c7811cbe12297013f94c 100644 (file)
--- a/scripts/config/Makefile
+++ b/scripts/config/Makefile
@@ -5,11 +5,11 @@
 .PHONY: clean all
 all: conf mconf
 clean:
-       rm -f *.o lxdialog/*.o *.moc $(clean-files) conf mconf qconf nconf
+       rm -f *.o lxdialog/*.o *.moc .*.cmd $(clean-files)
 
 # This clean-files definition is here to ensure that temporary files from the
 # previous version are removed by make config-clean.
-# It should be removed or emptied when this Makefile get updated again.
+# It should be emptied after the end of support for OpenWrt 19.07.
 clean-files    := zconf.tab.c zconf.lex.c zconf.hash.c .tmp_qtcheck
 
 # ===========================================================================
@@ -24,9 +24,11 @@ src:=.
 obj:=.
 Q:=$(if $V,,@)
 cmd = $(cmd_$(1))
-dot-target = $(dir $@).$(notdir $@)
 
-# taken from ../Kbuild.include
+# some definitions taken from ../Kbuild.include
+dot-target = $(dir $@).$(notdir $@)
+squote  := '
+escsq = $(subst $(squote),'\$(squote)',$1)
 define filechk
        $(Q)set -e;                                             \
        mkdir -p $(dir $@);                                     \
@@ -37,23 +39,29 @@ define filechk
                mv -f $(dot-target).tmp $@;                     \
        fi
 endef
+cmd-check = $(if $(strip $(cmd_$@)),,1)
+make-cmd = $(call escsq,$(subst $(pound),$$(pound),$(subst $$,$$$$,$(cmd_$(1)))))
+newer-prereqs = $(filter-out $(PHONY),$?)
+if_changed = $(if $(newer-prereqs)$(cmd-check),                        \
+       $(cmd);                                                 \
+       printf '%s\n' 'cmd_$@ := $(make-cmd)' > $(dot-target).cmd, @:)
 
 ### Stripped down upstream Makefile follows:
 # ===========================================================================
 # object files used by all kconfig flavours
-common-objs    := confdata.o expr.o lexer.lex.o parser.tab.o preprocess.o \
-                  symbol.o util.o
+common-objs    := confdata.o expr.o lexer.lex.o menu.o parser.tab.o \
+                  preprocess.o symbol.o util.o
 
 $(obj)/lexer.lex.o: $(obj)/parser.tab.h
 HOSTCFLAGS_lexer.lex.o := -I $(srctree)/$(src)
 HOSTCFLAGS_parser.tab.o        := -I $(srctree)/$(src)
 
 # conf: Used for defconfig, oldconfig and related targets
-hostprogs-y    += conf
+hostprogs      += conf
 conf-objs      := conf.o $(common-objs)
 
 # nconf: Used for the nconfig target based on ncurses
-hostprogs-y    += nconf
+hostprogs      += nconf
 nconf-objs     := nconf.o nconf.gui.o $(common-objs)
 
 HOSTLDLIBS_nconf       = $(shell . $(obj)/nconf-cfg && echo $$libs)
@@ -63,7 +71,7 @@ HOSTCFLAGS_nconf.gui.o        = $(shell . $(obj)/nconf-cfg && echo $$cflags)
 $(obj)/nconf.o $(obj)/nconf.gui.o: $(obj)/nconf-cfg
 
 # mconf: Used for the menuconfig target based on lxdialog
-hostprogs-y    += mconf
+hostprogs      += mconf
 lxdialog       := $(addprefix lxdialog/, \
                     checklist.o inputbox.o menubox.o textbox.o util.o yesno.o)
 mconf-objs     := mconf.o $(lxdialog) $(common-objs)
@@ -75,20 +83,23 @@ $(foreach f, mconf.o $(lxdialog), \
 $(addprefix $(obj)/, mconf.o $(lxdialog)): $(obj)/mconf-cfg
 
 # qconf: Used for the xconfig target based on Qt
-hostprogs-y    += qconf
-qconf-cxxobjs  := qconf.o
+hostprogs      += qconf
+qconf-cxxobjs  := qconf.o qconf-moc.o
 qconf-objs     := images.o $(common-objs)
 
 HOSTLDLIBS_qconf       = $(shell . $(obj)/qconf-cfg && echo $$libs)
 HOSTCXXFLAGS_qconf.o   = $(shell . $(obj)/qconf-cfg && echo $$cflags)
+HOSTCXXFLAGS_qconf-moc.o = $(shell . $(obj)/qconf-cfg && echo $$cflags)
 
-$(obj)/qconf.o: $(obj)/qconf-cfg $(obj)/qconf.moc
+$(obj)/qconf.o: $(obj)/qconf-cfg
 
 quiet_cmd_moc = MOC     $@
-      cmd_moc = $(shell . $(obj)/qconf-cfg && echo $$moc) -i $< -o $@
+      cmd_moc = $(shell . $(obj)/qconf-cfg && echo $$moc) $< -o $@
+
+$(obj)/qconf-moc.cc: $(src)/qconf.h $(obj)/qconf-cfg FORCE
+       $(call if_changed,moc)
 
-$(obj)/%.moc: $(src)/%.h $(obj)/qconf-cfg
-       $(call cmd,moc)
+targets += qconf-moc.cc
 
 # check if necessary packages are available, and configure build flags
 filechk_conf_cfg = $(CONFIG_SHELL) $<
@@ -102,6 +113,8 @@ clean-files += *conf-cfg
 # OpenWrt rules and final adjustments that need to be made after reading the
 # full upstream Makefile
 
+clean-files += $(targets) $(hostprogs)
+
 FORCE:
 
 ifdef BUILD_SHIPPED_FILES
@@ -117,24 +130,25 @@ clean-files += $(shipped-files)
        flex -L -o$@ $<
 endif
 
-$(foreach f, mconf.o $(lxdialog), \
-  $(eval $f: CFLAGS+=$$(HOSTCFLAGS_$f)))
+$(foreach f,$(conf-objs) $(filter-out $(common-objs),$(mconf-objs) \
+                                                    $(qconf-objs) \
+                                                    $(nconf-objs)), \
+  $(eval $(obj)/$f: CFLAGS+=$$(HOSTCFLAGS_$f)))
 
-$(obj)/lexer.lex.o: CFLAGS += $(HOSTCFLAGS_lexer.lex.o)
-$(obj)/parser.tab.o: CFLAGS += $(HOSTCFLAGS_parser.tab.o)
-$(obj)/qconf.o: CXXFLAGS+=$(HOSTCXXFLAGS_qconf.o)
+$(foreach f,$(qconf-cxxobjs), \
+  $(eval $(obj)/$f: CXXFLAGS+=$$(HOSTCXXFLAGS_$f)))
 
-conf: $(conf-objs)
+$(obj)/conf: $(addprefix $(obj)/,$(conf-objs))
 
 # The *conf-cfg file is used (then filtered out) as the first prerequisite to
 # avoid sourcing it before the script is built, when trying to compute CFLAGS
 # for the actual first prerequisite.  This avoids errors like:
 # '/bin/sh: ./mconf-cfg: No such file or directory'
-mconf: mconf-cfg $(mconf-objs)
+$(obj)/mconf: mconf-cfg $(addprefix $(obj)/,$(mconf-objs))
        $(CC) -o $@ $(filter-out mconf-cfg,$^) $(HOSTLDLIBS_mconf)
 
-nconf: nconf-cfg $(nconf-objs)
+$(obj)/nconf: nconf-cfg $(addprefix $(obj)/,$(nconf-objs))
        $(CC) -o $@ $(filter-out nconf-cfg,$^) $(HOSTLDLIBS_nconf)
 
-qconf: qconf-cfg $(qconf-cxxobjs) $(qconf-objs)
+$(obj)/qconf: qconf-cfg $(addprefix $(obj)/,$(qconf-cxxobjs) $(qconf-objs))
        $(CXX) -o $@ $(filter-out qconf-cfg,$^) $(HOSTLDLIBS_qconf)