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
@@ -26,103 +26,100 @@ configs += $(TOPDIR)/core/applets/config.in $(TOPDIR)/core/apps/config.in $(TOPD | |||
26 | all : $(TOPDIR)/.config | 26 | all : $(TOPDIR)/.config |
27 | 27 | ||
28 | # | 28 | # |
29 | # The IPK creation is a very slow process. If you want to only create some | 29 | # The IPK creation is a very slow process. If you want to only create some |
30 | # IPKs, e.g. the ones in library, then do | 30 | # IPKs, e.g. the ones in library, then do |
31 | #make ipks IPK_START=library | 31 | #make ipks IPK_START=library |
32 | # and then only the *.control files in this directory will be processed | 32 | # and then only the *.control files in this directory will be processed |
33 | ipks: $(OPIEDIR)/scripts/subst $(OPIEDIR)/scripts/filesubst FORCE $(TOPDIR)/.config | 33 | ipks: $(OPIEDIR)/scripts/subst $(OPIEDIR)/scripts/filesubst FORCE $(TOPDIR)/.config |
34 | @find $(OPIEDIR)/$(IPK_START) -type f -name \*.control | ( for ctrl in `cat`; do \ | 34 | @find $(OPIEDIR)/$(IPK_START) -type f -name \*.control | ( for ctrl in `cat`; do \ |
35 | prerm=`echo $$ctrl|sed -e 's,\.control$$,.prerm,'`; \ | 35 | prerm=`echo $$ctrl|sed -e 's,\.control$$,.prerm,'`; \ |
36 | preinst=`echo $$ctrl|sed -e 's,\.control$$,.preinst,'`; \ | 36 | preinst=`echo $$ctrl|sed -e 's,\.control$$,.preinst,'`; \ |
37 | postrm=`echo $$ctrl|sed -e 's,\.control$$,.postrm,'`; \ | 37 | postrm=`echo $$ctrl|sed -e 's,\.control$$,.postrm,'`; \ |
38 | postinst=`echo $$ctrl|sed -e 's,\.control$$,.postinst,'`; \ | 38 | postinst=`echo $$ctrl|sed -e 's,\.control$$,.postinst,'`; \ |
39 | echo "Building ipk of $$ctrl"; \ | 39 | echo "Building ipk of $$ctrl"; \ |
40 | cd $(OPIEDIR); $(OPIEDIR)/scripts/mkipkg --subst=$(OPIEDIR)/scripts/subst --filesubst=$(OPIEDIR)/scripts/filesubst --control=$$ctrl --prerm=$$prerm --preinst=$$preinst --postrm=$$postrm --postinst=$$postinst --strip=$(STRIP) $(OPIEDIR); \ | 40 | cd $(OPIEDIR); $(OPIEDIR)/scripts/mkipkg --subst=$(OPIEDIR)/scripts/subst --filesubst=$(OPIEDIR)/scripts/filesubst --control=$$ctrl --prerm=$$prerm --preinst=$$preinst --postrm=$$postrm --postinst=$$postinst --strip=$(STRIP) $(OPIEDIR); \ |
41 | done ) | 41 | done ) |
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 |
113 | -include $(TOPDIR)/.depends | 110 | -include $(TOPDIR)/.depends |
114 | endif | 111 | endif |
115 | 112 | ||
116 | -include $(TOPDIR)/.config.cmd | 113 | -include $(TOPDIR)/.config.cmd |
117 | 114 | ||
118 | SUBDIRS = $(subdir-y) | 115 | SUBDIRS = $(subdir-y) |
119 | 116 | ||
120 | all clean install ipk: $(SUBDIRS) | 117 | all clean install ipk: $(SUBDIRS) |
121 | 118 | ||
122 | lupdate lrelease: | 119 | lupdate lrelease: |
123 | @for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done | 120 | @for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done |
124 | 121 | ||
125 | opie-lupdate opie-lrelease: | 122 | opie-lupdate opie-lrelease: |
126 | @for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done | 123 | @for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done |
127 | 124 | ||
128 | $(subdir-y) : $(if $(CONFIG_LIBQPE),$(QTDIR)/stamp-headers $(OPIEDIR)/stamp-headers) \ | 125 | $(subdir-y) : $(if $(CONFIG_LIBQPE),$(QTDIR)/stamp-headers $(OPIEDIR)/stamp-headers) \ |