Fix

author: mark <mark> 2002-02-18 16:52:08 (UTC)
committer: mark <mark> 2002-02-18 16:52:08 (UTC)
commit: 46ae2ea92e910138307e65a8e4fbd666655766f4 (patch) (unidiff)
tree: 92b38969b4e8b1d4b9605b04fada0818a5cd9cd2
parent: 6e03d71c0e471659e7899e6641b20c62088cf34c (diff)
download: opie-46ae2ea92e910138307e65a8e4fbd666655766f4.zip
opie-46ae2ea92e910138307e65a8e4fbd666655766f4.tar.gz
opie-46ae2ea92e910138307e65a8e4fbd666655766f4.tar.bz2
1 files changed, 83 insertions, 25 deletions
diff --git a/core/apps/textedit/Makefile.in b/core/apps/textedit/Makefile.in
index bef671c..399ea4b 100644
--- a/core/apps/textedit/Makefile.in
+++ b/core/apps/textedit/Makefile.in
@@ -2,130 +2,188 @@
 ####### 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
+        HEADERS =textedit.h \
+                fileBrowser.h \
+                fontDialog.h \
+                fileSaver.h
        SOURCES =main.cpp \
-                textedit.cpp
+                textedit.cpp \
+                fileBrowser.cpp \
+                fontDialog.cpp \
+                fileSaver.cpp
        OBJECTS =main.o \
-                textedit.o
+                textedit.o \
+                fileBrowser.o \
+                fontDialog.o \
+                fileSaver.o
 INTERFACES =    
 UICDECLS =      
 UICIMPLS =      
-        SRCMOC  =moc_textedit.cpp
+        SRCMOC  =moc_textedit.cpp \
-        OBJMOC  =moc_textedit.o
+                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:
+tmake: Makefile.in
-        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 \
-                $(OPIEDIR)/include/qpe/filemanager.h \
+                /home/mark/source/opie/include/qpe/filemanager.h \
-                $(OPIEDIR)/include/qpe/qpeapplication.h \
+                /home/mark/source/opie/include/qpe/qpeapplication.h
-                $(OPIEDIR)/include/qpedecoration_qws.h \
-                $(OPIEDIR)/include/timestring.h
 textedit.o: textedit.cpp \
                textedit.h \
-                $(OPIEDIR)/include/qpe/filemanager.h \
+                /home/mark/source/opie/include/qpe/filemanager.h \
-                $(OPIEDIR)/include/qpe/global.h \
+                fileBrowser.h \
-                $(OPIEDIR)/include/qpe/fileselector.h \
+                fileSaver.h \
-                $(OPIEDIR)/include/filemanager.h \
+                fontDialog.h \
-                $(OPIEDIR)/include/applnk.h \
+                /home/mark/source/opie/include/qpe/fontdatabase.h \
-                $(OPIEDIR)/include/qpe/applnk.h \
+                /home/mark/source/opie/include/qpe/fontfactoryinterface.h \
-                $(OPIEDIR)/include/qpe/resource.h \
+                /home/mark/source/opie/include/qpe/qcom.h \
-                $(OPIEDIR)/include/qpe/config.h \
+                /home/mark/source/opie/include/qpe/quuid.h \
-                $(OPIEDIR)/include/qpe/qpeapplication.h \
+                /home/mark/source/opie/include/qpe/global.h \
-                $(OPIEDIR)/include/qpedecoration_qws.h \
+                /home/mark/source/opie/include/qpe/fileselector.h \
-                $(OPIEDIR)/include/timestring.h \
+                /home/mark/source/opie/include/qpe/applnk.h \
-                $(OPIEDIR)/include/qpe/qpemenubar.h \
+                /home/mark/source/opie/include/qpe/resource.h \
-                $(OPIEDIR)/include/qpe/qpetoolbar.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
+fileBrowser.o: fileBrowser.cpp \
+                fileBrowser.h \
+                /home/mark/source/opie/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
+fileSaver.o: fileSaver.cpp \
+                fileSaver.h \
+                /home/mark/source/opie/include/qpe/config.h \
+                /home/mark/source/opie/include/qpe/qpeapplication.h
 moc_textedit.o: moc_textedit.cpp \
                textedit.h \
-                $(OPIEDIR)/include/qpe/filemanager.h
+                /home/mark/source/opie/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
+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
author	mark <mark>	2002-02-18 16:52:08 (UTC)
committer	mark <mark>	2002-02-18 16:52:08 (UTC)
commit	46ae2ea92e910138307e65a8e4fbd666655766f4 (patch) (unidiff)
tree	92b38969b4e8b1d4b9605b04fada0818a5cd9cd2
parent	6e03d71c0e471659e7899e6641b20c62088cf34c (diff)
download	opie-46ae2ea92e910138307e65a8e4fbd666655766f4.zip opie-46ae2ea92e910138307e65a8e4fbd666655766f4.tar.gz opie-46ae2ea92e910138307e65a8e4fbd666655766f4.tar.bz2

diff --git a/core/apps/textedit/Makefile.in b/core/apps/textedit/Makefile.in index bef671c..399ea4b 100644 --- a/core/apps/textedit/Makefile.in +++ b/core/apps/textedit/Makefile.in
@@ -2,130 +2,188 @@
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 \
		28	fontDialog.h \
		29	fileSaver.h
27	SOURCES =main.cpp \	30	SOURCES =main.cpp \
28	textedit.cpp	31	textedit.cpp \
		32	fileBrowser.cpp \
		33	fontDialog.cpp \
		34	fileSaver.cpp
29	OBJECTS =main.o \	35	OBJECTS =main.o \
30	textedit.o	36	textedit.o \
		37	fileBrowser.o \
		38	fontDialog.o \
		39	fileSaver.o
31	INTERFACES =	40	INTERFACES =
32	UICDECLS =	41	UICDECLS =
33	UICIMPLS =	42	UICIMPLS =
34	SRCMOC =moc_textedit.cpp	43	SRCMOC =moc_textedit.cpp \
35	OBJMOC =moc_textedit.o	44	moc_fileBrowser.cpp \
		45	moc_fontDialog.cpp \
		46	moc_fileSaver.cpp
		47	OBJMOC =moc_textedit.o \
		48	moc_fileBrowser.o \
		49	moc_fontDialog.o \
		50	moc_fileSaver.o
36		51
37		52
38	####### Implicit rules	53	####### Implicit rules
39		54
40	.SUFFIXES: .cpp .cxx .cc .C .c	55	.SUFFIXES: .cpp .cxx .cc .C .c
41		56
42	.cpp.o:	57	.cpp.o:
43	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<	58	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
44		59
45	.cxx.o:	60	.cxx.o:
46	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<	61	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
47		62
48	.cc.o:	63	.cc.o:
49	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<	64	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
50		65
51	.C.o:	66	.C.o:
52	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<	67	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
53		68
54	.c.o:	69	.c.o:
55	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<	70	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
56		71
57	####### Build rules	72	####### Build rules
58		73
59		74
60	all: $(DESTDIR)$(TARGET)	75	all: $(DESTDIR)$(TARGET)
61		76
62	$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)	77	$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
63	$(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)	78	$(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
64		79
65	moc: $(SRCMOC)	80	moc: $(SRCMOC)
66		81
67	tmake:	82	tmake: Makefile.in
68	tmake textedit.pro	83
		84	Makefile.in: textedit.pro
		85	tmake textedit.pro -o Makefile.in
69		86
70	clean:	87	clean:
71	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)	88	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
72	-rm -f *~ core	89	-rm -f *~ core
73	-rm -f allmoc.cpp	90	-rm -f allmoc.cpp
74		91
75	####### Extension Modules	92	####### Extension Modules
76		93
77	listpromodules:	94	listpromodules:
78	@echo	95	@echo
79		96
80	listallmodules:	97	listallmodules:
81	@echo	98	@echo
82		99
83	listaddonpromodules:	100	listaddonpromodules:
84	@echo	101	@echo
85		102
86	listaddonentmodules:	103	listaddonentmodules:
87	@echo	104	@echo
88		105
89		106
90	REQUIRES=	107	REQUIRES=
91		108
92	####### Sub-libraries	109	####### Sub-libraries
93		110
94		111
95	###### Combined headers	112	###### Combined headers
96		113
97		114
98		115
99	####### Compile	116	####### Compile
100		117
101	main.o: main.cpp \	118	main.o: main.cpp \
102	textedit.h \	119	textedit.h \
103	$(OPIEDIR)/include/qpe/filemanager.h \	120	/home/mark/source/opie/include/qpe/filemanager.h \
104	$(OPIEDIR)/include/qpe/qpeapplication.h \	121	/home/mark/source/opie/include/qpe/qpeapplication.h
105	$(OPIEDIR)/include/qpedecoration_qws.h \
106	$(OPIEDIR)/include/timestring.h
107		122
108	textedit.o: textedit.cpp \	123	textedit.o: textedit.cpp \
109	textedit.h \	124	textedit.h \
110	$(OPIEDIR)/include/qpe/filemanager.h \	125	/home/mark/source/opie/include/qpe/filemanager.h \
111	$(OPIEDIR)/include/qpe/global.h \	126	fileBrowser.h \
112	$(OPIEDIR)/include/qpe/fileselector.h \	127	fileSaver.h \
113	$(OPIEDIR)/include/filemanager.h \	128	fontDialog.h \
114	$(OPIEDIR)/include/applnk.h \	129	/home/mark/source/opie/include/qpe/fontdatabase.h \
115	$(OPIEDIR)/include/qpe/applnk.h \	130	/home/mark/source/opie/include/qpe/fontfactoryinterface.h \
116	$(OPIEDIR)/include/qpe/resource.h \	131	/home/mark/source/opie/include/qpe/qcom.h \
117	$(OPIEDIR)/include/qpe/config.h \	132	/home/mark/source/opie/include/qpe/quuid.h \
118	$(OPIEDIR)/include/qpe/qpeapplication.h \	133	/home/mark/source/opie/include/qpe/global.h \
119	$(OPIEDIR)/include/qpedecoration_qws.h \	134	/home/mark/source/opie/include/qpe/fileselector.h \
120	$(OPIEDIR)/include/timestring.h \	135	/home/mark/source/opie/include/qpe/applnk.h \
121	$(OPIEDIR)/include/qpe/qpemenubar.h \	136	/home/mark/source/opie/include/qpe/resource.h \
122	$(OPIEDIR)/include/qpe/qpetoolbar.h	137	/home/mark/source/opie/include/qpe/config.h \
		138	/home/mark/source/opie/include/qpe/qpeapplication.h \
		139	/home/mark/source/opie/include/qpe/qpemenubar.h \
		140	/home/mark/source/opie/include/qpe/qpetoolbar.h
		141
		142	fileBrowser.o: fileBrowser.cpp \
		143	fileBrowser.h \
		144	/home/mark/source/opie/include/qpe/config.h
		145
		146	fontDialog.o: fontDialog.cpp \
		147	fontDialog.h \
		148	/home/mark/source/opie/include/qpe/fontdatabase.h \
		149	/home/mark/source/opie/include/qpe/fontfactoryinterface.h \
		150	/home/mark/source/opie/include/qpe/qcom.h \
		151	/home/mark/source/opie/include/qpe/quuid.h \
		152	/home/mark/source/opie/include/qpe/config.h \
		153	/home/mark/source/opie/include/qpe/qpeapplication.h
		154
		155	fileSaver.o: fileSaver.cpp \
		156	fileSaver.h \
		157	/home/mark/source/opie/include/qpe/config.h \
		158	/home/mark/source/opie/include/qpe/qpeapplication.h
123		159
124	moc_textedit.o: moc_textedit.cpp \	160	moc_textedit.o: moc_textedit.cpp \
125	textedit.h \	161	textedit.h \
126	$(OPIEDIR)/include/qpe/filemanager.h	162	/home/mark/source/opie/include/qpe/filemanager.h
		163
		164	moc_fileBrowser.o: moc_fileBrowser.cpp \
		165	fileBrowser.h
		166
		167	moc_fontDialog.o: moc_fontDialog.cpp \
		168	fontDialog.h \
		169	/home/mark/source/opie/include/qpe/fontdatabase.h \
		170	/home/mark/source/opie/include/qpe/fontfactoryinterface.h \
		171	/home/mark/source/opie/include/qpe/qcom.h \
		172	/home/mark/source/opie/include/qpe/quuid.h
		173
		174	moc_fileSaver.o: moc_fileSaver.cpp \
		175	fileSaver.h
127		176
128	moc_textedit.cpp: textedit.h	177	moc_textedit.cpp: textedit.h
129	$(MOC) textedit.h -o moc_textedit.cpp	178	$(MOC) textedit.h -o moc_textedit.cpp
130		179
		180	moc_fileBrowser.cpp: fileBrowser.h
		181	$(MOC) fileBrowser.h -o moc_fileBrowser.cpp
		182
		183	moc_fontDialog.cpp: fontDialog.h
		184	$(MOC) fontDialog.h -o moc_fontDialog.cpp
		185
		186	moc_fileSaver.cpp: fileSaver.h
		187	$(MOC) fileSaver.h -o moc_fileSaver.cpp
		188
131		189