1 files changed, 31 insertions, 33 deletions

diff --git a/core/apps/textedit/Makefile.in b/core/apps/textedit/Makefile.in
index 399ea4b..06fdb77 100644
--- a/core/apps/textedit/Makefile.in
+++ b/core/apps/textedit/Makefile.in
@@ -76,16 +76,14 @@ 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: textedit.pro
-        tmake textedit.pro -o Makefile.in
+tmake:
+        tmake textedit.pro
 
 clean:
         -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
         -rm -f *~ core
         -rm -f allmoc.cpp
 
@@ -114,65 +112,65 @@ REQUIRES=
 
 
 ####### Compile
 
 main.o: main.cpp \
                 textedit.h \
-                /home/mark/source/opie/include/qpe/filemanager.h \
-                /home/mark/source/opie/include/qpe/qpeapplication.h
+                $(OPIEDIR)/include/qpe/filemanager.h \
+                $(OPIEDIR)/include/qpe/qpeapplication.h
 
 textedit.o: textedit.cpp \
                 textedit.h \
-                /home/mark/source/opie/include/qpe/filemanager.h \
+                $(OPIEDIR)/include/qpe/filemanager.h \
                 fileBrowser.h \
                 fileSaver.h \
                 fontDialog.h \
-                /home/mark/source/opie/include/qpe/fontdatabase.h \
-                /home/mark/source/opie/include/qpe/fontfactoryinterface.h \
-                /home/mark/source/opie/include/qpe/qcom.h \
-                /home/mark/source/opie/include/qpe/quuid.h \
-                /home/mark/source/opie/include/qpe/global.h \
-                /home/mark/source/opie/include/qpe/fileselector.h \
-                /home/mark/source/opie/include/qpe/applnk.h \
-                /home/mark/source/opie/include/qpe/resource.h \
-                /home/mark/source/opie/include/qpe/config.h \
-                /home/mark/source/opie/include/qpe/qpeapplication.h \
-                /home/mark/source/opie/include/qpe/qpemenubar.h \
-                /home/mark/source/opie/include/qpe/qpetoolbar.h
+                $(OPIEDIR)/include/qpe/fontdatabase.h \
+                $(OPIEDIR)/include/qpe/fontfactoryinterface.h \
+                $(OPIEDIR)/include/qpe/qcom.h \
+                $(OPIEDIR)/include/qpe/quuid.h \
+                $(OPIEDIR)/include/qpe/global.h \
+                $(OPIEDIR)/include/qpe/fileselector.h \
+                $(OPIEDIR)/include/qpe/applnk.h \
+                $(OPIEDIR)/include/qpe/resource.h \
+                $(OPIEDIR)/include/qpe/config.h \
+                $(OPIEDIR)/include/qpe/qpeapplication.h \
+                $(OPIEDIR)/include/qpe/qpemenubar.h \
+                $(OPIEDIR)/include/qpe/qpetoolbar.h
 
 fileBrowser.o: fileBrowser.cpp \
                 fileBrowser.h \
-                /home/mark/source/opie/include/qpe/config.h
+                $(OPIEDIR)/include/qpe/config.h
 
 fontDialog.o: fontDialog.cpp \
                 fontDialog.h \
-                /home/mark/source/opie/include/qpe/fontdatabase.h \
-                /home/mark/source/opie/include/qpe/fontfactoryinterface.h \
-                /home/mark/source/opie/include/qpe/qcom.h \
-                /home/mark/source/opie/include/qpe/quuid.h \
-                /home/mark/source/opie/include/qpe/config.h \
-                /home/mark/source/opie/include/qpe/qpeapplication.h
+                $(OPIEDIR)/include/qpe/fontdatabase.h \
+                $(OPIEDIR)/include/qpe/fontfactoryinterface.h \
+                $(OPIEDIR)/include/qpe/qcom.h \
+                $(OPIEDIR)/include/qpe/quuid.h \
+                $(OPIEDIR)/include/qpe/config.h \
+                $(OPIEDIR)/include/qpe/qpeapplication.h
 
 fileSaver.o: fileSaver.cpp \
                 fileSaver.h \
-                /home/mark/source/opie/include/qpe/config.h \
-                /home/mark/source/opie/include/qpe/qpeapplication.h
+                $(OPIEDIR)/include/qpe/config.h \
+                $(OPIEDIR)/include/qpe/qpeapplication.h
 
 moc_textedit.o: moc_textedit.cpp \
                 textedit.h \
-                /home/mark/source/opie/include/qpe/filemanager.h
+                $(OPIEDIR)/include/qpe/filemanager.h
 
 moc_fileBrowser.o: moc_fileBrowser.cpp \
                 fileBrowser.h
 
 moc_fontDialog.o: moc_fontDialog.cpp \
                 fontDialog.h \
-                /home/mark/source/opie/include/qpe/fontdatabase.h \
-                /home/mark/source/opie/include/qpe/fontfactoryinterface.h \
-                /home/mark/source/opie/include/qpe/qcom.h \
-                /home/mark/source/opie/include/qpe/quuid.h
+                $(OPIEDIR)/include/qpe/fontdatabase.h \
+                $(OPIEDIR)/include/qpe/fontfactoryinterface.h \
+                $(OPIEDIR)/include/qpe/qcom.h \
+                $(OPIEDIR)/include/qpe/quuid.h
 
 moc_fileSaver.o: moc_fileSaver.cpp \
                 fileSaver.h
 
 moc_textedit.cpp: textedit.h
         $(MOC) textedit.h -o moc_textedit.cpp