-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 @@ -1,29 +1,29 @@ ############################################################################# ####### 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 = citytime TARGET1 = lib$(TARGET).so.$(VER_MAJ) ####### Files HEADERS = citytime.h \ zonemap.h \ sun.h \ stylusnormalizer.h @@ -110,46 +110,46 @@ REQUIRES= ###### Combined headers ####### Compile citytime.o: citytime.cpp \ zonemap.h \ stylusnormalizer.h \ citytime.h \ citytimebase.h \ - $(QPEDIR)/include/qpe/qpeapplication.h \ - $(QPEDIR)/include/qpe/config.h \ - $(QPEDIR)/include/qpe/timestring.h \ - $(QPEDIR)/include/qpe/tzselect.h \ - $(QPEDIR)/include/qpe/qcopenvelope_qws.h + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/config.h \ + $(OPIEDIR)/include/qpe/timestring.h \ + $(OPIEDIR)/include/qpe/tzselect.h \ + $(OPIEDIR)/include/qpe/qcopenvelope_qws.h zonemap.o: zonemap.cpp \ sun.h \ zonemap.h \ stylusnormalizer.h \ - $(QPEDIR)/include/qpe/resource.h \ - $(QPEDIR)/include/qpe/timestring.h \ - $(QPEDIR)/include/qpe/qpeapplication.h + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/timestring.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h main.o: main.cpp \ citytime.h \ citytimebase.h \ - $(QPEDIR)/include/qpe/qpeapplication.h + $(OPIEDIR)/include/qpe/qpeapplication.h sun.o: sun.c \ sun.h \ - $(QPEDIR)/include/qpe/qmath.h + $(OPIEDIR)/include/qpe/qmath.h stylusnormalizer.o: stylusnormalizer.cpp \ stylusnormalizer.h citytimebase.h: citytimebase.ui $(UIC) citytimebase.ui -o $(INTERFACE_DECL_PATH)/citytimebase.h citytimebase.cpp: citytimebase.ui $(UIC) citytimebase.ui -i citytimebase.h -o citytimebase.cpp citytimebase.o: citytimebase.cpp \ 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 @@ # $Id$ CONFIG += qt warn_on release TEMPLATE = app -DESTDIR = $(QPEDIR)/bin +DESTDIR = $(OPIEDIR)/bin INTERFACES = citytimebase.ui HEADERS = citytime.h zonemap.h sun.h stylusnormalizer.h SOURCES = citytime.cpp zonemap.cpp main.cpp sun.c stylusnormalizer.cpp TARGET = citytime -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe TRANSLATIONS = ../i18n/de/citytime.ts |