author | kergoth <kergoth> | 2003-07-01 14:41:48 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-07-01 14:41:48 (UTC) |
commit | 5f0493c41bc87320cd8eca55d998e05a7550dab7 (patch) (unidiff) | |
tree | d2a761c960d1286defdd293861cd634452101abd | |
parent | 99e582c840f0c37d318a28caf69d3ae4eb96bea4 (diff) | |
download | opie-5f0493c41bc87320cd8eca55d998e05a7550dab7.zip opie-5f0493c41bc87320cd8eca55d998e05a7550dab7.tar.gz opie-5f0493c41bc87320cd8eca55d998e05a7550dab7.tar.bz2 |
There's already a lxdialog binary rule in Rules.make, if we specify it with full path using instead of relative. Remove the duplicate lxdialog rule.
-rw-r--r-- | Makefile | 5 |
1 files changed, 1 insertions, 4 deletions
@@ -50,55 +50,52 @@ clean-configs : | |||
50 | 50 | ||
51 | ifneq ($(wildcard $(TOPDIR)/.depends.cfgs),) | 51 | ifneq ($(wildcard $(TOPDIR)/.depends.cfgs),) |
52 | include $(TOPDIR)/.depends.cfgs | 52 | include $(TOPDIR)/.depends.cfgs |
53 | endif | 53 | endif |
54 | 54 | ||
55 | all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(configs) | 55 | all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(configs) |
56 | 56 | ||
57 | $(TOPDIR)/.config: $(TOPDIR)/.depends.cfgs $(configs) | 57 | $(TOPDIR)/.config: $(TOPDIR)/.depends.cfgs $(configs) |
58 | $(call descend,scripts/kconfig,conf) | 58 | $(call descend,scripts/kconfig,conf) |
59 | @if [ ! -e $@ ]; then \ | 59 | @if [ ! -e $@ ]; then \ |
60 | cp $(TOPDIR)/def-configs/opie $@; \ | 60 | cp $(TOPDIR)/def-configs/opie $@; \ |
61 | fi | 61 | fi |
62 | @$(MAKE) -C scripts/kconfig conf | 62 | @$(MAKE) -C scripts/kconfig conf |
63 | ./scripts/kconfig/conf -s ./config.in | 63 | ./scripts/kconfig/conf -s ./config.in |
64 | 64 | ||
65 | # config rules must have the $(configs) var defined | 65 | # config rules must have the $(configs) var defined |
66 | # at the time that they run. we must ensure that .depends.cfgs | 66 | # at the time that they run. we must ensure that .depends.cfgs |
67 | # is built and included by the time we reach this point. | 67 | # is built and included by the time we reach this point. |
68 | 68 | ||
69 | xconfig : | 69 | xconfig : |
70 | $(call descend,scripts/kconfig,qconf) | 70 | $(call descend,scripts/kconfig,qconf) |
71 | LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(TOPDIR)/scripts/kconfig \ | 71 | LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(TOPDIR)/scripts/kconfig \ |
72 | ./scripts/kconfig/qconf ./config.in | 72 | ./scripts/kconfig/qconf ./config.in |
73 | 73 | ||
74 | menuconfig : scripts/lxdialog/lxdialog | 74 | menuconfig : $(TOPDIR)/scripts/lxdialog/lxdialog |
75 | $(call descend,scripts/kconfig,mconf) | 75 | $(call descend,scripts/kconfig,mconf) |
76 | ./scripts/kconfig/mconf ./config.in | 76 | ./scripts/kconfig/mconf ./config.in |
77 | 77 | ||
78 | scripts/lxdialog/lxdialog: | ||
79 | make -C scripts/lxdialog | ||
80 | |||
81 | config : | 78 | config : |
82 | $(call descend,scripts/kconfig,conf) | 79 | $(call descend,scripts/kconfig,conf) |
83 | ./scripts/kconfig/conf ./config.in | 80 | ./scripts/kconfig/conf ./config.in |
84 | 81 | ||
85 | oldconfig : | 82 | oldconfig : |
86 | $(call descend,scripts/kconfig,conf) | 83 | $(call descend,scripts/kconfig,conf) |
87 | ./scripts/kconfig/conf -o ./config.in | 84 | ./scripts/kconfig/conf -o ./config.in |
88 | 85 | ||
89 | randconfig : | 86 | randconfig : |
90 | $(call descend,scripts/kconfig,conf) | 87 | $(call descend,scripts/kconfig,conf) |
91 | ./scripts/kconfig/conf -r ./config.in | 88 | ./scripts/kconfig/conf -r ./config.in |
92 | 89 | ||
93 | allyesconfig : | 90 | allyesconfig : |
94 | $(call descend,scripts/kconfig,conf) | 91 | $(call descend,scripts/kconfig,conf) |
95 | ./scripts/kconfig/conf -y ./config.in | 92 | ./scripts/kconfig/conf -y ./config.in |
96 | 93 | ||
97 | allnoconfig : | 94 | allnoconfig : |
98 | $(call descend,scripts/kconfig,conf) | 95 | $(call descend,scripts/kconfig,conf) |
99 | ./scripts/kconfig/conf -n ./config.in | 96 | ./scripts/kconfig/conf -n ./config.in |
100 | 97 | ||
101 | defconfig : | 98 | defconfig : |
102 | $(call descend,scripts/kconfig,conf) | 99 | $(call descend,scripts/kconfig,conf) |
103 | ./scripts/kconfig/conf -d ./config.in | 100 | ./scripts/kconfig/conf -d ./config.in |
104 | 101 | ||