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,57 +1,57 @@
 #############################################################################
 ####### Compiler, tools and options
        CXX     =$(SYSCONF_CXX) $(QT_CXX_MT)
        CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
        CC      =$(SYSCONF_CC) $(QT_C_MT)
        CFLAGS  =$(SYSCONF_CFLAGS)
-        INCPATH =-I$(QPEDIR)/include
+        INCPATH =-I$(OPIEDIR)/include
        LFLAGS  =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
        LIBS    =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
        MOC     =$(SYSCONF_MOC)
        UIC     =$(SYSCONF_UIC)
 ####### Target
 DESTDIR = ../../bin/
 VER_MAJ = 1
 VER_MIN = 0
 VER_PATCH = 0
        TARGET= language
 TARGET1 = lib$(TARGET).so.$(VER_MAJ)
 ####### Files
        HEADERS =settings.h
        SOURCES =language.cpp \
                main.cpp
        OBJECTS =language.o \
                main.o \
                languagesettingsbase.o
 INTERFACES =    languagesettingsbase.ui
 UICDECLS =      languagesettingsbase.h
 UICIMPLS =      languagesettingsbase.cpp
        SRCMOC  =moc_settings.cpp \
                moc_languagesettingsbase.cpp
        OBJMOC  =moc_settings.o \
                moc_languagesettingsbase.o
 ####### Implicit rules
 .SUFFIXES: .cpp .cxx .cc .C .c
 .cpp.o:
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 .cxx.o:
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 .cc.o:
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 .C.o:
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 .c.o:
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 @@
        TEMPLATE= app
        CONFIG  += qt warn_on release
        DESTDIR         = ../../bin
        HEADERS         = settings.h
        SOURCES         = language.cpp main.cpp
        INTERFACES= languagesettingsbase.ui
-INCLUDEPATH += $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
-        DEPENDPATH+= ../$(QPEDIR)/include
+        DEPENDPATH+= ../$(OPIEDIR)/include
 LIBS            += -lqpe
        TARGET  = language
 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,57 +1,57 @@
 #############################################################################
 ####### Compiler, tools and options
        CXX     =$(SYSCONF_CXX) $(QT_CXX_MT)
        CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
        CC      =$(SYSCONF_CC) $(QT_C_MT)
        CFLAGS  =$(SYSCONF_CFLAGS)
-        INCPATH =-I$(QPEDIR)/include
+        INCPATH =-I$(OPIEDIR)/include
        LFLAGS  =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
        LIBS    =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
        MOC     =$(SYSCONF_MOC)
        UIC     =$(SYSCONF_UIC)
 ####### Target
 DESTDIR = ../../bin/
 VER_MAJ = 1
 VER_MIN = 0
 VER_PATCH = 0
        TARGET= sound
 TARGET1 = lib$(TARGET).so.$(VER_MAJ)
 ####### Files
        HEADERS =soundsettings.h
        SOURCES =soundsettings.cpp \
                main.cpp
        OBJECTS =soundsettings.o \
                main.o \
                soundsettingsbase.o
 INTERFACES =    soundsettingsbase.ui
 UICDECLS =      soundsettingsbase.h
 UICIMPLS =      soundsettingsbase.cpp
        SRCMOC  =moc_soundsettings.cpp \
                moc_soundsettingsbase.cpp
        OBJMOC  =moc_soundsettings.o \
                moc_soundsettingsbase.o
 ####### Implicit rules
 .SUFFIXES: .cpp .cxx .cc .C .c
 .cpp.o:
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 .cxx.o:
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 .cc.o:
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 .C.o:
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 .c.o:
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 @@
        TEMPLATE= app
        CONFIG  += qt warn_on release
        DESTDIR         = ../../bin
        HEADERS         = soundsettings.h
        SOURCES         = soundsettings.cpp main.cpp
        INTERFACES= soundsettingsbase.ui
-INCLUDEPATH += $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
-        DEPENDPATH+= ../$(QPEDIR)/include
+        DEPENDPATH+= ../$(OPIEDIR)/include
 LIBS            += -lqpe
        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,65 +1,65 @@
 #############################################################################
 ####### Compiler, tools and options
        CXX     =$(SYSCONF_CXX) $(QT_CXX_MT)
        CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
        CC      =$(SYSCONF_CC) $(QT_C_MT)
        CFLAGS  =$(SYSCONF_CFLAGS)
-        INCPATH =-I$(QPEDIR)/include
+        INCPATH =-I$(OPIEDIR)/include
        LFLAGS  =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
        LIBS    =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
        MOC     =$(SYSCONF_MOC)
        UIC     =$(SYSCONF_UIC)
 ####### Target
-DESTDIR = $(QPEDIR)/bin/
+DESTDIR = $(OPIEDIR)/bin/
 VER_MAJ = 1
 VER_MIN = 0
 VER_PATCH = 0
        TARGET= sysinfo
 TARGET1 = lib$(TARGET).so.$(VER_MAJ)
 ####### Files
        HEADERS =memory.h \
                graph.h \
                load.h \
                storage.h \
                versioninfo.h \
                sysinfo.h
        SOURCES =main.cpp \
                memory.cpp \
                graph.cpp \
                load.cpp \
                storage.cpp \
                versioninfo.cpp \
                sysinfo.cpp
        OBJECTS =main.o \
                memory.o \
                graph.o \
                load.o \
                storage.o \
                versioninfo.o \
                sysinfo.o
 INTERFACES =    
 UICDECLS =      
 UICIMPLS =      
        SRCMOC  =moc_memory.cpp \
                moc_graph.cpp \
                moc_load.cpp \
                moc_storage.cpp \
                moc_versioninfo.cpp \
                moc_sysinfo.cpp
        OBJMOC  =moc_memory.o \
                moc_graph.o \
                moc_load.o \
                moc_storage.o \
                moc_versioninfo.o \
                moc_sysinfo.o
 ####### Implicit rules
 .SUFFIXES: .cpp .cxx .cc .C .c
@@ -80,114 +80,114 @@ OBJMOC	=	moc_memory.o \
        $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
 ####### Build rules
 all: $(DESTDIR)$(TARGET)
 $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
        $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
 moc: $(SRCMOC)
 tmake:
        tmake sysinfo.pro
 clean:
        -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
        -rm -f *~ core
        -rm -f allmoc.cpp
 ####### Extension Modules
 listpromodules:
        @echo 
 listallmodules:
        @echo 
 listaddonpromodules:
        @echo 
 listaddonentmodules:
        @echo 
 REQUIRES=
 ####### Sub-libraries
 ###### Combined headers
 ####### Compile
 main.o: main.cpp \
                sysinfo.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h
+                $(OPIEDIR)/include/qpe/qpeapplication.h
 memory.o: memory.cpp \
                graph.h \
                memory.h
 graph.o: graph.cpp \
                graph.h
 load.o: load.cpp \
                load.h
 storage.o: storage.cpp \
                graph.h \
                storage.h
 versioninfo.o: versioninfo.cpp \
-                $(QPEDIR)/include/qpe/resource.h \
+                $(OPIEDIR)/include/qpe/resource.h \
-                $(QPEDIR)/include/qpe/version.h \
+                $(OPIEDIR)/include/qpe/version.h \
                versioninfo.h
 sysinfo.o: sysinfo.cpp \
                memory.h \
                load.h \
                storage.h \
                versioninfo.h \
                sysinfo.h \
-                $(QPEDIR)/include/qpe/resource.h
+                $(OPIEDIR)/include/qpe/resource.h
 moc_memory.o: moc_memory.cpp \
                memory.h
 moc_graph.o: moc_graph.cpp \
                graph.h
 moc_load.o: moc_load.cpp \
                load.h
 moc_storage.o: moc_storage.cpp \
                storage.h
 moc_versioninfo.o: moc_versioninfo.cpp \
                versioninfo.h
 moc_sysinfo.o: moc_sysinfo.cpp \
                sysinfo.h
 moc_memory.cpp: memory.h
        $(MOC) memory.h -o moc_memory.cpp
 moc_graph.cpp: graph.h
        $(MOC) graph.h -o moc_graph.cpp
 moc_load.cpp: load.h
        $(MOC) load.h -o moc_load.cpp
 moc_storage.cpp: storage.h
        $(MOC) storage.h -o moc_storage.cpp
 moc_versioninfo.cpp: versioninfo.h
        $(MOC) versioninfo.h -o moc_versioninfo.cpp
 moc_sysinfo.cpp: sysinfo.h
        $(MOC) sysinfo.h -o moc_sysinfo.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 @@
        TEMPLATE= app
        CONFIG  = qt warn_on release
-        DESTDIR         = $(QPEDIR)/bin
+        DESTDIR         = $(OPIEDIR)/bin
        HEADERS         = memory.h \
                  graph.h \
                  load.h \
                  storage.h \
                  versioninfo.h \
                  sysinfo.h
        SOURCES         = main.cpp \
                  memory.cpp \
                  graph.cpp \
                  load.cpp \
                  storage.cpp \
                  versioninfo.cpp \
                  sysinfo.cpp
        INTERFACES= 
-INCLUDEPATH += $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
-        DEPENDPATH+= $(QPEDIR)/include
+        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
        TARGET  = sysinfo
 TRANSLATIONS = ../i18n/de/sysinfo.ts

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,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= language	21	TARGET= language
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 =language.cpp \	27	SOURCES =language.cpp \
28	main.cpp	28	main.cpp
29	OBJECTS =language.o \	29	OBJECTS =language.o \
30	main.o \	30	main.o \
31	languagesettingsbase.o	31	languagesettingsbase.o
32	INTERFACES = languagesettingsbase.ui	32	INTERFACES = languagesettingsbase.ui
33	UICDECLS = languagesettingsbase.h	33	UICDECLS = languagesettingsbase.h
34	UICIMPLS = languagesettingsbase.cpp	34	UICIMPLS = languagesettingsbase.cpp
35	SRCMOC =moc_settings.cpp \	35	SRCMOC =moc_settings.cpp \
36	moc_languagesettingsbase.cpp	36	moc_languagesettingsbase.cpp
37	OBJMOC =moc_settings.o \	37	OBJMOC =moc_settings.o \
38	moc_languagesettingsbase.o	38	moc_languagesettingsbase.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/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,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= sound	21	TARGET= sound
22	TARGET1 = lib$(TARGET).so.$(VER_MAJ)	22	TARGET1 = lib$(TARGET).so.$(VER_MAJ)
23		23
24	####### Files	24	####### Files
25		25
26	HEADERS =soundsettings.h	26	HEADERS =soundsettings.h
27	SOURCES =soundsettings.cpp \	27	SOURCES =soundsettings.cpp \
28	main.cpp	28	main.cpp
29	OBJECTS =soundsettings.o \	29	OBJECTS =soundsettings.o \
30	main.o \	30	main.o \
31	soundsettingsbase.o	31	soundsettingsbase.o
32	INTERFACES = soundsettingsbase.ui	32	INTERFACES = soundsettingsbase.ui
33	UICDECLS = soundsettingsbase.h	33	UICDECLS = soundsettingsbase.h
34	UICIMPLS = soundsettingsbase.cpp	34	UICIMPLS = soundsettingsbase.cpp
35	SRCMOC =moc_soundsettings.cpp \	35	SRCMOC =moc_soundsettings.cpp \
36	moc_soundsettingsbase.cpp	36	moc_soundsettingsbase.cpp
37	OBJMOC =moc_soundsettings.o \	37	OBJMOC =moc_soundsettings.o \
38	moc_soundsettingsbase.o	38	moc_soundsettingsbase.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/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,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= 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
26	HEADERS =memory.h \	26	HEADERS =memory.h \
27	graph.h \	27	graph.h \
28	load.h \	28	load.h \
29	storage.h \	29	storage.h \
30	versioninfo.h \	30	versioninfo.h \
31	sysinfo.h	31	sysinfo.h
32	SOURCES =main.cpp \	32	SOURCES =main.cpp \
33	memory.cpp \	33	memory.cpp \
34	graph.cpp \	34	graph.cpp \
35	load.cpp \	35	load.cpp \
36	storage.cpp \	36	storage.cpp \
37	versioninfo.cpp \	37	versioninfo.cpp \
38	sysinfo.cpp	38	sysinfo.cpp
39	OBJECTS =main.o \	39	OBJECTS =main.o \
40	memory.o \	40	memory.o \
41	graph.o \	41	graph.o \
42	load.o \	42	load.o \
43	storage.o \	43	storage.o \
44	versioninfo.o \	44	versioninfo.o \
45	sysinfo.o	45	sysinfo.o
46	INTERFACES =	46	INTERFACES =
47	UICDECLS =	47	UICDECLS =
48	UICIMPLS =	48	UICIMPLS =
49	SRCMOC =moc_memory.cpp \	49	SRCMOC =moc_memory.cpp \
50	moc_graph.cpp \	50	moc_graph.cpp \
51	moc_load.cpp \	51	moc_load.cpp \
52	moc_storage.cpp \	52	moc_storage.cpp \
53	moc_versioninfo.cpp \	53	moc_versioninfo.cpp \
54	moc_sysinfo.cpp	54	moc_sysinfo.cpp
55	OBJMOC =moc_memory.o \	55	OBJMOC =moc_memory.o \
56	moc_graph.o \	56	moc_graph.o \
57	moc_load.o \	57	moc_load.o \
58	moc_storage.o \	58	moc_storage.o \
59	moc_versioninfo.o \	59	moc_versioninfo.o \
60	moc_sysinfo.o	60	moc_sysinfo.o
61		61
62		62
63	####### Implicit rules	63	####### Implicit rules
64		64
65	.SUFFIXES: .cpp .cxx .cc .C .c	65	.SUFFIXES: .cpp .cxx .cc .C .c
@@ -80,114 +80,114 @@ OBJMOC = moc_memory.o \
80	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<	80	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
81		81
82	####### Build rules	82	####### Build rules
83		83
84		84
85	all: $(DESTDIR)$(TARGET)	85	all: $(DESTDIR)$(TARGET)
86		86
87	$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)	87	$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
88	$(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)	88	$(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
89		89
90	moc: $(SRCMOC)	90	moc: $(SRCMOC)
91		91
92	tmake:	92	tmake:
93	tmake sysinfo.pro	93	tmake sysinfo.pro
94		94
95	clean:	95	clean:
96	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)	96	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
97	-rm -f *~ core	97	-rm -f *~ core
98	-rm -f allmoc.cpp	98	-rm -f allmoc.cpp
99		99
100	####### Extension Modules	100	####### Extension Modules
101		101
102	listpromodules:	102	listpromodules:
103	@echo	103	@echo
104		104
105	listallmodules:	105	listallmodules:
106	@echo	106	@echo
107		107
108	listaddonpromodules:	108	listaddonpromodules:
109	@echo	109	@echo
110		110
111	listaddonentmodules:	111	listaddonentmodules:
112	@echo	112	@echo
113		113
114		114
115	REQUIRES=	115	REQUIRES=
116		116
117	####### Sub-libraries	117	####### Sub-libraries
118		118
119		119
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 \
164	load.h	164	load.h
165		165
166	moc_storage.o: moc_storage.cpp \	166	moc_storage.o: moc_storage.cpp \
167	storage.h	167	storage.h
168		168
169	moc_versioninfo.o: moc_versioninfo.cpp \	169	moc_versioninfo.o: moc_versioninfo.cpp \
170	versioninfo.h	170	versioninfo.h
171		171
172	moc_sysinfo.o: moc_sysinfo.cpp \	172	moc_sysinfo.o: moc_sysinfo.cpp \
173	sysinfo.h	173	sysinfo.h
174		174
175	moc_memory.cpp: memory.h	175	moc_memory.cpp: memory.h
176	$(MOC) memory.h -o moc_memory.cpp	176	$(MOC) memory.h -o moc_memory.cpp
177		177
178	moc_graph.cpp: graph.h	178	moc_graph.cpp: graph.h
179	$(MOC) graph.h -o moc_graph.cpp	179	$(MOC) graph.h -o moc_graph.cpp
180		180
181	moc_load.cpp: load.h	181	moc_load.cpp: load.h
182	$(MOC) load.h -o moc_load.cpp	182	$(MOC) load.h -o moc_load.cpp
183		183
184	moc_storage.cpp: storage.h	184	moc_storage.cpp: storage.h
185	$(MOC) storage.h -o moc_storage.cpp	185	$(MOC) storage.h -o moc_storage.cpp
186		186
187	moc_versioninfo.cpp: versioninfo.h	187	moc_versioninfo.cpp: versioninfo.h
188	$(MOC) versioninfo.h -o moc_versioninfo.cpp	188	$(MOC) versioninfo.h -o moc_versioninfo.cpp
189		189
190	moc_sysinfo.cpp: sysinfo.h	190	moc_sysinfo.cpp: sysinfo.h
191	$(MOC) sysinfo.h -o moc_sysinfo.cpp	191	$(MOC) sysinfo.h -o moc_sysinfo.cpp
192		192
193		193


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