-rw-r--r-- | noncore/tools/calculator/Makefile.in | 14 | ||||
-rw-r--r-- | noncore/tools/calculator/calculator.pro | 6 |
2 files changed, 10 insertions, 10 deletions
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 | |||
@@ -8,3 +8,3 @@ 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) |
@@ -16,3 +16,3 @@ UIC = $(SYSCONF_UIC) | |||
16 | 16 | ||
17 | DESTDIR = $(QPEDIR)/bin/ | 17 | DESTDIR = $(OPIEDIR)/bin/ |
18 | VER_MAJ = 1 | 18 | VER_MAJ = 1 |
@@ -106,5 +106,5 @@ calculatorimpl.o: calculatorimpl.cpp \ | |||
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 | ||
@@ -113,6 +113,6 @@ main.o: main.cpp \ | |||
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 | ||
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,2 +1,2 @@ | |||
1 | DESTDIR = $(QPEDIR)/bin | 1 | DESTDIR = $(OPIEDIR)/bin |
2 | TEMPLATE= app | 2 | TEMPLATE= app |
@@ -6,4 +6,4 @@ 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 |