summaryrefslogtreecommitdiff
path: root/x11/kdelibs2/patches/patch-be
blob: 991b884eca8be1aca7575583ab4f6ad9de49b1ea (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
Cannot strip away RCS IDs, please handle manually!
$NetBSD: patch-be,v 1.1 2001/10/15 22:46:25 skrll Exp $

--- kio/kded/Makefile.in.orig	Wed Sep 12 06:10:13 2001
+++ kio/kded/Makefile.in
@@ -2 +2 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
@@ -4 +4 @@
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
@@ -285 +285,6 @@
-lib_LTLIBRARIES = kded.la kbuildsycoca.la
+lib_LTLIBRARIES = libkded_main.la kded.la libkbuildsycoca_main.la kbuildsycoca.la
+
+libkded_main_la_LDFLAGS = $(all_libraries)
+libkded_main_la_LIBADD = $(LIB_KSYCOCA)
+libkded_main_la_SOURCES = kded.cpp kbuildservicetypefactory.cpp 			kbuildservicefactory.cpp 			kbuildservicegroupfactory.cpp kdedmodule.cpp
+
@@ -288,2 +293,2 @@
-kded_la_LIBADD = $(LIB_KSYCOCA)
-kded_la_SOURCES = kded.cpp kbuildservicetypefactory.cpp 			kbuildservicefactory.cpp 			kbuildservicegroupfactory.cpp kdedmodule.cpp
+kded_la_LIBADD = libkded_main.la
+kded_la_SOURCES = kded_main.cpp
@@ -290,0 +296,3 @@
+libkbuildsycoca_main_la_LDFLAGS = $(all_libraries)
+libkbuildsycoca_main_la_LIBADD = $(LIB_KSYCOCA)
+libkbuildsycoca_main_la_SOURCES = kbuildsycoca.cpp kbuildservicetypefactory.cpp 				kbuildservicefactory.cpp 				kbuildservicegroupfactory.cpp 				kbuildimageiofactory.cpp 				kbuildprotocolinfofactory.cpp 				kctimefactory.cpp
@@ -292,3 +299,0 @@
-kbuildsycoca_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kbuildsycoca_la_LIBADD = $(LIB_KSYCOCA)
-kbuildsycoca_la_SOURCES = kbuildsycoca.cpp kbuildservicetypefactory.cpp 				kbuildservicefactory.cpp 				kbuildservicegroupfactory.cpp 				kbuildimageiofactory.cpp 				kbuildprotocolinfofactory.cpp 				kctimefactory.cpp
@@ -295,0 +301,3 @@
+kbuildsycoca_la_LDFLAGS = $(all_libraries) -module -avoid-version
+kbuildsycoca_la_LIBADD = libkbuildsycoca_main.la
+kbuildsycoca_la_SOURCES = kbuildsycoca_main.cpp
@@ -300,2 +308,2 @@
-kded_LDADD = $(LIB_KSYCOCA) kded.la
-kded_SOURCES = dummy.cpp
+kded_LDADD = $(LIB_KSYCOCA) libkded_main.la
+kded_SOURCES = kded_main.cpp
@@ -304,2 +312,2 @@
-kbuildsycoca_LDADD = $(LIB_KSYCOCA) kbuildsycoca.la
-kbuildsycoca_SOURCES = dummy.cpp
+kbuildsycoca_LDADD = $(LIB_KSYCOCA) libkbuildsycoca_main.la
+kbuildsycoca_SOURCES = kbuildsycoca_main.cpp
@@ -330,2 +338,2 @@
-kded_la_DEPENDENCIES = 
-#>- kded_la_OBJECTS =  kded.lo kbuildservicetypefactory.lo \
+libkded_main_la_DEPENDENCIES = 
+#>- libkded_main_la_OBJECTS =  kded.lo kbuildservicetypefactory.lo \
@@ -334,2 +342,2 @@
-kded_la_final_OBJECTS = kded_la.all_cpp.lo 
-kded_la_nofinal_OBJECTS = kded.lo kbuildservicetypefactory.lo \
+libkded_main_la_final_OBJECTS = libkded_main_la.all_cpp.lo 
+libkded_main_la_nofinal_OBJECTS = kded.lo kbuildservicetypefactory.lo \
@@ -337,15 +345,25 @@
-kded_la_meta_unload.lo 
-@KDE_USE_FINAL_FALSE@kded_la_OBJECTS = $(kded_la_nofinal_OBJECTS)
-@KDE_USE_FINAL_TRUE@kded_la_OBJECTS = $(kded_la_final_OBJECTS)
-kbuildsycoca_la_DEPENDENCIES = 
-#>- kbuildsycoca_la_OBJECTS =  kbuildsycoca.lo kbuildservicetypefactory.lo \
-#>- kbuildservicefactory.lo kbuildservicegroupfactory.lo \
-#>- kbuildimageiofactory.lo kbuildprotocolinfofactory.lo kctimefactory.lo
-#>+ 7
-kbuildsycoca_la_final_OBJECTS = kbuildsycoca_la.all_cpp.lo 
-kbuildsycoca_la_nofinal_OBJECTS = kbuildsycoca.lo kbuildservicetypefactory.lo \
-kbuildservicefactory.lo kbuildservicegroupfactory.lo \
-kbuildimageiofactory.lo kbuildprotocolinfofactory.lo kctimefactory.lo \
-kbuildsycoca_la_meta_unload.lo 
-@KDE_USE_FINAL_FALSE@kbuildsycoca_la_OBJECTS = $(kbuildsycoca_la_nofinal_OBJECTS)
-@KDE_USE_FINAL_TRUE@kbuildsycoca_la_OBJECTS = $(kbuildsycoca_la_final_OBJECTS)
+libkded_main_la_meta_unload.lo 
+@KDE_USE_FINAL_FALSE@libkded_main_la_OBJECTS = $(libkded_main_la_nofinal_OBJECTS)
+@KDE_USE_FINAL_TRUE@libkded_main_la_OBJECTS = $(libkded_main_la_final_OBJECTS)
+kded_la_DEPENDENCIES =  libkded_main.la
+#>- kded_la_OBJECTS =  kded_main.lo
+#>+ 1
+kded_la_OBJECTS = kded_main.lo
+libkbuildsycoca_main_la_DEPENDENCIES = 
+#>- libkbuildsycoca_main_la_OBJECTS =  kbuildsycoca.lo \
+#>- kbuildservicetypefactory.lo kbuildservicefactory.lo \
+#>- kbuildservicegroupfactory.lo kbuildimageiofactory.lo \
+#>- kbuildprotocolinfofactory.lo kctimefactory.lo
+#>+ 8
+libkbuildsycoca_main_la_final_OBJECTS = libkbuildsycoca_main_la.all_cpp.lo 
+libkbuildsycoca_main_la_nofinal_OBJECTS = kbuildsycoca.lo \
+kbuildservicetypefactory.lo kbuildservicefactory.lo \
+kbuildservicegroupfactory.lo kbuildimageiofactory.lo \
+kbuildprotocolinfofactory.lo kctimefactory.lo \
+libkbuildsycoca_main_la_meta_unload.lo 
+@KDE_USE_FINAL_FALSE@libkbuildsycoca_main_la_OBJECTS = $(libkbuildsycoca_main_la_nofinal_OBJECTS)
+@KDE_USE_FINAL_TRUE@libkbuildsycoca_main_la_OBJECTS = $(libkbuildsycoca_main_la_final_OBJECTS)
+kbuildsycoca_la_DEPENDENCIES =  libkbuildsycoca_main.la
+#>- kbuildsycoca_la_OBJECTS =  kbuildsycoca_main.lo
+#>+ 1
+kbuildsycoca_la_OBJECTS = kbuildsycoca_main.lo
@@ -356 +374 @@
-#>- kded_OBJECTS =  dummy.$(OBJEXT)
+#>- kded_OBJECTS =  kded_main.$(OBJEXT)
@@ -358,3 +376,3 @@
-kded_OBJECTS = dummy.$(OBJEXT)
-kded_DEPENDENCIES =  kded.la
-#>- kbuildsycoca_OBJECTS =  dummy.$(OBJEXT)
+kded_OBJECTS = kded_main.$(OBJEXT)
+kded_DEPENDENCIES =  libkded_main.la
+#>- kbuildsycoca_OBJECTS =  kbuildsycoca_main.$(OBJEXT)
@@ -362,2 +380,2 @@
-kbuildsycoca_OBJECTS = dummy.$(OBJEXT)
-kbuildsycoca_DEPENDENCIES =  kbuildsycoca.la
+kbuildsycoca_OBJECTS = kbuildsycoca_main.$(OBJEXT)
+kbuildsycoca_DEPENDENCIES =  libkbuildsycoca_main.la
@@ -388 +406 @@
-KDE_DIST=HOWTO README.kded DESIGN kdedmodule.desktop kded.h kctimefactory.h 
+KDE_DIST=README.kded DESIGN kdedmodule.desktop kded.h HOWTO kctimefactory.h 
@@ -395,2 +413,2 @@
-SOURCES = $(kded_la_SOURCES) $(kbuildsycoca_la_SOURCES) $(kded_SOURCES) $(kbuildsycoca_SOURCES) $(kdontchangethehostname_SOURCES)
-OBJECTS = $(kded_la_OBJECTS) $(kbuildsycoca_la_OBJECTS) $(kded_OBJECTS) $(kbuildsycoca_OBJECTS) $(kdontchangethehostname_OBJECTS)
+SOURCES = $(libkded_main_la_SOURCES) $(kded_la_SOURCES) $(libkbuildsycoca_main_la_SOURCES) $(kbuildsycoca_la_SOURCES) $(kded_SOURCES) $(kbuildsycoca_SOURCES) $(kdontchangethehostname_SOURCES)
+OBJECTS = $(libkded_main_la_OBJECTS) $(kded_la_OBJECTS) $(libkbuildsycoca_main_la_OBJECTS) $(kbuildsycoca_la_OBJECTS) $(kded_OBJECTS) $(kbuildsycoca_OBJECTS) $(kdontchangethehostname_OBJECTS)
@@ -482,0 +501,3 @@
+libkded_main.la: $(libkded_main_la_OBJECTS) $(libkded_main_la_DEPENDENCIES)
+	$(CXXLINK) -rpath $(libdir) $(libkded_main_la_LDFLAGS) $(libkded_main_la_OBJECTS) $(libkded_main_la_LIBADD) $(LIBS)
+
@@ -485,0 +507,3 @@
+libkbuildsycoca_main.la: $(libkbuildsycoca_main_la_OBJECTS) $(libkbuildsycoca_main_la_DEPENDENCIES)
+	$(CXXLINK) -rpath $(libdir) $(libkbuildsycoca_main_la_LDFLAGS) $(libkbuildsycoca_main_la_OBJECTS) $(libkbuildsycoca_main_la_LIBADD) $(LIBS)
+
@@ -600,11 +623,0 @@
-#>- 	@for file in $(DISTFILES); do \
-#>- 	  d=$(srcdir); \
-#>- 	  if test -d $$d/$$file; then \
-#>- 	    cp -pr $$/$$file $(distdir)/$$file; \
-#>- 	  else \
-#>- 	    test -f $(distdir)/$$file \
-#>- 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-#>- 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-#>- 	  fi; \
-#>- 	done
-#>+ 10
@@ -710,3 +722,0 @@
-dummy.cpp:
-	echo > dummy.cpp
-
@@ -743,8 +753,8 @@
-kded_la_meta_unload.cpp:  kded.moc kdedmodule.moc
-	@echo 'creating kded_la_meta_unload.cpp'
-	@-rm -f kded_la_meta_unload.cpp
-	@echo 'static const char * _metalist_kded_la[] = {' > kded_la_meta_unload.cpp
-	@cat  kded.moc kdedmodule.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kded_la_meta_unload.cpp
-	@echo '0};' >> kded_la_meta_unload.cpp
-	@echo '#include <kunload.h>' >> kded_la_meta_unload.cpp
-	@echo '_UNLOAD(kded_la)' >> kded_la_meta_unload.cpp
+libkded_main_la_meta_unload.cpp:  kded.moc kdedmodule.moc
+	@echo 'creating libkded_main_la_meta_unload.cpp'
+	@-rm -f libkded_main_la_meta_unload.cpp
+	@echo 'static const char * _metalist_libkded_main_la[] = {' > libkded_main_la_meta_unload.cpp
+	@cat  kded.moc kdedmodule.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkded_main_la_meta_unload.cpp
+	@echo '0};' >> libkded_main_la_meta_unload.cpp
+	@echo '#include <kunload.h>' >> libkded_main_la_meta_unload.cpp
+	@echo '_UNLOAD(libkded_main_la)' >> libkded_main_la_meta_unload.cpp
@@ -754,8 +764,8 @@
-kbuildsycoca_la_meta_unload.cpp:  kbuildsycoca.moc
-	@echo 'creating kbuildsycoca_la_meta_unload.cpp'
-	@-rm -f kbuildsycoca_la_meta_unload.cpp
-	@echo 'static const char * _metalist_kbuildsycoca_la[] = {' > kbuildsycoca_la_meta_unload.cpp
-	@cat  kbuildsycoca.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kbuildsycoca_la_meta_unload.cpp
-	@echo '0};' >> kbuildsycoca_la_meta_unload.cpp
-	@echo '#include <kunload.h>' >> kbuildsycoca_la_meta_unload.cpp
-	@echo '_UNLOAD(kbuildsycoca_la)' >> kbuildsycoca_la_meta_unload.cpp
+libkbuildsycoca_main_la_meta_unload.cpp:  kbuildsycoca.moc
+	@echo 'creating libkbuildsycoca_main_la_meta_unload.cpp'
+	@-rm -f libkbuildsycoca_main_la_meta_unload.cpp
+	@echo 'static const char * _metalist_libkbuildsycoca_main_la[] = {' > libkbuildsycoca_main_la_meta_unload.cpp
+	@cat  kbuildsycoca.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkbuildsycoca_main_la_meta_unload.cpp
+	@echo '0};' >> libkbuildsycoca_main_la_meta_unload.cpp
+	@echo '#include <kunload.h>' >> libkbuildsycoca_main_la_meta_unload.cpp
+	@echo '_UNLOAD(libkbuildsycoca_main_la)' >> libkbuildsycoca_main_la_meta_unload.cpp
@@ -766 +776,13 @@
-	-rm -f  kded_la_meta_unload.cpp kbuildsycoca_la_meta_unload.cpp
+	-rm -f  libkded_main_la_meta_unload.cpp libkbuildsycoca_main_la_meta_unload.cpp
+
+#>+ 11
+libkded_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kded.cpp $(srcdir)/kbuildservicetypefactory.cpp $(srcdir)/kbuildservicefactory.cpp $(srcdir)/kbuildservicegroupfactory.cpp $(srcdir)/kdedmodule.cpp libkded_main_la_meta_unload.cpp   kded.moc kdedmodule.moc kbuildsycoca.moc 
+	@echo 'creating libkded_main_la.all_cpp.cpp ...'; \
+	rm -f libkded_main_la.all_cpp.files libkded_main_la.all_cpp.final; \
+	echo "#define KDE_USE_FINAL 1" >> libkded_main_la.all_cpp.final; \
+	for file in kded.cpp kbuildservicetypefactory.cpp kbuildservicefactory.cpp kbuildservicegroupfactory.cpp kdedmodule.cpp libkded_main_la_meta_unload.cpp ; do \
+	  echo "#include \"$$file\"" >> libkded_main_la.all_cpp.files; \
+	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkded_main_la.all_cpp.final; \
+	done; \
+	cat libkded_main_la.all_cpp.final libkded_main_la.all_cpp.files  > libkded_main_la.all_cpp.cpp; \
+	rm -f libkded_main_la.all_cpp.final libkded_main_la.all_cpp.files
@@ -769 +791 @@
-kded_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kded.cpp $(srcdir)/kbuildservicetypefactory.cpp $(srcdir)/kbuildservicefactory.cpp $(srcdir)/kbuildservicegroupfactory.cpp $(srcdir)/kdedmodule.cpp kded_la_meta_unload.cpp   kded.moc kdedmodule.moc kbuildsycoca.moc 
+kded_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kded_main.cpp  
@@ -773 +795 @@
-	for file in kded.cpp kbuildservicetypefactory.cpp kbuildservicefactory.cpp kbuildservicegroupfactory.cpp kdedmodule.cpp kded_la_meta_unload.cpp ; do \
+	for file in kded_main.cpp ; do \
@@ -781 +803,13 @@
-kbuildsycoca_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kbuildsycoca.cpp $(srcdir)/kbuildservicetypefactory.cpp $(srcdir)/kbuildservicefactory.cpp $(srcdir)/kbuildservicegroupfactory.cpp $(srcdir)/kbuildimageiofactory.cpp $(srcdir)/kbuildprotocolinfofactory.cpp $(srcdir)/kctimefactory.cpp kbuildsycoca_la_meta_unload.cpp  
+libkbuildsycoca_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kbuildsycoca.cpp $(srcdir)/kbuildservicetypefactory.cpp $(srcdir)/kbuildservicefactory.cpp $(srcdir)/kbuildservicegroupfactory.cpp $(srcdir)/kbuildimageiofactory.cpp $(srcdir)/kbuildprotocolinfofactory.cpp $(srcdir)/kctimefactory.cpp libkbuildsycoca_main_la_meta_unload.cpp  
+	@echo 'creating libkbuildsycoca_main_la.all_cpp.cpp ...'; \
+	rm -f libkbuildsycoca_main_la.all_cpp.files libkbuildsycoca_main_la.all_cpp.final; \
+	echo "#define KDE_USE_FINAL 1" >> libkbuildsycoca_main_la.all_cpp.final; \
+	for file in kbuildsycoca.cpp kbuildservicetypefactory.cpp kbuildservicefactory.cpp kbuildservicegroupfactory.cpp kbuildimageiofactory.cpp kbuildprotocolinfofactory.cpp kctimefactory.cpp libkbuildsycoca_main_la_meta_unload.cpp ; do \
+	  echo "#include \"$$file\"" >> libkbuildsycoca_main_la.all_cpp.files; \
+	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkbuildsycoca_main_la.all_cpp.final; \
+	done; \
+	cat libkbuildsycoca_main_la.all_cpp.final libkbuildsycoca_main_la.all_cpp.files  > libkbuildsycoca_main_la.all_cpp.cpp; \
+	rm -f libkbuildsycoca_main_la.all_cpp.final libkbuildsycoca_main_la.all_cpp.files
+
+#>+ 11
+kbuildsycoca_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kbuildsycoca_main.cpp  
@@ -785 +819 @@
-	for file in kbuildsycoca.cpp kbuildservicetypefactory.cpp kbuildservicefactory.cpp kbuildservicegroupfactory.cpp kbuildimageiofactory.cpp kbuildprotocolinfofactory.cpp kctimefactory.cpp kbuildsycoca_la_meta_unload.cpp ; do \
+	for file in kbuildsycoca_main.cpp ; do \
@@ -793 +827 @@
-kded.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp  
+kded.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kded_main.cpp  
@@ -797 +831 @@
-	for file in dummy.cpp ; do \
+	for file in kded_main.cpp ; do \
@@ -805 +839 @@
-kbuildsycoca.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp  
+kbuildsycoca.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kbuildsycoca_main.cpp  
@@ -809 +843 @@
-	for file in dummy.cpp ; do \
+	for file in kbuildsycoca_main.cpp ; do \
@@ -830 +864 @@
-	-rm -f kded_la.all_cpp.cpp kbuildsycoca_la.all_cpp.cpp kded.all_cpp.cpp kbuildsycoca.all_cpp.cpp kdontchangethehostname.all_cpp.cpp
+	-rm -f libkded_main_la.all_cpp.cpp kded_la.all_cpp.cpp libkbuildsycoca_main_la.all_cpp.cpp kbuildsycoca_la.all_cpp.cpp kded.all_cpp.cpp kbuildsycoca.all_cpp.cpp kdontchangethehostname.all_cpp.cpp
@@ -834 +868 @@
-	$(MAKE) kded_la_OBJECTS="$(kded_la_final_OBJECTS)" kbuildsycoca_la_OBJECTS="$(kbuildsycoca_la_final_OBJECTS)" all-am
+	$(MAKE) libkded_main_la_OBJECTS="$(libkded_main_la_final_OBJECTS)" libkbuildsycoca_main_la_OBJECTS="$(libkbuildsycoca_main_la_final_OBJECTS)" all-am
@@ -837 +871 @@
-	$(MAKE) kded_la_OBJECTS="$(kded_la_nofinal_OBJECTS)" kbuildsycoca_la_OBJECTS="$(kbuildsycoca_la_nofinal_OBJECTS)" all-am
+	$(MAKE) libkded_main_la_OBJECTS="$(libkded_main_la_nofinal_OBJECTS)" libkbuildsycoca_main_la_OBJECTS="$(libkbuildsycoca_main_la_nofinal_OBJECTS)" all-am