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
@@ -12,7 +12,7 @@ noconfig_targets := xconfig menuconfig config oldconfig randconfig \
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.
@@ -62,44 +62,6 @@ $(TOPDIR)/.config: $(TOPDIR)/.depends.cfgs $(configs)
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)),)
@@ -119,8 +81,19 @@ all clean install ipk: $(SUBDIRS)
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 ) \
diff --git a/Rules.make b/Rules.make
index e673eac..d26e42a 100644
--- a/Rules.make
+++ b/Rules.make
@@ -1,4 +1,5 @@
1.PHONY: FORCE 1.phony: force
2force:
2 3
3$(configs) : 4$(configs) :
4 $(call makecfg,$@) 5 $(call makecfg,$@)
@@ -57,13 +58,11 @@ $(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 .; )
@@ -98,25 +97,62 @@ $(TOPDIR)/library/custom.h : $(TOPDIR)/.config
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'; \
@@ -134,6 +170,8 @@ $(TOPDIR)/scripts/filesubst : FORCE
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 ##
diff --git a/Vars.make b/Vars.make
index cc463d3..59766d1 100644
--- a/Vars.make
+++ b/Vars.make
@@ -55,6 +55,10 @@ ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VER
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
diff --git a/packages b/packages
index 71ae4ef..cda9591 100644
--- a/packages
+++ b/packages
@@ -95,9 +95,7 @@ CONFIG_NETWORKSETUP noncore/settings/networksettings networksettings.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