summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Rules.make4
-rw-r--r--examples/opiebluez/opiebluez.pro2
2 files changed, 3 insertions, 3 deletions
diff --git a/Rules.make b/Rules.make
index f41fcd0..9eeb9f9 100644
--- a/Rules.make
+++ b/Rules.make
@@ -1,353 +1,353 @@
1.phony: force 1.phony: force
2force: 2force:
3 3
4$(configs) : 4$(configs) :
5 $(call makecfg,$@) 5 $(call makecfg,$@)
6 6
7$(TOPDIR)/gen.pro : $(TOPDIR)/.config 7$(TOPDIR)/gen.pro : $(TOPDIR)/.config
8 echo > $@ 8 echo > $@
9# added for threaded version 9# added for threaded version
10ifneq ($(CONFIG_THREADED),) 10ifneq ($(CONFIG_THREADED),)
11 echo CONFIG += thread >> $@ 11 echo CONFIG += thread >> $@
12else 12else
13 echo CONFIG -= thread >> $@ 13 echo CONFIG -= thread >> $@
14endif 14endif
15# added for auto stripped build 15# added for auto stripped build
16ifneq ($(CONFIG_STRIP),) 16ifneq ($(CONFIG_STRIP),)
17 echo CONFIG += strip >> $@ 17 echo CONFIG += strip >> $@
18endif 18endif
19ifneq ($(CONFIG_DEBUG),) 19ifneq ($(CONFIG_DEBUG),)
20 echo CONFIG += debug >> $@ 20 echo CONFIG += debug >> $@
21 echo CONFIG -= release >> $@ 21 echo CONFIG -= release >> $@
22 echo DEFINES += "QT_COMPONENT_DEBUG=2" >> $@ 22 echo DEFINES += "QT_COMPONENT_DEBUG=2" >> $@
23 echo DEFINES += QT_DEBUG >> $@ 23 echo DEFINES += QT_DEBUG >> $@
24else 24else
25 echo CONFIG -= debug >> $@ 25 echo CONFIG -= debug >> $@
26 echo CONFIG += release >> $@ 26 echo CONFIG += release >> $@
27 echo DEFINES += "OPIE_NO_DEBUG" >> $@ 27 echo DEFINES += "OPIE_NO_DEBUG" >> $@
28endif 28endif
29ifeq ($(CONFIG_STATIC),y) 29ifeq ($(CONFIG_STATIC),y)
30 echo !contains\( TARGET,qpe \) \{ >> $@ 30 echo !contains\( TARGET,qpe \) \{ >> $@
31 echo CONFIG += staticlib >> $@ 31 echo CONFIG += staticlib >> $@
32 echo \} >> $@ 32 echo \} >> $@
33endif 33endif
34ifeq ($(filter 3.%,$(QTE_VERSION)),) # not qt3 34ifeq ($(filter 3.%,$(QTE_VERSION)),) # not qt3
35 echo CONFIG -= qt3 >> $@ 35 echo CONFIG -= qt3 >> $@
36else 36else
37 echo CONFIG += qt3 >> $@ 37 echo CONFIG += qt3 >> $@
38endif 38endif
39ifneq ($(CONFIG_QUICK_LAUNCH),) 39ifneq ($(CONFIG_QUICK_LAUNCH),)
40 echo contains\( CONFIG, quick-app \) \{ >> $@ 40 echo contains\( CONFIG, quick-app \) \{ >> $@
41 echo CONFIG -= staticlib >> $@ 41 echo CONFIG -= staticlib >> $@
42 echo CONFIG -= quick-app >> $@ 42 echo CONFIG -= quick-app >> $@
43 echo CONFIG += quick-app-lib >> $@ 43 echo CONFIG += quick-app-lib >> $@
44 echo QUICKLAUNCH_PATH = $(CONFIG_QUICKLAUNCH_PATH) >> $@ 44 echo QUICKLAUNCH_PATH = $(CONFIG_QUICKLAUNCH_PATH) >> $@
45 echo \} >> $@ 45 echo \} >> $@
46else 46else
47 echo contains\( CONFIG, quick-app \) \{ >> $@ 47 echo contains\( CONFIG, quick-app \) \{ >> $@
48 echo CONFIG -= quick-app >> $@ 48 echo CONFIG -= quick-app >> $@
49 echo CONFIG += quick-app-bin >> $@ 49 echo CONFIG += quick-app-bin >> $@
50 echo \} >> $@ 50 echo \} >> $@
51endif 51endif
52ifeq ($(CONFIG_SQL_PIM_BACKEND),y) 52ifeq ($(CONFIG_SQL_PIM_BACKEND),y)
53 echo ENABLE_SQL_PIM_BACKEND=$(CONFIG_SQL_PIM_BACKEND) >> $@ 53 echo ENABLE_SQL_PIM_BACKEND=$(CONFIG_SQL_PIM_BACKEND) >> $@
54else 54else
55 echo ENABLE_SQL_PIM_BACKEND=n >> $@ 55 echo ENABLE_SQL_PIM_BACKEND=n >> $@
56endif 56endif
57ifeq ($(CONFIG_OPIELOGIN_USEPAM),y) 57ifeq ($(CONFIG_OPIELOGIN_USEPAM),y)
58 echo CONFIG += OPIELOGIN_USEPAM >> $@ 58 echo CONFIG += OPIELOGIN_USEPAM >> $@
59endif 59endif
60ifeq ($(CONFIG_LIBQPE_WITHROHFEEDBACK),y) 60ifeq ($(CONFIG_LIBQPE_WITHROHFEEDBACK),y)
61 echo CONFIG += LIBQPE_WITHROHFEEDBACK >> $@ 61 echo CONFIG += LIBQPE_WITHROHFEEDBACK >> $@
62endif 62endif
63ifeq ($(CONFIG_LIBQPE_NO_INLINE_IMAGES),y) 63ifeq ($(CONFIG_LIBQPE_NO_INLINE_IMAGES),y)
64 echo DEFINES += LIBQPE_NO_INLINE_IMAGES >> $@ 64 echo DEFINES += LIBQPE_NO_INLINE_IMAGES >> $@
65endif 65endif
66ifeq ($(CONFIG_OPIE_NO_BUILTIN_SHUTDOWN),y) 66ifeq ($(CONFIG_OPIE_NO_BUILTIN_SHUTDOWN),y)
67 echo DEFINES += OPIE_NO_BUILTIN_SHUTDOWN >> $@ 67 echo DEFINES += OPIE_NO_BUILTIN_SHUTDOWN >> $@
68endif 68endif
69ifeq ($(CONFIG_OPIE_NO_BUILTIN_CALIBRATE),y) 69ifeq ($(CONFIG_OPIE_NO_BUILTIN_CALIBRATE),y)
70 echo DEFINES += OPIE_NO_BUILTIN_CALIBRATE >> $@ 70 echo DEFINES += OPIE_NO_BUILTIN_CALIBRATE >> $@
71endif 71endif
72ifeq ($(CONFIG_USE_REALTIME_AUDIO_THREAD),y) 72ifeq ($(CONFIG_USE_REALTIME_AUDIO_THREAD),y)
73 echo DEFINES += USE_REALTIME_AUDIO_THREAD >> $@ 73 echo DEFINES += USE_REALTIME_AUDIO_THREAD >> $@
74endif 74endif
75ifeq ($(CONFIG_USE_FILE_NOTIFICATION),y) 75ifeq ($(CONFIG_USE_FILE_NOTIFICATION),y)
76 echo DEFINES += USE_FILE_NOTIFICATION >> $@ 76 echo DEFINES += USE_FILE_NOTIFICATION >> $@
77endif 77endif
78ifeq ($(CONFIG_QT_QWS_ALLOW_CLOCK),y) 78ifeq ($(CONFIG_QT_QWS_ALLOW_CLOCK),y)
79 echo DEFINES += QT_QWS_ALLOW_OVERCLOCK >> $@ 79 echo DEFINES += QT_QWS_ALLOW_OVERCLOCK >> $@
80endif 80endif
81ifeq ($(CONFIG_OPIE_NEW_ALLOC),y) 81ifeq ($(CONFIG_OPIE_NEW_ALLOC),y)
82 echo DEFINES += OPIE_NEW_MALLOC >> $@ 82 echo DEFINES += OPIE_NEW_MALLOC >> $@
83endif 83endif
84ifeq ($(CONFIG_OPIE_NO_SOUND_PCM_READ_BITS),y) 84ifeq ($(CONFIG_OPIE_NO_SOUND_PCM_READ_BITS),y)
85 echo DEFINES += OPIE_NO_SOUND_PCM_READ_BITS >> $@ 85 echo DEFINES += OPIE_NO_SOUND_PCM_READ_BITS >> $@
86endif 86endif
87 echo DEFINES += OPIE_SOUND_FRAGMENT_SHIFT=$(CONFIG_OPIE_SOUND_FRAGMENT_SHIFT) >> $@ 87 echo DEFINES += OPIE_SOUND_FRAGMENT_SHIFT=$(CONFIG_OPIE_SOUND_FRAGMENT_SHIFT) >> $@
88ifeq ($(CONFIG_OPIE_WE_VERSION_OVERRIDE),y) 88ifeq ($(CONFIG_OPIE_WE_VERSION_OVERRIDE),y)
89 echo DEFINES += OPIE_WE_VERSION=$(CONFIG_OPIE_WE_VERSION) >> $@ 89 echo DEFINES += OPIE_WE_VERSION=$(CONFIG_OPIE_WE_VERSION) >> $@
90endif 90endif
91ifeq ($(CONFIG_OPIE_TASKBAR_LOCK_KEY_STATE),y) 91ifeq ($(CONFIG_OPIE_TASKBAR_LOCK_KEY_STATE),y)
92 echo DEFINES += OPIE_TASKBAR_LOCK_KEY_STATE >> $@ 92 echo DEFINES += OPIE_TASKBAR_LOCK_KEY_STATE >> $@
93 endif 93 endif
94# Write LIB dirs and INC dirs... 94# Write LIB dirs and INC dirs...
95ifeq ($(CONFIG_LIBETPAN_DEP),y) 95ifeq ($(CONFIG_LIBETPAN_DEP),y)
96 echo LIBETPAN_LIB_DIR = $(CONFIG_LIBETPAN_LIB_DIR) >> $@ 96 echo LIBETPAN_LIB_DIR = $(CONFIG_LIBETPAN_LIB_DIR) >> $@
97 echo LIBETPAN_INC_DIR = $(CONFIG_LIBETPAN_INC_DIR) >> $@ 97 echo LIBETPAN_INC_DIR = $(CONFIG_LIBETPAN_INC_DIR) >> $@
98endif 98endif
99ifeq ($(CONFIG_LIBPCAP_DEP),y) 99ifeq ($(CONFIG_LIBPCAP_DEP),y)
100 echo LIBPCAP_LIB_DIR = $(CONFIG_LIBPCAP_LIB_DIR) >> $@ 100 echo LIBPCAP_LIB_DIR = $(CONFIG_LIBPCAP_LIB_DIR) >> $@
101 echo LIBPCAP_INC_DIR = $(CONFIG_LIBPCAP_INC_DIR) >> $@ 101 echo LIBPCAP_INC_DIR = $(CONFIG_LIBPCAP_INC_DIR) >> $@
102endif 102endif
103ifeq ($(CONFIG_LIBSQLITE_DEP),y) 103ifeq ($(CONFIG_LIBSQLITE_DEP),y)
104 echo LIBSQLITE_LIB_DIR = $(CONFIG_LIBSQLITE_LIB_DIR) >> $@ 104 echo LIBSQLITE_LIB_DIR = $(CONFIG_LIBSQLITE_LIB_DIR) >> $@
105 echo LIBSQLITE_INC_DIR = $(CONFIG_LIBSQLITE_INC_DIR) >> $@ 105 echo LIBSQLITE_INC_DIR = $(CONFIG_LIBSQLITE_INC_DIR) >> $@
106endif 106endif
107ifeq ($(CONFIG_LIBXINE_DEP),y) 107ifeq ($(CONFIG_LIBXINE_DEP),y)
108 echo LIBXINE_LIB_DIR = $(CONFIG_LIBXINE_LIB_DIR) >> $@ 108 echo LIBXINE_LIB_DIR = $(CONFIG_LIBXINE_LIB_DIR) >> $@
109 echo LIBXINE_INC_DIR = $(CONFIG_LIBXINE_INC_DIR) >> $@ 109 echo LIBXINE_INC_DIR = $(CONFIG_LIBXINE_INC_DIR) >> $@
110endif 110endif
111ifeq ($(CONFIG_LIBBLUEZ_DEP),y) 111ifeq ($(CONFIG_LIBBLUEZ_DEP),y)
112 echo LIBBLUEZ_LIB_DIR = $(CONFIG_LIBBLUEZ_LIB_DIR) >> $@ 112 echo LIBBLUEZ_LIB_DIR = $(CONFIG_LIBBLUEZ_LIB_DIR) >> $@
113 echo LIBBLUEZ_INC_DIR = $(CONFIG_LIBBLUEZ_INC_DIR) >> $@ 113 echo LIBBLUEZ_INC_DIR = $(CONFIG_LIBBLUEZ_INC_DIR) >> $@
114endif 114endif
115ifeq ($(CONFIG_LIBIPK_DEP),y) 115ifeq ($(CONFIG_LIBIPK_DEP),y)
116 echo LIBIPK_LIB_DIR = $(CONFIG_LIBIPK_LIB_DIR) >> $@ 116 echo LIBIPK_LIB_DIR = $(CONFIG_LIBIPK_LIB_DIR) >> $@
117 echo LIBIPK_INC_DIR = $(CONFIG_LIBIPK_INC_DIR) >> $@ 117 echo LIBIPK_INC_DIR = $(CONFIG_LIBIPK_INC_DIR) >> $@
118endif 118endif
119ifeq ($(CONFIG_LIBSDK_DEP),y) 119ifeq ($(CONFIG_LIBSDK_DEP),y)
120 echo LIBSDL_LIB_DIR = $(CONFIG_LIBSDL_LIB_DIR) >> $@ 120 echo LIBSDL_LIB_DIR = $(CONFIG_LIBSDL_LIB_DIR) >> $@
121 echo LIBSDL_INC_DIR = $(CONFIG_LIBSDL_INC_DIR) >> $@ 121 echo LIBSDL_INC_DIR = $(CONFIG_LIBSDL_INC_DIR) >> $@
122endif 122endif
123ifeq ($(CONFIG_LIBSWORD_DEP),y) 123ifeq ($(CONFIG_LIBSWORD_DEP),y)
124 echo LIBSWORD_LIB_DIR = $(CONFIG_LIBSWORD_LIB_DIR) >> $@ 124 echo LIBSWORD_LIB_DIR = $(CONFIG_LIBSWORD_LIB_DIR) >> $@
125 echo LIBSWORD_INC_DIR = $(CONFIG_LIBSWORD_INC_DIR) >> $@ 125 echo LIBSWORD_INC_DIR = $(CONFIG_LIBSWORD_INC_DIR) >> $@
126endif 126endif
127ifeq ($(CONFIG_LIBFREETYPE2_DEP),y) 127ifeq ($(CONFIG_LIBFREETYPE2_DEP),y)
128 echo LIBFREETYPE2_INC_DIR = $(CONFIG_LIBFREETYPE2_INC_DIR) >> $@ 128 echo LIBFREETYPE2_INC_DIR = $(CONFIG_LIBFREETYPE2_INC_DIR) >> $@
129endif 129endif
130ifeq ($(CONFIG_LIBFLITE_DEP),y) 130ifeq ($(CONFIG_LIBFLITE_DEP),y)
131 echo LIBFLITE_LIB_DIR = $(CONFIG_LIBFLITE_LIB_DIR) >> $@ 131 echo LIBFLITE_LIB_DIR = $(CONFIG_LIBFLITE_LIB_DIR) >> $@
132 echo LIBFLITE_INC_DIR = $(CONFIG_LIBFLITE_INC_DIR) >> $@ 132 echo LIBFLITE_INC_DIR = $(CONFIG_LIBFLITE_INC_DIR) >> $@
133endif 133endif
134$(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) $(TOPDIR)/.config $(TOPDIR)/packages 134$(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) $(TOPDIR)/.config $(TOPDIR)/packages
135 @echo Generating dependency information... 135 @echo Generating dependency information...
136# add to subdir-y, and add descend rules 136# add to subdir-y, and add descend rules
137 @cat $(TOPDIR)/packages | grep -v '^#' | \ 137 @cat $(TOPDIR)/packages | grep -v '^#' | \
138 awk '{print \ 138 awk '{print \
139 ".PHONY : " $$2 "\n" \ 139 ".PHONY : " $$2 "\n" \
140 "subdir-$$(" $$1 ") += " $$2 "\n\n"; \ 140 "subdir-$$(" $$1 ") += " $$2 "\n\n"; \
141 print $$2 " : " $$2 "/Makefile\n\t+$$(call descend,$$@,$(filter-out $$@,$$(filter-out $$@,$$(MAKECMDGOALS))))\n"; }' > $(TOPDIR)/.depends 141 print $$2 " : " $$2 "/Makefile\n\t+$$(call descend,$$@,$(filter-out $$@,$$(filter-out $$@,$$(MAKECMDGOALS))))\n"; }' > $(TOPDIR)/.depends
142 cat $(TOPDIR)/packages | grep -v '^#' | \ 142 cat $(TOPDIR)/packages | grep -v '^#' | \
143 perl -ne '($$cfg, $$dir, $$pro) = $$_ =~ /^(\S+)\s+(\S+)\s+(\S+)/; if ( -e "$$dir/$$pro" ) { print "$$dir/Makefile : $$dir/$$pro \$$(QMAKE) \$$(OPIEDIR)/gen.pro \$$(OPIEDIR)/.config\n\t\$$(call makefilegen,\$$@)\n\n"; }' \ 143 perl -ne '($$cfg, $$dir, $$pro) = $$_ =~ /^(\S+)\s+(\S+)\s+(\S+)/; if ( -e "$$dir/$$pro" ) { print "$$dir/Makefile : $$dir/$$pro \$$(QMAKE) \$$(OPIEDIR)/gen.pro \$$(OPIEDIR)/.config\n\t\$$(call makefilegen,\$$@)\n\n"; }' \
144 >> $(TOPDIR)/.depends 144 >> $(TOPDIR)/.depends
145# interpackage dependency generation 145# interpackage dependency generation
146 @cat $(TOPDIR)/packages | \ 146 @cat $(TOPDIR)/packages | \
147 $(TOPDIR)/scripts/deps.pl >> $(TOPDIR)/.depends 147 $(TOPDIR)/scripts/deps.pl >> $(TOPDIR)/.depends
148 148
149$(TOPDIR)/.depends.cfgs: 149$(TOPDIR)/.depends.cfgs:
150# config.in interdependencies 150# config.in interdependencies
151 @echo $(configs) | sed -e 's,/config.in,,g' | ( for i in `cat`; do echo $$i; done ) > dirs 151 @echo $(configs) | sed -e 's,/config.in,,g' | ( for i in `cat`; do echo $$i; done ) > dirs
152 @cat dirs | ( for i in `cat`; do if [ "`cat dirs|grep $$i 2>/dev/null|wc -l`" -ne "1" ]; then deps=`cat dirs|grep $$i| grep -v "^$$i$$"|for i in \`cat|sed -e's,^$(TOPDIR)/,$$(TOPDIR)/,g'\`; do echo $$i/config.in; done`; echo `echo $$i/config.in|sed -e 's,^$(TOPDIR)/,$$(TOPDIR)/,'` : $$deps; fi; done ) >> $@ 152 @cat dirs | ( for i in `cat`; do if [ "`cat dirs|grep $$i 2>/dev/null|wc -l`" -ne "1" ]; then deps=`cat dirs|grep $$i| grep -v "^$$i$$"|for i in \`cat|sed -e's,^$(TOPDIR)/,$$(TOPDIR)/,g'\`; do echo $$i/config.in; done`; echo `echo $$i/config.in|sed -e 's,^$(TOPDIR)/,$$(TOPDIR)/,'` : $$deps; fi; done ) >> $@
153 @-rm -f dirs 153 @-rm -f dirs
154 154
155$(QTDIR)/stamp-headers : 155$(QTDIR)/stamp-headers :
156 @-rm -f $(QTDIR)/stamp-headers* 156 @-rm -f $(QTDIR)/stamp-headers*
157 ( cd $(QTDIR)/include; \ 157 ( cd $(QTDIR)/include; \
158 $(patsubst %,ln -sf ../src/kernel/%;,qgfx_qws.h qwsmouse_qws.h \ 158 $(patsubst %,ln -sf ../src/kernel/%;,qgfx_qws.h qwsmouse_qws.h \
159 qcopchannel_qws.h qwindowsystem_qws.h \ 159 qcopchannel_qws.h qwindowsystem_qws.h \
160 qfontmanager_qws.h qwsdefaultdecoration_qws.h)) 160 qfontmanager_qws.h qwsdefaultdecoration_qws.h))
161 touch $@ 161 touch $@
162 162
163$(QTDIR)/stamp-headers-x11 : 163$(QTDIR)/stamp-headers-x11 :
164 @-rm -f $(QTDIR)/stamp-headers* 164 @-rm -f $(QTDIR)/stamp-headers*
165 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) 165 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)
166 touch $@ 166 touch $@
167 167
168$(OPIEDIR)/stamp-headers : 168$(OPIEDIR)/stamp-headers :
169 @-rm -f $(OPIEDIR)/stamp-headers* 169 @-rm -f $(OPIEDIR)/stamp-headers*
170 mkdir -p $(TOPDIR)/include/qpe \ 170 mkdir -p $(TOPDIR)/include/qpe \
171 $(TOPDIR)/include/qtopia \ 171 $(TOPDIR)/include/qtopia \
172 $(TOPDIR)/include/opie \ 172 $(TOPDIR)/include/opie \
173 $(TOPDIR)/include/opie2 \ 173 $(TOPDIR)/include/opie2 \
174 $(TOPDIR)/include/opie2/private \ 174 $(TOPDIR)/include/opie2/private \
175 $(TOPDIR)/include/qtopia/private \ 175 $(TOPDIR)/include/qtopia/private \
176 $(TOPDIR)/include/sl 176 $(TOPDIR)/include/sl
177 ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) 177 ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; )
178 ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) 178 ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; )
179 ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; ) 179 ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; )
180 # libopie2 180 # libopie2
181 ( cd include/opie2 && ln -sf ../../libopie2/opiecore/*.h .; ) 181 ( cd include/opie2 && ln -sf ../../libopie2/opiecore/*.h .; )
182 ( cd include/opie2 && ln -sf ../../libopie2/opiecore/device/*.h .; ) 182 ( cd include/opie2 && ln -sf ../../libopie2/opiecore/device/*.h .; )
183 ( cd include/opie2 && ln -sf ../../libopie2/opiecore/linux/*.h .; ) 183 ( cd include/opie2 && ln -sf ../../libopie2/opiecore/linux/*.h .; )
184 ( cd include/opie2 && ln -sf ../../libopie2/opiemm/*.h .; ) 184 ( cd include/opie2 && ln -sf ../../libopie2/opiemm/*.h .; )
185 ( cd include/opie2 && ln -sf ../../libopie2/opiedb/*.h .; ) 185 ( cd include/opie2 && ln -sf ../../libopie2/opiedb/*.h .; )
186 ( cd include/opie2 && ln -sf ../../libopie2/opienet/*.h .; ) 186 ( cd include/opie2 && ln -sf ../../libopie2/opienet/*.h .; )
187 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/*.h .; ) 187 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/*.h .; )
188 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/core/*.h .; ) 188 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/core/*.h .; )
189 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/backend/*.h .; ) 189 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/backend/*.h .; )
190 ( cd include/opie2/private && ln -sf ../../../libopie2/opiepim/private/*.h .; ) 190 ( cd include/opie2/private && ln -sf ../../../libopie2/opiepim/private/*.h .; )
191 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/ui/*.h .; ) 191 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/ui/*.h .; )
192 ( cd include/opie2 && ln -sf ../../libopie2/opieui/*.h .; ) 192 ( cd include/opie2 && ln -sf ../../libopie2/opieui/*.h .; )
193 ( cd include/opie2 && ln -sf ../../libopie2/opieui/fileselector/*.h .; ) 193 ( cd include/opie2 && ln -sf ../../libopie2/opieui/fileselector/*.h .; )
194 ( cd include/opie2 && ln -sf ../../libopie2/opieui/big-screen/*.h .; ) 194 ( cd include/opie2 && ln -sf ../../libopie2/opieui/big-screen/*.h .; )
195 ( cd include/opie2 && ln -sf ../../libopie2/opiesecurity/*.h .; ) 195 ( cd include/opie2 && ln -sf ../../libopie2/opiesecurity/*.h .; )
196 ( cd include/opie2 && ln -sf ../../libopie2/opieshower/*.h .; ) 196 ( cd include/opie2 && ln -sf ../../libopie2/opiebluez/*.h .; )
197 # auxilliary libraries 197 # auxilliary libraries
198 ( cd include/opie2 && ln -sf ../../libqtaux/*.h .; ) 198 ( cd include/opie2 && ln -sf ../../libqtaux/*.h .; )
199 ( cd include/sl && ln -sf ../../libslcompat/*.h .; ) 199 ( cd include/sl && ln -sf ../../libslcompat/*.h .; )
200 ( cd include/ && ln -sf ../noncore/net/ftplib/*.h .; ) 200 ( cd include/ && ln -sf ../noncore/net/ftplib/*.h .; )
201 ( cd include/ && ln -sf ../inputmethods/pickboard/pickboardcfg.h .; ) 201 ( cd include/ && ln -sf ../inputmethods/pickboard/pickboardcfg.h .; )
202 ( cd include/ && ln -sf ../inputmethods/pickboard/pickboardpicks.h .; ) 202 ( cd include/ && ln -sf ../inputmethods/pickboard/pickboardpicks.h .; )
203 # all 203 # all
204 ( cd include/opie2; for generatedHeader in `cd ../../libopie2/opieui; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ 204 ( cd include/opie2; for generatedHeader in `cd ../../libopie2/opieui; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
205 ln -sf ../../libopie2/opieui/$$generatedHeader $$generatedHeader; done ) 205 ln -sf ../../libopie2/opieui/$$generatedHeader $$generatedHeader; done )
206 ( cd include/opie2; for generatedHeader in `cd ../../libopie2/opiepim/ui; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ 206 ( cd include/opie2; for generatedHeader in `cd ../../libopie2/opiepim/ui; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
207 ln -sf ../../libopie2/opiepim/ui/$$generatedHeader $$generatedHeader; done ) 207 ln -sf ../../libopie2/opiepim/ui/$$generatedHeader $$generatedHeader; done )
208 ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h 208 ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h
209 touch $@ 209 touch $@
210 210
211$(OPIEDIR)/stamp-headers-x11 : 211$(OPIEDIR)/stamp-headers-x11 :
212 @-rm -f $(OPIEDIR)/stamp-headers* 212 @-rm -f $(OPIEDIR)/stamp-headers*
213 mkdir -p $(TOPDIR)/include/qpe \ 213 mkdir -p $(TOPDIR)/include/qpe \
214 $(TOPDIR)/include/qtopia \ 214 $(TOPDIR)/include/qtopia \
215 $(TOPDIR)/include/qtopia/private \ 215 $(TOPDIR)/include/qtopia/private \
216 $(TOPDIR)/include/opie \ 216 $(TOPDIR)/include/opie \
217 $(TOPDIR)/include/opie2 \ 217 $(TOPDIR)/include/opie2 \
218 $(TOPDIR)/include/opie2/private \ 218 $(TOPDIR)/include/opie2/private \
219 $(TOPDIR)/include/sl 219 $(TOPDIR)/include/sl
220 220
221 ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) 221 ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; )
222 ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) 222 ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; )
223 ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; ) 223 ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; )
224 # libopie2 224 # libopie2
225 ( cd include/opie2 && ln -sf ../../libopie2/opiecore/*.h .; ) 225 ( cd include/opie2 && ln -sf ../../libopie2/opiecore/*.h .; )
226 ( cd include/opie2 && ln -sf ../../libopie2/opiecore/device/*.h .; ) 226 ( cd include/opie2 && ln -sf ../../libopie2/opiecore/device/*.h .; )
227 ( cd include/opie2 && ln -sf ../../libopie2/opiemm/*.h .; ) 227 ( cd include/opie2 && ln -sf ../../libopie2/opiemm/*.h .; )
228 ( cd include/opie2 && ln -sf ../../libopie2/opiedb/*.h .; ) 228 ( cd include/opie2 && ln -sf ../../libopie2/opiedb/*.h .; )
229 ( cd include/opie2 && ln -sf ../../libopie2/opienet/*.h .; ) 229 ( cd include/opie2 && ln -sf ../../libopie2/opienet/*.h .; )
230 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/*.h .; ) 230 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/*.h .; )
231 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/core/*.h .; ) 231 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/core/*.h .; )
232 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/backend/*.h .; ) 232 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/backend/*.h .; )
233 ( cd include/opie2/private && ln -sf ../../../libopie2/opiepim/private/*.h .; ) 233 ( cd include/opie2/private && ln -sf ../../../libopie2/opiepim/private/*.h .; )
234 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/ui/*.h .; ) 234 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/ui/*.h .; )
235 ( cd include/opie2 && ln -sf ../../libopie2/opieui/*.h .; ) 235 ( cd include/opie2 && ln -sf ../../libopie2/opieui/*.h .; )
236 ( cd include/opie2 && ln -sf ../../libopie2/opieui/fileselector/*.h .; ) 236 ( cd include/opie2 && ln -sf ../../libopie2/opieui/fileselector/*.h .; )
237 ( cd include/opie2 && ln -sf ../../libopie2/opieui/big-screen/*.h .; ) 237 ( cd include/opie2 && ln -sf ../../libopie2/opieui/big-screen/*.h .; )
238 ( cd include/opie2 && ln -sf ../../libopie2/opiesecurity/*.h .; ) 238 ( cd include/opie2 && ln -sf ../../libopie2/opiesecurity/*.h .; )
239 ( cd include/opie2 && ln -sf ../../libopie2/opieshower/*.h .; ) 239 ( cd include/opie2 && ln -sf ../../libopie2/opiebluez/*.h .; )
240 # auxilliary libraries 240 # auxilliary libraries
241 ( cd include/opie2 && ln -sf ../../libqtaux/*.h .; ) 241 ( cd include/opie2 && ln -sf ../../libqtaux/*.h .; )
242 ( cd include/sl && ln -sf ../../libslcompat/*.h .; ) 242 ( cd include/sl && ln -sf ../../libslcompat/*.h .; )
243 ( cd include/ && ln -sf ../noncore/net/ftplib/*.h .; ) 243 ( cd include/ && ln -sf ../noncore/net/ftplib/*.h .; )
244 ( cd include/ && ln -sf ../inputmethods/pickboard/pickboardcfg.h .; ) 244 ( cd include/ && ln -sf ../inputmethods/pickboard/pickboardcfg.h .; )
245 ( cd include/ && ln -sf ../inputmethods/pickboard/pickboardpicks.h .; ) 245 ( cd include/ && ln -sf ../inputmethods/pickboard/pickboardpicks.h .; )
246 # all 246 # all
247 ( cd include/opie2; for generatedHeader in `cd ../../libopie2/opieui; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ 247 ( cd include/opie2; for generatedHeader in `cd ../../libopie2/opieui; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
248 ln -sf ../../libopie2/opieui/$$generatedHeader $$generatedHeader; done ) 248 ln -sf ../../libopie2/opieui/$$generatedHeader $$generatedHeader; done )
249 ( cd include/opie2; for generatedHeader in `cd ../../libopie2/opiepim/ui; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ 249 ( cd include/opie2; for generatedHeader in `cd ../../libopie2/opiepim/ui; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
250 ln -sf ../../libopie2/opiepim/ui/$$generatedHeader $$generatedHeader; done ) 250 ln -sf ../../libopie2/opiepim/ui/$$generatedHeader $$generatedHeader; done )
251 ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h 251 ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h
252 252
253 # Qtopia 253 # Qtopia
254 ( cd include/qpe; ln -sf ../../x11/libqpe-x11/qpe/*.h .; ) 254 ( cd include/qpe; ln -sf ../../x11/libqpe-x11/qpe/*.h .; )
255 ( cd include/qtopia; ln -sf ../../x11/libqpe-x11/qpe/*.h .; ) 255 ( cd include/qtopia; ln -sf ../../x11/libqpe-x11/qpe/*.h .; )
256 touch $@ 256 touch $@
257 257
258$(TOPDIR)/library/custom.h : $(TOPDIR)/.config 258$(TOPDIR)/library/custom.h : $(TOPDIR)/.config
259 @-rm -f $@ 259 @-rm -f $@
260 @$(if $(patsubst "%",%,$(CONFIG_CUSTOMFILE)),\ 260 @$(if $(patsubst "%",%,$(CONFIG_CUSTOMFILE)),\
261 ln -sf $(patsubst "%",%,$(CONFIG_CUSTOMFILE)) $@) 261 ln -sf $(patsubst "%",%,$(CONFIG_CUSTOMFILE)) $@)
262 @touch $@ 262 @touch $@
263 263
264$(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: 264$(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:
265 +$(call descend,$(shell dirname $@),$(shell basename $@)) 265 +$(call descend,$(shell dirname $@),$(shell basename $@))
266 266
267menuconfig: $(TOPDIR)/scripts/lxdialog/lxdialog $(TOPDIR)/scripts/kconfig/mconf ./config.in 267menuconfig: $(TOPDIR)/scripts/lxdialog/lxdialog $(TOPDIR)/scripts/kconfig/mconf ./config.in
268 $(TOPDIR)/scripts/kconfig/mconf ./config.in 268 $(TOPDIR)/scripts/kconfig/mconf ./config.in
269 @touch ./.config.stamp 269 @touch ./.config.stamp
270 270
271xconfig: $(TOPDIR)/scripts/kconfig/qconf $(TOPDIR)/scripts/kconfig/libkconfig.so ./config.in 271xconfig: $(TOPDIR)/scripts/kconfig/qconf $(TOPDIR)/scripts/kconfig/libkconfig.so ./config.in
272 $(TOPDIR)/scripts/kconfig/qconf ./config.in 272 $(TOPDIR)/scripts/kconfig/qconf ./config.in
273 @touch .config.stamp 273 @touch .config.stamp
274 274
275gconfig: $(TOPDIR)/scripts/kconfig/gconf $(TOPDIR)/scripts/kconfig/libkconfig.so ./config.in 275gconfig: $(TOPDIR)/scripts/kconfig/gconf $(TOPDIR)/scripts/kconfig/libkconfig.so ./config.in
276 $(TOPDIR)/scripts/kconfig/gconf ./config.in 276 $(TOPDIR)/scripts/kconfig/gconf ./config.in
277 @touch .config.stamp 277 @touch .config.stamp
278 278
279config: $(TOPDIR)/scripts/kconfig/conf ./config.in 279config: $(TOPDIR)/scripts/kconfig/conf ./config.in
280 $(TOPDIR)/scripts/kconfig/conf ./config.in 280 $(TOPDIR)/scripts/kconfig/conf ./config.in
281 @touch .config.stamp 281 @touch .config.stamp
282 282
283oldconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in 283oldconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in
284 $(TOPDIR)/scripts/kconfig/conf -o ./config.in 284 $(TOPDIR)/scripts/kconfig/conf -o ./config.in
285 @touch .config.stamp 285 @touch .config.stamp
286 286
287randconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in 287randconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in
288 $(TOPDIR)/scripts/kconfig/conf -r ./config.in 288 $(TOPDIR)/scripts/kconfig/conf -r ./config.in
289 @touch .config.stamp 289 @touch .config.stamp
290 290
291allyesconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in 291allyesconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in
292 $(TOPDIR)/scripts/kconfig/conf -y ./config.in 292 $(TOPDIR)/scripts/kconfig/conf -y ./config.in
293 @touch .config.stamp 293 @touch .config.stamp
294 294
295allnoconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in 295allnoconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in
296 $(TOPDIR)/scripts/kconfig/conf -n ./config.in 296 $(TOPDIR)/scripts/kconfig/conf -n ./config.in
297 @touch .config.stamp 297 @touch .config.stamp
298 298
299defconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in 299defconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in
300 $(TOPDIR)/scripts/kconfig/conf -d ./config.in 300 $(TOPDIR)/scripts/kconfig/conf -d ./config.in
301 @touch .config.stamp 301 @touch .config.stamp
302 302
303$(TOPDIR)/qmake/qmake : $(TOPDIR)/mkspecs/default 303$(TOPDIR)/qmake/qmake : $(TOPDIR)/mkspecs/default
304 304
305$(TOPDIR)/mkspecs/default : 305$(TOPDIR)/mkspecs/default :
306 ln -sf linux-g++ $@ 306 ln -sf linux-g++ $@
307 307
308$(TOPDIR)/scripts/subst : force 308$(TOPDIR)/scripts/subst : force
309 @( \ 309 @( \
310 echo 's,\$$QPE_VERSION,$(QPE_VERSION),g'; \ 310 echo 's,\$$QPE_VERSION,$(QPE_VERSION),g'; \
311 echo 's,\$$OPIE_VERSION,$(OPIE_VERSION),g'; \ 311 echo 's,\$$OPIE_VERSION,$(OPIE_VERSION),g'; \
312 echo 's,\$$QTE_VERSION,$(QTE_VERSION),g'; \ 312 echo 's,\$$QTE_VERSION,$(QTE_VERSION),g'; \
313 echo 's,\$$QTE_REVISION,$(QTE_REVISION),g'; \ 313 echo 's,\$$QTE_REVISION,$(QTE_REVISION),g'; \
314 echo 's,\$$SUB_VERSION,$(SUB_VERSION),g'; \ 314 echo 's,\$$SUB_VERSION,$(SUB_VERSION),g'; \
315 echo 's,\$$EXTRAVERSION,$(EXTRAVERSION),g'; \ 315 echo 's,\$$EXTRAVERSION,$(EXTRAVERSION),g'; \
316 echo 's,\$$QTE_BASEVERSION,$(QTE_BASEVERSION),g'; \ 316 echo 's,\$$QTE_BASEVERSION,$(QTE_BASEVERSION),g'; \
317 ) > $@ || ( rm -f $@; exit 1 ) 317 ) > $@ || ( rm -f $@; exit 1 )
318 318
319$(TOPDIR)/scripts/filesubst : force 319$(TOPDIR)/scripts/filesubst : force
320 @( \ 320 @( \
321 echo 's,\$$OPIEDIR/root/,/,g'; \ 321 echo 's,\$$OPIEDIR/root/,/,g'; \
322 echo 's,$(OPIEDIR)/root/,/,g'; \ 322 echo 's,$(OPIEDIR)/root/,/,g'; \
323 echo 's,\$$OPIEDIR,$(prefix),g'; \ 323 echo 's,\$$OPIEDIR,$(prefix),g'; \
324 echo 's,$(OPIEDIR),$(prefix),g'; \ 324 echo 's,$(OPIEDIR),$(prefix),g'; \
325 echo 's,\$$QTDIR,$(prefix),g'; \ 325 echo 's,\$$QTDIR,$(prefix),g'; \
326 echo 's,$(QTDIR),$(prefix),g'; \ 326 echo 's,$(QTDIR),$(prefix),g'; \
327 echo 's,^\(\./\)*root/,/,g'; \ 327 echo 's,^\(\./\)*root/,/,g'; \
328 echo 's,^\(\./\)*etc/,$(prefix)/etc/,g'; \ 328 echo 's,^\(\./\)*etc/,$(prefix)/etc/,g'; \
329 echo 's,^\(\./\)*lib/,$(prefix)/lib/,g'; \ 329 echo 's,^\(\./\)*lib/,$(prefix)/lib/,g'; \
330 echo 's,^\(\./\)*bin/,$(prefix)/bin/,g'; \ 330 echo 's,^\(\./\)*bin/,$(prefix)/bin/,g'; \
331 echo 's,^\(\./\)*pics/,$(prefix)/pics/,g'; \ 331 echo 's,^\(\./\)*pics/,$(prefix)/pics/,g'; \
332 echo 's,^\(\./\)*sounds/,$(prefix)/sounds/,g'; \ 332 echo 's,^\(\./\)*sounds/,$(prefix)/sounds/,g'; \
333 echo 's,^\(\./\)*i18n/,$(prefix)/i18n/,g'; \ 333 echo 's,^\(\./\)*i18n/,$(prefix)/i18n/,g'; \
334 echo 's,^\(\./\)*plugins/,$(prefix)/plugins/,g'; \ 334 echo 's,^\(\./\)*plugins/,$(prefix)/plugins/,g'; \
335 echo 's,^\(\./\)*apps/,$(prefix)/apps/,g'; \ 335 echo 's,^\(\./\)*apps/,$(prefix)/apps/,g'; \
336 echo 's,^\(\./\)*share/,$(prefix)/share/,g'; \ 336 echo 's,^\(\./\)*share/,$(prefix)/share/,g'; \
337 echo 's,^\(\./\)*i18n/,$(prefix)/i18n/,g'; \ 337 echo 's,^\(\./\)*i18n/,$(prefix)/i18n/,g'; \
338 echo 's,^\(\./\)*help/,$(prefix)/help/,g'; \ 338 echo 's,^\(\./\)*help/,$(prefix)/help/,g'; \
339 ) > $@ || ( rm -f $@; exit 1 ) 339 ) > $@ || ( rm -f $@; exit 1 )
340 340
341## general rules ## 341## general rules ##
342 342
343define descend 343define descend
344 $(MAKE) $(if $(QMAKE),QMAKE=$(QMAKE)) -C $(1) $(2) 344 $(MAKE) $(if $(QMAKE),QMAKE=$(QMAKE)) -C $(1) $(2)
345endef 345endef
346 346
347define makefilegen 347define makefilegen
348 cd $(if $(1),$(dir $(1))); $(TOPDIR)/qmake/qmake $(3) -o $(if $(1),$(notdir $(1))) $(word 3,$(shell grep "[[:space:]]$(patsubst %/Makefile,%,$(1))[[:space:]]" $(OPIEDIR)/packages)) 348 cd $(if $(1),$(dir $(1))); $(TOPDIR)/qmake/qmake $(3) -o $(if $(1),$(notdir $(1))) $(word 3,$(shell grep "[[:space:]]$(patsubst %/Makefile,%,$(1))[[:space:]]" $(OPIEDIR)/packages))
349endef 349endef
350 350
351define makecfg 351define makecfg
352 $(TOPDIR)/scripts/makecfg.pl $1 $(OPIEDIR) 352 $(TOPDIR)/scripts/makecfg.pl $1 $(OPIEDIR)
353endef 353endef
diff --git a/examples/opiebluez/opiebluez.pro b/examples/opiebluez/opiebluez.pro
index 7e9fa8f..f3a9241 100644
--- a/examples/opiebluez/opiebluez.pro
+++ b/examples/opiebluez/opiebluez.pro
@@ -1,3 +1,3 @@
1TEMPLATE = subdirs 1TEMPLATE = subdirs
2SUBDIRS = oshowerdemo oshowertest 2SUBDIRS = obluezdemo oblueztest
3 3