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.
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 /noncore/tools
parent: 77d110d35f75d63f5dc66c1dd2427daf7dc2e214 (diff)
download: opie-f7b3193e5d2d9a211ce0b963dca571d82adecb71.zip
opie-f7b3193e5d2d9a211ce0b963dca571d82adecb71.tar.gz
opie-f7b3193e5d2d9a211ce0b963dca571d82adecb71.tar.bz2
7 files changed, 30 insertions, 30 deletions
diff --git a/noncore/tools/calc2/binary/binary.pro b/noncore/tools/calc2/binary/binary.pro
index 01ba6a4..2e9ed78 100644
--- a/noncore/tools/calc2/binary/binary.pro
+++ b/noncore/tools/calc2/binary/binary.pro
@@ -6,11 +6,11 @@ CONFIG += qt release
 INTERFACES += binary.ui
 HEADERS = binaryimpl.h \
            binaryfactory.h 
 SOURCES = binaryimpl.cpp \
            binaryfactory.cpp
-INCLUDEPATH     += $(QPEDIR)/include \
+INCLUDEPATH     += $(OPIEDIR)/include \
-                    $(QPEDIR)/calc2
+                    $(OPIEDIR)/calc2
-DEPENDPATH      += $(QPEDIR)/include 
+DEPENDPATH      += $(OPIEDIR)/include 
-DESTDIR = $(QPEDIR)/plugins/calculator
+DESTDIR = $(OPIEDIR)/plugins/calculator
diff --git a/noncore/tools/calc2/calc.pro b/noncore/tools/calc2/calc.pro
index c10232a..00e13b7 100644
--- a/noncore/tools/calc2/calc.pro
+++ b/noncore/tools/calc2/calc.pro
@@ -2,10 +2,10 @@ TEMPLATE = app
 CONFIG += qt release
 # Input
 HEADERS += calc.h plugininterface.h instruction.h engine.h stdinstructions.h
 SOURCES += calc.cpp main.cpp engine.cpp
-INCLUDEPATH     += $(QPEDIR)/include 
+INCLUDEPATH     += $(OPIEDIR)/include 
-DEPENDPATH      += $(QPEDIR)/include 
+DEPENDPATH      += $(OPIEDIR)/include 
 LIBS += -lqpe -Wl,-export-dynamic 
diff --git a/noncore/tools/calc2/simple/simple.pro b/noncore/tools/calc2/simple/simple.pro
index 92378a6..9e5d4e0 100644
--- a/noncore/tools/calc2/simple/simple.pro
+++ b/noncore/tools/calc2/simple/simple.pro
@@ -4,11 +4,11 @@ CONFIG += qt release
 # Input
 INTERFACES += simple.ui
 HEADERS = simpleimpl.h  simplefactory.h stdinstructions.h
 SOURCES = simpleimpl.cpp simplefactory.cpp
-INCLUDEPATH     += $(QPEDIR)/include \
+INCLUDEPATH     += $(OPIEDIR)/include \
-                    $(QPEDIR)/calc2
+                    $(OPIEDIR)/calc2
-DEPENDPATH      += $(QPEDIR)/include 
+DEPENDPATH      += $(OPIEDIR)/include 
-DESTDIR = $(QPEDIR)/plugins/calculator
+DESTDIR = $(OPIEDIR)/plugins/calculator
diff --git a/noncore/tools/calculator/Makefile.in b/noncore/tools/calculator/Makefile.in
index d62b046..ba78df5 100644
--- a/noncore/tools/calculator/Makefile.in
+++ b/noncore/tools/calculator/Makefile.in
@@ -3,21 +3,21 @@
 ####### 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= calculator
 TARGET1 = lib$(TARGET).so.$(VER_MAJ)
@@ -101,23 +101,23 @@ REQUIRES=
 ####### Compile
 calculatorimpl.o: calculatorimpl.cpp \
                calculatorimpl.h \
                calculator.h \
-                $(QPEDIR)/include/qpe/resource.h \
+                $(OPIEDIR)/include/qpe/resource.h \
-                $(QPEDIR)/include/qpe/qmath.h \
+                $(OPIEDIR)/include/qpe/qmath.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h
+                $(OPIEDIR)/include/qpe/qpeapplication.h
 main.o: main.cpp \
                calculatorimpl.h \
                calculator.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h
+                $(OPIEDIR)/include/qpe/qpeapplication.h
 calculator.h: calculator.ui
-        $(UIC) calculator.ui -o calculator.h
+        $(UIC) calculator.ui -o $(INTERFACE_DECL_PATH)/calculator.h
 calculator.cpp: calculator.ui
        $(UIC) calculator.ui -i calculator.h -o calculator.cpp
 calculator.o: calculator.cpp \
                calculator.h \
diff --git a/noncore/tools/calculator/calculator.pro b/noncore/tools/calculator/calculator.pro
index 1281fd5..9554d2a 100644
--- a/noncore/tools/calculator/calculator.pro
+++ b/noncore/tools/calculator/calculator.pro
@@ -1,13 +1,13 @@
-        DESTDIR         = $(QPEDIR)/bin
+        DESTDIR         = $(OPIEDIR)/bin
        TEMPLATE= app
        CONFIG  = qt warn_on release
        HEADERS         = calculatorimpl.h
        SOURCES         = calculatorimpl.cpp \
                  main.cpp
-INCLUDEPATH += $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
-        DEPENDPATH+= $(QPEDIR)/include
+        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
        INTERFACES= calculator.ui
        TARGET  = calculator
 TRANSLATIONS = ../i18n/de/calculator.ts
diff --git a/noncore/tools/clock/Makefile.in b/noncore/tools/clock/Makefile.in
index adda9e6..efa7808 100644
--- a/noncore/tools/clock/Makefile.in
+++ b/noncore/tools/clock/Makefile.in
@@ -3,21 +3,21 @@
 ####### 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= clock
 TARGET1 = lib$(TARGET).so.$(VER_MAJ)
@@ -97,20 +97,20 @@ REQUIRES=
 ####### Compile
 clock.o: clock.cpp \
                clock.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h \
+                $(OPIEDIR)/include/qpe/qpeapplication.h \
-                $(QPEDIR)/include/qpe/qcopenvelope_qws.h \
+                $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
-                $(QPEDIR)/include/qpe/config.h \
+                $(OPIEDIR)/include/qpe/config.h \
-                $(QPEDIR)/include/qpe/timestring.h
+                $(OPIEDIR)/include/qpe/timestring.h
 main.o: main.cpp \
                clock.h \
-                $(QPEDIR)/include/qpe/qpeapplication.h
+                $(OPIEDIR)/include/qpe/qpeapplication.h
 moc_clock.o: moc_clock.cpp \
                clock.h
 moc_clock.cpp: clock.h
        $(MOC) clock.h -o moc_clock.cpp
diff --git a/noncore/tools/clock/clock.pro b/noncore/tools/clock/clock.pro
index 97f4d2c..ec27adc 100644
--- a/noncore/tools/clock/clock.pro
+++ b/noncore/tools/clock/clock.pro
@@ -1,13 +1,13 @@
        TEMPLATE= app
        CONFIG  = qt warn_on release
-        DESTDIR         = $(QPEDIR)/bin
+        DESTDIR         = $(OPIEDIR)/bin
        HEADERS         = clock.h
        SOURCES         = clock.cpp \
                  main.cpp
-INCLUDEPATH += $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
-        DEPENDPATH+= $(QPEDIR)/include
+        DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe
        INTERFACES= 
        TARGET  = clock
 TRANSLATIONS = ../i18n/de/clock.ts
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 /noncore/tools
parent	77d110d35f75d63f5dc66c1dd2427daf7dc2e214 (diff)
download	opie-f7b3193e5d2d9a211ce0b963dca571d82adecb71.zip opie-f7b3193e5d2d9a211ce0b963dca571d82adecb71.tar.gz opie-f7b3193e5d2d9a211ce0b963dca571d82adecb71.tar.bz2

diff --git a/noncore/tools/calc2/binary/binary.pro b/noncore/tools/calc2/binary/binary.pro index 01ba6a4..2e9ed78 100644 --- a/noncore/tools/calc2/binary/binary.pro +++ b/noncore/tools/calc2/binary/binary.pro
@@ -6,11 +6,11 @@ CONFIG += qt release
6	INTERFACES += binary.ui	6	INTERFACES += binary.ui
7	HEADERS = binaryimpl.h \	7	HEADERS = binaryimpl.h \
8	binaryfactory.h	8	binaryfactory.h
9	SOURCES = binaryimpl.cpp \	9	SOURCES = binaryimpl.cpp \
10	binaryfactory.cpp	10	binaryfactory.cpp
11		11
12	INCLUDEPATH += $(QPEDIR)/include \	12	INCLUDEPATH += $(OPIEDIR)/include \
13	$(QPEDIR)/calc2	13	$(OPIEDIR)/calc2
14	DEPENDPATH += $(QPEDIR)/include	14	DEPENDPATH += $(OPIEDIR)/include
15		15
16	DESTDIR = $(QPEDIR)/plugins/calculator	16	DESTDIR = $(OPIEDIR)/plugins/calculator


diff --git a/noncore/tools/calc2/calc.pro b/noncore/tools/calc2/calc.pro index c10232a..00e13b7 100644 --- a/noncore/tools/calc2/calc.pro +++ b/noncore/tools/calc2/calc.pro
@@ -2,10 +2,10 @@ TEMPLATE = app
2	CONFIG += qt release	2	CONFIG += qt release
3		3
4	# Input	4	# Input
5	HEADERS += calc.h plugininterface.h instruction.h engine.h stdinstructions.h	5	HEADERS += calc.h plugininterface.h instruction.h engine.h stdinstructions.h
6	SOURCES += calc.cpp main.cpp engine.cpp	6	SOURCES += calc.cpp main.cpp engine.cpp
7		7
8	INCLUDEPATH += $(QPEDIR)/include	8	INCLUDEPATH += $(OPIEDIR)/include
9	DEPENDPATH += $(QPEDIR)/include	9	DEPENDPATH += $(OPIEDIR)/include
10	LIBS += -lqpe -Wl,-export-dynamic	10	LIBS += -lqpe -Wl,-export-dynamic
11		11


diff --git a/noncore/tools/calc2/simple/simple.pro b/noncore/tools/calc2/simple/simple.pro index 92378a6..9e5d4e0 100644 --- a/noncore/tools/calc2/simple/simple.pro +++ b/noncore/tools/calc2/simple/simple.pro
@@ -4,11 +4,11 @@ CONFIG += qt release
4		4
5	# Input	5	# Input
6	INTERFACES += simple.ui	6	INTERFACES += simple.ui
7	HEADERS = simpleimpl.h simplefactory.h stdinstructions.h	7	HEADERS = simpleimpl.h simplefactory.h stdinstructions.h
8	SOURCES = simpleimpl.cpp simplefactory.cpp	8	SOURCES = simpleimpl.cpp simplefactory.cpp
9		9
10	INCLUDEPATH += $(QPEDIR)/include \	10	INCLUDEPATH += $(OPIEDIR)/include \
11	$(QPEDIR)/calc2	11	$(OPIEDIR)/calc2
12	DEPENDPATH += $(QPEDIR)/include	12	DEPENDPATH += $(OPIEDIR)/include
13		13
14	DESTDIR = $(QPEDIR)/plugins/calculator	14	DESTDIR = $(OPIEDIR)/plugins/calculator


diff --git a/noncore/tools/calculator/Makefile.in b/noncore/tools/calculator/Makefile.in index d62b046..ba78df5 100644 --- a/noncore/tools/calculator/Makefile.in +++ b/noncore/tools/calculator/Makefile.in
@@ -3,21 +3,21 @@
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= calculator	21	TARGET= calculator
22	TARGET1 = lib$(TARGET).so.$(VER_MAJ)	22	TARGET1 = lib$(TARGET).so.$(VER_MAJ)
23		23
@@ -101,23 +101,23 @@ REQUIRES=
101		101
102	####### Compile	102	####### Compile
103		103
104	calculatorimpl.o: calculatorimpl.cpp \	104	calculatorimpl.o: calculatorimpl.cpp \
105	calculatorimpl.h \	105	calculatorimpl.h \
106	calculator.h \	106	calculator.h \
107	$(QPEDIR)/include/qpe/resource.h \	107	$(OPIEDIR)/include/qpe/resource.h \
108	$(QPEDIR)/include/qpe/qmath.h \	108	$(OPIEDIR)/include/qpe/qmath.h \
109	$(QPEDIR)/include/qpe/qpeapplication.h	109	$(OPIEDIR)/include/qpe/qpeapplication.h
110		110
111	main.o: main.cpp \	111	main.o: main.cpp \
112	calculatorimpl.h \	112	calculatorimpl.h \
113	calculator.h \	113	calculator.h \
114	$(QPEDIR)/include/qpe/qpeapplication.h	114	$(OPIEDIR)/include/qpe/qpeapplication.h
115		115
116	calculator.h: calculator.ui	116	calculator.h: calculator.ui
117	$(UIC) calculator.ui -o calculator.h	117	$(UIC) calculator.ui -o $(INTERFACE_DECL_PATH)/calculator.h
118		118
119	calculator.cpp: calculator.ui	119	calculator.cpp: calculator.ui
120	$(UIC) calculator.ui -i calculator.h -o calculator.cpp	120	$(UIC) calculator.ui -i calculator.h -o calculator.cpp
121		121
122	calculator.o: calculator.cpp \	122	calculator.o: calculator.cpp \
123	calculator.h \	123	calculator.h \


diff --git a/noncore/tools/calculator/calculator.pro b/noncore/tools/calculator/calculator.pro index 1281fd5..9554d2a 100644 --- a/noncore/tools/calculator/calculator.pro +++ b/noncore/tools/calculator/calculator.pro
@@ -1,13 +1,13 @@
1	DESTDIR = $(QPEDIR)/bin	1	DESTDIR = $(OPIEDIR)/bin
2	TEMPLATE= app	2	TEMPLATE= app
3	CONFIG = qt warn_on release	3	CONFIG = qt warn_on release
4	HEADERS = calculatorimpl.h	4	HEADERS = calculatorimpl.h
5	SOURCES = calculatorimpl.cpp \	5	SOURCES = calculatorimpl.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= calculator.ui	10	INTERFACES= calculator.ui
11	TARGET = calculator	11	TARGET = calculator
12		12
13	TRANSLATIONS = ../i18n/de/calculator.ts	13	TRANSLATIONS = ../i18n/de/calculator.ts


diff --git a/noncore/tools/clock/Makefile.in b/noncore/tools/clock/Makefile.in index adda9e6..efa7808 100644 --- a/noncore/tools/clock/Makefile.in +++ b/noncore/tools/clock/Makefile.in
@@ -3,21 +3,21 @@
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= clock	21	TARGET= clock
22	TARGET1 = lib$(TARGET).so.$(VER_MAJ)	22	TARGET1 = lib$(TARGET).so.$(VER_MAJ)
23		23
@@ -97,20 +97,20 @@ REQUIRES=
97		97
98		98
99	####### Compile	99	####### Compile
100		100
101	clock.o: clock.cpp \	101	clock.o: clock.cpp \
102	clock.h \	102	clock.h \
103	$(QPEDIR)/include/qpe/qpeapplication.h \	103	$(OPIEDIR)/include/qpe/qpeapplication.h \
104	$(QPEDIR)/include/qpe/qcopenvelope_qws.h \	104	$(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
105	$(QPEDIR)/include/qpe/config.h \	105	$(OPIEDIR)/include/qpe/config.h \
106	$(QPEDIR)/include/qpe/timestring.h	106	$(OPIEDIR)/include/qpe/timestring.h
107		107
108	main.o: main.cpp \	108	main.o: main.cpp \
109	clock.h \	109	clock.h \
110	$(QPEDIR)/include/qpe/qpeapplication.h	110	$(OPIEDIR)/include/qpe/qpeapplication.h
111		111
112	moc_clock.o: moc_clock.cpp \	112	moc_clock.o: moc_clock.cpp \
113	clock.h	113	clock.h
114		114
115	moc_clock.cpp: clock.h	115	moc_clock.cpp: clock.h
116	$(MOC) clock.h -o moc_clock.cpp	116	$(MOC) clock.h -o moc_clock.cpp


diff --git a/noncore/tools/clock/clock.pro b/noncore/tools/clock/clock.pro index 97f4d2c..ec27adc 100644 --- a/noncore/tools/clock/clock.pro +++ b/noncore/tools/clock/clock.pro
@@ -1,13 +1,13 @@
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 = clock.h	4	HEADERS = clock.h
5	SOURCES = clock.cpp \	5	SOURCES = clock.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	TARGET = clock	11	TARGET = clock
12		12
13	TRANSLATIONS = ../i18n/de/clock.ts	13	TRANSLATIONS = ../i18n/de/clock.ts