-rw-r--r-- | core/settings/citytime/Makefile.in | 24 | ||||
-rw-r--r-- | core/settings/citytime/citytime.pro | 6 |
2 files changed, 15 insertions, 15 deletions
diff --git a/core/settings/citytime/Makefile.in b/core/settings/citytime/Makefile.in index b058021..4112a68 100644 --- a/core/settings/citytime/Makefile.in +++ b/core/settings/citytime/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= citytime | 21 | TARGET= citytime |
22 | TARGET1 = lib$(TARGET).so.$(VER_MAJ) | 22 | TARGET1 = lib$(TARGET).so.$(VER_MAJ) |
23 | 23 | ||
@@ -116,34 +116,34 @@ REQUIRES= | |||
116 | 116 | ||
117 | citytime.o: citytime.cpp \ | 117 | citytime.o: citytime.cpp \ |
118 | zonemap.h \ | 118 | zonemap.h \ |
119 | stylusnormalizer.h \ | 119 | stylusnormalizer.h \ |
120 | citytime.h \ | 120 | citytime.h \ |
121 | citytimebase.h \ | 121 | citytimebase.h \ |
122 | $(QPEDIR)/include/qpe/qpeapplication.h \ | 122 | $(OPIEDIR)/include/qpe/qpeapplication.h \ |
123 | $(QPEDIR)/include/qpe/config.h \ | 123 | $(OPIEDIR)/include/qpe/config.h \ |
124 | $(QPEDIR)/include/qpe/timestring.h \ | 124 | $(OPIEDIR)/include/qpe/timestring.h \ |
125 | $(QPEDIR)/include/qpe/tzselect.h \ | 125 | $(OPIEDIR)/include/qpe/tzselect.h \ |
126 | $(QPEDIR)/include/qpe/qcopenvelope_qws.h | 126 | $(OPIEDIR)/include/qpe/qcopenvelope_qws.h |
127 | 127 | ||
128 | zonemap.o: zonemap.cpp \ | 128 | zonemap.o: zonemap.cpp \ |
129 | sun.h \ | 129 | sun.h \ |
130 | zonemap.h \ | 130 | zonemap.h \ |
131 | stylusnormalizer.h \ | 131 | stylusnormalizer.h \ |
132 | $(QPEDIR)/include/qpe/resource.h \ | 132 | $(OPIEDIR)/include/qpe/resource.h \ |
133 | $(QPEDIR)/include/qpe/timestring.h \ | 133 | $(OPIEDIR)/include/qpe/timestring.h \ |
134 | $(QPEDIR)/include/qpe/qpeapplication.h | 134 | $(OPIEDIR)/include/qpe/qpeapplication.h |
135 | 135 | ||
136 | main.o: main.cpp \ | 136 | main.o: main.cpp \ |
137 | citytime.h \ | 137 | citytime.h \ |
138 | citytimebase.h \ | 138 | citytimebase.h \ |
139 | $(QPEDIR)/include/qpe/qpeapplication.h | 139 | $(OPIEDIR)/include/qpe/qpeapplication.h |
140 | 140 | ||
141 | sun.o: sun.c \ | 141 | sun.o: sun.c \ |
142 | sun.h \ | 142 | sun.h \ |
143 | $(QPEDIR)/include/qpe/qmath.h | 143 | $(OPIEDIR)/include/qpe/qmath.h |
144 | 144 | ||
145 | stylusnormalizer.o: stylusnormalizer.cpp \ | 145 | stylusnormalizer.o: stylusnormalizer.cpp \ |
146 | stylusnormalizer.h | 146 | stylusnormalizer.h |
147 | 147 | ||
148 | citytimebase.h: citytimebase.ui | 148 | citytimebase.h: citytimebase.ui |
149 | $(UIC) citytimebase.ui -o $(INTERFACE_DECL_PATH)/citytimebase.h | 149 | $(UIC) citytimebase.ui -o $(INTERFACE_DECL_PATH)/citytimebase.h |
diff --git a/core/settings/citytime/citytime.pro b/core/settings/citytime/citytime.pro index d988b48..3420499 100644 --- a/core/settings/citytime/citytime.pro +++ b/core/settings/citytime/citytime.pro | |||
@@ -1,13 +1,13 @@ | |||
1 | # $Id$ | 1 | # $Id$ |
2 | CONFIG += qt warn_on release | 2 | CONFIG += qt warn_on release |
3 | TEMPLATE = app | 3 | TEMPLATE = app |
4 | DESTDIR = $(QPEDIR)/bin | 4 | DESTDIR = $(OPIEDIR)/bin |
5 | INTERFACES = citytimebase.ui | 5 | INTERFACES = citytimebase.ui |
6 | HEADERS = citytime.h zonemap.h sun.h stylusnormalizer.h | 6 | HEADERS = citytime.h zonemap.h sun.h stylusnormalizer.h |
7 | SOURCES = citytime.cpp zonemap.cpp main.cpp sun.c stylusnormalizer.cpp | 7 | SOURCES = citytime.cpp zonemap.cpp main.cpp sun.c stylusnormalizer.cpp |
8 | TARGET = citytime | 8 | TARGET = citytime |
9 | INCLUDEPATH += $(QPEDIR)/include | 9 | INCLUDEPATH += $(OPIEDIR)/include |
10 | DEPENDPATH += $(QPEDIR)/include | 10 | DEPENDPATH += $(OPIEDIR)/include |
11 | LIBS += -lqpe | 11 | LIBS += -lqpe |
12 | 12 | ||
13 | TRANSLATIONS = ../i18n/de/citytime.ts | 13 | TRANSLATIONS = ../i18n/de/citytime.ts |