-rw-r--r-- | core/pim/datebook/Makefile.in | 155 | ||||
-rw-r--r-- | core/pim/datebook/datebook.pro | 6 |
2 files changed, 92 insertions, 69 deletions
diff --git a/core/pim/datebook/Makefile.in b/core/pim/datebook/Makefile.in index bdc69dc..0c3282e 100644 --- a/core/pim/datebook/Makefile.in +++ b/core/pim/datebook/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 = datebook TARGET1 = lib$(TARGET).so.$(VER_MAJ) ####### Files HEADERS = datebookday.h \ datebook.h \ dateentryimpl.h \ datebookdayheaderimpl.h \ @@ -151,118 +151,131 @@ REQUIRES= ####### Sub-libraries ###### Combined headers ####### Compile main.o: main.cpp \ datebook.h \ - $(QPEDIR)/include/qpe/datebookdb.h \ - $(QPEDIR)/include/qpe/event.h \ - $(QPEDIR)/include/qpe/palmtoprecord.h \ - $(QPEDIR)/include/qpe/qpeapplication.h + $(OPIEDIR)/include/qpe/datebookdb.h \ + $(OPIEDIR)/include/qpe/event.h \ + $(OPIEDIR)/include/qpe/palmtoprecord.h \ + $(OPIEDIR)/include/qpe/timeconversion.h \ + $(OPIEDIR)/include/qpe/qpcglobal.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h datebookday.o: datebookday.cpp \ datebookday.h \ - $(QPEDIR)/include/qpe/event.h \ - $(QPEDIR)/include/qpe/palmtoprecord.h \ + $(OPIEDIR)/include/qpe/event.h \ + $(OPIEDIR)/include/qpe/palmtoprecord.h \ + $(OPIEDIR)/include/qpe/timeconversion.h \ + $(OPIEDIR)/include/qpe/qpcglobal.h \ datebookdayheaderimpl.h \ datebookdayheader.h \ - $(QPEDIR)/include/qpe/datebookdb.h \ - $(QPEDIR)/include/qpe/resource.h \ - $(QPEDIR)/include/qpe/qpeapplication.h \ - $(QPEDIR)/include/qpe/timestring.h \ - $(QPEDIR)/include/qpe/qpedebug.h + $(OPIEDIR)/include/qpe/datebookdb.h \ + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/timestring.h \ + $(OPIEDIR)/include/qpe/qpedebug.h datebook.o: datebook.cpp \ datebook.h \ - $(QPEDIR)/include/qpe/datebookdb.h \ - $(QPEDIR)/include/qpe/event.h \ - $(QPEDIR)/include/qpe/palmtoprecord.h \ + $(OPIEDIR)/include/qpe/datebookdb.h \ + $(OPIEDIR)/include/qpe/event.h \ + $(OPIEDIR)/include/qpe/palmtoprecord.h \ + $(OPIEDIR)/include/qpe/timeconversion.h \ + $(OPIEDIR)/include/qpe/qpcglobal.h \ datebookday.h \ datebooksettings.h \ datebooksettingsbase.h \ datebookweek.h \ dateentryimpl.h \ dateentry.h \ - $(QPEDIR)/include/qpe/datebookmonth.h \ - $(QPEDIR)/include/qpe/qpeapplication.h \ - $(QPEDIR)/include/qpe/config.h \ - $(QPEDIR)/include/qpe/qpedebug.h \ - $(QPEDIR)/include/qpe/finddialog.h \ - $(QPEDIR)/include/qpe/ir.h \ - $(QPEDIR)/include/qpe/qpemenubar.h \ - $(QPEDIR)/include/qpe/qpemessagebox.h \ - $(QPEDIR)/include/qpe/resource.h \ - $(QPEDIR)/include/qpe/sound.h \ - $(QPEDIR)/include/qpe/timestring.h \ - $(QPEDIR)/include/qpe/qpetoolbar.h \ - $(QPEDIR)/include/qpe/tzselect.h \ - $(QPEDIR)/include/qpe/xmlreader.h + $(OPIEDIR)/include/qpe/datebookmonth.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/config.h \ + $(OPIEDIR)/include/qpe/qpedebug.h \ + $(OPIEDIR)/include/qpe/finddialog.h \ + $(OPIEDIR)/include/qpe/ir.h \ + $(OPIEDIR)/include/qpe/qpemenubar.h \ + $(OPIEDIR)/include/qpe/qpemessagebox.h \ + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/sound.h \ + $(OPIEDIR)/include/qpe/timestring.h \ + $(OPIEDIR)/include/qpe/qpetoolbar.h \ + $(OPIEDIR)/include/qpe/tzselect.h \ + $(OPIEDIR)/include/qpe/xmlreader.h dateentryimpl.o: dateentryimpl.cpp \ dateentryimpl.h \ dateentry.h \ - $(QPEDIR)/include/qpe/event.h \ - $(QPEDIR)/include/qpe/palmtoprecord.h \ + $(OPIEDIR)/include/qpe/event.h \ + $(OPIEDIR)/include/qpe/palmtoprecord.h \ + $(OPIEDIR)/include/qpe/timeconversion.h \ + $(OPIEDIR)/include/qpe/qpcglobal.h \ repeatentry.h \ repeatentrybase.h \ - $(QPEDIR)/include/qpe/qpeapplication.h \ - $(QPEDIR)/include/qpe/categoryselect.h \ - $(QPEDIR)/include/qpe/datebookmonth.h \ - $(QPEDIR)/include/qpe/global.h \ - $(QPEDIR)/include/qpe/timeconversion.h \ - $(QPEDIR)/include/qpe/timestring.h \ - $(QPEDIR)/include/qpe/tzselect.h + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/categoryselect.h \ + $(OPIEDIR)/include/qpe/datebookmonth.h \ + $(OPIEDIR)/include/qpe/global.h \ + $(OPIEDIR)/include/qpe/timestring.h \ + $(OPIEDIR)/include/qpe/tzselect.h datebookdayheaderimpl.o: datebookdayheaderimpl.cpp \ datebookdayheaderimpl.h \ datebookdayheader.h \ - $(QPEDIR)/include/qpe/datebookmonth.h \ - $(QPEDIR)/include/qpe/event.h \ - $(QPEDIR)/include/qpe/palmtoprecord.h \ - $(QPEDIR)/include/qpe/timestring.h + $(OPIEDIR)/include/qpe/datebookmonth.h \ + $(OPIEDIR)/include/qpe/event.h \ + $(OPIEDIR)/include/qpe/palmtoprecord.h \ + $(OPIEDIR)/include/qpe/timeconversion.h \ + $(OPIEDIR)/include/qpe/qpcglobal.h \ + $(OPIEDIR)/include/qpe/timestring.h datebooksettings.o: datebooksettings.cpp \ datebooksettings.h \ datebooksettingsbase.h \ - $(QPEDIR)/include/qpe/qpeapplication.h + $(OPIEDIR)/include/qpe/qpeapplication.h datebookweek.o: datebookweek.cpp \ datebookweek.h \ - $(QPEDIR)/include/qpe/event.h \ - $(QPEDIR)/include/qpe/palmtoprecord.h \ + $(OPIEDIR)/include/qpe/event.h \ + $(OPIEDIR)/include/qpe/palmtoprecord.h \ + $(OPIEDIR)/include/qpe/timeconversion.h \ + $(OPIEDIR)/include/qpe/qpcglobal.h \ datebookweekheaderimpl.h \ datebookweekheader.h \ - $(QPEDIR)/include/qpe/calendar.h \ - $(QPEDIR)/include/qpe/datebookdb.h \ - $(QPEDIR)/include/qpe/qpeapplication.h \ - $(QPEDIR)/include/qpe/timestring.h + $(OPIEDIR)/include/qpe/calendar.h \ + $(OPIEDIR)/include/qpe/datebookdb.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/timestring.h datebookweekheaderimpl.o: datebookweekheaderimpl.cpp \ datebookweekheaderimpl.h \ datebookweekheader.h repeatentry.o: repeatentry.cpp \ repeatentry.h \ repeatentrybase.h \ - $(QPEDIR)/include/qpe/event.h \ - $(QPEDIR)/include/qpe/palmtoprecord.h \ - $(QPEDIR)/include/qpe/datebookmonth.h \ - $(QPEDIR)/include/qpe/qpeapplication.h \ - $(QPEDIR)/include/qpe/timestring.h + $(OPIEDIR)/include/qpe/event.h \ + $(OPIEDIR)/include/qpe/palmtoprecord.h \ + $(OPIEDIR)/include/qpe/timeconversion.h \ + $(OPIEDIR)/include/qpe/qpcglobal.h \ + $(OPIEDIR)/include/qpe/datebookmonth.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/timestring.h dateentry.h: dateentry.ui $(UIC) dateentry.ui -o $(INTERFACE_DECL_PATH)/dateentry.h dateentry.cpp: dateentry.ui $(UIC) dateentry.ui -i dateentry.h -o dateentry.cpp datebookdayheader.h: datebookdayheader.ui $(UIC) datebookdayheader.ui -o $(INTERFACE_DECL_PATH)/datebookdayheader.h datebookdayheader.cpp: datebookdayheader.ui $(UIC) datebookdayheader.ui -i datebookdayheader.h -o datebookdayheader.cpp @@ -288,57 +301,67 @@ repeatentrybase.cpp: repeatentrybase.ui dateentry.o: dateentry.cpp datebookdayheader.o: datebookdayheader.cpp datebooksettingsbase.o: datebooksettingsbase.cpp datebookweekheader.o: datebookweekheader.cpp repeatentrybase.o: repeatentrybase.cpp moc_datebookday.o: moc_datebookday.cpp \ datebookday.h \ - $(QPEDIR)/include/qpe/event.h \ - $(QPEDIR)/include/qpe/palmtoprecord.h + $(OPIEDIR)/include/qpe/event.h \ + $(OPIEDIR)/include/qpe/palmtoprecord.h \ + $(OPIEDIR)/include/qpe/timeconversion.h \ + $(OPIEDIR)/include/qpe/qpcglobal.h moc_datebook.o: moc_datebook.cpp \ datebook.h \ - $(QPEDIR)/include/qpe/datebookdb.h \ - $(QPEDIR)/include/qpe/event.h \ - $(QPEDIR)/include/qpe/palmtoprecord.h + $(OPIEDIR)/include/qpe/datebookdb.h \ + $(OPIEDIR)/include/qpe/event.h \ + $(OPIEDIR)/include/qpe/palmtoprecord.h \ + $(OPIEDIR)/include/qpe/timeconversion.h \ + $(OPIEDIR)/include/qpe/qpcglobal.h moc_dateentryimpl.o: moc_dateentryimpl.cpp \ dateentryimpl.h \ dateentry.h \ - $(QPEDIR)/include/qpe/event.h \ - $(QPEDIR)/include/qpe/palmtoprecord.h + $(OPIEDIR)/include/qpe/event.h \ + $(OPIEDIR)/include/qpe/palmtoprecord.h \ + $(OPIEDIR)/include/qpe/timeconversion.h \ + $(OPIEDIR)/include/qpe/qpcglobal.h moc_datebookdayheaderimpl.o: moc_datebookdayheaderimpl.cpp \ datebookdayheaderimpl.h \ datebookdayheader.h moc_datebookweek.o: moc_datebookweek.cpp \ datebookweek.h \ - $(QPEDIR)/include/qpe/event.h \ - $(QPEDIR)/include/qpe/palmtoprecord.h + $(OPIEDIR)/include/qpe/event.h \ + $(OPIEDIR)/include/qpe/palmtoprecord.h \ + $(OPIEDIR)/include/qpe/timeconversion.h \ + $(OPIEDIR)/include/qpe/qpcglobal.h moc_datebookweekheaderimpl.o: moc_datebookweekheaderimpl.cpp \ datebookweekheaderimpl.h \ datebookweekheader.h moc_repeatentry.o: moc_repeatentry.cpp \ repeatentry.h \ repeatentrybase.h \ - $(QPEDIR)/include/qpe/event.h \ - $(QPEDIR)/include/qpe/palmtoprecord.h + $(OPIEDIR)/include/qpe/event.h \ + $(OPIEDIR)/include/qpe/palmtoprecord.h \ + $(OPIEDIR)/include/qpe/timeconversion.h \ + $(OPIEDIR)/include/qpe/qpcglobal.h moc_dateentry.o: moc_dateentry.cpp \ dateentry.h moc_datebookdayheader.o: moc_datebookdayheader.cpp \ datebookdayheader.h moc_datebooksettingsbase.o: moc_datebooksettingsbase.cpp \ datebooksettingsbase.h moc_datebookweekheader.o: moc_datebookweekheader.cpp \ datebookweekheader.h diff --git a/core/pim/datebook/datebook.pro b/core/pim/datebook/datebook.pro index 17c02ec..fae5d2b 100644 --- a/core/pim/datebook/datebook.pro +++ b/core/pim/datebook/datebook.pro @@ -1,15 +1,15 @@ TEMPLATE = app CONFIG += qt warn_on release -DESTDIR = $(QPEDIR)/bin +DESTDIR = $(OPIEDIR)/bin HEADERS = datebookday.h \ datebook.h \ dateentryimpl.h \ datebookdayheaderimpl.h \ datebooksettings.h \ datebookweek.h \ datebookweekheaderimpl.h \ repeatentry.h SOURCES = main.cpp \ datebookday.cpp \ @@ -18,19 +18,19 @@ SOURCES = main.cpp \ datebookdayheaderimpl.cpp \ datebooksettings.cpp \ datebookweek.cpp \ datebookweekheaderimpl.cpp \ repeatentry.cpp INTERFACES = dateentry.ui \ datebookdayheader.ui \ datebooksettingsbase.ui \ datebookweekheader.ui \ repeatentrybase.ui -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe TARGET = datebook TRANSLATIONS = ../i18n/de/datebook.ts |