-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 | |||
@@ -5,17 +5,17 @@ | |||
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 |
@@ -103,19 +103,19 @@ REQUIRES= | |||
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 | ||
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,12 +1,12 @@ | |||
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 | ||