-rw-r--r-- | noncore/settings/language/Makefile.in | 2 | ||||
-rw-r--r-- | noncore/settings/language/language.pro | 4 | ||||
-rw-r--r-- | noncore/settings/sound/Makefile.in | 2 | ||||
-rw-r--r-- | noncore/settings/sound/sound.pro | 4 | ||||
-rw-r--r-- | noncore/settings/sysinfo/Makefile.in | 12 | ||||
-rw-r--r-- | noncore/settings/sysinfo/sysinfo.pro | 6 |
6 files changed, 15 insertions, 15 deletions
diff --git a/noncore/settings/language/Makefile.in b/noncore/settings/language/Makefile.in index 2babf6e..d1a602d 100644 --- a/noncore/settings/language/Makefile.in +++ b/noncore/settings/language/Makefile.in | |||
@@ -1,17 +1,17 @@ | |||
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/ |
diff --git a/noncore/settings/language/language.pro b/noncore/settings/language/language.pro index d1f1bf0..c01ffc8 100644 --- a/noncore/settings/language/language.pro +++ b/noncore/settings/language/language.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 = language.cpp main.cpp | 5 | SOURCES = language.cpp main.cpp |
6 | INTERFACES= languagesettingsbase.ui | 6 | INTERFACES= languagesettingsbase.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 = language | 10 | TARGET = language |
11 | 11 | ||
12 | TRANSLATIONS = ../../i18n/de/language.ts | 12 | TRANSLATIONS = ../../i18n/de/language.ts |
diff --git a/noncore/settings/sound/Makefile.in b/noncore/settings/sound/Makefile.in index 1772e12..b42f2e9 100644 --- a/noncore/settings/sound/Makefile.in +++ b/noncore/settings/sound/Makefile.in | |||
@@ -1,17 +1,17 @@ | |||
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/ |
diff --git a/noncore/settings/sound/sound.pro b/noncore/settings/sound/sound.pro index 9028a44..44eff44 100644 --- a/noncore/settings/sound/sound.pro +++ b/noncore/settings/sound/sound.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 = soundsettings.h | 4 | HEADERS = soundsettings.h |
5 | SOURCES = soundsettings.cpp main.cpp | 5 | SOURCES = soundsettings.cpp main.cpp |
6 | INTERFACES= soundsettingsbase.ui | 6 | INTERFACES= soundsettingsbase.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 = sound | 10 | TARGET = sound |
diff --git a/noncore/settings/sysinfo/Makefile.in b/noncore/settings/sysinfo/Makefile.in index 1149304..fb9d15e 100644 --- a/noncore/settings/sysinfo/Makefile.in +++ b/noncore/settings/sysinfo/Makefile.in | |||
@@ -1,25 +1,25 @@ | |||
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= sysinfo | 21 | TARGET= sysinfo |
22 | TARGET1 = lib$(TARGET).so.$(VER_MAJ) | 22 | TARGET1 = lib$(TARGET).so.$(VER_MAJ) |
23 | 23 | ||
24 | ####### Files | 24 | ####### Files |
25 | 25 | ||
@@ -120,44 +120,44 @@ REQUIRES= | |||
120 | ###### Combined headers | 120 | ###### Combined headers |
121 | 121 | ||
122 | 122 | ||
123 | 123 | ||
124 | ####### Compile | 124 | ####### Compile |
125 | 125 | ||
126 | main.o: main.cpp \ | 126 | main.o: main.cpp \ |
127 | sysinfo.h \ | 127 | sysinfo.h \ |
128 | $(QPEDIR)/include/qpe/qpeapplication.h | 128 | $(OPIEDIR)/include/qpe/qpeapplication.h |
129 | 129 | ||
130 | memory.o: memory.cpp \ | 130 | memory.o: memory.cpp \ |
131 | graph.h \ | 131 | graph.h \ |
132 | memory.h | 132 | memory.h |
133 | 133 | ||
134 | graph.o: graph.cpp \ | 134 | graph.o: graph.cpp \ |
135 | graph.h | 135 | graph.h |
136 | 136 | ||
137 | load.o: load.cpp \ | 137 | load.o: load.cpp \ |
138 | load.h | 138 | load.h |
139 | 139 | ||
140 | storage.o: storage.cpp \ | 140 | storage.o: storage.cpp \ |
141 | graph.h \ | 141 | graph.h \ |
142 | storage.h | 142 | storage.h |
143 | 143 | ||
144 | versioninfo.o: versioninfo.cpp \ | 144 | versioninfo.o: versioninfo.cpp \ |
145 | $(QPEDIR)/include/qpe/resource.h \ | 145 | $(OPIEDIR)/include/qpe/resource.h \ |
146 | $(QPEDIR)/include/qpe/version.h \ | 146 | $(OPIEDIR)/include/qpe/version.h \ |
147 | versioninfo.h | 147 | versioninfo.h |
148 | 148 | ||
149 | sysinfo.o: sysinfo.cpp \ | 149 | sysinfo.o: sysinfo.cpp \ |
150 | memory.h \ | 150 | memory.h \ |
151 | load.h \ | 151 | load.h \ |
152 | storage.h \ | 152 | storage.h \ |
153 | versioninfo.h \ | 153 | versioninfo.h \ |
154 | sysinfo.h \ | 154 | sysinfo.h \ |
155 | $(QPEDIR)/include/qpe/resource.h | 155 | $(OPIEDIR)/include/qpe/resource.h |
156 | 156 | ||
157 | moc_memory.o: moc_memory.cpp \ | 157 | moc_memory.o: moc_memory.cpp \ |
158 | memory.h | 158 | memory.h |
159 | 159 | ||
160 | moc_graph.o: moc_graph.cpp \ | 160 | moc_graph.o: moc_graph.cpp \ |
161 | graph.h | 161 | graph.h |
162 | 162 | ||
163 | moc_load.o: moc_load.cpp \ | 163 | moc_load.o: moc_load.cpp \ |
diff --git a/noncore/settings/sysinfo/sysinfo.pro b/noncore/settings/sysinfo/sysinfo.pro index 0c7d907..3393a12 100644 --- a/noncore/settings/sysinfo/sysinfo.pro +++ b/noncore/settings/sysinfo/sysinfo.pro | |||
@@ -1,25 +1,25 @@ | |||
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 = memory.h \ | 4 | HEADERS = memory.h \ |
5 | graph.h \ | 5 | graph.h \ |
6 | load.h \ | 6 | load.h \ |
7 | storage.h \ | 7 | storage.h \ |
8 | versioninfo.h \ | 8 | versioninfo.h \ |
9 | sysinfo.h | 9 | sysinfo.h |
10 | SOURCES = main.cpp \ | 10 | SOURCES = main.cpp \ |
11 | memory.cpp \ | 11 | memory.cpp \ |
12 | graph.cpp \ | 12 | graph.cpp \ |
13 | load.cpp \ | 13 | load.cpp \ |
14 | storage.cpp \ | 14 | storage.cpp \ |
15 | versioninfo.cpp \ | 15 | versioninfo.cpp \ |
16 | sysinfo.cpp | 16 | sysinfo.cpp |
17 | INTERFACES= | 17 | INTERFACES= |
18 | 18 | ||
19 | INCLUDEPATH += $(QPEDIR)/include | 19 | INCLUDEPATH += $(OPIEDIR)/include |
20 | DEPENDPATH+= $(QPEDIR)/include | 20 | DEPENDPATH+= $(OPIEDIR)/include |
21 | LIBS += -lqpe | 21 | LIBS += -lqpe |
22 | 22 | ||
23 | TARGET = sysinfo | 23 | TARGET = sysinfo |
24 | 24 | ||
25 | TRANSLATIONS = ../i18n/de/sysinfo.ts | 25 | TRANSLATIONS = ../i18n/de/sysinfo.ts |