summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Rules.make2
-rw-r--r--library/library.pro6
2 files changed, 4 insertions, 4 deletions
diff --git a/Rules.make b/Rules.make
index 04cfbee..e8b2420 100644
--- a/Rules.make
+++ b/Rules.make
@@ -1,316 +1,316 @@
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
15ifneq ($(CONFIG_DEBUG),) 15ifneq ($(CONFIG_DEBUG),)
16 echo CONFIG += debug >> $@ 16 echo CONFIG += debug >> $@
17 echo CONFIG -= release >> $@ 17 echo CONFIG -= release >> $@
18 echo DEFINES += "QT_COMPONENT_DEBUG=2" >> $@ 18 echo DEFINES += "QT_COMPONENT_DEBUG=2" >> $@
19 echo DEFINES += QT_DEBUG >> $@ 19 echo DEFINES += QT_DEBUG >> $@
20else 20else
21 echo CONFIG -= debug >> $@ 21 echo CONFIG -= debug >> $@
22 echo CONFIG += release >> $@ 22 echo CONFIG += release >> $@
23 echo DEFINES += "OPIE_NO_DEBUG" >> $@ 23 echo DEFINES += "OPIE_NO_DEBUG" >> $@
24endif 24endif
25ifeq ($(CONFIG_STATIC),y) 25ifeq ($(CONFIG_STATIC),y)
26 echo !contains\( TARGET,qpe \) \{ >> $@ 26 echo !contains\( TARGET,qpe \) \{ >> $@
27 echo CONFIG += staticlib >> $@ 27 echo CONFIG += staticlib >> $@
28 echo \} >> $@ 28 echo \} >> $@
29endif 29endif
30ifeq ($(filter 3.%,$(QTE_VERSION)),) # not qt3 30ifeq ($(filter 3.%,$(QTE_VERSION)),) # not qt3
31 echo CONFIG -= qt3 >> $@ 31 echo CONFIG -= qt3 >> $@
32else 32else
33 echo CONFIG += qt3 >> $@ 33 echo CONFIG += qt3 >> $@
34endif 34endif
35ifneq ($(CONFIG_QUICK_LAUNCH),) 35ifneq ($(CONFIG_QUICK_LAUNCH),)
36 echo contains\( CONFIG, quick-app \) \{ >> $@ 36 echo contains\( CONFIG, quick-app \) \{ >> $@
37 echo CONFIG -= staticlib >> $@ 37 echo CONFIG -= staticlib >> $@
38 echo CONFIG -= quick-app >> $@ 38 echo CONFIG -= quick-app >> $@
39 echo CONFIG += quick-app-lib >> $@ 39 echo CONFIG += quick-app-lib >> $@
40 echo QUICKLAUNCH_PATH = $(CONFIG_QUICKLAUNCH_PATH) >> $@ 40 echo QUICKLAUNCH_PATH = $(CONFIG_QUICKLAUNCH_PATH) >> $@
41 echo \} >> $@ 41 echo \} >> $@
42else 42else
43 echo contains\( CONFIG, quick-app \) \{ >> $@ 43 echo contains\( CONFIG, quick-app \) \{ >> $@
44 echo CONFIG -= quick-app >> $@ 44 echo CONFIG -= quick-app >> $@
45 echo CONFIG += quick-app-bin >> $@ 45 echo CONFIG += quick-app-bin >> $@
46 echo \} >> $@ 46 echo \} >> $@
47endif 47endif
48ifeq ($(CONFIG_SQL_PIM_BACKEND),y) 48ifeq ($(CONFIG_SQL_PIM_BACKEND),y)
49 echo ENABLE_SQL_PIM_BACKEND=$(CONFIG_SQL_PIM_BACKEND) >> $@ 49 echo ENABLE_SQL_PIM_BACKEND=$(CONFIG_SQL_PIM_BACKEND) >> $@
50else 50else
51 echo ENABLE_SQL_PIM_BACKEND=n >> $@ 51 echo ENABLE_SQL_PIM_BACKEND=n >> $@
52endif 52endif
53ifeq ($(CONFIG_OPIE_NO_OVERRIDE_QT),y) 53ifeq ($(CONFIG_OPIE_NO_OVERRIDE_QT),y)
54 echo CONFIG += no-override >> $@ 54 echo CONFIG += no-override >> $@
55endif 55endif
56ifeq ($(CONFIG_LIBQPE_WITHROHFEEDBACK),y) 56ifeq ($(CONFIG_LIBQPE_WITHROHFEEDBACK),y)
57 echo DEFINES += OPIE_WITHROHFEEDBACK >> $@ 57 echo CONFIG += LIBQPE_WITHROHFEEDBACK >> $@
58endif 58endif
59ifeq ($(CONFIG_OPIE_NO_ERASERECT_FIX),y) 59ifeq ($(CONFIG_OPIE_NO_ERASERECT_FIX),y)
60 echo DEFINES += OPIE_NO_ERASE_RECT_HACKFIX >> $@ 60 echo DEFINES += OPIE_NO_ERASE_RECT_HACKFIX >> $@
61endif 61endif
62ifeq ($(CONFIG_OPIE_NO_BUILTIN_SHUTDOWN),y) 62ifeq ($(CONFIG_OPIE_NO_BUILTIN_SHUTDOWN),y)
63 echo DEFINES += OPIE_NO_BUILTIN_SHUTDOWN >> $@ 63 echo DEFINES += OPIE_NO_BUILTIN_SHUTDOWN >> $@
64endif 64endif
65ifeq ($(CONFIG_OPIE_NO_BUILTIN_CALIBRATE),y) 65ifeq ($(CONFIG_OPIE_NO_BUILTIN_CALIBRATE),y)
66 echo DEFINES += OPIE_NO_BUILTIN_CALIBRATE >> $@ 66 echo DEFINES += OPIE_NO_BUILTIN_CALIBRATE >> $@
67endif 67endif
68ifeq ($(CONFIG_USE_REALTIME_AUDIO_THREAD),y) 68ifeq ($(CONFIG_USE_REALTIME_AUDIO_THREAD),y)
69 echo DEFINES += USE_REALTIME_AUDIO_THREAD >> $@ 69 echo DEFINES += USE_REALTIME_AUDIO_THREAD >> $@
70endif 70endif
71ifeq ($(CONFIG_USE_FILE_NOTIFICATION),y) 71ifeq ($(CONFIG_USE_FILE_NOTIFICATION),y)
72 echo DEFINES += USE_FILE_NOTIFICATION >> $@ 72 echo DEFINES += USE_FILE_NOTIFICATION >> $@
73endif 73endif
74ifeq ($(CONFIG_QT_QWS_ALLOW_CLOCK),y) 74ifeq ($(CONFIG_QT_QWS_ALLOW_CLOCK),y)
75 echo DEFINES += QT_QWS_ALLOW_OVERCLOCK >> $@ 75 echo DEFINES += QT_QWS_ALLOW_OVERCLOCK >> $@
76endif 76endif
77ifeq ($(CONFIG_OPIE_NEW_ALLOC),y) 77ifeq ($(CONFIG_OPIE_NEW_ALLOC),y)
78 echo DEFINES += OPIE_NEW_MALLOC >> $@ 78 echo DEFINES += OPIE_NEW_MALLOC >> $@
79endif 79endif
80ifeq ($(CONFIG_OPIE_NO_SOUND_PCM_READ_BITS),y) 80ifeq ($(CONFIG_OPIE_NO_SOUND_PCM_READ_BITS),y)
81 echo DEFINES += OPIE_NO_SOUND_PCM_READ_BITS >> $@ 81 echo DEFINES += OPIE_NO_SOUND_PCM_READ_BITS >> $@
82endif 82endif
83 echo DEFINES += OPIE_SOUND_FRAGMENT_SHIFT=$(CONFIG_OPIE_SOUND_FRAGMENT_SHIFT) >> $@ 83 echo DEFINES += OPIE_SOUND_FRAGMENT_SHIFT=$(CONFIG_OPIE_SOUND_FRAGMENT_SHIFT) >> $@
84ifeq ($(CONFIG_OPIE_WE_VERSION_OVERRIDE),y) 84ifeq ($(CONFIG_OPIE_WE_VERSION_OVERRIDE),y)
85 echo DEFINES += OPIE_WE_VERSION=$(CONFIG_OPIE_WE_VERSION) >> $@ 85 echo DEFINES += OPIE_WE_VERSION=$(CONFIG_OPIE_WE_VERSION) >> $@
86endif 86endif
87ifeq ($(CONFIG_OPIE_TASKBAR_LOCK_KEY_STATE),y) 87ifeq ($(CONFIG_OPIE_TASKBAR_LOCK_KEY_STATE),y)
88 echo DEFINES += OPIE_TASKBAR_LOCK_KEY_STATE >> $@ 88 echo DEFINES += OPIE_TASKBAR_LOCK_KEY_STATE >> $@
89 endif 89 endif
90# Write LIB dirs and INC dirs... 90# Write LIB dirs and INC dirs...
91ifeq ($(CONFIG_LIBETPAN_DEP),y) 91ifeq ($(CONFIG_LIBETPAN_DEP),y)
92 echo LIBETPAN_LIB_DIR = $(CONFIG_LIBETPAN_LIB_DIR) >> $@ 92 echo LIBETPAN_LIB_DIR = $(CONFIG_LIBETPAN_LIB_DIR) >> $@
93 echo LIBETPAN_INC_DIR = $(CONFIG_LIBETPAN_INC_DIR) >> $@ 93 echo LIBETPAN_INC_DIR = $(CONFIG_LIBETPAN_INC_DIR) >> $@
94endif 94endif
95ifeq ($(CONFIG_LIBPCAP_DEP),y) 95ifeq ($(CONFIG_LIBPCAP_DEP),y)
96 echo LIBPCAP_LIB_DIR = $(CONFIG_LIBPCAP_LIB_DIR) >> $@ 96 echo LIBPCAP_LIB_DIR = $(CONFIG_LIBPCAP_LIB_DIR) >> $@
97 echo LIBPCAP_INC_DIR = $(CONFIG_LIBPCAP_INC_DIR) >> $@ 97 echo LIBPCAP_INC_DIR = $(CONFIG_LIBPCAP_INC_DIR) >> $@
98endif 98endif
99ifeq ($(CONFIG_LIBSQLITE_DEP),y) 99ifeq ($(CONFIG_LIBSQLITE_DEP),y)
100 echo LIBSQLITE_LIB_DIR = $(CONFIG_LIBSQLITE_LIB_DIR) >> $@ 100 echo LIBSQLITE_LIB_DIR = $(CONFIG_LIBSQLITE_LIB_DIR) >> $@
101 echo LIBSQLITE_INC_DIR = $(CONFIG_LIBSQLITE_INC_DIR) >> $@ 101 echo LIBSQLITE_INC_DIR = $(CONFIG_LIBSQLITE_INC_DIR) >> $@
102endif 102endif
103ifeq ($(CONFIG_LIBXINE_DEP),y) 103ifeq ($(CONFIG_LIBXINE_DEP),y)
104 echo LIBXINE_LIB_DIR = $(CONFIG_LIBXINE_LIB_DIR) >> $@ 104 echo LIBXINE_LIB_DIR = $(CONFIG_LIBXINE_LIB_DIR) >> $@
105 echo LIBXINE_INC_DIR = $(CONFIG_LIBXINE_INC_DIR) >> $@ 105 echo LIBXINE_INC_DIR = $(CONFIG_LIBXINE_INC_DIR) >> $@
106endif 106endif
107ifeq ($(CONFIG_LIBIPK_DEP),y) 107ifeq ($(CONFIG_LIBIPK_DEP),y)
108 echo LIBIPK_LIB_DIR = $(CONFIG_LIBIPK_LIB_DIR) >> $@ 108 echo LIBIPK_LIB_DIR = $(CONFIG_LIBIPK_LIB_DIR) >> $@
109 echo LIBIPK_INC_DIR = $(CONFIG_LIBIPK_INC_DIR) >> $@ 109 echo LIBIPK_INC_DIR = $(CONFIG_LIBIPK_INC_DIR) >> $@
110endif 110endif
111ifeq ($(CONFIG_LIBSDK_DEP),y) 111ifeq ($(CONFIG_LIBSDK_DEP),y)
112 echo LIBSDL_LIB_DIR = $(CONFIG_LIBSDL_LIB_DIR) >> $@ 112 echo LIBSDL_LIB_DIR = $(CONFIG_LIBSDL_LIB_DIR) >> $@
113 echo LIBSDL_INC_DIR = $(CONFIG_LIBSDL_INC_DIR) >> $@ 113 echo LIBSDL_INC_DIR = $(CONFIG_LIBSDL_INC_DIR) >> $@
114endif 114endif
115ifeq ($(CONFIG_LIBSWORD_DEP),y) 115ifeq ($(CONFIG_LIBSWORD_DEP),y)
116 echo LIBSWORD_LIB_DIR = $(CONFIG_LIBSWORD_LIB_DIR) >> $@ 116 echo LIBSWORD_LIB_DIR = $(CONFIG_LIBSWORD_LIB_DIR) >> $@
117 echo LIBSWORD_INC_DIR = $(CONFIG_LIBSWORD_INC_DIR) >> $@ 117 echo LIBSWORD_INC_DIR = $(CONFIG_LIBSWORD_INC_DIR) >> $@
118endif 118endif
119$(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) $(TOPDIR)/.config $(TOPDIR)/packages 119$(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) $(TOPDIR)/.config $(TOPDIR)/packages
120 @echo Generating dependency information... 120 @echo Generating dependency information...
121# add to subdir-y, and add descend rules 121# add to subdir-y, and add descend rules
122 @cat $(TOPDIR)/packages | grep -v '^#' | \ 122 @cat $(TOPDIR)/packages | grep -v '^#' | \
123 awk '{print \ 123 awk '{print \
124 ".PHONY : " $$2 "\n" \ 124 ".PHONY : " $$2 "\n" \
125 "subdir-$$(" $$1 ") += " $$2 "\n\n"; \ 125 "subdir-$$(" $$1 ") += " $$2 "\n\n"; \
126 print $$2 " : " $$2 "/Makefile\n\t$$(call descend,$$@,$(filter-out $$@,$$(filter-out $$@,$$(MAKECMDGOALS))))\n"; }' > $(TOPDIR)/.depends 126 print $$2 " : " $$2 "/Makefile\n\t$$(call descend,$$@,$(filter-out $$@,$$(filter-out $$@,$$(MAKECMDGOALS))))\n"; }' > $(TOPDIR)/.depends
127 cat $(TOPDIR)/packages | grep -v '^#' | \ 127 cat $(TOPDIR)/packages | grep -v '^#' | \
128 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"; }' \ 128 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"; }' \
129 >> $(TOPDIR)/.depends 129 >> $(TOPDIR)/.depends
130# interpackage dependency generation 130# interpackage dependency generation
131 @cat $(TOPDIR)/packages | \ 131 @cat $(TOPDIR)/packages | \
132 $(TOPDIR)/scripts/deps.pl >> $(TOPDIR)/.depends 132 $(TOPDIR)/scripts/deps.pl >> $(TOPDIR)/.depends
133 133
134$(TOPDIR)/.depends.cfgs: 134$(TOPDIR)/.depends.cfgs:
135# config.in interdependencies 135# config.in interdependencies
136 @echo $(configs) | sed -e 's,/config.in,,g' | ( for i in `cat`; do echo $$i; done ) > dirs 136 @echo $(configs) | sed -e 's,/config.in,,g' | ( for i in `cat`; do echo $$i; done ) > dirs
137 @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 ) >> $@ 137 @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 ) >> $@
138 @-rm -f dirs 138 @-rm -f dirs
139 139
140$(QTDIR)/stamp-headers : 140$(QTDIR)/stamp-headers :
141 @-rm -f $(QTDIR)/stamp-headers* 141 @-rm -f $(QTDIR)/stamp-headers*
142 ( cd $(QTDIR)/include; \ 142 ( cd $(QTDIR)/include; \
143 $(patsubst %,ln -sf ../src/kernel/%;,qgfx_qws.h qwsmouse_qws.h \ 143 $(patsubst %,ln -sf ../src/kernel/%;,qgfx_qws.h qwsmouse_qws.h \
144 qcopchannel_qws.h qwindowsystem_qws.h \ 144 qcopchannel_qws.h qwindowsystem_qws.h \
145 qfontmanager_qws.h qwsdefaultdecoration_qws.h)) 145 qfontmanager_qws.h qwsdefaultdecoration_qws.h))
146 touch $@ 146 touch $@
147 147
148$(QTDIR)/stamp-headers-x11 : 148$(QTDIR)/stamp-headers-x11 :
149 @-rm -f $(QTDIR)/stamp-headers* 149 @-rm -f $(QTDIR)/stamp-headers*
150 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) 150 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)
151 touch $@ 151 touch $@
152 152
153$(OPIEDIR)/stamp-headers : 153$(OPIEDIR)/stamp-headers :
154 @-rm -f $(OPIEDIR)/stamp-headers* 154 @-rm -f $(OPIEDIR)/stamp-headers*
155 mkdir -p $(TOPDIR)/include/qpe \ 155 mkdir -p $(TOPDIR)/include/qpe \
156 $(TOPDIR)/include/qtopia \ 156 $(TOPDIR)/include/qtopia \
157 $(TOPDIR)/include/opie \ 157 $(TOPDIR)/include/opie \
158 $(TOPDIR)/include/opie2 \ 158 $(TOPDIR)/include/opie2 \
159 $(TOPDIR)/include/opie2/private \ 159 $(TOPDIR)/include/opie2/private \
160 $(TOPDIR)/include/qtopia/private \ 160 $(TOPDIR)/include/qtopia/private \
161 $(TOPDIR)/include/sl 161 $(TOPDIR)/include/sl
162 ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) 162 ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; )
163 ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) 163 ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; )
164 ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; ) 164 ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; )
165ifeq ($(CONFIG_LIBOPIE),y) 165ifeq ($(CONFIG_LIBOPIE),y)
166 # libopie1 166 # libopie1
167 ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; ) 167 ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; )
168 ( cd include/opie && ln -sf ../../libopie/pim/*.h .; ) 168 ( cd include/opie && ln -sf ../../libopie/pim/*.h .; )
169 ( cd include/opie && ln -sf ../../libopie/big-screen/*.h .; ) 169 ( cd include/opie && ln -sf ../../libopie/big-screen/*.h .; )
170endif 170endif
171 # libopie2 171 # libopie2
172 ( cd include/opie2 && ln -sf ../../libopie2/opiecore/*.h .; ) 172 ( cd include/opie2 && ln -sf ../../libopie2/opiecore/*.h .; )
173 ( cd include/opie2 && ln -sf ../../libopie2/opiecore/device/*.h .; ) 173 ( cd include/opie2 && ln -sf ../../libopie2/opiecore/device/*.h .; )
174 ( cd include/opie2 && ln -sf ../../libopie2/opiemm/*.h .; ) 174 ( cd include/opie2 && ln -sf ../../libopie2/opiemm/*.h .; )
175 ( cd include/opie2 && ln -sf ../../libopie2/opiedb/*.h .; ) 175 ( cd include/opie2 && ln -sf ../../libopie2/opiedb/*.h .; )
176 ( cd include/opie2 && ln -sf ../../libopie2/opienet/*.h .; ) 176 ( cd include/opie2 && ln -sf ../../libopie2/opienet/*.h .; )
177 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/*.h .; ) 177 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/*.h .; )
178 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/core/*.h .; ) 178 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/core/*.h .; )
179 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/backend/*.h .; ) 179 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/backend/*.h .; )
180 ( cd include/opie2/private && ln -sf ../../../libopie2/opiepim/private/*.h .; ) 180 ( cd include/opie2/private && ln -sf ../../../libopie2/opiepim/private/*.h .; )
181 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/ui/*.h .; ) 181 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/ui/*.h .; )
182 ( cd include/opie2 && ln -sf ../../libopie2/opieui/*.h .; ) 182 ( cd include/opie2 && ln -sf ../../libopie2/opieui/*.h .; )
183 ( cd include/opie2 && ln -sf ../../libopie2/opieui/fileselector/*.h .; ) 183 ( cd include/opie2 && ln -sf ../../libopie2/opieui/fileselector/*.h .; )
184 ( cd include/opie2 && ln -sf ../../libopie2/opieui/big-screen/*.h .; ) 184 ( cd include/opie2 && ln -sf ../../libopie2/opieui/big-screen/*.h .; )
185 ( cd include/opie2 && ln -sf ../../libopie2/opiesecurity/*.h .; ) 185 ( cd include/opie2 && ln -sf ../../libopie2/opiesecurity/*.h .; )
186 # auxilliary libraries 186 # auxilliary libraries
187 ( cd include/opie2 && ln -sf ../../libqtaux/*.h .; ) 187 ( cd include/opie2 && ln -sf ../../libqtaux/*.h .; )
188 ( cd include/sl && ln -sf ../../libslcompat/*.h .; ) 188 ( cd include/sl && ln -sf ../../libslcompat/*.h .; )
189 ( cd include/ && ln -sf ../noncore/net/ftplib/*.h .; ) 189 ( cd include/ && ln -sf ../noncore/net/ftplib/*.h .; )
190 ( cd include/ && ln -sf ../inputmethods/pickboard/pickboardcfg.h .; ) 190 ( cd include/ && ln -sf ../inputmethods/pickboard/pickboardcfg.h .; )
191 ( cd include/ && ln -sf ../inputmethods/pickboard/pickboardpicks.h .; ) 191 ( cd include/ && ln -sf ../inputmethods/pickboard/pickboardpicks.h .; )
192 # all 192 # all
193ifeq ($(CONFIG_LIBOPIE),y) 193ifeq ($(CONFIG_LIBOPIE),y)
194 ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ 194 ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
195 ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done ) 195 ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done )
196endif 196endif
197 ( cd include/opie2; for generatedHeader in `cd ../../libopie2/opieui; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ 197 ( cd include/opie2; for generatedHeader in `cd ../../libopie2/opieui; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
198 ln -sf ../../libopie2/opieui/$$generatedHeader $$generatedHeader; done ) 198 ln -sf ../../libopie2/opieui/$$generatedHeader $$generatedHeader; done )
199 ( cd include/opie2; for generatedHeader in `cd ../../libopie2/opiepim/ui; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ 199 ( cd include/opie2; for generatedHeader in `cd ../../libopie2/opiepim/ui; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
200 ln -sf ../../libopie2/opiepim/ui/$$generatedHeader $$generatedHeader; done ) 200 ln -sf ../../libopie2/opiepim/ui/$$generatedHeader $$generatedHeader; done )
201 ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h 201 ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h
202 touch $@ 202 touch $@
203 203
204$(OPIEDIR)/stamp-headers-x11 : 204$(OPIEDIR)/stamp-headers-x11 :
205 @-rm -f $(OPIEDIR)/stamp-headers* 205 @-rm -f $(OPIEDIR)/stamp-headers*
206 mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \ 206 mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \
207 $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private 207 $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private
208 ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) 208 ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; )
209 ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) 209 ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; )
210 ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; ) 210 ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; )
211 ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; ) 211 ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; )
212 ( cd include/opie && ln -sf ../../libsql/*.h .; ) 212 ( cd include/opie && ln -sf ../../libsql/*.h .; )
213 ( cd include/opie && ln -sf ../../libopie/pim/*.h .; ) 213 ( cd include/opie && ln -sf ../../libopie/pim/*.h .; )
214 ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ 214 ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
215 ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done ) 215 ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done )
216 ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h 216 ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h
217 ( cd include/qpe; ln -sf ../../x11/libqpe-x11/qpe/*.h .; ) 217 ( cd include/qpe; ln -sf ../../x11/libqpe-x11/qpe/*.h .; )
218 touch $@ 218 touch $@
219 219
220$(TOPDIR)/library/custom.h : $(TOPDIR)/.config 220$(TOPDIR)/library/custom.h : $(TOPDIR)/.config
221 @-rm -f $@ 221 @-rm -f $@
222 @$(if $(patsubst "%",%,$(CONFIG_CUSTOMFILE)),\ 222 @$(if $(patsubst "%",%,$(CONFIG_CUSTOMFILE)),\
223 ln -sf $(patsubst "%",%,$(CONFIG_CUSTOMFILE)) $@) 223 ln -sf $(patsubst "%",%,$(CONFIG_CUSTOMFILE)) $@)
224 @touch $@ 224 @touch $@
225 225
226$(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: 226$(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:
227 @$(call descend,$(shell dirname $@),$(shell basename $@)) 227 @$(call descend,$(shell dirname $@),$(shell basename $@))
228 228
229menuconfig: $(TOPDIR)/scripts/lxdialog/lxdialog $(TOPDIR)/scripts/kconfig/mconf ./config.in 229menuconfig: $(TOPDIR)/scripts/lxdialog/lxdialog $(TOPDIR)/scripts/kconfig/mconf ./config.in
230 $(TOPDIR)/scripts/kconfig/mconf ./config.in 230 $(TOPDIR)/scripts/kconfig/mconf ./config.in
231 @touch ./.config.stamp 231 @touch ./.config.stamp
232 232
233xconfig: $(TOPDIR)/scripts/kconfig/qconf $(TOPDIR)/scripts/kconfig/libkconfig.so ./config.in 233xconfig: $(TOPDIR)/scripts/kconfig/qconf $(TOPDIR)/scripts/kconfig/libkconfig.so ./config.in
234 $(TOPDIR)/scripts/kconfig/qconf ./config.in 234 $(TOPDIR)/scripts/kconfig/qconf ./config.in
235 @touch .config.stamp 235 @touch .config.stamp
236 236
237gconfig: $(TOPDIR)/scripts/kconfig/gconf $(TOPDIR)/scripts/kconfig/libkconfig.so ./config.in 237gconfig: $(TOPDIR)/scripts/kconfig/gconf $(TOPDIR)/scripts/kconfig/libkconfig.so ./config.in
238 $(TOPDIR)/scripts/kconfig/gconf ./config.in 238 $(TOPDIR)/scripts/kconfig/gconf ./config.in
239 @touch .config.stamp 239 @touch .config.stamp
240 240
241config: $(TOPDIR)/scripts/kconfig/conf ./config.in 241config: $(TOPDIR)/scripts/kconfig/conf ./config.in
242 $(TOPDIR)/scripts/kconfig/conf ./config.in 242 $(TOPDIR)/scripts/kconfig/conf ./config.in
243 @touch .config.stamp 243 @touch .config.stamp
244 244
245oldconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in 245oldconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in
246 $(TOPDIR)/scripts/kconfig/conf -o ./config.in 246 $(TOPDIR)/scripts/kconfig/conf -o ./config.in
247 @touch .config.stamp 247 @touch .config.stamp
248 248
249randconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in 249randconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in
250 $(TOPDIR)/scripts/kconfig/conf -r ./config.in 250 $(TOPDIR)/scripts/kconfig/conf -r ./config.in
251 @touch .config.stamp 251 @touch .config.stamp
252 252
253allyesconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in 253allyesconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in
254 $(TOPDIR)/scripts/kconfig/conf -y ./config.in 254 $(TOPDIR)/scripts/kconfig/conf -y ./config.in
255 @touch .config.stamp 255 @touch .config.stamp
256 256
257allnoconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in 257allnoconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in
258 $(TOPDIR)/scripts/kconfig/conf -n ./config.in 258 $(TOPDIR)/scripts/kconfig/conf -n ./config.in
259 @touch .config.stamp 259 @touch .config.stamp
260 260
261defconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in 261defconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in
262 $(TOPDIR)/scripts/kconfig/conf -d ./config.in 262 $(TOPDIR)/scripts/kconfig/conf -d ./config.in
263 @touch .config.stamp 263 @touch .config.stamp
264 264
265$(TOPDIR)/qmake/qmake : $(TOPDIR)/mkspecs/default 265$(TOPDIR)/qmake/qmake : $(TOPDIR)/mkspecs/default
266 266
267$(TOPDIR)/mkspecs/default : 267$(TOPDIR)/mkspecs/default :
268 ln -sf linux-g++ $@ 268 ln -sf linux-g++ $@
269 269
270$(TOPDIR)/scripts/subst : force 270$(TOPDIR)/scripts/subst : force
271 @( \ 271 @( \
272 echo 's,\$$QPE_VERSION,$(QPE_VERSION),g'; \ 272 echo 's,\$$QPE_VERSION,$(QPE_VERSION),g'; \
273 echo 's,\$$OPIE_VERSION,$(OPIE_VERSION),g'; \ 273 echo 's,\$$OPIE_VERSION,$(OPIE_VERSION),g'; \
274 echo 's,\$$QTE_VERSION,$(QTE_VERSION),g'; \ 274 echo 's,\$$QTE_VERSION,$(QTE_VERSION),g'; \
275 echo 's,\$$QTE_REVISION,$(QTE_REVISION),g'; \ 275 echo 's,\$$QTE_REVISION,$(QTE_REVISION),g'; \
276 echo 's,\$$SUB_VERSION,$(SUB_VERSION),g'; \ 276 echo 's,\$$SUB_VERSION,$(SUB_VERSION),g'; \
277 echo 's,\$$EXTRAVERSION,$(EXTRAVERSION),g'; \ 277 echo 's,\$$EXTRAVERSION,$(EXTRAVERSION),g'; \
278 echo 's,\$$QTE_BASEVERSION,$(QTE_BASEVERSION),g'; \ 278 echo 's,\$$QTE_BASEVERSION,$(QTE_BASEVERSION),g'; \
279 ) > $@ || ( rm -f $@; exit 1 ) 279 ) > $@ || ( rm -f $@; exit 1 )
280 280
281$(TOPDIR)/scripts/filesubst : force 281$(TOPDIR)/scripts/filesubst : force
282 @( \ 282 @( \
283 echo 's,\$$OPIEDIR/root/,/,g'; \ 283 echo 's,\$$OPIEDIR/root/,/,g'; \
284 echo 's,$(OPIEDIR)/root/,/,g'; \ 284 echo 's,$(OPIEDIR)/root/,/,g'; \
285 echo 's,\$$OPIEDIR,$(prefix),g'; \ 285 echo 's,\$$OPIEDIR,$(prefix),g'; \
286 echo 's,$(OPIEDIR),$(prefix),g'; \ 286 echo 's,$(OPIEDIR),$(prefix),g'; \
287 echo 's,\$$QTDIR,$(prefix),g'; \ 287 echo 's,\$$QTDIR,$(prefix),g'; \
288 echo 's,$(QTDIR),$(prefix),g'; \ 288 echo 's,$(QTDIR),$(prefix),g'; \
289 echo 's,^\(\./\)*root/,/,g'; \ 289 echo 's,^\(\./\)*root/,/,g'; \
290 echo 's,^\(\./\)*etc/,$(prefix)/etc/,g'; \ 290 echo 's,^\(\./\)*etc/,$(prefix)/etc/,g'; \
291 echo 's,^\(\./\)*lib/,$(prefix)/lib/,g'; \ 291 echo 's,^\(\./\)*lib/,$(prefix)/lib/,g'; \
292 echo 's,^\(\./\)*bin/,$(prefix)/bin/,g'; \ 292 echo 's,^\(\./\)*bin/,$(prefix)/bin/,g'; \
293 echo 's,^\(\./\)*pics/,$(prefix)/pics/,g'; \ 293 echo 's,^\(\./\)*pics/,$(prefix)/pics/,g'; \
294 echo 's,^\(\./\)*sounds/,$(prefix)/sounds/,g'; \ 294 echo 's,^\(\./\)*sounds/,$(prefix)/sounds/,g'; \
295 echo 's,^\(\./\)*i18n/,$(prefix)/i18n/,g'; \ 295 echo 's,^\(\./\)*i18n/,$(prefix)/i18n/,g'; \
296 echo 's,^\(\./\)*plugins/,$(prefix)/plugins/,g'; \ 296 echo 's,^\(\./\)*plugins/,$(prefix)/plugins/,g'; \
297 echo 's,^\(\./\)*apps/,$(prefix)/apps/,g'; \ 297 echo 's,^\(\./\)*apps/,$(prefix)/apps/,g'; \
298 echo 's,^\(\./\)*share/,$(prefix)/share/,g'; \ 298 echo 's,^\(\./\)*share/,$(prefix)/share/,g'; \
299 echo 's,^\(\./\)*i18n/,$(prefix)/i18n/,g'; \ 299 echo 's,^\(\./\)*i18n/,$(prefix)/i18n/,g'; \
300 echo 's,^\(\./\)*help/,$(prefix)/help/,g'; \ 300 echo 's,^\(\./\)*help/,$(prefix)/help/,g'; \
301 ) > $@ || ( rm -f $@; exit 1 ) 301 ) > $@ || ( rm -f $@; exit 1 )
302 302
303## general rules ## 303## general rules ##
304 304
305define descend 305define descend
306 $(MAKE) $(if $(QMAKE),QMAKE=$(QMAKE)) -C $(1) $(2) 306 $(MAKE) $(if $(QMAKE),QMAKE=$(QMAKE)) -C $(1) $(2)
307endef 307endef
308 308
309define makefilegen 309define makefilegen
310 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$$,,'\`" | \ 310 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$$,,'\`" | \
311 head -1 | awk '{print $$3}'` 311 head -1 | awk '{print $$3}'`
312endef 312endef
313 313
314define makecfg 314define makecfg
315 $(TOPDIR)/scripts/makecfg.pl $1 $(OPIEDIR) 315 $(TOPDIR)/scripts/makecfg.pl $1 $(OPIEDIR)
316endef 316endef
diff --git a/library/library.pro b/library/library.pro
index af07fa3..1f68b74 100644
--- a/library/library.pro
+++ b/library/library.pro
@@ -1,143 +1,143 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2 #CONFIG += qt warn_on release 2 #CONFIG += qt warn_on release
3 CONFIG += qt warn_on debug 3 CONFIG += qt warn_on debug
4 HEADERS= calendar.h \ 4 HEADERS= calendar.h \
5 global.h \ 5 global.h \
6 resource.h \ 6 resource.h \
7 xmlreader.h \ 7 xmlreader.h \
8 mimetype.h \ 8 mimetype.h \
9 menubutton.h \ 9 menubutton.h \
10 network.h \ 10 network.h \
11 networkinterface.h \ 11 networkinterface.h \
12 filemanager.h \ 12 filemanager.h \
13 fontmanager.h \ 13 fontmanager.h \
14 qdawg.h \ 14 qdawg.h \
15 datebookmonth.h \ 15 datebookmonth.h \
16 fileselector.h \ 16 fileselector.h \
17 fileselector_p.h \ 17 fileselector_p.h \
18 imageedit.h \ 18 imageedit.h \
19 qcopenvelope_qws.h \ 19 qcopenvelope_qws.h \
20 qpedecoration_qws.h \ 20 qpedecoration_qws.h \
21 qpeapplication.h \ 21 qpeapplication.h \
22 qpestyle.h \ 22 qpestyle.h \
23 qpedialog.h \ 23 qpedialog.h \
24 lightstyle.h \ 24 lightstyle.h \
25 config.h \ 25 config.h \
26 applnk.h \ 26 applnk.h \
27 sound.h \ 27 sound.h \
28 tzselect.h \ 28 tzselect.h \
29 qmath.h \ 29 qmath.h \
30 datebookdb.h \ 30 datebookdb.h \
31 alarmserver.h \ 31 alarmserver.h \
32 process.h \ 32 process.h \
33 password.h \ 33 password.h \
34 timestring.h \ 34 timestring.h \
35 fontfactoryinterface.h \ 35 fontfactoryinterface.h \
36 fontdatabase.h \ 36 fontdatabase.h \
37 power.h \ 37 power.h \
38 storage.h \ 38 storage.h \
39 qpemessagebox.h \ 39 qpemessagebox.h \
40 timeconversion.h \ 40 timeconversion.h \
41 qpedebug.h \ 41 qpedebug.h \
42 qpemenubar.h \ 42 qpemenubar.h \
43 qpetoolbar.h \ 43 qpetoolbar.h \
44 backend/categories.h \ 44 backend/categories.h \
45 stringutil.h \ 45 stringutil.h \
46 backend/palmtoprecord.h \ 46 backend/palmtoprecord.h \
47 backend/task.h \ 47 backend/task.h \
48 backend/event.h \ 48 backend/event.h \
49 backend/contact.h\ 49 backend/contact.h\
50 backend/rohfeedback.h \
51 categorymenu.h \ 50 categorymenu.h \
52 categoryedit_p.h \ 51 categoryedit_p.h \
53 categoryselect.h \ 52 categoryselect.h \
54 categorywidget.h \ 53 categorywidget.h \
55 ir.h \ 54 ir.h \
56 backend/vobject_p.h \ 55 backend/vobject_p.h \
57 findwidget_p.h \ 56 findwidget_p.h \
58 finddialog.h \ 57 finddialog.h \
59 lnkproperties.h \ 58 lnkproperties.h \
60 windowdecorationinterface.h \ 59 windowdecorationinterface.h \
61 textcodecinterface.h \ 60 textcodecinterface.h \
62 imagecodecinterface.h \ 61 imagecodecinterface.h \
63 qt_override_p.h 62 qt_override_p.h
64 63
65 SOURCES= calendar.cpp \ 64 SOURCES= calendar.cpp \
66 global.cpp \ 65 global.cpp \
67 xmlreader.cpp \ 66 xmlreader.cpp \
68 mimetype.cpp \ 67 mimetype.cpp \
69 menubutton.cpp \ 68 menubutton.cpp \
70 network.cpp \ 69 network.cpp \
71 networkinterface.cpp \ 70 networkinterface.cpp \
72 filemanager.cpp \ 71 filemanager.cpp \
73 fontmanager.cpp \ 72 fontmanager.cpp \
74 qdawg.cpp \ 73 qdawg.cpp \
75 datebookmonth.cpp \ 74 datebookmonth.cpp \
76 fileselector.cpp \ 75 fileselector.cpp \
77 imageedit.cpp \ 76 imageedit.cpp \
78 resource.cpp \ 77 resource.cpp \
79 qpedecoration_qws.cpp \ 78 qpedecoration_qws.cpp \
80 qcopenvelope_qws.cpp \ 79 qcopenvelope_qws.cpp \
81 qpeapplication.cpp \ 80 qpeapplication.cpp \
82 qpestyle.cpp \ 81 qpestyle.cpp \
83 qpedialog.cpp \ 82 qpedialog.cpp \
84 lightstyle.cpp \ 83 lightstyle.cpp \
85 config.cpp \ 84 config.cpp \
86 applnk.cpp \ 85 applnk.cpp \
87 sound.cpp \ 86 sound.cpp \
88 tzselect.cpp \ 87 tzselect.cpp \
89 qmath.c \ 88 qmath.c \
90 datebookdb.cpp \ 89 datebookdb.cpp \
91 alarmserver.cpp \ 90 alarmserver.cpp \
92 password.cpp \ 91 password.cpp \
93 process.cpp \ 92 process.cpp \
94 process_unix.cpp \ 93 process_unix.cpp \
95 timestring.cpp \ 94 timestring.cpp \
96 fontdatabase.cpp \ 95 fontdatabase.cpp \
97 power.cpp \ 96 power.cpp \
98 storage.cpp \ 97 storage.cpp \
99 qpemessagebox.cpp \ 98 qpemessagebox.cpp \
100 backend/timeconversion.cpp \ 99 backend/timeconversion.cpp \
101 qpedebug.cpp \ 100 qpedebug.cpp \
102 qpemenubar.cpp \ 101 qpemenubar.cpp \
103 qpetoolbar.cpp \ 102 qpetoolbar.cpp \
104 backend/categories.cpp \ 103 backend/categories.cpp \
105 backend/stringutil.cpp \ 104 backend/stringutil.cpp \
106 backend/palmtoprecord.cpp \ 105 backend/palmtoprecord.cpp \
107 backend/task.cpp \ 106 backend/task.cpp \
108 backend/event.cpp \ 107 backend/event.cpp \
109 backend/contact.cpp \ 108 backend/contact.cpp \
110 backend/rohfeedback.cpp \
111 categorymenu.cpp \ 109 categorymenu.cpp \
112 categoryedit_p.cpp \ 110 categoryedit_p.cpp \
113 categoryselect.cpp \ 111 categoryselect.cpp \
114 categorywidget.cpp \ 112 categorywidget.cpp \
115 ir.cpp \ 113 ir.cpp \
116 backend/vcc_yacc.cpp \ 114 backend/vcc_yacc.cpp \
117 backend/vobject.cpp \ 115 backend/vobject.cpp \
118 findwidget_p.cpp \ 116 findwidget_p.cpp \
119 finddialog.cpp \ 117 finddialog.cpp \
120 lnkproperties.cpp \ 118 lnkproperties.cpp \
121 qt_override.cpp 119 qt_override.cpp
122 120
123 121
124 122
125# Qt 3 compatibility 123# Qt 3 compatibility
126HEADERS += quuid.h qcom.h qlibrary.h qlibrary_p.h 124HEADERS += quuid.h qcom.h qlibrary.h qlibrary_p.h
127SOURCES += quuid.cpp qlibrary.cpp qlibrary_unix.cpp 125SOURCES += quuid.cpp qlibrary.cpp qlibrary_unix.cpp
128INCLUDEPATH += $(OPIEDIR)/include backend 126INCLUDEPATH += $(OPIEDIR)/include backend
129 LIBS += -ldl -lcrypt -lm 127 LIBS += -ldl -lcrypt -lm
130INTERFACES = passwordbase_p.ui categoryeditbase_p.ui findwidgetbase_p.ui lnkpropertiesbase_p.ui 128INTERFACES = passwordbase_p.ui categoryeditbase_p.ui findwidgetbase_p.ui lnkpropertiesbase_p.ui
131 TARGET = qpe 129 TARGET = qpe
132 DESTDIR = $(OPIEDIR)/lib$(PROJMAK) 130 DESTDIR = $(OPIEDIR)/lib$(PROJMAK)
133 VERSION = 1.5.0.1 131 VERSION = 1.5.0.1
134 132
135include ( $(OPIEDIR)/include.pro ) 133include ( $(OPIEDIR)/include.pro )
136 134
137contains( CONFIG, no-override ){ 135contains( CONFIG, no-override ){
138 DEFINES += OPIE_NO_OVERRIDE_QT 136 DEFINES += OPIE_NO_OVERRIDE_QT
139} 137}
140 138
141contains( CONFIG, LIBQPE_WITHROHFEEDBACK ){ 139contains( CONFIG, LIBQPE_WITHROHFEEDBACK ){
142 DEFINES += WITHROHFEEDBACK 140 DEFINES += OPIE_ROHFEEDBACK
141 SOURCES += backend/rohfeedback.cpp
142 HEADERS += backend/rohfeedback.h
143} 143}