|
diff --git a/Makefile b/Makefile index fd7da6d..b1e76cb 100644 --- a/ Makefile+++ b/ Makefile |
|
@@ -42,71 +42,68 @@ ipks: $(OPIEDIR)/scripts/subst $(OPIEDIR)/scripts/filesubst FORCE $(TOPDIR)/.con |
42 | |
42 | |
43 | $(TOPDIR)/.config : $(TOPDIR)/.depends.cfgs |
43 | $(TOPDIR)/.config : $(TOPDIR)/.depends.cfgs |
44 | |
44 | |
45 | all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(TOPDIR)/.depends.cfgs |
45 | all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(TOPDIR)/.depends.cfgs |
46 | |
46 | |
47 | clean-configs : |
47 | clean-configs : |
48 | @echo "Wiping generated config.in files..." |
48 | @echo "Wiping generated config.in files..." |
49 | @-rm -f $(configs) |
49 | @-rm -f $(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 | |
105 | |
102 | |
106 | export |
103 | export |
107 | |
104 | |
108 | ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),) |
105 | ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),) |
109 | |
106 | |
110 | export include-config := 1 |
107 | export include-config := 1 |
111 | |
108 | |
112 | -include $(TOPDIR)/.config |
109 | -include $(TOPDIR)/.config |
|