|
diff --git a/Makefile b/Makefile index b1e76cb..0b4a06b 100644 --- a/ Makefile+++ b/ Makefile |
|
@@ -14,3 +14,3 @@ noconfig_targets := xconfig menuconfig config oldconfig randconfig \ |
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 | |
@@ -64,40 +64,2 @@ $(TOPDIR)/.config: $(TOPDIR)/.depends.cfgs $(configs) |
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 |
@@ -121,4 +83,15 @@ lupdate lrelease: |
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 | |
|
|
|
|
@@ -1,2 +1,3 @@ |
1 | .PHONY: FORCE |
1 | .phony: force |
| |
2 | force: |
2 | |
3 | |
@@ -59,4 +60,3 @@ $(OPIEDIR)/stamp-headers : |
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; ) |
@@ -65,3 +65,2 @@ $(OPIEDIR)/stamp-headers : |
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 .; ) |
@@ -100,4 +99,40 @@ $(TOPDIR)/library/custom.h : $(TOPDIR)/.config |
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 | |
@@ -108,3 +143,3 @@ $(TOPDIR)/mkspecs/default : |
108 | |
143 | |
109 | $(TOPDIR)/scripts/subst : FORCE |
144 | $(TOPDIR)/scripts/subst : force |
110 | @( \ |
145 | @( \ |
@@ -115,2 +150,3 @@ $(TOPDIR)/scripts/subst : FORCE |
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'; \ |
@@ -118,3 +154,3 @@ $(TOPDIR)/scripts/subst : FORCE |
118 | |
154 | |
119 | $(TOPDIR)/scripts/filesubst : FORCE |
155 | $(TOPDIR)/scripts/filesubst : force |
120 | @( \ |
156 | @( \ |
@@ -136,2 +172,4 @@ $(TOPDIR)/scripts/filesubst : FORCE |
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 ) |
|
|
diff --git a/Vars.make b/Vars.make index cc463d3..59766d1 100644 --- a/ Vars.make+++ b/ Vars.make |
|
@@ -57,2 +57,6 @@ 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),) |
|
|
diff --git a/packages b/packages index 71ae4ef..cda9591 100644 --- a/ packages+++ b/ packages |
|
@@ -97,5 +97,3 @@ CONFIG_OAPP core/apps/oapp oapp.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 |
|