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
+tmake:
+        tmake textedit.pro
-Makefile.in: textedit.pro
-        tmake textedit.pro -o Makefile.in
 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 \
+                $(OPIEDIR)/include/qpe/filemanager.h \
-                /home/mark/source/opie/include/qpe/qpeapplication.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 \
+                $(OPIEDIR)/include/qpe/fontdatabase.h \
-                /home/mark/source/opie/include/qpe/fontfactoryinterface.h \
+                $(OPIEDIR)/include/qpe/fontfactoryinterface.h \
-                /home/mark/source/opie/include/qpe/qcom.h \
+                $(OPIEDIR)/include/qpe/qcom.h \
-                /home/mark/source/opie/include/qpe/quuid.h \
+                $(OPIEDIR)/include/qpe/quuid.h \
-                /home/mark/source/opie/include/qpe/global.h \
+                $(OPIEDIR)/include/qpe/global.h \
-                /home/mark/source/opie/include/qpe/fileselector.h \
+                $(OPIEDIR)/include/qpe/fileselector.h \
-                /home/mark/source/opie/include/qpe/applnk.h \
+                $(OPIEDIR)/include/qpe/applnk.h \
-                /home/mark/source/opie/include/qpe/resource.h \
+                $(OPIEDIR)/include/qpe/resource.h \
-                /home/mark/source/opie/include/qpe/config.h \
+                $(OPIEDIR)/include/qpe/config.h \
-                /home/mark/source/opie/include/qpe/qpeapplication.h \
+                $(OPIEDIR)/include/qpe/qpeapplication.h \
-                /home/mark/source/opie/include/qpe/qpemenubar.h \
+                $(OPIEDIR)/include/qpe/qpemenubar.h \
-                /home/mark/source/opie/include/qpe/qpetoolbar.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 \
+                $(OPIEDIR)/include/qpe/fontdatabase.h \
-                /home/mark/source/opie/include/qpe/fontfactoryinterface.h \
+                $(OPIEDIR)/include/qpe/fontfactoryinterface.h \
-                /home/mark/source/opie/include/qpe/qcom.h \
+                $(OPIEDIR)/include/qpe/qcom.h \
-                /home/mark/source/opie/include/qpe/quuid.h \
+                $(OPIEDIR)/include/qpe/quuid.h \
-                /home/mark/source/opie/include/qpe/config.h \
+                $(OPIEDIR)/include/qpe/config.h \
-                /home/mark/source/opie/include/qpe/qpeapplication.h
+                $(OPIEDIR)/include/qpe/qpeapplication.h
 fileSaver.o: fileSaver.cpp \
                fileSaver.h \
-                /home/mark/source/opie/include/qpe/config.h \
+                $(OPIEDIR)/include/qpe/config.h \
-                /home/mark/source/opie/include/qpe/qpeapplication.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 \
+                $(OPIEDIR)/include/qpe/fontdatabase.h \
-                /home/mark/source/opie/include/qpe/fontfactoryinterface.h \
+                $(OPIEDIR)/include/qpe/fontfactoryinterface.h \
-                /home/mark/source/opie/include/qpe/qcom.h \
+                $(OPIEDIR)/include/qpe/qcom.h \
-                /home/mark/source/opie/include/qpe/quuid.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

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 @@
1	#############################################################################	1	#############################################################################
2		2
3	####### Compiler, tools and options	3	####### Compiler, tools and options
4		4
5	CXX =$(SYSCONF_CXX) $(QT_CXX_MT)	5	CXX =$(SYSCONF_CXX) $(QT_CXX_MT)
6	CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)	6	CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
7	CC =$(SYSCONF_CC) $(QT_C_MT)	7	CC =$(SYSCONF_CC) $(QT_C_MT)
8	CFLAGS =$(SYSCONF_CFLAGS)	8	CFLAGS =$(SYSCONF_CFLAGS)
9	INCPATH =-I$(OPIEDIR)/include	9	INCPATH =-I$(OPIEDIR)/include
10	LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)	10	LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11	LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)	11	LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
12	MOC =$(SYSCONF_MOC)	12	MOC =$(SYSCONF_MOC)
13	UIC =$(SYSCONF_UIC)	13	UIC =$(SYSCONF_UIC)
14		14
15	####### Target	15	####### Target
16		16
17	DESTDIR = $(OPIEDIR)/bin/	17	DESTDIR = $(OPIEDIR)/bin/
18	VER_MAJ = 1	18	VER_MAJ = 1
19	VER_MIN = 0	19	VER_MIN = 0
20	VER_PATCH = 0	20	VER_PATCH = 0
21	TARGET= textedit	21	TARGET= textedit
22	TARGET1 = lib$(TARGET).so.$(VER_MAJ)	22	TARGET1 = lib$(TARGET).so.$(VER_MAJ)
23		23
24	####### Files	24	####### Files
25		25
26	HEADERS =textedit.h \	26	HEADERS =textedit.h \
27	fileBrowser.h \	27	fileBrowser.h \
28	fontDialog.h \	28	fontDialog.h \
29	fileSaver.h	29	fileSaver.h
30	SOURCES =main.cpp \	30	SOURCES =main.cpp \
31	textedit.cpp \	31	textedit.cpp \
32	fileBrowser.cpp \	32	fileBrowser.cpp \
33	fontDialog.cpp \	33	fontDialog.cpp \
34	fileSaver.cpp	34	fileSaver.cpp
35	OBJECTS =main.o \	35	OBJECTS =main.o \
36	textedit.o \	36	textedit.o \
37	fileBrowser.o \	37	fileBrowser.o \
38	fontDialog.o \	38	fontDialog.o \
39	fileSaver.o	39	fileSaver.o
40	INTERFACES =	40	INTERFACES =
41	UICDECLS =	41	UICDECLS =
42	UICIMPLS =	42	UICIMPLS =
43	SRCMOC =moc_textedit.cpp \	43	SRCMOC =moc_textedit.cpp \
44	moc_fileBrowser.cpp \	44	moc_fileBrowser.cpp \
45	moc_fontDialog.cpp \	45	moc_fontDialog.cpp \
46	moc_fileSaver.cpp	46	moc_fileSaver.cpp
47	OBJMOC =moc_textedit.o \	47	OBJMOC =moc_textedit.o \
48	moc_fileBrowser.o \	48	moc_fileBrowser.o \
49	moc_fontDialog.o \	49	moc_fontDialog.o \
50	moc_fileSaver.o	50	moc_fileSaver.o
51		51
52		52
53	####### Implicit rules	53	####### Implicit rules
54		54
55	.SUFFIXES: .cpp .cxx .cc .C .c	55	.SUFFIXES: .cpp .cxx .cc .C .c
56		56
57	.cpp.o:	57	.cpp.o:
58	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<	58	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
59		59
60	.cxx.o:	60	.cxx.o:
61	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<	61	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
62		62
63	.cc.o:	63	.cc.o:
64	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<	64	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
65		65
66	.C.o:	66	.C.o:
67	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<	67	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
68		68
69	.c.o:	69	.c.o:
70	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<	70	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
71		71
72	####### Build rules	72	####### Build rules
73		73
74		74
75	all: $(DESTDIR)$(TARGET)	75	all: $(DESTDIR)$(TARGET)
76		76
77	$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)	77	$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
78	$(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)	78	$(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
79		79
80	moc: $(SRCMOC)	80	moc: $(SRCMOC)
81		81
82	tmake: Makefile.in	82	tmake:
83		83	tmake textedit.pro
84	Makefile.in: textedit.pro
85	tmake textedit.pro -o Makefile.in
86		84
87	clean:	85	clean:
88	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)	86	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
89	-rm -f *~ core	87	-rm -f *~ core
90	-rm -f allmoc.cpp	88	-rm -f allmoc.cpp
91		89
92	####### Extension Modules	90	####### Extension Modules
93		91
94	listpromodules:	92	listpromodules:
95	@echo	93	@echo
96		94
97	listallmodules:	95	listallmodules:
98	@echo	96	@echo
99		97
100	listaddonpromodules:	98	listaddonpromodules:
101	@echo	99	@echo
102		100
103	listaddonentmodules:	101	listaddonentmodules:
104	@echo	102	@echo
105		103
106		104
107	REQUIRES=	105	REQUIRES=
108		106
109	####### Sub-libraries	107	####### Sub-libraries
110		108
111		109
112	###### Combined headers	110	###### Combined headers
113		111
114		112
115		113
116	####### Compile	114	####### Compile
117		115
118	main.o: main.cpp \	116	main.o: main.cpp \
119	textedit.h \	117	textedit.h \
120	/home/mark/source/opie/include/qpe/filemanager.h \	118	$(OPIEDIR)/include/qpe/filemanager.h \
121	/home/mark/source/opie/include/qpe/qpeapplication.h	119	$(OPIEDIR)/include/qpe/qpeapplication.h
122		120
123	textedit.o: textedit.cpp \	121	textedit.o: textedit.cpp \
124	textedit.h \	122	textedit.h \
125	/home/mark/source/opie/include/qpe/filemanager.h \	123	$(OPIEDIR)/include/qpe/filemanager.h \
126	fileBrowser.h \	124	fileBrowser.h \
127	fileSaver.h \	125	fileSaver.h \
128	fontDialog.h \	126	fontDialog.h \
129	/home/mark/source/opie/include/qpe/fontdatabase.h \	127	$(OPIEDIR)/include/qpe/fontdatabase.h \
130	/home/mark/source/opie/include/qpe/fontfactoryinterface.h \	128	$(OPIEDIR)/include/qpe/fontfactoryinterface.h \
131	/home/mark/source/opie/include/qpe/qcom.h \	129	$(OPIEDIR)/include/qpe/qcom.h \
132	/home/mark/source/opie/include/qpe/quuid.h \	130	$(OPIEDIR)/include/qpe/quuid.h \
133	/home/mark/source/opie/include/qpe/global.h \	131	$(OPIEDIR)/include/qpe/global.h \
134	/home/mark/source/opie/include/qpe/fileselector.h \	132	$(OPIEDIR)/include/qpe/fileselector.h \
135	/home/mark/source/opie/include/qpe/applnk.h \	133	$(OPIEDIR)/include/qpe/applnk.h \
136	/home/mark/source/opie/include/qpe/resource.h \	134	$(OPIEDIR)/include/qpe/resource.h \
137	/home/mark/source/opie/include/qpe/config.h \	135	$(OPIEDIR)/include/qpe/config.h \
138	/home/mark/source/opie/include/qpe/qpeapplication.h \	136	$(OPIEDIR)/include/qpe/qpeapplication.h \
139	/home/mark/source/opie/include/qpe/qpemenubar.h \	137	$(OPIEDIR)/include/qpe/qpemenubar.h \
140	/home/mark/source/opie/include/qpe/qpetoolbar.h	138	$(OPIEDIR)/include/qpe/qpetoolbar.h
141		139
142	fileBrowser.o: fileBrowser.cpp \	140	fileBrowser.o: fileBrowser.cpp \
143	fileBrowser.h \	141	fileBrowser.h \
144	/home/mark/source/opie/include/qpe/config.h	142	$(OPIEDIR)/include/qpe/config.h
145		143
146	fontDialog.o: fontDialog.cpp \	144	fontDialog.o: fontDialog.cpp \
147	fontDialog.h \	145	fontDialog.h \
148	/home/mark/source/opie/include/qpe/fontdatabase.h \	146	$(OPIEDIR)/include/qpe/fontdatabase.h \
149	/home/mark/source/opie/include/qpe/fontfactoryinterface.h \	147	$(OPIEDIR)/include/qpe/fontfactoryinterface.h \
150	/home/mark/source/opie/include/qpe/qcom.h \	148	$(OPIEDIR)/include/qpe/qcom.h \
151	/home/mark/source/opie/include/qpe/quuid.h \	149	$(OPIEDIR)/include/qpe/quuid.h \
152	/home/mark/source/opie/include/qpe/config.h \	150	$(OPIEDIR)/include/qpe/config.h \
153	/home/mark/source/opie/include/qpe/qpeapplication.h	151	$(OPIEDIR)/include/qpe/qpeapplication.h
154		152
155	fileSaver.o: fileSaver.cpp \	153	fileSaver.o: fileSaver.cpp \
156	fileSaver.h \	154	fileSaver.h \
157	/home/mark/source/opie/include/qpe/config.h \	155	$(OPIEDIR)/include/qpe/config.h \
158	/home/mark/source/opie/include/qpe/qpeapplication.h	156	$(OPIEDIR)/include/qpe/qpeapplication.h
159		157
160	moc_textedit.o: moc_textedit.cpp \	158	moc_textedit.o: moc_textedit.cpp \
161	textedit.h \	159	textedit.h \
162	/home/mark/source/opie/include/qpe/filemanager.h	160	$(OPIEDIR)/include/qpe/filemanager.h
163		161
164	moc_fileBrowser.o: moc_fileBrowser.cpp \	162	moc_fileBrowser.o: moc_fileBrowser.cpp \
165	fileBrowser.h	163	fileBrowser.h
166		164
167	moc_fontDialog.o: moc_fontDialog.cpp \	165	moc_fontDialog.o: moc_fontDialog.cpp \
168	fontDialog.h \	166	fontDialog.h \
169	/home/mark/source/opie/include/qpe/fontdatabase.h \	167	$(OPIEDIR)/include/qpe/fontdatabase.h \
170	/home/mark/source/opie/include/qpe/fontfactoryinterface.h \	168	$(OPIEDIR)/include/qpe/fontfactoryinterface.h \
171	/home/mark/source/opie/include/qpe/qcom.h \	169	$(OPIEDIR)/include/qpe/qcom.h \
172	/home/mark/source/opie/include/qpe/quuid.h	170	$(OPIEDIR)/include/qpe/quuid.h
173		171
174	moc_fileSaver.o: moc_fileSaver.cpp \	172	moc_fileSaver.o: moc_fileSaver.cpp \
175	fileSaver.h	173	fileSaver.h
176		174
177	moc_textedit.cpp: textedit.h	175	moc_textedit.cpp: textedit.h
178	$(MOC) textedit.h -o moc_textedit.cpp	176	$(MOC) textedit.h -o moc_textedit.cpp
179		177
180	moc_fileBrowser.cpp: fileBrowser.h	178	moc_fileBrowser.cpp: fileBrowser.h
181	$(MOC) fileBrowser.h -o moc_fileBrowser.cpp	179	$(MOC) fileBrowser.h -o moc_fileBrowser.cpp
182		180
183	moc_fontDialog.cpp: fontDialog.h	181	moc_fontDialog.cpp: fontDialog.h
184	$(MOC) fontDialog.h -o moc_fontDialog.cpp	182	$(MOC) fontDialog.h -o moc_fontDialog.cpp
185		183
186	moc_fileSaver.cpp: fileSaver.h	184	moc_fileSaver.cpp: fileSaver.h
187	$(MOC) fileSaver.h -o moc_fileSaver.cpp	185	$(MOC) fileSaver.h -o moc_fileSaver.cpp
188		186
189		187