From 0a513103bf2a80787ec4c7064570d08ad36881aa Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Sat, 23 Feb 2013 08:41:52 +0100 Subject: buildsys: tweak KCONFIG_CONFIG export 0c3eb2da578bc7ba2e74d240e3249dce62ec725e moved KCONFIG_CONFIG around and that broke propagation of config-settings to the testsuite. Fix that. Signed-off-by: Bernhard Reutner-Fischer --- extra/config/Makefile | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'extra') diff --git a/extra/config/Makefile b/extra/config/Makefile index 46c3614a1..3cde22640 100644 --- a/extra/config/Makefile +++ b/extra/config/Makefile @@ -1,15 +1,17 @@ top_srcdir ?= ../../ -include $(top_srcdir)Rules.mak -include $(top_srcdir)Makerules - -# ugh -top_srcdir:=$(shell cd $(top_srcdir) && pwd)/ ifdef O top_builddir ?= ../../ else top_builddir = ../../ endif + +include $(top_srcdir)Rules.mak +include $(top_srcdir)Makerules + +# ugh +top_srcdir:=$(shell cd $(top_srcdir) && pwd)/ + srctree := $(top_srcdir) src := extra/config obj := $(top_builddir)$(src) @@ -75,12 +77,12 @@ $(obj)/%:: $(top_srcdir)$(src)/%_shipped endif CLEAN_extra/config menuconfig_clean: $(do_rm) $(clean-files) $(lxdialog) conf $(wildcard *.o) -distclean: clean - $(do_rm) $(lxdialog) $(conf-objs) $(mconf-objs) \ +distclean: CLEAN_extra/config + $(Q)$(RM) -r $(lxdialog) $(conf-objs) $(mconf-objs) \ $(kxgettext-objs) \ $(hostprogs-y) $(qconf-cxxobjs) $(qconf-objs) $(gconf-objs) \ - .depend - $(do_rm) -r $(top_builddir)include/config + .depend \ + $(top_builddir)include/config FORCE: .PHONY: FORCE clean distclean $(always) -- cgit v1.2.3