Fix

author: mark <mark> 2002-02-18 17:25:37 (UTC)
committer: mark <mark> 2002-02-18 17:25:37 (UTC)
commit: 4e553417909be0ddec9e8c35ecb312c9c5ddc0df (patch) (unidiff)
tree: dd1988fd56e53613a621982ba9e819b695679cf4
parent: 0dd511276a499a83699a3d17ddb074eab7e7e4ca (diff)
download: opie-4e553417909be0ddec9e8c35ecb312c9c5ddc0df.zip
opie-4e553417909be0ddec9e8c35ecb312c9c5ddc0df.tar.gz
opie-4e553417909be0ddec9e8c35ecb312c9c5ddc0df.tar.bz2
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
@@ -1,185 +1,184 @@
 #############################################################################
 ####### 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= today
 TARGET1 = lib$(TARGET).so.$(VER_MAJ)
 ####### Files
        HEADERS =today.h \
                TodoItem.h \
                minidom.h \
                todaybase.h \
                todayconfig.h
        SOURCES =main.cpp \
                today.cpp \
                todaybase.cpp \
                todayconfig.cpp \
                minidom.c \
                TodoItem.cpp
        OBJECTS =main.o \
                today.o \
                todaybase.o \
                todayconfig.o \
                minidom.o \
                TodoItem.o
 INTERFACES =    
 UICDECLS =      
 UICIMPLS =      
        SRCMOC  =moc_today.cpp \
                moc_todaybase.cpp \
                moc_todayconfig.cpp
        OBJMOC  =moc_today.o \
                moc_todaybase.o \
                moc_todayconfig.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 today.pro
-Makefile.in: today.pro
-        tmake today.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 \
                today.h \
                todaybase.h \
-                /home/kergoth/buildsystem/buildroot-oz/build/opie/include/qpe/datebookdb.h \
+                $(OPIEDIR)/include/qpe/datebookdb.h \
-                /home/kergoth/buildsystem/buildroot-oz/build/opie/include/qpe/event.h \
+                $(OPIEDIR)/include/qpe/event.h \
-                /home/kergoth/buildsystem/buildroot-oz/build/opie/include/qpe/palmtoprecord.h \
+                $(OPIEDIR)/include/qpe/palmtoprecord.h \
-                /home/kergoth/buildsystem/buildroot-oz/build/opie/include/qpe/timeconversion.h \
+                $(OPIEDIR)/include/qpe/timeconversion.h \
-                /home/kergoth/buildsystem/buildroot-oz/build/opie/include/qpe/qpcglobal.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 \
+                $(OPIEDIR)/include/qpe/datebookdb.h \
-                /home/kergoth/buildsystem/buildroot-oz/build/opie/include/qpe/event.h \
+                $(OPIEDIR)/include/qpe/event.h \
-                /home/kergoth/buildsystem/buildroot-oz/build/opie/include/qpe/palmtoprecord.h \
+                $(OPIEDIR)/include/qpe/palmtoprecord.h \
-                /home/kergoth/buildsystem/buildroot-oz/build/opie/include/qpe/timeconversion.h \
+                $(OPIEDIR)/include/qpe/timeconversion.h \
-                /home/kergoth/buildsystem/buildroot-oz/build/opie/include/qpe/qpcglobal.h \
+                $(OPIEDIR)/include/qpe/qpcglobal.h \
                TodoItem.h \
                todayconfig.h \
                minidom.h \
-                /home/kergoth/buildsystem/buildroot-oz/build/opie/include/qpe/timestring.h \
+                $(OPIEDIR)/include/qpe/timestring.h \
-                /home/kergoth/buildsystem/buildroot-oz/build/opie/include/qpe/config.h \
+                $(OPIEDIR)/include/qpe/config.h \
-                /home/kergoth/buildsystem/buildroot-oz/build/opie/include/qpe/qprocess.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 \
+                $(OPIEDIR)/include/qpe/datebookdb.h \
-                /home/kergoth/buildsystem/buildroot-oz/build/opie/include/qpe/event.h \
+                $(OPIEDIR)/include/qpe/event.h \
-                /home/kergoth/buildsystem/buildroot-oz/build/opie/include/qpe/palmtoprecord.h \
+                $(OPIEDIR)/include/qpe/palmtoprecord.h \
-                /home/kergoth/buildsystem/buildroot-oz/build/opie/include/qpe/timeconversion.h \
+                $(OPIEDIR)/include/qpe/timeconversion.h \
-                /home/kergoth/buildsystem/buildroot-oz/build/opie/include/qpe/qpcglobal.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
 moc_today.cpp: today.h
        $(MOC) today.h -o moc_today.cpp
 moc_todaybase.cpp: todaybase.h
        $(MOC) todaybase.h -o moc_todaybase.cpp
 moc_todayconfig.cpp: todayconfig.h
        $(MOC) todayconfig.h -o moc_todayconfig.cpp
author	mark <mark>	2002-02-18 17:25:37 (UTC)
committer	mark <mark>	2002-02-18 17:25:37 (UTC)
commit	4e553417909be0ddec9e8c35ecb312c9c5ddc0df (patch) (unidiff)
tree	dd1988fd56e53613a621982ba9e819b695679cf4
parent	0dd511276a499a83699a3d17ddb074eab7e7e4ca (diff)
download	opie-4e553417909be0ddec9e8c35ecb312c9c5ddc0df.zip opie-4e553417909be0ddec9e8c35ecb312c9c5ddc0df.tar.gz opie-4e553417909be0ddec9e8c35ecb312c9c5ddc0df.tar.bz2

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
@@ -1,185 +1,184 @@
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= today	21	TARGET= today
22	TARGET1 = lib$(TARGET).so.$(VER_MAJ)	22	TARGET1 = lib$(TARGET).so.$(VER_MAJ)
23		23
24	####### Files	24	####### Files
25		25
26	HEADERS =today.h \	26	HEADERS =today.h \
27	TodoItem.h \	27	TodoItem.h \
28	minidom.h \	28	minidom.h \
29	todaybase.h \	29	todaybase.h \
30	todayconfig.h	30	todayconfig.h
31	SOURCES =main.cpp \	31	SOURCES =main.cpp \
32	today.cpp \	32	today.cpp \
33	todaybase.cpp \	33	todaybase.cpp \
34	todayconfig.cpp \	34	todayconfig.cpp \
35	minidom.c \	35	minidom.c \
36	TodoItem.cpp	36	TodoItem.cpp
37	OBJECTS =main.o \	37	OBJECTS =main.o \
38	today.o \	38	today.o \
39	todaybase.o \	39	todaybase.o \
40	todayconfig.o \	40	todayconfig.o \
41	minidom.o \	41	minidom.o \
42	TodoItem.o	42	TodoItem.o
43	INTERFACES =	43	INTERFACES =
44	UICDECLS =	44	UICDECLS =
45	UICIMPLS =	45	UICIMPLS =
46	SRCMOC =moc_today.cpp \	46	SRCMOC =moc_today.cpp \
47	moc_todaybase.cpp \	47	moc_todaybase.cpp \
48	moc_todayconfig.cpp	48	moc_todayconfig.cpp
49	OBJMOC =moc_today.o \	49	OBJMOC =moc_today.o \
50	moc_todaybase.o \	50	moc_todaybase.o \
51	moc_todayconfig.o	51	moc_todayconfig.o
52		52
53		53
54	####### Implicit rules	54	####### Implicit rules
55		55
56	.SUFFIXES: .cpp .cxx .cc .C .c	56	.SUFFIXES: .cpp .cxx .cc .C .c
57		57
58	.cpp.o:	58	.cpp.o:
59	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<	59	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
60		60
61	.cxx.o:	61	.cxx.o:
62	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<	62	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
63		63
64	.cc.o:	64	.cc.o:
65	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<	65	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
66		66
67	.C.o:	67	.C.o:
68	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<	68	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
69		69
70	.c.o:	70	.c.o:
71	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<	71	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
72		72
73	####### Build rules	73	####### Build rules
74		74
75		75
76	all: $(DESTDIR)$(TARGET)	76	all: $(DESTDIR)$(TARGET)
77		77
78	$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)	78	$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
79	$(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)	79	$(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
80		80
81	moc: $(SRCMOC)	81	moc: $(SRCMOC)
82		82
83	tmake: Makefile.in	83	tmake:
84		84	tmake today.pro
85	Makefile.in: today.pro
86	tmake today.pro -o Makefile.in
87		85
88	clean:	86	clean:
89	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)	87	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
90	-rm -f *~ core	88	-rm -f *~ core
91	-rm -f allmoc.cpp	89	-rm -f allmoc.cpp
92		90
93	####### Extension Modules	91	####### Extension Modules
94		92
95	listpromodules:	93	listpromodules:
96	@echo	94	@echo
97		95
98	listallmodules:	96	listallmodules:
99	@echo	97	@echo
100		98
101	listaddonpromodules:	99	listaddonpromodules:
102	@echo	100	@echo
103		101
104	listaddonentmodules:	102	listaddonentmodules:
105	@echo	103	@echo
106		104
107		105
108	REQUIRES=	106	REQUIRES=
109		107
110	####### Sub-libraries	108	####### Sub-libraries
111		109
112		110
113	###### Combined headers	111	###### Combined headers
114		112
115		113
116		114
117	####### Compile	115	####### Compile
118		116
119	main.o: main.cpp \	117	main.o: main.cpp \
120	today.h \	118	today.h \
121	todaybase.h \	119	todaybase.h \
122	/home/kergoth/buildsystem/buildroot-oz/build/opie/include/qpe/datebookdb.h \	120	$(OPIEDIR)/include/qpe/datebookdb.h \
123	/home/kergoth/buildsystem/buildroot-oz/build/opie/include/qpe/event.h \	121	$(OPIEDIR)/include/qpe/event.h \
124	/home/kergoth/buildsystem/buildroot-oz/build/opie/include/qpe/palmtoprecord.h \	122	$(OPIEDIR)/include/qpe/palmtoprecord.h \
125	/home/kergoth/buildsystem/buildroot-oz/build/opie/include/qpe/timeconversion.h \	123	$(OPIEDIR)/include/qpe/timeconversion.h \
126	/home/kergoth/buildsystem/buildroot-oz/build/opie/include/qpe/qpcglobal.h \	124	$(OPIEDIR)/include/qpe/qpcglobal.h \
127	TodoItem.h \	125	TodoItem.h \
128	todayconfig.h \	126	todayconfig.h \
129	/home/kergoth/buildsystem/buildroot-oz/build/opie/include/qpe/qpeapplication.h	127	$(OPIEDIR)/include/qpe/qpeapplication.h
130		128
131	today.o: today.cpp \	129	today.o: today.cpp \
132	today.h \	130	today.h \
133	todaybase.h \	131	todaybase.h \
134	/home/kergoth/buildsystem/buildroot-oz/build/opie/include/qpe/datebookdb.h \	132	$(OPIEDIR)/include/qpe/datebookdb.h \
135	/home/kergoth/buildsystem/buildroot-oz/build/opie/include/qpe/event.h \	133	$(OPIEDIR)/include/qpe/event.h \
136	/home/kergoth/buildsystem/buildroot-oz/build/opie/include/qpe/palmtoprecord.h \	134	$(OPIEDIR)/include/qpe/palmtoprecord.h \
137	/home/kergoth/buildsystem/buildroot-oz/build/opie/include/qpe/timeconversion.h \	135	$(OPIEDIR)/include/qpe/timeconversion.h \
138	/home/kergoth/buildsystem/buildroot-oz/build/opie/include/qpe/qpcglobal.h \	136	$(OPIEDIR)/include/qpe/qpcglobal.h \
139	TodoItem.h \	137	TodoItem.h \
140	todayconfig.h \	138	todayconfig.h \
141	minidom.h \	139	minidom.h \
142	/home/kergoth/buildsystem/buildroot-oz/build/opie/include/qpe/timestring.h \	140	$(OPIEDIR)/include/qpe/timestring.h \
143	/home/kergoth/buildsystem/buildroot-oz/build/opie/include/qpe/config.h \	141	$(OPIEDIR)/include/qpe/config.h \
144	/home/kergoth/buildsystem/buildroot-oz/build/opie/include/qpe/qprocess.h	142	$(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
		143	$(OPIEDIR)/include/qpe/qprocess.h
145		144
146	todaybase.o: todaybase.cpp \	145	todaybase.o: todaybase.cpp \
147	todaybase.h \	146	todaybase.h \
148	/home/kergoth/buildsystem/buildroot-oz/build/opie/include/qpe/resource.h	147	$(OPIEDIR)/include/qpe/resource.h
149		148
150	todayconfig.o: todayconfig.cpp \	149	todayconfig.o: todayconfig.cpp \
151	todayconfig.h	150	todayconfig.h
152		151
153	minidom.o: minidom.c \	152	minidom.o: minidom.c \
154	minidom.h	153	minidom.h
155		154
156	TodoItem.o: TodoItem.cpp \	155	TodoItem.o: TodoItem.cpp \
157	TodoItem.h	156	TodoItem.h
158		157
159	moc_today.o: moc_today.cpp \	158	moc_today.o: moc_today.cpp \
160	today.h \	159	today.h \
161	todaybase.h \	160	todaybase.h \
162	/home/kergoth/buildsystem/buildroot-oz/build/opie/include/qpe/datebookdb.h \	161	$(OPIEDIR)/include/qpe/datebookdb.h \
163	/home/kergoth/buildsystem/buildroot-oz/build/opie/include/qpe/event.h \	162	$(OPIEDIR)/include/qpe/event.h \
164	/home/kergoth/buildsystem/buildroot-oz/build/opie/include/qpe/palmtoprecord.h \	163	$(OPIEDIR)/include/qpe/palmtoprecord.h \
165	/home/kergoth/buildsystem/buildroot-oz/build/opie/include/qpe/timeconversion.h \	164	$(OPIEDIR)/include/qpe/timeconversion.h \
166	/home/kergoth/buildsystem/buildroot-oz/build/opie/include/qpe/qpcglobal.h \	165	$(OPIEDIR)/include/qpe/qpcglobal.h \
167	TodoItem.h \	166	TodoItem.h \
168	todayconfig.h	167	todayconfig.h
169		168
170	moc_todaybase.o: moc_todaybase.cpp \	169	moc_todaybase.o: moc_todaybase.cpp \
171	todaybase.h	170	todaybase.h
172		171
173	moc_todayconfig.o: moc_todayconfig.cpp \	172	moc_todayconfig.o: moc_todayconfig.cpp \
174	todayconfig.h	173	todayconfig.h
175		174
176	moc_today.cpp: today.h	175	moc_today.cpp: today.h
177	$(MOC) today.h -o moc_today.cpp	176	$(MOC) today.h -o moc_today.cpp
178		177
179	moc_todaybase.cpp: todaybase.h	178	moc_todaybase.cpp: todaybase.h
180	$(MOC) todaybase.h -o moc_todaybase.cpp	179	$(MOC) todaybase.h -o moc_todaybase.cpp
181		180
182	moc_todayconfig.cpp: todayconfig.h	181	moc_todayconfig.cpp: todayconfig.h
183	$(MOC) todayconfig.h -o moc_todayconfig.cpp	182	$(MOC) todayconfig.h -o moc_todayconfig.cpp
184		183
185		184