|
diff --git a/Makefile b/Makefile index b1e76cb..0b4a06b 100644 --- a/ Makefile+++ b/ Makefile |
|
@@ -7,17 +7,17 @@ ifneq ($(wildcard $(TOPDIR)/Vars.local),) |
7 | include $(TOPDIR)/Vars.local |
7 | include $(TOPDIR)/Vars.local |
8 | endif |
8 | endif |
9 | |
9 | |
10 | noconfig_targets := xconfig menuconfig config oldconfig randconfig \ |
10 | noconfig_targets := xconfig menuconfig config oldconfig randconfig \ |
11 | defconfig allyesconfig allnoconfig allmodconfig \ |
11 | defconfig allyesconfig allnoconfig allmodconfig \ |
12 | clean-configs $(TOPDIR)/scripts/subst $(TOPDIR)/scripts/filesubst \ |
12 | clean-configs $(TOPDIR)/scripts/subst $(TOPDIR)/scripts/filesubst \ |
13 | ipks |
13 | ipks |
14 | |
14 | |
15 | configs += $(TOPDIR)/core/applets/config.in $(TOPDIR)/core/apps/config.in $(TOPDIR)/core/multimedia/config.in $(TOPDIR)/core/pim/config.in $(TOPDIR)/core/pim/today/plugins/config.in $(TOPDIR)/core/settings/config.in $(TOPDIR)/development/config.in $(TOPDIR)/inputmethods/config.in $(TOPDIR)/libopie/ofileselector/config.in $(TOPDIR)/libopie/pim/config.in $(TOPDIR)/libsql/config.in $(TOPDIR)/noncore/applets/config.in $(TOPDIR)/noncore/apps/opie-console/test/config.in $(TOPDIR)/noncore/apps/config.in $(TOPDIR)/noncore/comm/config.in $(TOPDIR)/noncore/decorations/config.in $(TOPDIR)/noncore/games/config.in $(TOPDIR)/noncore/graphics/config.in $(TOPDIR)/noncore/multimedia/config.in $(TOPDIR)/noncore/net/config.in $(TOPDIR)/noncore/net/opietooth/config.in $(TOPDIR)/noncore/settings/config.in $(TOPDIR)/noncore/styles/config.in $(TOPDIR)/noncore/tools/calc2/config.in $(TOPDIR)/noncore/tools/config.in $(TOPDIR)/noncore/todayplugins/config.in |
15 | configs += $(TOPDIR)/core/applets/config.in $(TOPDIR)/core/apps/config.in $(TOPDIR)/core/multimedia/config.in $(TOPDIR)/core/pim/config.in $(TOPDIR)/core/pim/today/plugins/config.in $(TOPDIR)/core/settings/config.in $(TOPDIR)/development/config.in $(TOPDIR)/inputmethods/config.in $(TOPDIR)/libopie/pim/config.in $(TOPDIR)/noncore/applets/config.in $(TOPDIR)/noncore/apps/opie-console/test/config.in $(TOPDIR)/noncore/apps/config.in $(TOPDIR)/noncore/comm/config.in $(TOPDIR)/noncore/decorations/config.in $(TOPDIR)/noncore/games/config.in $(TOPDIR)/noncore/graphics/config.in $(TOPDIR)/noncore/multimedia/config.in $(TOPDIR)/noncore/net/config.in $(TOPDIR)/noncore/net/opietooth/config.in $(TOPDIR)/noncore/settings/config.in $(TOPDIR)/noncore/styles/config.in $(TOPDIR)/noncore/tools/calc2/config.in $(TOPDIR)/noncore/tools/config.in $(TOPDIR)/noncore/todayplugins/config.in |
16 | |
16 | |
17 | # $(TOPDIR)/.config depends on .depends.cfgs, as it depends on $(configs) |
17 | # $(TOPDIR)/.config depends on .depends.cfgs, as it depends on $(configs) |
18 | # in order to have a full set of config.in files. |
18 | # in order to have a full set of config.in files. |
19 | # .depends depends on $(TOPDIR)/.config |
19 | # .depends depends on $(TOPDIR)/.config |
20 | # everything else depends on .depends, to ensure the dependencies are |
20 | # everything else depends on .depends, to ensure the dependencies are |
21 | # intact. |
21 | # intact. |
22 | # |
22 | # |
23 | # NOTE: The order in which things happen in this makefile is |
23 | # NOTE: The order in which things happen in this makefile is |
@@ -57,54 +57,16 @@ all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defc |
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 |
| |
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. |
| |
68 | |
| |
69 | xconfig : |
| |
70 | $(call descend,scripts/kconfig,qconf) |
| |
71 | LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(TOPDIR)/scripts/kconfig \ |
| |
72 | ./scripts/kconfig/qconf ./config.in |
| |
73 | |
| |
74 | menuconfig : $(TOPDIR)/scripts/lxdialog/lxdialog |
| |
75 | $(call descend,scripts/kconfig,mconf) |
| |
76 | ./scripts/kconfig/mconf ./config.in |
| |
77 | |
| |
78 | config : |
| |
79 | $(call descend,scripts/kconfig,conf) |
| |
80 | ./scripts/kconfig/conf ./config.in |
| |
81 | |
| |
82 | oldconfig : |
| |
83 | $(call descend,scripts/kconfig,conf) |
| |
84 | ./scripts/kconfig/conf -o ./config.in |
| |
85 | |
| |
86 | randconfig : |
| |
87 | $(call descend,scripts/kconfig,conf) |
| |
88 | ./scripts/kconfig/conf -r ./config.in |
| |
89 | |
| |
90 | allyesconfig : |
| |
91 | $(call descend,scripts/kconfig,conf) |
| |
92 | ./scripts/kconfig/conf -y ./config.in |
| |
93 | |
| |
94 | allnoconfig : |
| |
95 | $(call descend,scripts/kconfig,conf) |
| |
96 | ./scripts/kconfig/conf -n ./config.in |
| |
97 | |
| |
98 | defconfig : |
| |
99 | $(call descend,scripts/kconfig,conf) |
| |
100 | ./scripts/kconfig/conf -d ./config.in |
| |
101 | |
| |
102 | |
| |
103 | export |
65 | export |
104 | |
66 | |
105 | ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),) |
67 | ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),) |
106 | |
68 | |
107 | export include-config := 1 |
69 | export include-config := 1 |
108 | |
70 | |
109 | -include $(TOPDIR)/.config |
71 | -include $(TOPDIR)/.config |
110 | -include $(TOPDIR)/.depends |
72 | -include $(TOPDIR)/.depends |
@@ -114,18 +76,29 @@ endif |
114 | |
76 | |
115 | SUBDIRS = $(subdir-y) |
77 | SUBDIRS = $(subdir-y) |
116 | |
78 | |
117 | all clean install ipk: $(SUBDIRS) |
79 | all clean install ipk: $(SUBDIRS) |
118 | |
80 | |
119 | lupdate lrelease: |
81 | lupdate lrelease: |
120 | @for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done |
82 | @for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done |
121 | |
83 | |
122 | opie-lupdate opie-lrelease: |
84 | opie-lupdate opie-lrelease messages: |
123 | @for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done |
85 | @for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done; |
| |
86 | |
| |
87 | # from kde |
| |
88 | qtmessages: |
| |
89 | cd $(QTDIR)/src ; \ |
| |
90 | sed -e "s,#define,," xml/qxml.cpp > qxml_clean.cpp ;\ |
| |
91 | find . -name "*.cpp" | grep -v moc_ > list ;\ |
| |
92 | for file in qfiledialog qcolordialog qprintdialog \ |
| |
93 | qurloperator qftp qhttp qlocal qerrormessage; do \ |
| |
94 | grep -v $$file list > list.new && mv list.new list ;\ |
| |
95 | done ;\ |
| |
96 | xgettext -C -ktr -kQT_TRANSLATE_NOOP -n `cat list` -o $(OPIEDIR)/qt-messages.pot |
124 | |
97 | |
125 | $(subdir-y) : $(if $(CONFIG_LIBQPE),$(QTDIR)/stamp-headers $(OPIEDIR)/stamp-headers) \ |
98 | $(subdir-y) : $(if $(CONFIG_LIBQPE),$(QTDIR)/stamp-headers $(OPIEDIR)/stamp-headers) \ |
126 | $(if $(CONFIG_LIBQPE-X11),$(QTDIR)/stamp-headers-x11 $(OPIEDIR)/stamp-headers-x11 ) \ |
99 | $(if $(CONFIG_LIBQPE-X11),$(QTDIR)/stamp-headers-x11 $(OPIEDIR)/stamp-headers-x11 ) \ |
127 | $(TOPDIR)/library/custom.h |
100 | $(TOPDIR)/library/custom.h |
128 | |
101 | |
129 | clean : $(TOPDIR)/.config |
102 | clean : $(TOPDIR)/.config |
130 | make -C bin clean |
103 | make -C bin clean |
131 | make -C lib clean |
104 | make -C lib clean |
|
|
|
|
@@ -1,9 +1,10 @@ |
1 | .PHONY: FORCE |
1 | .phony: force |
| |
2 | force: |
2 | |
3 | |
3 | $(configs) : |
4 | $(configs) : |
4 | $(call makecfg,$@) |
5 | $(call makecfg,$@) |
5 | |
6 | |
6 | $(TOPDIR)/gen.pro : $(TOPDIR)/.config |
7 | $(TOPDIR)/gen.pro : $(TOPDIR)/.config |
7 | echo > $@ |
8 | echo > $@ |
8 | ifneq ($(CONFIG_DEBUG),) |
9 | ifneq ($(CONFIG_DEBUG),) |
9 | echo CONFIG += debug >> $@ |
10 | echo CONFIG += debug >> $@ |
@@ -52,23 +53,21 @@ $(QTDIR)/stamp-headers-x11 : |
52 | cd $(QTDIR)/include; $(patsubst %,ln -sf $(OPIEDIR)/x11/libqpe-x11/qt/%;,qgfx_qws.h qwsmouse_qws.h qcopchannel_qws.h qwindowsystem_qws.h qfontmanager_qws.h qwsdefaultdecoration_qws.h) |
53 | cd $(QTDIR)/include; $(patsubst %,ln -sf $(OPIEDIR)/x11/libqpe-x11/qt/%;,qgfx_qws.h qwsmouse_qws.h qcopchannel_qws.h qwindowsystem_qws.h qfontmanager_qws.h qwsdefaultdecoration_qws.h) |
53 | touch $@ |
54 | touch $@ |
54 | |
55 | |
55 | $(OPIEDIR)/stamp-headers : |
56 | $(OPIEDIR)/stamp-headers : |
56 | @-rm -f $(OPIEDIR)/stamp-headers* |
57 | @-rm -f $(OPIEDIR)/stamp-headers* |
57 | mkdir -p $(TOPDIR)/include/qpe \ |
58 | mkdir -p $(TOPDIR)/include/qpe \ |
58 | $(TOPDIR)/include/qtopia \ |
59 | $(TOPDIR)/include/qtopia \ |
59 | $(TOPDIR)/include/opie \ |
60 | $(TOPDIR)/include/opie \ |
60 | $(TOPDIR)/include/qtopia/private \ |
61 | $(TOPDIR)/include/qtopia/private |
61 | $(TOPDIR)/include/opie2 |
| |
62 | ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) |
62 | ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) |
63 | ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) |
63 | ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) |
64 | ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; ) |
64 | ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; ) |
65 | ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; ) |
65 | ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; ) |
66 | ( cd include/opie && ln -sf ../../libsql/*.h .; ) |
| |
67 | ( cd include/opie && ln -sf ../../libopie/pim/*.h .; ) |
66 | ( cd include/opie && ln -sf ../../libopie/pim/*.h .; ) |
68 | ( cd include/opie2 && ln -sf ../../libopie2/opiecore/*.h .; ) |
67 | ( cd include/opie2 && ln -sf ../../libopie2/opiecore/*.h .; ) |
69 | ( cd include/opie2 && ln -sf ../../libopie2/opiemm/*.h .; ) |
68 | ( cd include/opie2 && ln -sf ../../libopie2/opiemm/*.h .; ) |
70 | #( cd include/opie2 && ln -sf ../../libopie2/opiedb/*.h .; ) |
69 | #( cd include/opie2 && ln -sf ../../libopie2/opiedb/*.h .; ) |
71 | ( cd include/opie2 && ln -sf ../../libopie2/opienet/*.h .; ) |
70 | ( cd include/opie2 && ln -sf ../../libopie2/opienet/*.h .; ) |
72 | #( cd include/opie2 && ln -sf ../../libopie2/opiepim/*.h .; ) |
71 | #( cd include/opie2 && ln -sf ../../libopie2/opiepim/*.h .; ) |
73 | ( cd include/opie2 && ln -sf ../../libopie2/opieui/*.h .; ) |
72 | ( cd include/opie2 && ln -sf ../../libopie2/opieui/*.h .; ) |
74 | ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ |
73 | ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ |
@@ -93,35 +92,72 @@ $(OPIEDIR)/stamp-headers-x11 : |
93 | touch $@ |
92 | touch $@ |
94 | |
93 | |
95 | $(TOPDIR)/library/custom.h : $(TOPDIR)/.config |
94 | $(TOPDIR)/library/custom.h : $(TOPDIR)/.config |
96 | @-rm -f $@ |
95 | @-rm -f $@ |
97 | @$(if $(patsubst "%",%,$(CONFIG_CUSTOMFILE)),\ |
96 | @$(if $(patsubst "%",%,$(CONFIG_CUSTOMFILE)),\ |
98 | ln -sf $(patsubst "%",%,$(CONFIG_CUSTOMFILE)) $@) |
97 | ln -sf $(patsubst "%",%,$(CONFIG_CUSTOMFILE)) $@) |
99 | @touch $@ |
98 | @touch $@ |
100 | |
99 | |
101 | $(TOPDIR)/scripts/lxdialog/lxdialog $(TOPDIR)/scripts/kconfig/conf scripts/kconfig/conf $(TOPDIR)/scripts/kconfig/mconf scripts/kconfig/mconf $(TOPDIR)/scripts/kconfig/qconf scripts/kconfig/qconf $(TOPDIR)/qmake/qmake : |
100 | $(TOPDIR)/scripts/lxdialog/lxdialog $(TOPDIR)/scripts/kconfig/mconf $(TOPDIR)/scripts/kconfig/conf $(TOPDIR)/scripts/kconfig/qconf $(TOPDIR)/scripts/kconfig/libkconfig.so $(TOPDIR)/scripts/kconfig/gconf $(TOPDIR)/qmake/qmake: |
102 | $(call descend,$(shell dirname $@),$(shell basename $@)) |
101 | @$(call descend,$(shell dirname $@),$(shell basename $@)) |
| |
102 | |
| |
103 | menuconfig: $(TOPDIR)/scripts/lxdialog/lxdialog $(TOPDIR)/scripts/kconfig/mconf ./config.in |
| |
104 | $(TOPDIR)/scripts/kconfig/mconf ./config.in |
| |
105 | @touch ./.config.stamp |
| |
106 | |
| |
107 | xconfig: $(TOPDIR)/scripts/kconfig/qconf $(TOPDIR)/scripts/kconfig/libkconfig.so ./config.in |
| |
108 | $(TOPDIR)/scripts/kconfig/qconf ./config.in |
| |
109 | @touch .config.stamp |
| |
110 | |
| |
111 | gconfig: $(TOPDIR)/scripts/kconfig/gconf $(TOPDIR)/scripts/kconfig/libkconfig.so ./config.in |
| |
112 | $(TOPDIR)/scripts/kconfig/gconf ./config.in |
| |
113 | @touch .config.stamp |
| |
114 | |
| |
115 | config: $(TOPDIR)/scripts/kconfig/conf ./config.in |
| |
116 | $(TOPDIR)/scripts/kconfig/conf ./config.in |
| |
117 | @touch .config.stamp |
| |
118 | |
| |
119 | oldconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in |
| |
120 | $(TOPDIR)/scripts/kconfig/conf -o ./config.in |
| |
121 | @touch .config.stamp |
| |
122 | |
| |
123 | randconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in |
| |
124 | $(TOPDIR)/scripts/kconfig/conf -r ./config.in |
| |
125 | @touch .config.stamp |
| |
126 | |
| |
127 | allyesconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in |
| |
128 | $(TOPDIR)/scripts/kconfig/conf -y ./config.in |
| |
129 | @touch .config.stamp |
| |
130 | |
| |
131 | allnoconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in |
| |
132 | $(TOPDIR)/scripts/kconfig/conf -n ./config.in |
| |
133 | @touch .config.stamp |
| |
134 | |
| |
135 | defconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in |
| |
136 | $(TOPDIR)/scripts/kconfig/conf -d ./config.in |
| |
137 | @touch .config.stamp |
103 | |
138 | |
104 | $(TOPDIR)/qmake/qmake : $(TOPDIR)/mkspecs/default |
139 | $(TOPDIR)/qmake/qmake : $(TOPDIR)/mkspecs/default |
105 | |
140 | |
106 | $(TOPDIR)/mkspecs/default : |
141 | $(TOPDIR)/mkspecs/default : |
107 | ln -sf linux-g++ $@ |
142 | ln -sf linux-g++ $@ |
108 | |
143 | |
109 | $(TOPDIR)/scripts/subst : FORCE |
144 | $(TOPDIR)/scripts/subst : force |
110 | @( \ |
145 | @( \ |
111 | echo 's,\$$QPE_VERSION,$(QPE_VERSION),g'; \ |
146 | echo 's,\$$QPE_VERSION,$(QPE_VERSION),g'; \ |
112 | echo 's,\$$OPIE_VERSION,$(OPIE_VERSION),g'; \ |
147 | echo 's,\$$OPIE_VERSION,$(OPIE_VERSION),g'; \ |
113 | echo 's,\$$QTE_VERSION,$(QTE_VERSION),g'; \ |
148 | echo 's,\$$QTE_VERSION,$(QTE_VERSION),g'; \ |
114 | echo 's,\$$QTE_REVISION,$(QTE_REVISION),g'; \ |
149 | echo 's,\$$QTE_REVISION,$(QTE_REVISION),g'; \ |
115 | echo 's,\$$SUB_VERSION,$(SUB_VERSION),g'; \ |
150 | echo 's,\$$SUB_VERSION,$(SUB_VERSION),g'; \ |
| |
151 | echo 's,\$$EXTRAVERSION,$(EXTRAVERSION),g'; \ |
116 | echo 's,\$$QTE_BASEVERSION,$(QTE_BASEVERSION),g'; \ |
152 | echo 's,\$$QTE_BASEVERSION,$(QTE_BASEVERSION),g'; \ |
117 | ) > $@ || ( rm -f $@; exit 1 ) |
153 | ) > $@ || ( rm -f $@; exit 1 ) |
118 | |
154 | |
119 | $(TOPDIR)/scripts/filesubst : FORCE |
155 | $(TOPDIR)/scripts/filesubst : force |
120 | @( \ |
156 | @( \ |
121 | echo 's,\$$OPIEDIR/root/,/,g'; \ |
157 | echo 's,\$$OPIEDIR/root/,/,g'; \ |
122 | echo 's,$(OPIEDIR)/root/,/,g'; \ |
158 | echo 's,$(OPIEDIR)/root/,/,g'; \ |
123 | echo 's,\$$OPIEDIR,$(prefix),g'; \ |
159 | echo 's,\$$OPIEDIR,$(prefix),g'; \ |
124 | echo 's,$(OPIEDIR),$(prefix),g'; \ |
160 | echo 's,$(OPIEDIR),$(prefix),g'; \ |
125 | echo 's,\$$QTDIR,$(prefix),g'; \ |
161 | echo 's,\$$QTDIR,$(prefix),g'; \ |
126 | echo 's,$(QTDIR),$(prefix),g'; \ |
162 | echo 's,$(QTDIR),$(prefix),g'; \ |
127 | echo 's,^\(\./\)*root/,/,g'; \ |
163 | echo 's,^\(\./\)*root/,/,g'; \ |
@@ -129,16 +165,18 @@ $(TOPDIR)/scripts/filesubst : FORCE |
129 | echo 's,^\(\./\)*lib/,$(prefix)/lib/,g'; \ |
165 | echo 's,^\(\./\)*lib/,$(prefix)/lib/,g'; \ |
130 | echo 's,^\(\./\)*bin/,$(prefix)/bin/,g'; \ |
166 | echo 's,^\(\./\)*bin/,$(prefix)/bin/,g'; \ |
131 | echo 's,^\(\./\)*pics/,$(prefix)/pics/,g'; \ |
167 | echo 's,^\(\./\)*pics/,$(prefix)/pics/,g'; \ |
132 | echo 's,^\(\./\)*sounds/,$(prefix)/sounds/,g'; \ |
168 | echo 's,^\(\./\)*sounds/,$(prefix)/sounds/,g'; \ |
133 | echo 's,^\(\./\)*i18n/,$(prefix)/i18n/,g'; \ |
169 | echo 's,^\(\./\)*i18n/,$(prefix)/i18n/,g'; \ |
134 | echo 's,^\(\./\)*plugins/,$(prefix)/plugins/,g'; \ |
170 | echo 's,^\(\./\)*plugins/,$(prefix)/plugins/,g'; \ |
135 | echo 's,^\(\./\)*apps/,$(prefix)/apps/,g'; \ |
171 | echo 's,^\(\./\)*apps/,$(prefix)/apps/,g'; \ |
136 | echo 's,^\(\./\)*share/,$(prefix)/share/,g'; \ |
172 | echo 's,^\(\./\)*share/,$(prefix)/share/,g'; \ |
| |
173 | echo 's,^\(\./\)*i18n/,$(prefix)/i18n/,g'; \ |
| |
174 | echo 's,^\(\./\)*help/,$(prefix)/help/,g'; \ |
137 | ) > $@ || ( rm -f $@; exit 1 ) |
175 | ) > $@ || ( rm -f $@; exit 1 ) |
138 | |
176 | |
139 | ## general rules ## |
177 | ## general rules ## |
140 | |
178 | |
141 | define descend |
179 | define descend |
142 | $(MAKE) $(if $(QMAKE),QMAKE=$(QMAKE)) -C $(1) $(2) |
180 | $(MAKE) $(if $(QMAKE),QMAKE=$(QMAKE)) -C $(1) $(2) |
143 | endef |
181 | endef |
144 | |
182 | |
|
|
diff --git a/Vars.make b/Vars.make index cc463d3..59766d1 100644 --- a/ Vars.make+++ b/ Vars.make |
|
@@ -50,16 +50,20 @@ SUB_VERSION=$(shell echo $$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$(OPI |
50 | ifeq ($(VERSION_CVS),) |
50 | ifeq ($(VERSION_CVS),) |
51 | VERSION_CVS:=$(shell date +%Y%m%d) |
51 | VERSION_CVS:=$(shell date +%Y%m%d) |
52 | endif |
52 | endif |
53 | ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),) |
53 | ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),) |
54 | SUB_VERSION:=$(VERSION_CVS) |
54 | SUB_VERSION:=$(VERSION_CVS) |
55 | endif |
55 | endif |
56 | export SUB_VERSION |
56 | export SUB_VERSION |
57 | |
57 | |
| |
58 | ifneq ($(strip $(SUB_VERSION)),) |
| |
59 | EXTRAVERSION=-$(SUB_VERSION) |
| |
60 | endif |
| |
61 | |
58 | ifeq ($(QTE_REVISION),) |
62 | ifeq ($(QTE_REVISION),) |
59 | QTE_REVISION=5 |
63 | QTE_REVISION=5 |
60 | endif |
64 | endif |
61 | export QTE_REVISION |
65 | export QTE_REVISION |
62 | |
66 | |
63 | export DEB_VERSION=2.0 |
67 | export DEB_VERSION=2.0 |
64 | |
68 | |
65 | ifeq ($(QTE_BASEVERSION),) |
69 | ifeq ($(QTE_BASEVERSION),) |
|
|
diff --git a/packages b/packages index 71ae4ef..cda9591 100644 --- a/ packages+++ b/ packages |
|
@@ -90,19 +90,17 @@ CONFIG_MOBILEMSG noncore/comm/mobilemsg mobilemsg.pro |
90 | CONFIG_MODPLUG core/multimedia/opieplayer/modplugmodplug.pro |
90 | CONFIG_MODPLUG core/multimedia/opieplayer/modplugmodplug.pro |
91 | CONFIG_MULTIKEY inputmethods/multikeymultikey.pro |
91 | CONFIG_MULTIKEY inputmethods/multikeymultikey.pro |
92 | CONFIG_NETSYSTEMTIME noncore/settings/netsystemtimenetsystemtime.pro |
92 | CONFIG_NETSYSTEMTIME noncore/settings/netsystemtimenetsystemtime.pro |
93 | CONFIG_NETWORKAPPLET noncore/applets/networkappletnetworkapplet.pro |
93 | CONFIG_NETWORKAPPLET noncore/applets/networkappletnetworkapplet.pro |
94 | CONFIG_NETWORKSETUP noncore/settings/networksettingsnetworksettings.pro |
94 | CONFIG_NETWORKSETUP noncore/settings/networksettingsnetworksettings.pro |
95 | CONFIG_NOTESAPPLET noncore/applets/notesappletnotesapplet.pro |
95 | CONFIG_NOTESAPPLET noncore/applets/notesappletnotesapplet.pro |
96 | CONFIG_OAPP core/apps/oappoapp.pro |
96 | CONFIG_OAPP core/apps/oappoapp.pro |
97 | CONFIG_OBEX core/applets/obex2obex.pro |
97 | CONFIG_OBEX core/applets/obex2obex.pro |
98 | CONFIG_OCOPSERVER x11/ipc/serverocopserver.pro |
| |
99 | CONFIG_ODICT noncore/apps/odictodict.pro |
98 | CONFIG_ODICT noncore/apps/odictodict.pro |
100 | CONFIG_OFILESELECTOR libopie/ofileselectorofileselector.pro |
| |
101 | CONFIG_OIPKG core/apps/oipkgoipkg.pro |
99 | CONFIG_OIPKG core/apps/oipkgoipkg.pro |
102 | CONFIG_OPIE-CONSOLE noncore/apps/opie-consoleopie-console.pro |
100 | CONFIG_OPIE-CONSOLE noncore/apps/opie-consoleopie-console.pro |
103 | CONFIG_OPIE-LOGIN core/opie-loginopie-login.pro |
101 | CONFIG_OPIE-LOGIN core/opie-loginopie-login.pro |
104 | CONFIG_OPIE-READER noncore/apps/opie-readeropie-reader.pro |
102 | CONFIG_OPIE-READER noncore/apps/opie-readeropie-reader.pro |
105 | CONFIG_OPIE-SH noncore/tools/opie-shopie-sh.pro |
103 | CONFIG_OPIE-SH noncore/tools/opie-shopie-sh.pro |
106 | CONFIG_OPIE-SHEET noncore/apps/opie-sheetopie-sheet.pro |
104 | CONFIG_OPIE-SHEET noncore/apps/opie-sheetopie-sheet.pro |
107 | CONFIG_OPIE-WRITE noncore/apps/opie-writeopie-write.pro |
105 | CONFIG_OPIE-WRITE noncore/apps/opie-writeopie-write.pro |
108 | CONFIG_OPIEALARMcore/opiealarm |
106 | CONFIG_OPIEALARMcore/opiealarm |
|