-rw-r--r-- | noncore/tools/calc2/binary/binary.pro | 8 | ||||
-rw-r--r-- | noncore/tools/calc2/calc.pro | 4 | ||||
-rw-r--r-- | noncore/tools/calc2/simple/simple.pro | 8 | ||||
-rw-r--r-- | noncore/tools/calculator/Makefile.in | 14 | ||||
-rw-r--r-- | noncore/tools/calculator/calculator.pro | 6 | ||||
-rw-r--r-- | noncore/tools/clock/Makefile.in | 14 | ||||
-rw-r--r-- | noncore/tools/clock/clock.pro | 6 |
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 | |||
@@ -10,7 +10,7 @@ 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 | |||
@@ -6,6 +6,6 @@ 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 | |||
@@ -8,7 +8,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 | |||
@@ -7,5 +7,5 @@ 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) |
@@ -15,5 +15,5 @@ UIC = $(SYSCONF_UIC) | |||
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 |
@@ -105,15 +105,15 @@ 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 |
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,3 +1,3 @@ | |||
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 |
@@ -5,6 +5,6 @@ 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 |
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 | |||
@@ -7,5 +7,5 @@ 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) |
@@ -15,5 +15,5 @@ UIC = $(SYSCONF_UIC) | |||
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 |
@@ -101,12 +101,12 @@ REQUIRES= | |||
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 \ |
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,10 +1,10 @@ | |||
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= |