author | kergoth <kergoth> | 2003-08-09 19:43:03 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-08-09 19:43:03 (UTC) |
commit | 102a00422a155cef204977f6bb7b3f530b7b8c19 (patch) (unidiff) | |
tree | c4add67d773b27cad52c719cc032431cb687c3f9 | |
parent | 3a53173f75c21417bf7601b60a791f72fbb4631d (diff) | |
download | opie-102a00422a155cef204977f6bb7b3f530b7b8c19.zip opie-102a00422a155cef204977f6bb7b3f530b7b8c19.tar.gz opie-102a00422a155cef204977f6bb7b3f530b7b8c19.tar.bz2 |
Merges.
-rw-r--r-- | Makefile | 55 | ||||
-rw-r--r-- | Rules.make | 54 | ||||
-rw-r--r-- | Vars.make | 4 | ||||
-rw-r--r-- | packages | 2 |
4 files changed, 64 insertions, 51 deletions
@@ -11,9 +11,9 @@ 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 |
@@ -61,46 +61,8 @@ $(TOPDIR)/.config: $(TOPDIR)/.depends.cfgs $(configs) | |||
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 | ||
@@ -118,10 +80,21 @@ 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 |
@@ -1,5 +1,6 @@ | |||
1 | .PHONY: FORCE | 1 | .phony: force |
2 | force: | ||
2 | 3 | ||
3 | $(configs) : | 4 | $(configs) : |
4 | $(call makecfg,$@) | 5 | $(call makecfg,$@) |
5 | 6 | ||
@@ -56,15 +57,13 @@ $(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 .; ) |
@@ -97,27 +96,64 @@ $(TOPDIR)/library/custom.h : $(TOPDIR)/.config | |||
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'; \ |
@@ -133,8 +169,10 @@ $(TOPDIR)/scripts/filesubst : FORCE | |||
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 | ||
@@ -54,8 +54,12 @@ ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VER | |||
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 |
@@ -94,11 +94,9 @@ CONFIG_NETWORKAPPLET noncore/applets/networkapplet networkapplet.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 |