summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile55
-rw-r--r--Rules.make54
-rw-r--r--Vars.make4
-rw-r--r--packages2
4 files changed, 64 insertions, 51 deletions
diff --git a/Makefile b/Makefile
index b1e76cb..0b4a06b 100644
--- a/Makefile
+++ b/Makefile
@@ -3,25 +3,25 @@
3export TOPDIR:=$(shell pwd) 3export TOPDIR:=$(shell pwd)
4 4
5include $(TOPDIR)/Vars.make 5include $(TOPDIR)/Vars.make
6ifneq ($(wildcard $(TOPDIR)/Vars.local),) 6ifneq ($(wildcard $(TOPDIR)/Vars.local),)
7include $(TOPDIR)/Vars.local 7include $(TOPDIR)/Vars.local
8endif 8endif
9 9
10noconfig_targets := xconfig menuconfig config oldconfig randconfig \ 10noconfig_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
15configs += $(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 15configs += $(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
24 # -critical-. Do not rearrange this! 24 # -critical-. Do not rearrange this!
25 25
26all : $(TOPDIR)/.config 26all : $(TOPDIR)/.config
27 27
@@ -53,83 +53,56 @@ ifneq ($(wildcard $(TOPDIR)/.depends.cfgs),)
53endif 53endif
54 54
55all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(configs) 55all 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
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
69xconfig :
70 $(call descend,scripts/kconfig,qconf)
71 LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(TOPDIR)/scripts/kconfig \
72 ./scripts/kconfig/qconf ./config.in
73
74menuconfig : $(TOPDIR)/scripts/lxdialog/lxdialog
75 $(call descend,scripts/kconfig,mconf)
76 ./scripts/kconfig/mconf ./config.in
77
78config :
79 $(call descend,scripts/kconfig,conf)
80 ./scripts/kconfig/conf ./config.in
81
82oldconfig :
83 $(call descend,scripts/kconfig,conf)
84 ./scripts/kconfig/conf -o ./config.in
85
86randconfig :
87 $(call descend,scripts/kconfig,conf)
88 ./scripts/kconfig/conf -r ./config.in
89
90allyesconfig :
91 $(call descend,scripts/kconfig,conf)
92 ./scripts/kconfig/conf -y ./config.in
93
94allnoconfig :
95 $(call descend,scripts/kconfig,conf)
96 ./scripts/kconfig/conf -n ./config.in
97
98defconfig :
99 $(call descend,scripts/kconfig,conf)
100 ./scripts/kconfig/conf -d ./config.in
101
102
103export 65export
104 66
105ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),) 67ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
106 68
107export include-config := 1 69export include-config := 1
108 70
109-include $(TOPDIR)/.config 71-include $(TOPDIR)/.config
110-include $(TOPDIR)/.depends 72-include $(TOPDIR)/.depends
111endif 73endif
112 74
113-include $(TOPDIR)/.config.cmd 75-include $(TOPDIR)/.config.cmd
114 76
115SUBDIRS = $(subdir-y) 77SUBDIRS = $(subdir-y)
116 78
117all clean install ipk: $(SUBDIRS) 79all clean install ipk: $(SUBDIRS)
118 80
119lupdate lrelease: 81lupdate lrelease:
120 @for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done 82 @for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done
121 83
122opie-lupdate opie-lrelease: 84opie-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
88qtmessages:
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
129clean : $(TOPDIR)/.config 102clean : $(TOPDIR)/.config
130 make -C bin clean 103 make -C bin clean
131 make -C lib clean 104 make -C lib clean
132 make -C plugins clean 105 make -C plugins clean
133 106
134apidox : doc/generate_apidox 107apidox : doc/generate_apidox
135 108
diff --git a/Rules.make b/Rules.make
index e673eac..d26e42a 100644
--- a/Rules.make
+++ b/Rules.make
@@ -1,13 +1,14 @@
1.PHONY: FORCE 1.phony: force
2force:
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 > $@
8ifneq ($(CONFIG_DEBUG),) 9ifneq ($(CONFIG_DEBUG),)
9 echo CONFIG += debug >> $@ 10 echo CONFIG += debug >> $@
10 echo CONFIG -= release >> $@ 11 echo CONFIG -= release >> $@
11else 12else
12 echo CONFIG -= debug >> $@ 13 echo CONFIG -= debug >> $@
13 echo CONFIG += release >> $@ 14 echo CONFIG += release >> $@
@@ -48,31 +49,29 @@ $(QTDIR)/stamp-headers :
48 touch $@ 49 touch $@
49 50
50$(QTDIR)/stamp-headers-x11 : 51$(QTDIR)/stamp-headers-x11 :
51 @-rm -f $(QTDIR)/stamp-headers* 52 @-rm -f $(QTDIR)/stamp-headers*
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 \
75 ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done ) 74 ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done )
76 ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h 75 ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h
77 touch $@ 76 touch $@
78 77
@@ -89,60 +88,99 @@ $(OPIEDIR)/stamp-headers-x11 :
89 ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ 88 ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
90 ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done ) 89 ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done )
91 ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h 90 ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h
92 ( cd include/qpe; ln -sf ../../x11/libqpe-x11/qpe/*.h .; ) 91 ( cd include/qpe; ln -sf ../../x11/libqpe-x11/qpe/*.h .; )
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
103menuconfig: $(TOPDIR)/scripts/lxdialog/lxdialog $(TOPDIR)/scripts/kconfig/mconf ./config.in
104 $(TOPDIR)/scripts/kconfig/mconf ./config.in
105 @touch ./.config.stamp
106
107xconfig: $(TOPDIR)/scripts/kconfig/qconf $(TOPDIR)/scripts/kconfig/libkconfig.so ./config.in
108 $(TOPDIR)/scripts/kconfig/qconf ./config.in
109 @touch .config.stamp
110
111gconfig: $(TOPDIR)/scripts/kconfig/gconf $(TOPDIR)/scripts/kconfig/libkconfig.so ./config.in
112 $(TOPDIR)/scripts/kconfig/gconf ./config.in
113 @touch .config.stamp
114
115config: $(TOPDIR)/scripts/kconfig/conf ./config.in
116 $(TOPDIR)/scripts/kconfig/conf ./config.in
117 @touch .config.stamp
118
119oldconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in
120 $(TOPDIR)/scripts/kconfig/conf -o ./config.in
121 @touch .config.stamp
122
123randconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in
124 $(TOPDIR)/scripts/kconfig/conf -r ./config.in
125 @touch .config.stamp
126
127allyesconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in
128 $(TOPDIR)/scripts/kconfig/conf -y ./config.in
129 @touch .config.stamp
130
131allnoconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in
132 $(TOPDIR)/scripts/kconfig/conf -n ./config.in
133 @touch .config.stamp
134
135defconfig: $(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'; \
128 echo 's,^\(\./\)*etc/,$(prefix)/etc/,g'; \ 164 echo 's,^\(\./\)*etc/,$(prefix)/etc/,g'; \
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
141define descend 179define descend
142 $(MAKE) $(if $(QMAKE),QMAKE=$(QMAKE)) -C $(1) $(2) 180 $(MAKE) $(if $(QMAKE),QMAKE=$(QMAKE)) -C $(1) $(2)
143endef 181endef
144 182
145define makefilegen 183define makefilegen
146 cd $(if $(1),$(shell dirname $(1))); $(TOPDIR)/qmake/qmake $(3) -o $(if $(1),$(shell basename $(1))) `cat $(OPIEDIR)/packages | grep " \`echo $(1)|sed -e 's,/Makefile$$,,'\`" | \ 184 cd $(if $(1),$(shell dirname $(1))); $(TOPDIR)/qmake/qmake $(3) -o $(if $(1),$(shell basename $(1))) `cat $(OPIEDIR)/packages | grep " \`echo $(1)|sed -e 's,/Makefile$$,,'\`" | \
147 head -1 | awk '{print $$3}'` 185 head -1 | awk '{print $$3}'`
148endef 186endef
diff --git a/Vars.make b/Vars.make
index cc463d3..59766d1 100644
--- a/Vars.make
+++ b/Vars.make
@@ -46,24 +46,28 @@ ifeq ($(QPE_VERSION),)
46endif 46endif
47export QPE_VERSION 47export QPE_VERSION
48 48
49SUB_VERSION=$(shell echo $$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$(OPIEDIR)/library/version.h)) 49SUB_VERSION=$(shell echo $$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$(OPIEDIR)/library/version.h))
50ifeq ($(VERSION_CVS),) 50ifeq ($(VERSION_CVS),)
51 VERSION_CVS:=$(shell date +%Y%m%d) 51 VERSION_CVS:=$(shell date +%Y%m%d)
52endif 52endif
53ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),) 53ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),)
54 SUB_VERSION:=$(VERSION_CVS) 54 SUB_VERSION:=$(VERSION_CVS)
55endif 55endif
56export SUB_VERSION 56export SUB_VERSION
57 57
58ifneq ($(strip $(SUB_VERSION)),)
59EXTRAVERSION=-$(SUB_VERSION)
60endif
61
58ifeq ($(QTE_REVISION),) 62ifeq ($(QTE_REVISION),)
59 QTE_REVISION=5 63 QTE_REVISION=5
60endif 64endif
61export QTE_REVISION 65export QTE_REVISION
62 66
63export DEB_VERSION=2.0 67export DEB_VERSION=2.0
64 68
65ifeq ($(QTE_BASEVERSION),) 69ifeq ($(QTE_BASEVERSION),)
66 ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) 70 ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),)
67 QTE_BASEVERSION:=$(shell cat $(QTDIR)/include/qglobal.h|grep '^\#define QT_VERSION'|grep -v STR|sed -e 's/\#define QT_VERSION\t*//; s/.*\([0-9]\)\([0-9]\)\([0-9]\).*/\1.\2.\3/;') 71 QTE_BASEVERSION:=$(shell cat $(QTDIR)/include/qglobal.h|grep '^\#define QT_VERSION'|grep -v STR|sed -e 's/\#define QT_VERSION\t*//; s/.*\([0-9]\)\([0-9]\)\([0-9]\).*/\1.\2.\3/;')
68 else 72 else
69 QTE_BASEVERSION=2.3.5 73 QTE_BASEVERSION=2.3.5
diff --git a/packages b/packages
index 71ae4ef..cda9591 100644
--- a/packages
+++ b/packages
@@ -86,27 +86,25 @@ CONFIG_MEDIUMMOUNT noncore/settings/mediummount mediummount.pro
86 CONFIG_METAL noncore/styles/metalmetal.pro 86 CONFIG_METAL noncore/styles/metalmetal.pro
87 CONFIG_MINDBREAKER noncore/games/mindbreakermindbreaker.pro 87 CONFIG_MINDBREAKER noncore/games/mindbreakermindbreaker.pro
88 CONFIG_MINESWEEP noncore/games/minesweepminesweep.pro 88 CONFIG_MINESWEEP noncore/games/minesweepminesweep.pro
89 CONFIG_MOBILEMSG noncore/comm/mobilemsgmobilemsg.pro 89 CONFIG_MOBILEMSG noncore/comm/mobilemsgmobilemsg.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
109 CONFIG_OPIEFTP noncore/net/opieftpopieftp.pro 107 CONFIG_OPIEFTP noncore/net/opieftpopieftp.pro
110 CONFIG_OPIEIRC noncore/net/opieircopieirc.pro 108 CONFIG_OPIEIRC noncore/net/opieircopieirc.pro
111 CONFIG_OPIEMAIL2noncore/mail mail.pro 109 CONFIG_OPIEMAIL2noncore/mail mail.pro
112 CONFIG_OPIEPLAYER core/multimedia/opieplayeropieplayer.pro 110 CONFIG_OPIEPLAYER core/multimedia/opieplayeropieplayer.pro