1 files changed, 23 insertions, 24 deletions

diff --git a/core/pim/today/Makefile.in b/core/pim/today/Makefile.in
index 85f162a..65243f2 100644
--- a/core/pim/today/Makefile.in
+++ b/core/pim/today/Makefile.in
@@ -75,20 +75,18 @@ OBJMOC	=	moc_today.o \
 
 all: $(DESTDIR)$(TARGET)
 
 $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
         $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
 
 moc: $(SRCMOC)
 
-tmake: Makefile.in
-
-Makefile.in: today.pro
-        tmake today.pro -o Makefile.in
+tmake:
+        tmake today.pro
 
 clean:
         -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
         -rm -f *~ core
         -rm -f allmoc.cpp
 
 ####### Extension Modules
 
@@ -114,61 +112,62 @@ REQUIRES=
 
 
 
 ####### Compile
 
 main.o: main.cpp \
                 today.h \
                 todaybase.h \
-                /home/kergoth/buildsystem/buildroot-oz/build/opie/include/qpe/datebookdb.h \
-                /home/kergoth/buildsystem/buildroot-oz/build/opie/include/qpe/event.h \
-                /home/kergoth/buildsystem/buildroot-oz/build/opie/include/qpe/palmtoprecord.h \
-                /home/kergoth/buildsystem/buildroot-oz/build/opie/include/qpe/timeconversion.h \
-                /home/kergoth/buildsystem/buildroot-oz/build/opie/include/qpe/qpcglobal.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 \
                 TodoItem.h \
                 todayconfig.h \
-                /home/kergoth/buildsystem/buildroot-oz/build/opie/include/qpe/qpeapplication.h
+                $(OPIEDIR)/include/qpe/qpeapplication.h
 
 today.o: today.cpp \
                 today.h \
                 todaybase.h \
-                /home/kergoth/buildsystem/buildroot-oz/build/opie/include/qpe/datebookdb.h \
-                /home/kergoth/buildsystem/buildroot-oz/build/opie/include/qpe/event.h \
-                /home/kergoth/buildsystem/buildroot-oz/build/opie/include/qpe/palmtoprecord.h \
-                /home/kergoth/buildsystem/buildroot-oz/build/opie/include/qpe/timeconversion.h \
-                /home/kergoth/buildsystem/buildroot-oz/build/opie/include/qpe/qpcglobal.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 \
                 TodoItem.h \
                 todayconfig.h \
                 minidom.h \
-                /home/kergoth/buildsystem/buildroot-oz/build/opie/include/qpe/timestring.h \
-                /home/kergoth/buildsystem/buildroot-oz/build/opie/include/qpe/config.h \
-                /home/kergoth/buildsystem/buildroot-oz/build/opie/include/qpe/qprocess.h
+                $(OPIEDIR)/include/qpe/timestring.h \
+                $(OPIEDIR)/include/qpe/config.h \
+                $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
+                $(OPIEDIR)/include/qpe/qprocess.h
 
 todaybase.o: todaybase.cpp \
                 todaybase.h \
-                /home/kergoth/buildsystem/buildroot-oz/build/opie/include/qpe/resource.h
+                $(OPIEDIR)/include/qpe/resource.h
 
 todayconfig.o: todayconfig.cpp \
                 todayconfig.h
 
 minidom.o: minidom.c \
                 minidom.h
 
 TodoItem.o: TodoItem.cpp \
                 TodoItem.h
 
 moc_today.o: moc_today.cpp \
                 today.h \
                 todaybase.h \
-                /home/kergoth/buildsystem/buildroot-oz/build/opie/include/qpe/datebookdb.h \
-                /home/kergoth/buildsystem/buildroot-oz/build/opie/include/qpe/event.h \
-                /home/kergoth/buildsystem/buildroot-oz/build/opie/include/qpe/palmtoprecord.h \
-                /home/kergoth/buildsystem/buildroot-oz/build/opie/include/qpe/timeconversion.h \
-                /home/kergoth/buildsystem/buildroot-oz/build/opie/include/qpe/qpcglobal.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 \
                 TodoItem.h \
                 todayconfig.h
 
 moc_todaybase.o: moc_todaybase.cpp \
                 todaybase.h
 
 moc_todayconfig.o: moc_todayconfig.cpp \
                 todayconfig.h