This patch adds support for the xconfig top-level target. If qt3 is detected on the system (by checking for the presence of the directory /usr/include/qt3), the top-level target expands to the invocation of scripts/configs/qconf. Otherwise, the target prints a message and errors.
Signed-off-by: Emmanuel Deloget <emmanuel.delo...@efixo.com> --
Index: include/toplevel.mk =================================================================== --- include/toplevel.mk (revision 27257) +++ include/toplevel.mk (working copy) @@ -43,6 +43,8 @@ SUBMAKE:=umask 022; $(SUBMAKE) +have-qt3-dev:=$(shell [ -d /usr/include/qt3 ] && echo y) + prepare-mk: FORCE ; prepare-tmpinfo: FORCE @@ -67,6 +69,13 @@ $(eval $(call rdep,scripts/config,scripts/config/mconf)) +ifneq ($(have-qt3-dev),) +scripts/config/qconf: + @$(_SINGLE)$(SUBMAKE) -s -C scripts/config qconf + +$(eval $(call rdep,scripts/config,scripts/config/qconf)) +endif + scripts/config/conf: @$(_SINGLE)$(SUBMAKE) -s -C scripts/config conf @@ -89,6 +98,19 @@ fi $< Config.in +ifneq ($(have-qt3-dev),) +xconfig: scripts/config/qconf prepare-tmpinfo FORCE + if [ \! -e .config -a -e $(HOME)/.openwrt/defconfig ]; then \ + cp $(HOME)/.openwrt/defconfig .config; \ + fi + $< Config.in +else +xconfig: + @echo " Target xconfig adds qt3-dev to the dependencies of OpenWRT, and this dependency is missing on your system" + @echo " You shall install qt3-dev to be able to run make xconfig." + @false +endif + prepare_kernel_conf: .config FORCE ifeq ($(wildcard staging_dir/host/bin/sed),)
_______________________________________________ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
