-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,29 +1,29 @@ | |||
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 \ |
@@ -174,54 +174,55 @@ 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 \ |
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,17 +1,17 @@ | |||
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 | ||
@@ -19,20 +19,20 @@ 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,29 +1,29 @@ | |||
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 \ |
@@ -91,29 +91,29 @@ 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,21 +1,21 @@ | |||
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 |
@@ -88,15 +88,15 @@ listaddonentmodules: | |||
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,29 +1,29 @@ | |||
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 \ |
@@ -91,35 +91,35 @@ 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 |