summaryrefslogtreecommitdiff
path: root/extra/config
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2013-02-23 08:41:52 +0100
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2013-03-14 22:49:25 +0100
commit0a513103bf2a80787ec4c7064570d08ad36881aa (patch)
treea58d228984212042f8b5480ebcc2374680bd2c8e /extra/config
parent7598eeaa1defa2884adaa890bb115c493d69cc35 (diff)
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 <rep.dot.nop@gmail.com>
Diffstat (limited to 'extra/config')
-rw-r--r--extra/config/Makefile20
1 files changed, 11 insertions, 9 deletions
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)