author | kergoth <kergoth> | 2002-01-28 23:28:04 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2002-01-28 23:28:04 (UTC) |
commit | f7b3193e5d2d9a211ce0b963dca571d82adecb71 (patch) (unidiff) | |
tree | 44f49bdc076dc299bba1a4dc8d5d517114be5701 /core/apps | |
parent | 77d110d35f75d63f5dc66c1dd2427daf7dc2e214 (diff) | |
download | opie-f7b3193e5d2d9a211ce0b963dca571d82adecb71.zip opie-f7b3193e5d2d9a211ce0b963dca571d82adecb71.tar.gz opie-f7b3193e5d2d9a211ce0b963dca571d82adecb71.tar.bz2 |
Committing in .
Modified Files:
configure mkipks addressbook/Makefile.in
addressbook/addressbook.pro calc2/calc.pro
calc2/binary/binary.pro calc2/simple/simple.pro
calculator/Makefile.in calculator/calculator.pro
cardmon/Makefile.in cardmon/cardmon.pro chess/chess.pro
citytime/Makefile.in citytime/citytime.pro clock/Makefile.in
clock/clock.pro datebook/Makefile.in datebook/datebook.pro
dictionary/dictionary.pro doc/qcop.doc doc/start.doc
embeddedkonsole/Makefile.in
embeddedkonsole/embeddedkonsole.pro etc/init.d/qpe
example/example.pro fifteen/Makefile.in fifteen/fifteen.pro
filebrowser/Makefile.in filebrowser/filebrowser.pro
freetype/freetype.pro go/Makefile.in go/go.pro
helpbrowser/Makefile.in helpbrowser/helpbrowser.pro
inputmethods/handwriting/Makefile.in
inputmethods/handwriting/handwriting.pro
inputmethods/keyboard/Makefile.in
inputmethods/keyboard/keyboard.pro
inputmethods/pickboard/Makefile.in
inputmethods/pickboard/pickboard.pro
inputmethods/unikeyboard/Makefile.in
inputmethods/unikeyboard/unikeyboard.pro keypebble/Makefile.in
keypebble/keypebble.pro library/Makefile.in library/global.cpp
library/library.pro library/qpeapplication.cpp
mindbreaker/Makefile.in mindbreaker/mindbreaker.pro
minesweep/Makefile.in minesweep/minesweep.pro
mpegplayer/Makefile.in mpegplayer/mpegplayer.pro
mpegplayer/libflash/libflash.pro mpegplayer/libmad/Makefile.in
mpegplayer/libmad/libmad.pro mpegplayer/libmpeg3/Makefile.in
mpegplayer/libmpeg3/libmpeg3.pro
mpegplayer/libmpeg3/audio/Makefile
mpegplayer/libmpeg3/video/Makefile
mpegplayer/wavplugin/Makefile.in
mpegplayer/wavplugin/wavplugin.pro netsetup/Makefile.in
netsetup/README netsetup/netsetup.pro
netsetup/dialup/Makefile.in netsetup/dialup/dialup.pro
netsetup/lan/Makefile.in netsetup/lan/lan.pro
parashoot/Makefile.in parashoot/parashoot.pro
qasteroids/Makefile.in qasteroids/qasteroids.pro
qcop/Makefile.in qcop/qcop.pro qipkg/Makefile.in
qipkg/qipkg.pro scripts/q_functions
settings/appearance/Makefile.in
settings/appearance/appearance.pro
settings/language/Makefile.in settings/language/language.pro
settings/light-and-power/Makefile.in
settings/light-and-power/light-and-power.pro
settings/rotation/Makefile.in settings/rotation/rotation.pro
settings/security/Makefile.in settings/security/security.pro
settings/sound/Makefile.in settings/sound/sound.pro
settings/systemtime/Makefile.in
settings/systemtime/systemtime.pro showimg/Makefile.in
showimg/showimg.pro single/Makefile.in single/single.pro
snake/Makefile.in snake/snake.pro solitaire/Makefile.in
solitaire/solitaire.pro spreadsheet/Makefile.in
spreadsheet/spreadsheet.pro sysinfo/Makefile.in
sysinfo/sysinfo.pro tableviewer/tableviewer.pro
taskbar/Makefile.in taskbar/main.cpp taskbar/taskbar.pro
taskbar/batteryapplet/Makefile.in
taskbar/batteryapplet/batteryapplet.pro
taskbar/clipboardapplet/clipboardapplet.pro
taskbar/clockapplet/Makefile.in
taskbar/clockapplet/clockapplet.pro
taskbar/netmonapplet/Makefile.in
taskbar/netmonapplet/netmonapplet.pro
taskbar/volumeapplet/Makefile.in
taskbar/volumeapplet/volumeapplet.pro tetrix/Makefile.in
tetrix/tetrix.pro textedit/Makefile.in textedit/textedit.pro
todo/Makefile.in todo/todo.pro tux/Makefile.in tux/tux.pro
website/htdocs/build.html website/htdocs/development.html
website/htdocs/refman/qcop.html
website/htdocs/refman/qpeapplication.html wordgame/Makefile.in
wordgame/wordgame.pro
Log Message:
Changed QPEDIR to OPIEDIR in .pro files, and documentation,
and regenerated all Makefile.in's that were affected.
-rw-r--r-- | core/apps/embeddedkonsole/Makefile.in | 15 | ||||
-rwxr-xr-x | core/apps/embeddedkonsole/embeddedkonsole.pro | 6 | ||||
-rw-r--r-- | core/apps/helpbrowser/Makefile.in | 16 | ||||
-rw-r--r-- | core/apps/helpbrowser/helpbrowser.pro | 6 | ||||
-rw-r--r-- | core/apps/qcop/Makefile.in | 4 | ||||
-rw-r--r-- | core/apps/qcop/qcop.pro | 4 | ||||
-rw-r--r-- | core/apps/textedit/Makefile.in | 28 | ||||
-rw-r--r-- | core/apps/textedit/textedit.pro | 6 |
8 files changed, 43 insertions, 42 deletions
diff --git a/core/apps/embeddedkonsole/Makefile.in b/core/apps/embeddedkonsole/Makefile.in index b858cd4..8a69557 100644 --- a/core/apps/embeddedkonsole/Makefile.in +++ b/core/apps/embeddedkonsole/Makefile.in | |||
@@ -1,65 +1,65 @@ | |||
1 | ############################################################################# | 1 | ############################################################################# |
2 | 2 | ||
3 | ####### Compiler, tools and options | 3 | ####### Compiler, tools and options |
4 | 4 | ||
5 | CXX =$(SYSCONF_CXX) $(QT_CXX_MT) | 5 | CXX =$(SYSCONF_CXX) $(QT_CXX_MT) |
6 | CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) | 6 | CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) |
7 | CC =$(SYSCONF_CC) $(QT_C_MT) | 7 | CC =$(SYSCONF_CC) $(QT_C_MT) |
8 | CFLAGS =$(SYSCONF_CFLAGS) | 8 | CFLAGS =$(SYSCONF_CFLAGS) |
9 | INCPATH =-I$(QPEDIR)/include | 9 | INCPATH =-I$(OPIEDIR)/include |
10 | LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) | 10 | LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) |
11 | LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) | 11 | LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) |
12 | MOC =$(SYSCONF_MOC) | 12 | MOC =$(SYSCONF_MOC) |
13 | UIC =$(SYSCONF_UIC) | 13 | UIC =$(SYSCONF_UIC) |
14 | 14 | ||
15 | ####### Target | 15 | ####### Target |
16 | 16 | ||
17 | DESTDIR = $(QPEDIR)/bin/ | 17 | DESTDIR = $(OPIEDIR)/bin/ |
18 | VER_MAJ = 1 | 18 | VER_MAJ = 1 |
19 | VER_MIN = 0 | 19 | VER_MIN = 0 |
20 | VER_PATCH = 0 | 20 | VER_PATCH = 0 |
21 | TARGET= embeddedkonsole | 21 | TARGET= embeddedkonsole |
22 | TARGET1 = lib$(TARGET).so.$(VER_MAJ) | 22 | TARGET1 = lib$(TARGET).so.$(VER_MAJ) |
23 | 23 | ||
24 | ####### Files | 24 | ####### Files |
25 | 25 | ||
26 | HEADERS =TEWidget.h \ | 26 | HEADERS =TEWidget.h \ |
27 | TEScreen.h \ | 27 | TEScreen.h \ |
28 | TECommon.h \ | 28 | TECommon.h \ |
29 | TEHistory.h \ | 29 | TEHistory.h \ |
30 | TEmulation.h \ | 30 | TEmulation.h \ |
31 | TEmuVt102.h \ | 31 | TEmuVt102.h \ |
32 | session.h \ | 32 | session.h \ |
33 | keytrans.h \ | 33 | keytrans.h \ |
34 | konsole.h \ | 34 | konsole.h \ |
35 | MyPty.h | 35 | MyPty.h |
36 | SOURCES =TEScreen.cpp \ | 36 | SOURCES =TEScreen.cpp \ |
37 | TEWidget.cpp \ | 37 | TEWidget.cpp \ |
38 | TEHistory.cpp \ | 38 | TEHistory.cpp \ |
39 | TEmulation.cpp \ | 39 | TEmulation.cpp \ |
40 | TEmuVt102.cpp \ | 40 | TEmuVt102.cpp \ |
41 | session.cpp \ | 41 | session.cpp \ |
42 | keytrans.cpp \ | 42 | keytrans.cpp \ |
43 | konsole.cpp \ | 43 | konsole.cpp \ |
44 | main.cpp \ | 44 | main.cpp \ |
45 | MyPty.cpp | 45 | MyPty.cpp |
46 | OBJECTS =TEScreen.o \ | 46 | OBJECTS =TEScreen.o \ |
47 | TEWidget.o \ | 47 | TEWidget.o \ |
48 | TEHistory.o \ | 48 | TEHistory.o \ |
49 | TEmulation.o \ | 49 | TEmulation.o \ |
50 | TEmuVt102.o \ | 50 | TEmuVt102.o \ |
51 | session.o \ | 51 | session.o \ |
52 | keytrans.o \ | 52 | keytrans.o \ |
53 | konsole.o \ | 53 | konsole.o \ |
54 | main.o \ | 54 | main.o \ |
55 | MyPty.o | 55 | MyPty.o |
56 | INTERFACES = | 56 | INTERFACES = |
57 | UICDECLS = | 57 | UICDECLS = |
58 | UICIMPLS = | 58 | UICIMPLS = |
59 | SRCMOC =moc_TEWidget.cpp \ | 59 | SRCMOC =moc_TEWidget.cpp \ |
60 | moc_TEmulation.cpp \ | 60 | moc_TEmulation.cpp \ |
61 | moc_TEmuVt102.cpp \ | 61 | moc_TEmuVt102.cpp \ |
62 | moc_session.cpp \ | 62 | moc_session.cpp \ |
63 | moc_konsole.cpp \ | 63 | moc_konsole.cpp \ |
64 | moc_MyPty.cpp | 64 | moc_MyPty.cpp |
65 | OBJMOC =moc_TEWidget.o \ | 65 | OBJMOC =moc_TEWidget.o \ |
@@ -138,126 +138,127 @@ TEScreen.o: TEScreen.cpp \ | |||
138 | TECommon.h \ | 138 | TECommon.h \ |
139 | TEHistory.h | 139 | TEHistory.h |
140 | 140 | ||
141 | TEWidget.o: TEWidget.cpp \ | 141 | TEWidget.o: TEWidget.cpp \ |
142 | TEWidget.h \ | 142 | TEWidget.h \ |
143 | TECommon.h \ | 143 | TECommon.h \ |
144 | session.h \ | 144 | session.h \ |
145 | MyPty.h \ | 145 | MyPty.h \ |
146 | TEmuVt102.h \ | 146 | TEmuVt102.h \ |
147 | TEScreen.h \ | 147 | TEScreen.h \ |
148 | TEHistory.h \ | 148 | TEHistory.h \ |
149 | TEmulation.h \ | 149 | TEmulation.h \ |
150 | keytrans.h | 150 | keytrans.h |
151 | 151 | ||
152 | TEHistory.o: TEHistory.cpp \ | 152 | TEHistory.o: TEHistory.cpp \ |
153 | TEHistory.h \ | 153 | TEHistory.h \ |
154 | TECommon.h | 154 | TECommon.h |
155 | 155 | ||
156 | TEmulation.o: TEmulation.cpp \ | 156 | TEmulation.o: TEmulation.cpp \ |
157 | TEmulation.h \ | 157 | TEmulation.h \ |
158 | TEWidget.h \ | 158 | TEWidget.h \ |
159 | TECommon.h \ | 159 | TECommon.h \ |
160 | TEScreen.h \ | 160 | TEScreen.h \ |
161 | TEHistory.h \ | 161 | TEHistory.h \ |
162 | keytrans.h | 162 | keytrans.h |
163 | 163 | ||
164 | TEmuVt102.o: TEmuVt102.cpp \ | 164 | TEmuVt102.o: TEmuVt102.cpp \ |
165 | TEmuVt102.h \ | 165 | TEmuVt102.h \ |
166 | TEWidget.h \ | 166 | TEWidget.h \ |
167 | TECommon.h \ | 167 | TECommon.h \ |
168 | TEScreen.h \ | 168 | TEScreen.h \ |
169 | TEHistory.h \ | 169 | TEHistory.h \ |
170 | TEmulation.h \ | 170 | TEmulation.h \ |
171 | keytrans.h | 171 | keytrans.h |
172 | 172 | ||
173 | session.o: session.cpp \ | 173 | session.o: session.cpp \ |
174 | session.h \ | 174 | session.h \ |
175 | MyPty.h \ | 175 | MyPty.h \ |
176 | TEWidget.h \ | 176 | TEWidget.h \ |
177 | TECommon.h \ | 177 | TECommon.h \ |
178 | TEmuVt102.h \ | 178 | TEmuVt102.h \ |
179 | TEScreen.h \ | 179 | TEScreen.h \ |
180 | TEHistory.h \ | 180 | TEHistory.h \ |
181 | TEmulation.h \ | 181 | TEmulation.h \ |
182 | keytrans.h | 182 | keytrans.h |
183 | 183 | ||
184 | keytrans.o: keytrans.cpp \ | 184 | keytrans.o: keytrans.cpp \ |
185 | keytrans.h \ | 185 | keytrans.h \ |
186 | $(QPEDIR)/include/qpe/qpeapplication.h \ | 186 | $(OPIEDIR)/include/qpe/qpeapplication.h \ |
187 | default.keytab.h | 187 | default.keytab.h |
188 | 188 | ||
189 | konsole.o: konsole.cpp \ | 189 | konsole.o: konsole.cpp \ |
190 | $(QPEDIR)/include/qpe/resource.h \ | 190 | $(OPIEDIR)/include/qpe/resource.h \ |
191 | $(QPEDIR)/include/qpe/qpetoolbar.h \ | 191 | $(OPIEDIR)/include/qpe/qpetoolbar.h \ |
192 | $(QPEDIR)/include/qpe/qpemenubar.h \ | 192 | $(OPIEDIR)/include/qpe/qpemenubar.h \ |
193 | $(OPIEDIR)/include/qpe/config.h \ | ||
193 | konsole.h \ | 194 | konsole.h \ |
194 | MyPty.h \ | 195 | MyPty.h \ |
195 | TEWidget.h \ | 196 | TEWidget.h \ |
196 | TECommon.h \ | 197 | TECommon.h \ |
197 | TEmuVt102.h \ | 198 | TEmuVt102.h \ |
198 | TEScreen.h \ | 199 | TEScreen.h \ |
199 | TEHistory.h \ | 200 | TEHistory.h \ |
200 | TEmulation.h \ | 201 | TEmulation.h \ |
201 | keytrans.h \ | 202 | keytrans.h \ |
202 | session.h | 203 | session.h |
203 | 204 | ||
204 | main.o: main.cpp \ | 205 | main.o: main.cpp \ |
205 | konsole.h \ | 206 | konsole.h \ |
206 | MyPty.h \ | 207 | MyPty.h \ |
207 | TEWidget.h \ | 208 | TEWidget.h \ |
208 | TECommon.h \ | 209 | TECommon.h \ |
209 | TEmuVt102.h \ | 210 | TEmuVt102.h \ |
210 | TEScreen.h \ | 211 | TEScreen.h \ |
211 | TEHistory.h \ | 212 | TEHistory.h \ |
212 | TEmulation.h \ | 213 | TEmulation.h \ |
213 | keytrans.h \ | 214 | keytrans.h \ |
214 | session.h \ | 215 | session.h \ |
215 | $(QPEDIR)/include/qpe/qpeapplication.h | 216 | $(OPIEDIR)/include/qpe/qpeapplication.h |
216 | 217 | ||
217 | MyPty.o: MyPty.cpp \ | 218 | MyPty.o: MyPty.cpp \ |
218 | MyPty.h | 219 | MyPty.h |
219 | 220 | ||
220 | moc_TEWidget.o: moc_TEWidget.cpp \ | 221 | moc_TEWidget.o: moc_TEWidget.cpp \ |
221 | TEWidget.h \ | 222 | TEWidget.h \ |
222 | TECommon.h | 223 | TECommon.h |
223 | 224 | ||
224 | moc_TEmulation.o: moc_TEmulation.cpp \ | 225 | moc_TEmulation.o: moc_TEmulation.cpp \ |
225 | TEmulation.h \ | 226 | TEmulation.h \ |
226 | TEWidget.h \ | 227 | TEWidget.h \ |
227 | TECommon.h \ | 228 | TECommon.h \ |
228 | TEScreen.h \ | 229 | TEScreen.h \ |
229 | TEHistory.h \ | 230 | TEHistory.h \ |
230 | keytrans.h | 231 | keytrans.h |
231 | 232 | ||
232 | moc_TEmuVt102.o: moc_TEmuVt102.cpp \ | 233 | moc_TEmuVt102.o: moc_TEmuVt102.cpp \ |
233 | TEmuVt102.h \ | 234 | TEmuVt102.h \ |
234 | TEWidget.h \ | 235 | TEWidget.h \ |
235 | TECommon.h \ | 236 | TECommon.h \ |
236 | TEScreen.h \ | 237 | TEScreen.h \ |
237 | TEHistory.h \ | 238 | TEHistory.h \ |
238 | TEmulation.h \ | 239 | TEmulation.h \ |
239 | keytrans.h | 240 | keytrans.h |
240 | 241 | ||
241 | moc_session.o: moc_session.cpp \ | 242 | moc_session.o: moc_session.cpp \ |
242 | session.h \ | 243 | session.h \ |
243 | MyPty.h \ | 244 | MyPty.h \ |
244 | TEWidget.h \ | 245 | TEWidget.h \ |
245 | TECommon.h \ | 246 | TECommon.h \ |
246 | TEmuVt102.h \ | 247 | TEmuVt102.h \ |
247 | TEScreen.h \ | 248 | TEScreen.h \ |
248 | TEHistory.h \ | 249 | TEHistory.h \ |
249 | TEmulation.h \ | 250 | TEmulation.h \ |
250 | keytrans.h | 251 | keytrans.h |
251 | 252 | ||
252 | moc_konsole.o: moc_konsole.cpp \ | 253 | moc_konsole.o: moc_konsole.cpp \ |
253 | konsole.h \ | 254 | konsole.h \ |
254 | MyPty.h \ | 255 | MyPty.h \ |
255 | TEWidget.h \ | 256 | TEWidget.h \ |
256 | TECommon.h \ | 257 | TECommon.h \ |
257 | TEmuVt102.h \ | 258 | TEmuVt102.h \ |
258 | TEScreen.h \ | 259 | TEScreen.h \ |
259 | TEHistory.h \ | 260 | TEHistory.h \ |
260 | TEmulation.h \ | 261 | TEmulation.h \ |
261 | keytrans.h \ | 262 | keytrans.h \ |
262 | session.h | 263 | session.h |
263 | 264 | ||
diff --git a/core/apps/embeddedkonsole/embeddedkonsole.pro b/core/apps/embeddedkonsole/embeddedkonsole.pro index b757ea5..3452014 100755 --- a/core/apps/embeddedkonsole/embeddedkonsole.pro +++ b/core/apps/embeddedkonsole/embeddedkonsole.pro | |||
@@ -1,38 +1,38 @@ | |||
1 | TEMPLATE= app | 1 | TEMPLATE= app |
2 | 2 | ||
3 | CONFIG += qt warn_on release | 3 | CONFIG += qt warn_on release |
4 | 4 | ||
5 | DESTDIR = $(QPEDIR)/bin | 5 | DESTDIR = $(OPIEDIR)/bin |
6 | 6 | ||
7 | HEADERS = TEWidget.h \ | 7 | HEADERS = TEWidget.h \ |
8 | TEScreen.h \ | 8 | TEScreen.h \ |
9 | TECommon.h \ | 9 | TECommon.h \ |
10 | TEHistory.h \ | 10 | TEHistory.h \ |
11 | TEmulation.h \ | 11 | TEmulation.h \ |
12 | TEmuVt102.h \ | 12 | TEmuVt102.h \ |
13 | session.h \ | 13 | session.h \ |
14 | keytrans.h \ | 14 | keytrans.h \ |
15 | konsole.h \ | 15 | konsole.h \ |
16 | MyPty.h | 16 | MyPty.h |
17 | 17 | ||
18 | SOURCES = TEScreen.cpp \ | 18 | SOURCES = TEScreen.cpp \ |
19 | TEWidget.cpp \ | 19 | TEWidget.cpp \ |
20 | TEHistory.cpp \ | 20 | TEHistory.cpp \ |
21 | TEmulation.cpp \ | 21 | TEmulation.cpp \ |
22 | TEmuVt102.cpp \ | 22 | TEmuVt102.cpp \ |
23 | session.cpp \ | 23 | session.cpp \ |
24 | keytrans.cpp \ | 24 | keytrans.cpp \ |
25 | konsole.cpp \ | 25 | konsole.cpp \ |
26 | main.cpp \ | 26 | main.cpp \ |
27 | MyPty.cpp | 27 | MyPty.cpp |
28 | 28 | ||
29 | TARGET = embeddedkonsole | 29 | TARGET = embeddedkonsole |
30 | 30 | ||
31 | INCLUDEPATH += $(QPEDIR)/include | 31 | INCLUDEPATH += $(OPIEDIR)/include |
32 | 32 | ||
33 | DEPENDPATH+= $(QPEDIR)/include | 33 | DEPENDPATH+= $(OPIEDIR)/include |
34 | 34 | ||
35 | LIBS += -lqpe | 35 | LIBS += -lqpe |
36 | 36 | ||
37 | REQUIRES= embeddedkonsole | 37 | REQUIRES= embeddedkonsole |
38 | 38 | ||
diff --git a/core/apps/helpbrowser/Makefile.in b/core/apps/helpbrowser/Makefile.in index 8f0ce0e..ed3ea03 100644 --- a/core/apps/helpbrowser/Makefile.in +++ b/core/apps/helpbrowser/Makefile.in | |||
@@ -1,119 +1,119 @@ | |||
1 | ############################################################################# | 1 | ############################################################################# |
2 | 2 | ||
3 | ####### Compiler, tools and options | 3 | ####### Compiler, tools and options |
4 | 4 | ||
5 | CXX =$(SYSCONF_CXX) $(QT_CXX_MT) | 5 | CXX =$(SYSCONF_CXX) $(QT_CXX_MT) |
6 | CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) | 6 | CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) |
7 | CC =$(SYSCONF_CC) $(QT_C_MT) | 7 | CC =$(SYSCONF_CC) $(QT_C_MT) |
8 | CFLAGS =$(SYSCONF_CFLAGS) | 8 | CFLAGS =$(SYSCONF_CFLAGS) |
9 | INCPATH =-I$(QPEDIR)/include | 9 | INCPATH =-I$(OPIEDIR)/include |
10 | LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) | 10 | LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) |
11 | LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) | 11 | LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) |
12 | MOC =$(SYSCONF_MOC) | 12 | MOC =$(SYSCONF_MOC) |
13 | UIC =$(SYSCONF_UIC) | 13 | UIC =$(SYSCONF_UIC) |
14 | 14 | ||
15 | ####### Target | 15 | ####### Target |
16 | 16 | ||
17 | DESTDIR = $(QPEDIR)/bin/ | 17 | DESTDIR = $(OPIEDIR)/bin/ |
18 | VER_MAJ = 1 | 18 | VER_MAJ = 1 |
19 | VER_MIN = 0 | 19 | VER_MIN = 0 |
20 | VER_PATCH = 0 | 20 | VER_PATCH = 0 |
21 | TARGET= helpbrowser | 21 | TARGET= helpbrowser |
22 | TARGET1 = lib$(TARGET).so.$(VER_MAJ) | 22 | TARGET1 = lib$(TARGET).so.$(VER_MAJ) |
23 | 23 | ||
24 | ####### Files | 24 | ####### Files |
25 | 25 | ||
26 | HEADERS =helpbrowser.h | 26 | HEADERS =helpbrowser.h |
27 | SOURCES =helpbrowser.cpp \ | 27 | SOURCES =helpbrowser.cpp \ |
28 | main.cpp | 28 | main.cpp |
29 | OBJECTS =helpbrowser.o \ | 29 | OBJECTS =helpbrowser.o \ |
30 | main.o | 30 | main.o |
31 | INTERFACES = | 31 | INTERFACES = |
32 | UICDECLS = | 32 | UICDECLS = |
33 | UICIMPLS = | 33 | UICIMPLS = |
34 | SRCMOC =moc_helpbrowser.cpp | 34 | SRCMOC =moc_helpbrowser.cpp |
35 | OBJMOC =moc_helpbrowser.o | 35 | OBJMOC =moc_helpbrowser.o |
36 | 36 | ||
37 | 37 | ||
38 | ####### Implicit rules | 38 | ####### Implicit rules |
39 | 39 | ||
40 | .SUFFIXES: .cpp .cxx .cc .C .c | 40 | .SUFFIXES: .cpp .cxx .cc .C .c |
41 | 41 | ||
42 | .cpp.o: | 42 | .cpp.o: |
43 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< | 43 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< |
44 | 44 | ||
45 | .cxx.o: | 45 | .cxx.o: |
46 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< | 46 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< |
47 | 47 | ||
48 | .cc.o: | 48 | .cc.o: |
49 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< | 49 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< |
50 | 50 | ||
51 | .C.o: | 51 | .C.o: |
52 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< | 52 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< |
53 | 53 | ||
54 | .c.o: | 54 | .c.o: |
55 | $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< | 55 | $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< |
56 | 56 | ||
57 | ####### Build rules | 57 | ####### Build rules |
58 | 58 | ||
59 | 59 | ||
60 | all: $(DESTDIR)$(TARGET) | 60 | all: $(DESTDIR)$(TARGET) |
61 | 61 | ||
62 | $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) | 62 | $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) |
63 | $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) | 63 | $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) |
64 | 64 | ||
65 | moc: $(SRCMOC) | 65 | moc: $(SRCMOC) |
66 | 66 | ||
67 | tmake: | 67 | tmake: |
68 | tmake helpbrowser.pro | 68 | tmake helpbrowser.pro |
69 | 69 | ||
70 | clean: | 70 | clean: |
71 | -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) | 71 | -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) |
72 | -rm -f *~ core | 72 | -rm -f *~ core |
73 | -rm -f allmoc.cpp | 73 | -rm -f allmoc.cpp |
74 | 74 | ||
75 | ####### Extension Modules | 75 | ####### Extension Modules |
76 | 76 | ||
77 | listpromodules: | 77 | listpromodules: |
78 | @echo | 78 | @echo |
79 | 79 | ||
80 | listallmodules: | 80 | listallmodules: |
81 | @echo | 81 | @echo |
82 | 82 | ||
83 | listaddonpromodules: | 83 | listaddonpromodules: |
84 | @echo | 84 | @echo |
85 | 85 | ||
86 | listaddonentmodules: | 86 | listaddonentmodules: |
87 | @echo | 87 | @echo |
88 | 88 | ||
89 | 89 | ||
90 | REQUIRES= | 90 | REQUIRES= |
91 | 91 | ||
92 | ####### Sub-libraries | 92 | ####### Sub-libraries |
93 | 93 | ||
94 | 94 | ||
95 | ###### Combined headers | 95 | ###### Combined headers |
96 | 96 | ||
97 | 97 | ||
98 | 98 | ||
99 | ####### Compile | 99 | ####### Compile |
100 | 100 | ||
101 | helpbrowser.o: helpbrowser.cpp \ | 101 | helpbrowser.o: helpbrowser.cpp \ |
102 | helpbrowser.h \ | 102 | helpbrowser.h \ |
103 | $(QPEDIR)/include/qpe/qpeapplication.h \ | 103 | $(OPIEDIR)/include/qpe/qpeapplication.h \ |
104 | $(QPEDIR)/include/qpe/resource.h \ | 104 | $(OPIEDIR)/include/qpe/resource.h \ |
105 | $(QPEDIR)/include/qpe/global.h \ | 105 | $(OPIEDIR)/include/qpe/global.h \ |
106 | $(QPEDIR)/include/qpe/qpemenubar.h \ | 106 | $(OPIEDIR)/include/qpe/qpemenubar.h \ |
107 | $(QPEDIR)/include/qpe/qpetoolbar.h | 107 | $(OPIEDIR)/include/qpe/qpetoolbar.h |
108 | 108 | ||
109 | main.o: main.cpp \ | 109 | main.o: main.cpp \ |
110 | helpbrowser.h \ | 110 | helpbrowser.h \ |
111 | $(QPEDIR)/include/qpe/qpeapplication.h | 111 | $(OPIEDIR)/include/qpe/qpeapplication.h |
112 | 112 | ||
113 | moc_helpbrowser.o: moc_helpbrowser.cpp \ | 113 | moc_helpbrowser.o: moc_helpbrowser.cpp \ |
114 | helpbrowser.h | 114 | helpbrowser.h |
115 | 115 | ||
116 | moc_helpbrowser.cpp: helpbrowser.h | 116 | moc_helpbrowser.cpp: helpbrowser.h |
117 | $(MOC) helpbrowser.h -o moc_helpbrowser.cpp | 117 | $(MOC) helpbrowser.h -o moc_helpbrowser.cpp |
118 | 118 | ||
119 | 119 | ||
diff --git a/core/apps/helpbrowser/helpbrowser.pro b/core/apps/helpbrowser/helpbrowser.pro index 43230f1..f6ede8b 100644 --- a/core/apps/helpbrowser/helpbrowser.pro +++ b/core/apps/helpbrowser/helpbrowser.pro | |||
@@ -1,12 +1,12 @@ | |||
1 | TEMPLATE= app | 1 | TEMPLATE= app |
2 | CONFIG = qt warn_on release | 2 | CONFIG = qt warn_on release |
3 | DESTDIR = $(QPEDIR)/bin | 3 | DESTDIR = $(OPIEDIR)/bin |
4 | HEADERS = helpbrowser.h | 4 | HEADERS = helpbrowser.h |
5 | SOURCES = helpbrowser.cpp \ | 5 | SOURCES = helpbrowser.cpp \ |
6 | main.cpp | 6 | main.cpp |
7 | INCLUDEPATH += $(QPEDIR)/include | 7 | INCLUDEPATH += $(OPIEDIR)/include |
8 | DEPENDPATH+= $(QPEDIR)/include | 8 | DEPENDPATH+= $(OPIEDIR)/include |
9 | LIBS += -lqpe | 9 | LIBS += -lqpe |
10 | INTERFACES= | 10 | INTERFACES= |
11 | 11 | ||
12 | TRANSLATIONS = ../i18n/de/helpbrowser.ts | 12 | TRANSLATIONS = ../i18n/de/helpbrowser.ts |
diff --git a/core/apps/qcop/Makefile.in b/core/apps/qcop/Makefile.in index 0a12320..fd543f5 100644 --- a/core/apps/qcop/Makefile.in +++ b/core/apps/qcop/Makefile.in | |||
@@ -1,102 +1,102 @@ | |||
1 | ############################################################################# | 1 | ############################################################################# |
2 | 2 | ||
3 | ####### Compiler, tools and options | 3 | ####### Compiler, tools and options |
4 | 4 | ||
5 | CXX =$(SYSCONF_CXX) $(QT_CXX_MT) | 5 | CXX =$(SYSCONF_CXX) $(QT_CXX_MT) |
6 | CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) | 6 | CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) |
7 | CC =$(SYSCONF_CC) $(QT_C_MT) | 7 | CC =$(SYSCONF_CC) $(QT_C_MT) |
8 | CFLAGS =$(SYSCONF_CFLAGS) | 8 | CFLAGS =$(SYSCONF_CFLAGS) |
9 | INCPATH =-I$(QPEDIR)/include | 9 | INCPATH =-I$(OPIEDIR)/include |
10 | LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) | 10 | LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) |
11 | LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) | 11 | LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) |
12 | MOC =$(SYSCONF_MOC) | 12 | MOC =$(SYSCONF_MOC) |
13 | UIC =$(SYSCONF_UIC) | 13 | UIC =$(SYSCONF_UIC) |
14 | 14 | ||
15 | ####### Target | 15 | ####### Target |
16 | 16 | ||
17 | DESTDIR = ../bin/ | 17 | DESTDIR = ../bin/ |
18 | VER_MAJ = 1 | 18 | VER_MAJ = 1 |
19 | VER_MIN = 0 | 19 | VER_MIN = 0 |
20 | VER_PATCH = 0 | 20 | VER_PATCH = 0 |
21 | TARGET= qcop | 21 | TARGET= qcop |
22 | TARGET1 = lib$(TARGET).so.$(VER_MAJ) | 22 | TARGET1 = lib$(TARGET).so.$(VER_MAJ) |
23 | 23 | ||
24 | ####### Files | 24 | ####### Files |
25 | 25 | ||
26 | HEADERS = | 26 | HEADERS = |
27 | SOURCES =main.cpp | 27 | SOURCES =main.cpp |
28 | OBJECTS =main.o | 28 | OBJECTS =main.o |
29 | INTERFACES = | 29 | INTERFACES = |
30 | UICDECLS = | 30 | UICDECLS = |
31 | UICIMPLS = | 31 | UICIMPLS = |
32 | SRCMOC = | 32 | SRCMOC = |
33 | OBJMOC = | 33 | OBJMOC = |
34 | 34 | ||
35 | 35 | ||
36 | ####### Implicit rules | 36 | ####### Implicit rules |
37 | 37 | ||
38 | .SUFFIXES: .cpp .cxx .cc .C .c | 38 | .SUFFIXES: .cpp .cxx .cc .C .c |
39 | 39 | ||
40 | .cpp.o: | 40 | .cpp.o: |
41 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< | 41 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< |
42 | 42 | ||
43 | .cxx.o: | 43 | .cxx.o: |
44 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< | 44 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< |
45 | 45 | ||
46 | .cc.o: | 46 | .cc.o: |
47 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< | 47 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< |
48 | 48 | ||
49 | .C.o: | 49 | .C.o: |
50 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< | 50 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< |
51 | 51 | ||
52 | .c.o: | 52 | .c.o: |
53 | $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< | 53 | $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< |
54 | 54 | ||
55 | ####### Build rules | 55 | ####### Build rules |
56 | 56 | ||
57 | 57 | ||
58 | all: $(DESTDIR)$(TARGET) | 58 | all: $(DESTDIR)$(TARGET) |
59 | 59 | ||
60 | $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) | 60 | $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) |
61 | $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) | 61 | $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) |
62 | 62 | ||
63 | moc: $(SRCMOC) | 63 | moc: $(SRCMOC) |
64 | 64 | ||
65 | tmake: | 65 | tmake: |
66 | tmake qcop.pro | 66 | tmake qcop.pro |
67 | 67 | ||
68 | clean: | 68 | clean: |
69 | -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) | 69 | -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) |
70 | -rm -f *~ core | 70 | -rm -f *~ core |
71 | -rm -f allmoc.cpp | 71 | -rm -f allmoc.cpp |
72 | 72 | ||
73 | ####### Extension Modules | 73 | ####### Extension Modules |
74 | 74 | ||
75 | listpromodules: | 75 | listpromodules: |
76 | @echo | 76 | @echo |
77 | 77 | ||
78 | listallmodules: | 78 | listallmodules: |
79 | @echo | 79 | @echo |
80 | 80 | ||
81 | listaddonpromodules: | 81 | listaddonpromodules: |
82 | @echo | 82 | @echo |
83 | 83 | ||
84 | listaddonentmodules: | 84 | listaddonentmodules: |
85 | @echo | 85 | @echo |
86 | 86 | ||
87 | 87 | ||
88 | REQUIRES= | 88 | REQUIRES= |
89 | 89 | ||
90 | ####### Sub-libraries | 90 | ####### Sub-libraries |
91 | 91 | ||
92 | 92 | ||
93 | ###### Combined headers | 93 | ###### Combined headers |
94 | 94 | ||
95 | 95 | ||
96 | 96 | ||
97 | ####### Compile | 97 | ####### Compile |
98 | 98 | ||
99 | main.o: main.cpp \ | 99 | main.o: main.cpp \ |
100 | $(QPEDIR)/include/qpe/qcopenvelope_qws.h | 100 | $(OPIEDIR)/include/qpe/qcopenvelope_qws.h |
101 | 101 | ||
102 | 102 | ||
diff --git a/core/apps/qcop/qcop.pro b/core/apps/qcop/qcop.pro index b52bfd8..3ffe796 100644 --- a/core/apps/qcop/qcop.pro +++ b/core/apps/qcop/qcop.pro | |||
@@ -1,10 +1,10 @@ | |||
1 | TEMPLATE= app | 1 | TEMPLATE= app |
2 | CONFIG = qt warn_on release | 2 | CONFIG = qt warn_on release |
3 | DESTDIR = ../bin | 3 | DESTDIR = ../bin |
4 | HEADERS = | 4 | HEADERS = |
5 | SOURCES = main.cpp | 5 | SOURCES = main.cpp |
6 | INCLUDEPATH += $(QPEDIR)/include | 6 | INCLUDEPATH += $(OPIEDIR)/include |
7 | DEPENDPATH+= $(QPEDIR)/include | 7 | DEPENDPATH+= $(OPIEDIR)/include |
8 | LIBS += -lqpe | 8 | LIBS += -lqpe |
9 | INTERFACES= | 9 | INTERFACES= |
10 | TARGET = qcop | 10 | TARGET = qcop |
diff --git a/core/apps/textedit/Makefile.in b/core/apps/textedit/Makefile.in index 84542bb..997f2a4 100644 --- a/core/apps/textedit/Makefile.in +++ b/core/apps/textedit/Makefile.in | |||
@@ -1,125 +1,125 @@ | |||
1 | ############################################################################# | 1 | ############################################################################# |
2 | 2 | ||
3 | ####### Compiler, tools and options | 3 | ####### Compiler, tools and options |
4 | 4 | ||
5 | CXX =$(SYSCONF_CXX) $(QT_CXX_MT) | 5 | CXX =$(SYSCONF_CXX) $(QT_CXX_MT) |
6 | CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) | 6 | CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) |
7 | CC =$(SYSCONF_CC) $(QT_C_MT) | 7 | CC =$(SYSCONF_CC) $(QT_C_MT) |
8 | CFLAGS =$(SYSCONF_CFLAGS) | 8 | CFLAGS =$(SYSCONF_CFLAGS) |
9 | INCPATH =-I$(QPEDIR)/include | 9 | INCPATH =-I$(OPIEDIR)/include |
10 | LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) | 10 | LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) |
11 | LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) | 11 | LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) |
12 | MOC =$(SYSCONF_MOC) | 12 | MOC =$(SYSCONF_MOC) |
13 | UIC =$(SYSCONF_UIC) | 13 | UIC =$(SYSCONF_UIC) |
14 | 14 | ||
15 | ####### Target | 15 | ####### Target |
16 | 16 | ||
17 | DESTDIR = $(QPEDIR)/bin/ | 17 | DESTDIR = $(OPIEDIR)/bin/ |
18 | VER_MAJ = 1 | 18 | VER_MAJ = 1 |
19 | VER_MIN = 0 | 19 | VER_MIN = 0 |
20 | VER_PATCH = 0 | 20 | VER_PATCH = 0 |
21 | TARGET= textedit | 21 | TARGET= textedit |
22 | TARGET1 = lib$(TARGET).so.$(VER_MAJ) | 22 | TARGET1 = lib$(TARGET).so.$(VER_MAJ) |
23 | 23 | ||
24 | ####### Files | 24 | ####### Files |
25 | 25 | ||
26 | HEADERS =textedit.h | 26 | HEADERS =textedit.h |
27 | SOURCES =main.cpp \ | 27 | SOURCES =main.cpp \ |
28 | textedit.cpp | 28 | textedit.cpp |
29 | OBJECTS =main.o \ | 29 | OBJECTS =main.o \ |
30 | textedit.o | 30 | textedit.o |
31 | INTERFACES = | 31 | INTERFACES = |
32 | UICDECLS = | 32 | UICDECLS = |
33 | UICIMPLS = | 33 | UICIMPLS = |
34 | SRCMOC =moc_textedit.cpp | 34 | SRCMOC =moc_textedit.cpp |
35 | OBJMOC =moc_textedit.o | 35 | OBJMOC =moc_textedit.o |
36 | 36 | ||
37 | 37 | ||
38 | ####### Implicit rules | 38 | ####### Implicit rules |
39 | 39 | ||
40 | .SUFFIXES: .cpp .cxx .cc .C .c | 40 | .SUFFIXES: .cpp .cxx .cc .C .c |
41 | 41 | ||
42 | .cpp.o: | 42 | .cpp.o: |
43 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< | 43 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< |
44 | 44 | ||
45 | .cxx.o: | 45 | .cxx.o: |
46 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< | 46 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< |
47 | 47 | ||
48 | .cc.o: | 48 | .cc.o: |
49 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< | 49 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< |
50 | 50 | ||
51 | .C.o: | 51 | .C.o: |
52 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< | 52 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< |
53 | 53 | ||
54 | .c.o: | 54 | .c.o: |
55 | $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< | 55 | $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< |
56 | 56 | ||
57 | ####### Build rules | 57 | ####### Build rules |
58 | 58 | ||
59 | 59 | ||
60 | all: $(DESTDIR)$(TARGET) | 60 | all: $(DESTDIR)$(TARGET) |
61 | 61 | ||
62 | $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) | 62 | $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) |
63 | $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) | 63 | $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) |
64 | 64 | ||
65 | moc: $(SRCMOC) | 65 | moc: $(SRCMOC) |
66 | 66 | ||
67 | tmake: | 67 | tmake: |
68 | tmake textedit.pro | 68 | tmake textedit.pro |
69 | 69 | ||
70 | clean: | 70 | clean: |
71 | -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) | 71 | -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) |
72 | -rm -f *~ core | 72 | -rm -f *~ core |
73 | -rm -f allmoc.cpp | 73 | -rm -f allmoc.cpp |
74 | 74 | ||
75 | ####### Extension Modules | 75 | ####### Extension Modules |
76 | 76 | ||
77 | listpromodules: | 77 | listpromodules: |
78 | @echo | 78 | @echo |
79 | 79 | ||
80 | listallmodules: | 80 | listallmodules: |
81 | @echo | 81 | @echo |
82 | 82 | ||
83 | listaddonpromodules: | 83 | listaddonpromodules: |
84 | @echo | 84 | @echo |
85 | 85 | ||
86 | listaddonentmodules: | 86 | listaddonentmodules: |
87 | @echo | 87 | @echo |
88 | 88 | ||
89 | 89 | ||
90 | REQUIRES= | 90 | REQUIRES= |
91 | 91 | ||
92 | ####### Sub-libraries | 92 | ####### Sub-libraries |
93 | 93 | ||
94 | 94 | ||
95 | ###### Combined headers | 95 | ###### Combined headers |
96 | 96 | ||
97 | 97 | ||
98 | 98 | ||
99 | ####### Compile | 99 | ####### Compile |
100 | 100 | ||
101 | main.o: main.cpp \ | 101 | main.o: main.cpp \ |
102 | textedit.h \ | 102 | textedit.h \ |
103 | $(QPEDIR)/include/qpe/filemanager.h \ | 103 | $(OPIEDIR)/include/qpe/filemanager.h \ |
104 | $(QPEDIR)/include/qpe/qpeapplication.h | 104 | $(OPIEDIR)/include/qpe/qpeapplication.h |
105 | 105 | ||
106 | textedit.o: textedit.cpp \ | 106 | textedit.o: textedit.cpp \ |
107 | textedit.h \ | 107 | textedit.h \ |
108 | $(QPEDIR)/include/qpe/filemanager.h \ | 108 | $(OPIEDIR)/include/qpe/filemanager.h \ |
109 | $(QPEDIR)/include/qpe/global.h \ | 109 | $(OPIEDIR)/include/qpe/global.h \ |
110 | $(QPEDIR)/include/qpe/fileselector.h \ | 110 | $(OPIEDIR)/include/qpe/fileselector.h \ |
111 | $(QPEDIR)/include/qpe/applnk.h \ | 111 | $(OPIEDIR)/include/qpe/applnk.h \ |
112 | $(QPEDIR)/include/qpe/resource.h \ | 112 | $(OPIEDIR)/include/qpe/resource.h \ |
113 | $(QPEDIR)/include/qpe/config.h \ | 113 | $(OPIEDIR)/include/qpe/config.h \ |
114 | $(QPEDIR)/include/qpe/qpeapplication.h \ | 114 | $(OPIEDIR)/include/qpe/qpeapplication.h \ |
115 | $(QPEDIR)/include/qpe/qpemenubar.h \ | 115 | $(OPIEDIR)/include/qpe/qpemenubar.h \ |
116 | $(QPEDIR)/include/qpe/qpetoolbar.h | 116 | $(OPIEDIR)/include/qpe/qpetoolbar.h |
117 | 117 | ||
118 | moc_textedit.o: moc_textedit.cpp \ | 118 | moc_textedit.o: moc_textedit.cpp \ |
119 | textedit.h \ | 119 | textedit.h \ |
120 | $(QPEDIR)/include/qpe/filemanager.h | 120 | $(OPIEDIR)/include/qpe/filemanager.h |
121 | 121 | ||
122 | moc_textedit.cpp: textedit.h | 122 | moc_textedit.cpp: textedit.h |
123 | $(MOC) textedit.h -o moc_textedit.cpp | 123 | $(MOC) textedit.h -o moc_textedit.cpp |
124 | 124 | ||
125 | 125 | ||
diff --git a/core/apps/textedit/textedit.pro b/core/apps/textedit/textedit.pro index 3f5473e..23b8d8d 100644 --- a/core/apps/textedit/textedit.pro +++ b/core/apps/textedit/textedit.pro | |||
@@ -1,16 +1,16 @@ | |||
1 | TEMPLATE= app | 1 | TEMPLATE= app |
2 | CONFIG += qt warn_on release | 2 | CONFIG += qt warn_on release |
3 | 3 | ||
4 | DESTDIR = $(QPEDIR)/bin | 4 | DESTDIR = $(OPIEDIR)/bin |
5 | 5 | ||
6 | HEADERS= textedit.h | 6 | HEADERS= textedit.h |
7 | 7 | ||
8 | SOURCES= main.cpp textedit.cpp | 8 | SOURCES= main.cpp textedit.cpp |
9 | 9 | ||
10 | INCLUDEPATH += $(QPEDIR)/include | 10 | INCLUDEPATH += $(OPIEDIR)/include |
11 | DEPENDPATH+= $(QPEDIR)/include | 11 | DEPENDPATH+= $(OPIEDIR)/include |
12 | LIBS += -lqpe | 12 | LIBS += -lqpe |
13 | 13 | ||
14 | TARGET = textedit | 14 | TARGET = textedit |
15 | 15 | ||
16 | TRANSLATIONS = ../i18n/de/textedit.ts | 16 | TRANSLATIONS = ../i18n/de/textedit.ts |