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/settings | |
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/settings/citytime/Makefile.in | 24 | ||||
-rw-r--r-- | core/settings/citytime/citytime.pro | 6 | ||||
-rw-r--r-- | core/settings/light-and-power/Makefile.in | 2 | ||||
-rw-r--r-- | core/settings/light-and-power/light-and-power.pro | 4 | ||||
-rw-r--r-- | core/settings/security/Makefile.in | 2 | ||||
-rw-r--r-- | core/settings/security/security.pro | 4 |
6 files changed, 21 insertions, 21 deletions
diff --git a/core/settings/citytime/Makefile.in b/core/settings/citytime/Makefile.in index b058021..4112a68 100644 --- a/core/settings/citytime/Makefile.in +++ b/core/settings/citytime/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= citytime | 21 | TARGET= citytime |
22 | TARGET1 = lib$(TARGET).so.$(VER_MAJ) | 22 | TARGET1 = lib$(TARGET).so.$(VER_MAJ) |
23 | 23 | ||
24 | ####### Files | 24 | ####### Files |
25 | 25 | ||
26 | HEADERS =citytime.h \ | 26 | HEADERS =citytime.h \ |
27 | zonemap.h \ | 27 | zonemap.h \ |
28 | sun.h \ | 28 | sun.h \ |
29 | stylusnormalizer.h | 29 | stylusnormalizer.h |
30 | SOURCES =citytime.cpp \ | 30 | SOURCES =citytime.cpp \ |
31 | zonemap.cpp \ | 31 | zonemap.cpp \ |
32 | main.cpp \ | 32 | main.cpp \ |
33 | sun.c \ | 33 | sun.c \ |
34 | stylusnormalizer.cpp | 34 | stylusnormalizer.cpp |
35 | OBJECTS =citytime.o \ | 35 | OBJECTS =citytime.o \ |
36 | zonemap.o \ | 36 | zonemap.o \ |
37 | main.o \ | 37 | main.o \ |
38 | sun.o \ | 38 | sun.o \ |
39 | stylusnormalizer.o \ | 39 | stylusnormalizer.o \ |
40 | citytimebase.o | 40 | citytimebase.o |
41 | INTERFACES = citytimebase.ui | 41 | INTERFACES = citytimebase.ui |
42 | UICDECLS = citytimebase.h | 42 | UICDECLS = citytimebase.h |
43 | UICIMPLS = citytimebase.cpp | 43 | UICIMPLS = citytimebase.cpp |
44 | SRCMOC =moc_citytime.cpp \ | 44 | SRCMOC =moc_citytime.cpp \ |
45 | moc_zonemap.cpp \ | 45 | moc_zonemap.cpp \ |
46 | moc_stylusnormalizer.cpp \ | 46 | moc_stylusnormalizer.cpp \ |
47 | moc_citytimebase.cpp | 47 | moc_citytimebase.cpp |
48 | OBJMOC =moc_citytime.o \ | 48 | OBJMOC =moc_citytime.o \ |
49 | moc_zonemap.o \ | 49 | moc_zonemap.o \ |
50 | moc_stylusnormalizer.o \ | 50 | moc_stylusnormalizer.o \ |
51 | moc_citytimebase.o | 51 | moc_citytimebase.o |
52 | 52 | ||
53 | 53 | ||
54 | ####### Implicit rules | 54 | ####### Implicit rules |
55 | 55 | ||
56 | .SUFFIXES: .cpp .cxx .cc .C .c | 56 | .SUFFIXES: .cpp .cxx .cc .C .c |
57 | 57 | ||
58 | .cpp.o: | 58 | .cpp.o: |
59 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< | 59 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< |
60 | 60 | ||
61 | .cxx.o: | 61 | .cxx.o: |
62 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< | 62 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< |
63 | 63 | ||
64 | .cc.o: | 64 | .cc.o: |
65 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< | 65 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< |
@@ -74,111 +74,111 @@ OBJMOC = moc_citytime.o \ | |||
74 | 74 | ||
75 | 75 | ||
76 | all: $(DESTDIR)$(TARGET) | 76 | all: $(DESTDIR)$(TARGET) |
77 | 77 | ||
78 | $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) | 78 | $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) |
79 | $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) | 79 | $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) |
80 | 80 | ||
81 | moc: $(SRCMOC) | 81 | moc: $(SRCMOC) |
82 | 82 | ||
83 | tmake: | 83 | tmake: |
84 | tmake citytime.pro | 84 | tmake citytime.pro |
85 | 85 | ||
86 | clean: | 86 | clean: |
87 | -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) | 87 | -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) |
88 | -rm -f *~ core | 88 | -rm -f *~ core |
89 | -rm -f allmoc.cpp | 89 | -rm -f allmoc.cpp |
90 | 90 | ||
91 | ####### Extension Modules | 91 | ####### Extension Modules |
92 | 92 | ||
93 | listpromodules: | 93 | listpromodules: |
94 | @echo | 94 | @echo |
95 | 95 | ||
96 | listallmodules: | 96 | listallmodules: |
97 | @echo | 97 | @echo |
98 | 98 | ||
99 | listaddonpromodules: | 99 | listaddonpromodules: |
100 | @echo | 100 | @echo |
101 | 101 | ||
102 | listaddonentmodules: | 102 | listaddonentmodules: |
103 | @echo | 103 | @echo |
104 | 104 | ||
105 | 105 | ||
106 | REQUIRES= | 106 | REQUIRES= |
107 | 107 | ||
108 | ####### Sub-libraries | 108 | ####### Sub-libraries |
109 | 109 | ||
110 | 110 | ||
111 | ###### Combined headers | 111 | ###### Combined headers |
112 | 112 | ||
113 | 113 | ||
114 | 114 | ||
115 | ####### Compile | 115 | ####### Compile |
116 | 116 | ||
117 | citytime.o: citytime.cpp \ | 117 | citytime.o: citytime.cpp \ |
118 | zonemap.h \ | 118 | zonemap.h \ |
119 | stylusnormalizer.h \ | 119 | stylusnormalizer.h \ |
120 | citytime.h \ | 120 | citytime.h \ |
121 | citytimebase.h \ | 121 | citytimebase.h \ |
122 | $(QPEDIR)/include/qpe/qpeapplication.h \ | 122 | $(OPIEDIR)/include/qpe/qpeapplication.h \ |
123 | $(QPEDIR)/include/qpe/config.h \ | 123 | $(OPIEDIR)/include/qpe/config.h \ |
124 | $(QPEDIR)/include/qpe/timestring.h \ | 124 | $(OPIEDIR)/include/qpe/timestring.h \ |
125 | $(QPEDIR)/include/qpe/tzselect.h \ | 125 | $(OPIEDIR)/include/qpe/tzselect.h \ |
126 | $(QPEDIR)/include/qpe/qcopenvelope_qws.h | 126 | $(OPIEDIR)/include/qpe/qcopenvelope_qws.h |
127 | 127 | ||
128 | zonemap.o: zonemap.cpp \ | 128 | zonemap.o: zonemap.cpp \ |
129 | sun.h \ | 129 | sun.h \ |
130 | zonemap.h \ | 130 | zonemap.h \ |
131 | stylusnormalizer.h \ | 131 | stylusnormalizer.h \ |
132 | $(QPEDIR)/include/qpe/resource.h \ | 132 | $(OPIEDIR)/include/qpe/resource.h \ |
133 | $(QPEDIR)/include/qpe/timestring.h \ | 133 | $(OPIEDIR)/include/qpe/timestring.h \ |
134 | $(QPEDIR)/include/qpe/qpeapplication.h | 134 | $(OPIEDIR)/include/qpe/qpeapplication.h |
135 | 135 | ||
136 | main.o: main.cpp \ | 136 | main.o: main.cpp \ |
137 | citytime.h \ | 137 | citytime.h \ |
138 | citytimebase.h \ | 138 | citytimebase.h \ |
139 | $(QPEDIR)/include/qpe/qpeapplication.h | 139 | $(OPIEDIR)/include/qpe/qpeapplication.h |
140 | 140 | ||
141 | sun.o: sun.c \ | 141 | sun.o: sun.c \ |
142 | sun.h \ | 142 | sun.h \ |
143 | $(QPEDIR)/include/qpe/qmath.h | 143 | $(OPIEDIR)/include/qpe/qmath.h |
144 | 144 | ||
145 | stylusnormalizer.o: stylusnormalizer.cpp \ | 145 | stylusnormalizer.o: stylusnormalizer.cpp \ |
146 | stylusnormalizer.h | 146 | stylusnormalizer.h |
147 | 147 | ||
148 | citytimebase.h: citytimebase.ui | 148 | citytimebase.h: citytimebase.ui |
149 | $(UIC) citytimebase.ui -o $(INTERFACE_DECL_PATH)/citytimebase.h | 149 | $(UIC) citytimebase.ui -o $(INTERFACE_DECL_PATH)/citytimebase.h |
150 | 150 | ||
151 | citytimebase.cpp: citytimebase.ui | 151 | citytimebase.cpp: citytimebase.ui |
152 | $(UIC) citytimebase.ui -i citytimebase.h -o citytimebase.cpp | 152 | $(UIC) citytimebase.ui -i citytimebase.h -o citytimebase.cpp |
153 | 153 | ||
154 | citytimebase.o: citytimebase.cpp \ | 154 | citytimebase.o: citytimebase.cpp \ |
155 | citytimebase.h \ | 155 | citytimebase.h \ |
156 | citytimebase.ui | 156 | citytimebase.ui |
157 | 157 | ||
158 | moc_citytime.o: moc_citytime.cpp \ | 158 | moc_citytime.o: moc_citytime.cpp \ |
159 | citytime.h \ | 159 | citytime.h \ |
160 | citytimebase.h | 160 | citytimebase.h |
161 | 161 | ||
162 | moc_zonemap.o: moc_zonemap.cpp \ | 162 | moc_zonemap.o: moc_zonemap.cpp \ |
163 | zonemap.h \ | 163 | zonemap.h \ |
164 | stylusnormalizer.h | 164 | stylusnormalizer.h |
165 | 165 | ||
166 | moc_stylusnormalizer.o: moc_stylusnormalizer.cpp \ | 166 | moc_stylusnormalizer.o: moc_stylusnormalizer.cpp \ |
167 | stylusnormalizer.h | 167 | stylusnormalizer.h |
168 | 168 | ||
169 | moc_citytimebase.o: moc_citytimebase.cpp \ | 169 | moc_citytimebase.o: moc_citytimebase.cpp \ |
170 | citytimebase.h | 170 | citytimebase.h |
171 | 171 | ||
172 | moc_citytime.cpp: citytime.h | 172 | moc_citytime.cpp: citytime.h |
173 | $(MOC) citytime.h -o moc_citytime.cpp | 173 | $(MOC) citytime.h -o moc_citytime.cpp |
174 | 174 | ||
175 | moc_zonemap.cpp: zonemap.h | 175 | moc_zonemap.cpp: zonemap.h |
176 | $(MOC) zonemap.h -o moc_zonemap.cpp | 176 | $(MOC) zonemap.h -o moc_zonemap.cpp |
177 | 177 | ||
178 | moc_stylusnormalizer.cpp: stylusnormalizer.h | 178 | moc_stylusnormalizer.cpp: stylusnormalizer.h |
179 | $(MOC) stylusnormalizer.h -o moc_stylusnormalizer.cpp | 179 | $(MOC) stylusnormalizer.h -o moc_stylusnormalizer.cpp |
180 | 180 | ||
181 | moc_citytimebase.cpp: citytimebase.h | 181 | moc_citytimebase.cpp: citytimebase.h |
182 | $(MOC) citytimebase.h -o moc_citytimebase.cpp | 182 | $(MOC) citytimebase.h -o moc_citytimebase.cpp |
183 | 183 | ||
184 | 184 | ||
diff --git a/core/settings/citytime/citytime.pro b/core/settings/citytime/citytime.pro index d988b48..3420499 100644 --- a/core/settings/citytime/citytime.pro +++ b/core/settings/citytime/citytime.pro | |||
@@ -1,13 +1,13 @@ | |||
1 | # $Id$ | 1 | # $Id$ |
2 | CONFIG += qt warn_on release | 2 | CONFIG += qt warn_on release |
3 | TEMPLATE = app | 3 | TEMPLATE = app |
4 | DESTDIR = $(QPEDIR)/bin | 4 | DESTDIR = $(OPIEDIR)/bin |
5 | INTERFACES = citytimebase.ui | 5 | INTERFACES = citytimebase.ui |
6 | HEADERS = citytime.h zonemap.h sun.h stylusnormalizer.h | 6 | HEADERS = citytime.h zonemap.h sun.h stylusnormalizer.h |
7 | SOURCES = citytime.cpp zonemap.cpp main.cpp sun.c stylusnormalizer.cpp | 7 | SOURCES = citytime.cpp zonemap.cpp main.cpp sun.c stylusnormalizer.cpp |
8 | TARGET = citytime | 8 | TARGET = citytime |
9 | INCLUDEPATH += $(QPEDIR)/include | 9 | INCLUDEPATH += $(OPIEDIR)/include |
10 | DEPENDPATH += $(QPEDIR)/include | 10 | DEPENDPATH += $(OPIEDIR)/include |
11 | LIBS += -lqpe | 11 | LIBS += -lqpe |
12 | 12 | ||
13 | TRANSLATIONS = ../i18n/de/citytime.ts | 13 | TRANSLATIONS = ../i18n/de/citytime.ts |
diff --git a/core/settings/light-and-power/Makefile.in b/core/settings/light-and-power/Makefile.in index 8236ed0..5caa249 100644 --- a/core/settings/light-and-power/Makefile.in +++ b/core/settings/light-and-power/Makefile.in | |||
@@ -1,57 +1,57 @@ | |||
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= light-and-power | 21 | TARGET= light-and-power |
22 | TARGET1 = lib$(TARGET).so.$(VER_MAJ) | 22 | TARGET1 = lib$(TARGET).so.$(VER_MAJ) |
23 | 23 | ||
24 | ####### Files | 24 | ####### Files |
25 | 25 | ||
26 | HEADERS =settings.h | 26 | HEADERS =settings.h |
27 | SOURCES =light.cpp \ | 27 | SOURCES =light.cpp \ |
28 | main.cpp | 28 | main.cpp |
29 | OBJECTS =light.o \ | 29 | OBJECTS =light.o \ |
30 | main.o \ | 30 | main.o \ |
31 | lightsettingsbase.o | 31 | lightsettingsbase.o |
32 | INTERFACES = lightsettingsbase.ui | 32 | INTERFACES = lightsettingsbase.ui |
33 | UICDECLS = lightsettingsbase.h | 33 | UICDECLS = lightsettingsbase.h |
34 | UICIMPLS = lightsettingsbase.cpp | 34 | UICIMPLS = lightsettingsbase.cpp |
35 | SRCMOC =moc_settings.cpp \ | 35 | SRCMOC =moc_settings.cpp \ |
36 | moc_lightsettingsbase.cpp | 36 | moc_lightsettingsbase.cpp |
37 | OBJMOC =moc_settings.o \ | 37 | OBJMOC =moc_settings.o \ |
38 | moc_lightsettingsbase.o | 38 | moc_lightsettingsbase.o |
39 | 39 | ||
40 | 40 | ||
41 | ####### Implicit rules | 41 | ####### Implicit rules |
42 | 42 | ||
43 | .SUFFIXES: .cpp .cxx .cc .C .c | 43 | .SUFFIXES: .cpp .cxx .cc .C .c |
44 | 44 | ||
45 | .cpp.o: | 45 | .cpp.o: |
46 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< | 46 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< |
47 | 47 | ||
48 | .cxx.o: | 48 | .cxx.o: |
49 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< | 49 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< |
50 | 50 | ||
51 | .cc.o: | 51 | .cc.o: |
52 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< | 52 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< |
53 | 53 | ||
54 | .C.o: | 54 | .C.o: |
55 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< | 55 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< |
56 | 56 | ||
57 | .c.o: | 57 | .c.o: |
diff --git a/core/settings/light-and-power/light-and-power.pro b/core/settings/light-and-power/light-and-power.pro index 87bb111..35b51a7 100644 --- a/core/settings/light-and-power/light-and-power.pro +++ b/core/settings/light-and-power/light-and-power.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 = ../../bin | 3 | DESTDIR = ../../bin |
4 | HEADERS = settings.h | 4 | HEADERS = settings.h |
5 | SOURCES = light.cpp main.cpp | 5 | SOURCES = light.cpp main.cpp |
6 | INTERFACES= lightsettingsbase.ui | 6 | INTERFACES= lightsettingsbase.ui |
7 | INCLUDEPATH += $(QPEDIR)/include | 7 | INCLUDEPATH += $(OPIEDIR)/include |
8 | DEPENDPATH+= ../$(QPEDIR)/include | 8 | DEPENDPATH+= ../$(OPIEDIR)/include |
9 | LIBS += -lqpe | 9 | LIBS += -lqpe |
10 | TARGET = light-and-power | 10 | TARGET = light-and-power |
11 | 11 | ||
12 | TRANSLATIONS = ../../i18n/de/light-and-power.ts | 12 | TRANSLATIONS = ../../i18n/de/light-and-power.ts |
diff --git a/core/settings/security/Makefile.in b/core/settings/security/Makefile.in index 803edc5..f190e79 100644 --- a/core/settings/security/Makefile.in +++ b/core/settings/security/Makefile.in | |||
@@ -1,57 +1,57 @@ | |||
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= security | 21 | TARGET= security |
22 | TARGET1 = lib$(TARGET).so.$(VER_MAJ) | 22 | TARGET1 = lib$(TARGET).so.$(VER_MAJ) |
23 | 23 | ||
24 | ####### Files | 24 | ####### Files |
25 | 25 | ||
26 | HEADERS =security.h | 26 | HEADERS =security.h |
27 | SOURCES =security.cpp \ | 27 | SOURCES =security.cpp \ |
28 | main.cpp | 28 | main.cpp |
29 | OBJECTS =security.o \ | 29 | OBJECTS =security.o \ |
30 | main.o \ | 30 | main.o \ |
31 | securitybase.o | 31 | securitybase.o |
32 | INTERFACES = securitybase.ui | 32 | INTERFACES = securitybase.ui |
33 | UICDECLS = securitybase.h | 33 | UICDECLS = securitybase.h |
34 | UICIMPLS = securitybase.cpp | 34 | UICIMPLS = securitybase.cpp |
35 | SRCMOC =moc_security.cpp \ | 35 | SRCMOC =moc_security.cpp \ |
36 | moc_securitybase.cpp | 36 | moc_securitybase.cpp |
37 | OBJMOC =moc_security.o \ | 37 | OBJMOC =moc_security.o \ |
38 | moc_securitybase.o | 38 | moc_securitybase.o |
39 | 39 | ||
40 | 40 | ||
41 | ####### Implicit rules | 41 | ####### Implicit rules |
42 | 42 | ||
43 | .SUFFIXES: .cpp .cxx .cc .C .c | 43 | .SUFFIXES: .cpp .cxx .cc .C .c |
44 | 44 | ||
45 | .cpp.o: | 45 | .cpp.o: |
46 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< | 46 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< |
47 | 47 | ||
48 | .cxx.o: | 48 | .cxx.o: |
49 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< | 49 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< |
50 | 50 | ||
51 | .cc.o: | 51 | .cc.o: |
52 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< | 52 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< |
53 | 53 | ||
54 | .C.o: | 54 | .C.o: |
55 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< | 55 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< |
56 | 56 | ||
57 | .c.o: | 57 | .c.o: |
diff --git a/core/settings/security/security.pro b/core/settings/security/security.pro index 282127e..f22e7a6 100644 --- a/core/settings/security/security.pro +++ b/core/settings/security/security.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 = ../../bin | 3 | DESTDIR = ../../bin |
4 | HEADERS = security.h | 4 | HEADERS = security.h |
5 | SOURCES = security.cpp main.cpp | 5 | SOURCES = security.cpp main.cpp |
6 | INTERFACES= securitybase.ui | 6 | INTERFACES= securitybase.ui |
7 | INCLUDEPATH += $(QPEDIR)/include | 7 | INCLUDEPATH += $(OPIEDIR)/include |
8 | DEPENDPATH+= ../$(QPEDIR)/include | 8 | DEPENDPATH+= ../$(OPIEDIR)/include |
9 | LIBS += -lqpe | 9 | LIBS += -lqpe |
10 | TARGET = security | 10 | TARGET = security |
11 | 11 | ||
12 | TRANSLATIONS = ../../i18n/de/security.ts | 12 | TRANSLATIONS = ../../i18n/de/security.ts |