summaryrefslogtreecommitdiff
authorkergoth <kergoth>2002-11-05 21:46:36 (UTC)
committer kergoth <kergoth>2002-11-05 21:46:36 (UTC)
commit1d3654e884ac4236279a24e10b7aa60efa87f449 (patch) (unidiff)
tree7585a66c901899646b484c8b9eb473060748340e
parent808fd6176bcbb19360dc5185c4cff5113678d06a (diff)
downloadopie-1d3654e884ac4236279a24e10b7aa60efa87f449.zip
opie-1d3654e884ac4236279a24e10b7aa60efa87f449.tar.gz
opie-1d3654e884ac4236279a24e10b7aa60efa87f449.tar.bz2
Add scripts/kconfig to LD_LIBRARY_PATH for qconf call
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--Makefile.test1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile.test b/Makefile.test
index 61d8a56..434f3ca 100644
--- a/Makefile.test
+++ b/Makefile.test
@@ -22,48 +22,49 @@ $(TOPDIR)/.config : $(TOPDIR)/.depends.cfgs
22all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(TOPDIR)/.depends 22all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(TOPDIR)/.depends
23 23
24clean-configs : $(TOPDIR)/.depends.cfgs 24clean-configs : $(TOPDIR)/.depends.cfgs
25 @echo "Wiping generated config.in files..." 25 @echo "Wiping generated config.in files..."
26 @-rm -f $(configs) 26 @-rm -f $(configs)
27 27
28-include $(TOPDIR)/.depends.cfgs 28-include $(TOPDIR)/.depends.cfgs
29 29
30all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(configs) 30all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(configs)
31 31
32$(TOPDIR)/.config: $(TOPDIR)/.depends.cfgs $(configs) 32$(TOPDIR)/.config: $(TOPDIR)/.depends.cfgs $(configs)
33 $(call descend,scripts/kconfig,conf) 33 $(call descend,scripts/kconfig,conf)
34 @if [ ! -e $@ ]; then \ 34 @if [ ! -e $@ ]; then \
35 cp $(TOPDIR)/def-configs/opie $@; \ 35 cp $(TOPDIR)/def-configs/opie $@; \
36 fi; 36 fi;
37 @$(MAKE) -C scripts/kconfig conf; 37 @$(MAKE) -C scripts/kconfig conf;
38 ./scripts/kconfig/conf -s ./config.in 38 ./scripts/kconfig/conf -s ./config.in
39 39
40# config rules must have the $(configs) var defined 40# config rules must have the $(configs) var defined
41# at the time that they run. we must ensure that .depends.cfgs 41# at the time that they run. we must ensure that .depends.cfgs
42# is built and included by the time we reach this point. 42# is built and included by the time we reach this point.
43 43
44xconfig : 44xconfig :
45 $(call descend,scripts/kconfig,qconf) 45 $(call descend,scripts/kconfig,qconf)
46 LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(TOPDIR)/scripts/kconfig \
46 ./scripts/kconfig/qconf ./config.in 47 ./scripts/kconfig/qconf ./config.in
47 48
48menuconfig : scripts/lxdialog/lxdialog 49menuconfig : scripts/lxdialog/lxdialog
49 $(call descend,scripts/kconfig,mconf) 50 $(call descend,scripts/kconfig,mconf)
50 ./scripts/kconfig/mconf ./config.in 51 ./scripts/kconfig/mconf ./config.in
51 52
52config : 53config :
53 $(call descend,scripts/kconfig,conf) 54 $(call descend,scripts/kconfig,conf)
54 ./scripts/kconfig/conf ./config.in 55 ./scripts/kconfig/conf ./config.in
55 56
56oldconfig : 57oldconfig :
57 $(call descend,scripts/kconfig,conf) 58 $(call descend,scripts/kconfig,conf)
58 ./scripts/kconfig/conf -o ./config.in 59 ./scripts/kconfig/conf -o ./config.in
59 60
60randconfig : 61randconfig :
61 $(call descend,scripts/kconfig,conf) 62 $(call descend,scripts/kconfig,conf)
62 ./scripts/kconfig/conf -r ./config.in 63 ./scripts/kconfig/conf -r ./config.in
63 64
64allyesconfig : 65allyesconfig :
65 $(call descend,scripts/kconfig,conf) 66 $(call descend,scripts/kconfig,conf)
66 ./scripts/kconfig/conf -y ./config.in 67 ./scripts/kconfig/conf -y ./config.in
67 68
68allnoconfig : 69allnoconfig :
69 $(call descend,scripts/kconfig,conf) 70 $(call descend,scripts/kconfig,conf)