Fix (please work this time)

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
@@ -1,189 +1,187 @@
 #############################################################################
 
 ####### 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$(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 = $(OPIEDIR)/bin/
 VER_MAJ = 1
 VER_MIN = 0
 VER_PATCH = 0
 TARGET	= textedit
 TARGET1 = lib$(TARGET).so.$(VER_MAJ)
 
 ####### Files
 
 HEADERS =	textedit.h \
 		fileBrowser.h \
 		fontDialog.h \
 		fileSaver.h
 SOURCES =	main.cpp \
 		textedit.cpp \
 		fileBrowser.cpp \
 		fontDialog.cpp \
 		fileSaver.cpp
 OBJECTS =	main.o \
 		textedit.o \
 		fileBrowser.o \
 		fontDialog.o \
 		fileSaver.o
 INTERFACES =    
 UICDECLS =      
 UICIMPLS =      
 SRCMOC	=	moc_textedit.cpp \
 		moc_fileBrowser.cpp \
 		moc_fontDialog.cpp \
 		moc_fileSaver.cpp
 OBJMOC	=	moc_textedit.o \
 		moc_fileBrowser.o \
 		moc_fontDialog.o \
 		moc_fileSaver.o
 
 
 ####### Implicit rules
 
 .SUFFIXES: .cpp .cxx .cc .C .c
 
 .cpp.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .cxx.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .cc.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .C.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .c.o:
 	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
 
 ####### Build rules
 
 
 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
 
 ####### Extension Modules
 
 listpromodules:
 	@echo 
 
 listallmodules:
 	@echo 
 
 listaddonpromodules:
 	@echo 
 
 listaddonentmodules:
 	@echo 
 
 
 REQUIRES=
 
 ####### Sub-libraries
 
 
 ###### Combined headers
 
 
 
 ####### 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
 
 moc_fileBrowser.cpp: fileBrowser.h
 	$(MOC) fileBrowser.h -o moc_fileBrowser.cpp
 
 moc_fontDialog.cpp: fontDialog.h
 	$(MOC) fontDialog.h -o moc_fontDialog.cpp
 
 moc_fileSaver.cpp: fileSaver.h
 	$(MOC) fileSaver.h -o moc_fileSaver.cpp