summaryrefslogtreecommitdiff
path: root/x11/kdebase3/patches/patch-ct
blob: 00aee26b456b94782b3c1d39bc4dbd36b4d4b2bf (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
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
$NetBSD: patch-ct,v 1.6 2003/05/22 02:42:51 markd Exp $

--- konsole/konsole/Makefile.in.orig	Tue May 13 23:08:00 2003
+++ konsole/konsole/Makefile.in
@@ -437,7 +437,7 @@ INCLUDES = -I. $(all_includes)
 
 # you can add here more. This one gets installed
 bin_PROGRAMS = konsole konsole_grantpty kwrited #kcmkonsole
-lib_LTLIBRARIES = kwrited.la konsole.la
+lib_LTLIBRARIES = libkwrited_main.la kwrited.la libkonsole_main.la konsole.la
 
 
 # libkonsolepart is a part, but konsole.la links directly to it, so we can't
@@ -472,30 +472,38 @@ libkonsolepart_la_LDFLAGS = $(all_librar
 libkonsolepart_la_LIBADD = $(LIBUTIL) $(XTESTLIB) $(LIB_KPARTS)
 
 # kwrited kdeinit module
-kwrited_la_SOURCES = kwrited.cpp
-kwrited_la_LIBADD = libkonsolepart.la
+libkwrited_main_la_SOURCES = kwrited.cpp
+libkwrited_main_la_LIBADD = libkonsolepart.la
+libkwrited_main_la_LDFLAGS = $(all_libraries)
+
+kwrited_la_SOURCES = kwrited_main.cpp
+kwrited_la_LIBADD = libkwrited_main.la
 kwrited_la_LDFLAGS = $(all_libraries) -module -avoid-version
 
 # kwrited executable
-kwrited_SOURCES = dummy.cpp
-kwrited_LDADD = kwrited.la 
+kwrited_SOURCES = kwrited_main.cpp
+kwrited_LDADD = libkwrited_main.la 
 kwrited_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 
 # konsole kdeinit module
-#>- konsole_la_SOURCES = TEPty.cpp BlockArray.cpp main.cpp konsole.cpp schema.cpp session.cpp TEWidget.cpp TEmuVt102.cpp \
+#>- libkonsole_main_la_SOURCES = TEPty.cpp BlockArray.cpp main.cpp konsole.cpp schema.cpp session.cpp TEWidget.cpp TEmuVt102.cpp \
 #>-      TEScreen.cpp TEmulation.cpp TEHistory.cpp keytrans.cpp konsoleiface.skel sessioniface.skel \
 #>-      konsole_wcwidth.cpp konsolebookmarkhandler.cpp konsolebookmarkmenu.cpp konsole_child.cpp
 #>+ 3
-konsole_la_SOURCES=TEPty.cpp BlockArray.cpp main.cpp konsole.cpp schema.cpp session.cpp TEWidget.cpp TEmuVt102.cpp \
+libkonsole_main_la_SOURCES=TEPty.cpp BlockArray.cpp main.cpp konsole.cpp schema.cpp session.cpp TEWidget.cpp TEmuVt102.cpp \
      TEScreen.cpp TEmulation.cpp TEHistory.cpp keytrans.cpp   \
      konsole_wcwidth.cpp konsolebookmarkhandler.cpp konsolebookmarkmenu.cpp konsole_child.cpp konsoleiface_skel.cpp sessioniface_skel.cpp
 
+libkonsole_main_la_LDFLAGS = $(all_libraries)
+libkonsole_main_la_LIBADD = $(LIB_KDEPRINT) $(LIBUTIL) $(XTESTLIB)
+
+konsole_la_SOURCES = konsole_main.cpp
 konsole_la_LDFLAGS = $(all_libraries) -module -avoid-version
-konsole_la_LIBADD = $(LIB_KDEPRINT) $(LIBUTIL) $(XTESTLIB)
+konsole_la_LIBADD = libkonsole_main.la
 
 # konsole executable
-konsole_SOURCES = dummy.cpp
-konsole_LDADD = konsole.la $(LIB_KDEPRINT)
+konsole_SOURCES = konsole_main.cpp
+konsole_LDADD = libkonsole_main.la
 konsole_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 
 
@@ -531,27 +539,32 @@ CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES)
 
-konsole_la_DEPENDENCIES =
-am_konsole_la_OBJECTS = TEPty.lo BlockArray.lo main.lo konsole.lo \
-	schema.lo session.lo TEWidget.lo TEmuVt102.lo TEScreen.lo \
-	TEmulation.lo TEHistory.lo keytrans.lo konsole_wcwidth.lo \
-	konsolebookmarkhandler.lo konsolebookmarkmenu.lo \
-	konsole_child.lo
+konsole_la_DEPENDENCIES = libkonsole_main.la
+am_konsole_la_OBJECTS = konsole_main.lo
 #>- konsole_la_OBJECTS = $(am_konsole_la_OBJECTS)
-#>+ 8
-konsole_la_final_OBJECTS = konsole_la.all_cpp.lo 
-konsole_la_nofinal_OBJECTS = TEPty.lo BlockArray.lo main.lo konsole.lo \
-	schema.lo session.lo TEWidget.lo TEmuVt102.lo TEScreen.lo \
-	TEmulation.lo TEHistory.lo keytrans.lo konsole_wcwidth.lo \
-	konsolebookmarkhandler.lo konsolebookmarkmenu.lo \
-	konsole_child.lo konsoleiface_skel.lo sessioniface_skel.lo
-@KDE_USE_FINAL_FALSE@konsole_la_OBJECTS = $(konsole_la_nofinal_OBJECTS)
-@KDE_USE_FINAL_TRUE@konsole_la_OBJECTS = $(konsole_la_final_OBJECTS)
-kwrited_la_DEPENDENCIES = libkonsolepart.la
-am_kwrited_la_OBJECTS = kwrited.lo
+#>+ 1
+konsole_la_OBJECTS = konsole_main.lo
+kwrited_la_DEPENDENCIES = libkwrited_main.la
+am_kwrited_la_OBJECTS = kwrited_main.lo
 #>- kwrited_la_OBJECTS = $(am_kwrited_la_OBJECTS)
 #>+ 1
-kwrited_la_OBJECTS = kwrited.lo
+kwrited_la_OBJECTS = kwrited_main.lo
+libkonsole_main_la_DEPENDENCIES =
+am_libkonsole_main_la_OBJECTS = TEPty.lo BlockArray.lo main.lo \
+	konsole.lo schema.lo session.lo TEWidget.lo TEmuVt102.lo \
+	TEScreen.lo TEmulation.lo TEHistory.lo keytrans.lo \
+	konsole_wcwidth.lo konsolebookmarkhandler.lo \
+	konsolebookmarkmenu.lo konsole_child.lo
+#>- libkonsole_main_la_OBJECTS = $(am_libkonsole_main_la_OBJECTS)
+#>+ 8
+libkonsole_main_la_final_OBJECTS = libkonsole_main_la.all_cpp.lo 
+libkonsole_main_la_nofinal_OBJECTS = TEPty.lo BlockArray.lo main.lo \
+	konsole.lo schema.lo session.lo TEWidget.lo TEmuVt102.lo \
+	TEScreen.lo TEmulation.lo TEHistory.lo keytrans.lo \
+	konsole_wcwidth.lo konsolebookmarkhandler.lo \
+	konsolebookmarkmenu.lo konsole_child.lo konsoleiface_skel.lo sessioniface_skel.lo
+@KDE_USE_FINAL_FALSE@libkonsole_main_la_OBJECTS = $(libkonsole_main_la_nofinal_OBJECTS)
+@KDE_USE_FINAL_TRUE@libkonsole_main_la_OBJECTS = $(libkonsole_main_la_final_OBJECTS)
 libkonsolepart_la_DEPENDENCIES =
 am_libkonsolepart_la_OBJECTS = TEPty.lo BlockArray.lo konsole_part.lo \
 	schema.lo session.lo TEWidget.lo TEmuVt102.lo TEScreen.lo \
@@ -564,25 +577,30 @@ libkonsolepart_la_nofinal_OBJECTS = TEPt
 	konsole_wcwidth.lo TEmulation.lo TEHistory.lo keytrans.lo konsoleiface_skel.lo sessioniface_skel.lo
 @KDE_USE_FINAL_FALSE@libkonsolepart_la_OBJECTS = $(libkonsolepart_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@libkonsolepart_la_OBJECTS = $(libkonsolepart_la_final_OBJECTS)
+libkwrited_main_la_DEPENDENCIES = libkonsolepart.la
+am_libkwrited_main_la_OBJECTS = kwrited.lo
+#>- libkwrited_main_la_OBJECTS = $(am_libkwrited_main_la_OBJECTS)
+#>+ 1
+libkwrited_main_la_OBJECTS = kwrited.lo
 bin_PROGRAMS = konsole$(EXEEXT) konsole_grantpty$(EXEEXT) \
 	kwrited$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS)
 
-am_konsole_OBJECTS = dummy.$(OBJEXT)
+am_konsole_OBJECTS = konsole_main.$(OBJEXT)
 #>- konsole_OBJECTS = $(am_konsole_OBJECTS)
 #>+ 1
-konsole_OBJECTS = dummy.$(OBJEXT)
-konsole_DEPENDENCIES = konsole.la
+konsole_OBJECTS = konsole_main.$(OBJEXT)
+konsole_DEPENDENCIES = libkonsole_main.la
 am_konsole_grantpty_OBJECTS = konsole_grantpty.$(OBJEXT)
 #>- konsole_grantpty_OBJECTS = $(am_konsole_grantpty_OBJECTS)
 #>+ 1
 konsole_grantpty_OBJECTS = konsole_grantpty.$(OBJEXT)
 konsole_grantpty_DEPENDENCIES =
-am_kwrited_OBJECTS = dummy.$(OBJEXT)
+am_kwrited_OBJECTS = kwrited_main.$(OBJEXT)
 #>- kwrited_OBJECTS = $(am_kwrited_OBJECTS)
 #>+ 1
-kwrited_OBJECTS = dummy.$(OBJEXT)
-kwrited_DEPENDENCIES = kwrited.la
+kwrited_OBJECTS = kwrited_main.$(OBJEXT)
+kwrited_DEPENDENCIES = libkwrited_main.la
 
 DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
@@ -591,44 +609,56 @@ am__depfiles_maybe = depfiles
 #>- @AMDEP_TRUE@	./$(DEPDIR)/TEHistory.Plo ./$(DEPDIR)/TEPty.Plo \
 #>- @AMDEP_TRUE@	./$(DEPDIR)/TEScreen.Plo ./$(DEPDIR)/TEWidget.Plo \
 #>- @AMDEP_TRUE@	./$(DEPDIR)/TEmuVt102.Plo \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/TEmulation.Plo ./$(DEPDIR)/dummy.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/keytrans.Plo ./$(DEPDIR)/konsole.Plo \
+#>- @AMDEP_TRUE@	./$(DEPDIR)/TEmulation.Plo ./$(DEPDIR)/keytrans.Plo \
+#>- @AMDEP_TRUE@	./$(DEPDIR)/konsole.Plo \
 #>- @AMDEP_TRUE@	./$(DEPDIR)/konsole_child.Plo \
 #>- @AMDEP_TRUE@	./$(DEPDIR)/konsole_grantpty.Po \
+#>- @AMDEP_TRUE@	./$(DEPDIR)/konsole_main.Plo \
+#>- @AMDEP_TRUE@	./$(DEPDIR)/konsole_main.Po \
 #>- @AMDEP_TRUE@	./$(DEPDIR)/konsole_part.Plo \
 #>- @AMDEP_TRUE@	./$(DEPDIR)/konsole_wcwidth.Plo \
 #>- @AMDEP_TRUE@	./$(DEPDIR)/konsolebookmarkhandler.Plo \
 #>- @AMDEP_TRUE@	./$(DEPDIR)/konsolebookmarkmenu.Plo \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/kwrited.Plo ./$(DEPDIR)/main.Plo \
+#>- @AMDEP_TRUE@	./$(DEPDIR)/kwrited.Plo \
+#>- @AMDEP_TRUE@	./$(DEPDIR)/kwrited_main.Plo \
+#>- @AMDEP_TRUE@	./$(DEPDIR)/kwrited_main.Po ./$(DEPDIR)/main.Plo \
 #>- @AMDEP_TRUE@	./$(DEPDIR)/schema.Plo ./$(DEPDIR)/session.Plo
-#>+ 29
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =  $(DEPDIR)/konsoleiface_skel.P $(DEPDIR)/sessioniface_skel.P  $(DEPDIR)/konsole_la.all_cpp.P $(DEPDIR)/libkonsolepart_la.all_cpp.P  ./$(DEPDIR)/BlockArray.Plo \
+#>+ 37
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =  $(DEPDIR)/konsoleiface_skel.P $(DEPDIR)/sessioniface_skel.P  $(DEPDIR)/libkonsole_main_la.all_cpp.P $(DEPDIR)/libkonsolepart_la.all_cpp.P  ./$(DEPDIR)/BlockArray.Plo \
 @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/TEHistory.Plo ./$(DEPDIR)/TEPty.Plo \
 @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/TEScreen.Plo ./$(DEPDIR)/TEWidget.Plo \
 @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/TEmuVt102.Plo \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/TEmulation.Plo ./$(DEPDIR)/dummy.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/keytrans.Plo ./$(DEPDIR)/konsole.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/TEmulation.Plo ./$(DEPDIR)/keytrans.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/konsole.Plo \
 @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/konsole_child.Plo \
 @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/konsole_grantpty.Po \
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/konsole_main.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/konsole_main.Po \
 @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/konsole_part.Plo \
 @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/konsole_wcwidth.Plo \
 @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/konsolebookmarkhandler.Plo \
 @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/konsolebookmarkmenu.Plo \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kwrited.Plo ./$(DEPDIR)/main.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kwrited.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kwrited_main.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kwrited_main.Po ./$(DEPDIR)/main.Plo \
 @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/schema.Plo ./$(DEPDIR)/session.Plo
 @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =  $(DEPDIR)/konsoleiface_skel.P $(DEPDIR)/sessioniface_skel.P  ./$(DEPDIR)/BlockArray.Plo \
 @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/TEHistory.Plo ./$(DEPDIR)/TEPty.Plo \
 @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/TEScreen.Plo ./$(DEPDIR)/TEWidget.Plo \
 @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/TEmuVt102.Plo \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/TEmulation.Plo ./$(DEPDIR)/dummy.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/keytrans.Plo ./$(DEPDIR)/konsole.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/TEmulation.Plo ./$(DEPDIR)/keytrans.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/konsole.Plo \
 @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/konsole_child.Plo \
 @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/konsole_grantpty.Po \
+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/konsole_main.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/konsole_main.Po \
 @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/konsole_part.Plo \
 @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/konsole_wcwidth.Plo \
 @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/konsolebookmarkhandler.Plo \
 @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/konsolebookmarkmenu.Plo \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kwrited.Plo ./$(DEPDIR)/main.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kwrited.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kwrited_main.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kwrited_main.Po ./$(DEPDIR)/main.Plo \
 @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/schema.Plo ./$(DEPDIR)/session.Plo
 
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -657,14 +687,15 @@ CXXLD = $(CXX)
 CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 DIST_SOURCES = $(konsole_la_SOURCES) $(kwrited_la_SOURCES) \
-	$(libkonsolepart_la_SOURCES) $(konsole_SOURCES) \
+	$(libkonsole_main_la_SOURCES) $(libkonsolepart_la_SOURCES) \
+	$(libkwrited_main_la_SOURCES) $(konsole_SOURCES) \
 	$(konsole_grantpty_SOURCES) $(kwrited_SOURCES)
 DATA = $(data_DATA) $(mime_DATA)
 
 HEADERS = $(noinst_HEADERS)
 
 DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
-SOURCES = $(konsole_la_SOURCES) $(kwrited_la_SOURCES) $(libkonsolepart_la_SOURCES) $(konsole_SOURCES) $(konsole_grantpty_SOURCES) $(kwrited_SOURCES)
+SOURCES = $(konsole_la_SOURCES) $(kwrited_la_SOURCES) $(libkonsole_main_la_SOURCES) $(libkonsolepart_la_SOURCES) $(libkwrited_main_la_SOURCES) $(konsole_SOURCES) $(konsole_grantpty_SOURCES) $(kwrited_SOURCES)
 
 #>- all: all-am
 #>+ 1
@@ -741,11 +772,15 @@ konsole.la: $(konsole_la_OBJECTS) $(kons
 	$(CXXLINK) -rpath $(libdir) $(konsole_la_LDFLAGS) $(konsole_la_OBJECTS) $(konsole_la_LIBADD) $(LIBS)
 kwrited.la: $(kwrited_la_OBJECTS) $(kwrited_la_DEPENDENCIES) 
 	$(CXXLINK) -rpath $(libdir) $(kwrited_la_LDFLAGS) $(kwrited_la_OBJECTS) $(kwrited_la_LIBADD) $(LIBS)
+libkonsole_main.la: $(libkonsole_main_la_OBJECTS) $(libkonsole_main_la_DEPENDENCIES) 
+	$(CXXLINK) -rpath $(libdir) $(libkonsole_main_la_LDFLAGS) $(libkonsole_main_la_OBJECTS) $(libkonsole_main_la_LIBADD) $(LIBS)
 #>- libkonsolepart.la: $(libkonsolepart_la_OBJECTS) $(libkonsolepart_la_DEPENDENCIES) 
 #>+ 2
 @KDE_USE_CLOSURE_TRUE@libkonsolepart.la: libkonsolepart.la.closure $(libkonsolepart_la_OBJECTS) $(libkonsolepart_la_DEPENDENCIES) 
 @KDE_USE_CLOSURE_FALSE@libkonsolepart.la: $(libkonsolepart_la_OBJECTS) $(libkonsolepart_la_DEPENDENCIES) 
 	$(CXXLINK) -rpath $(kde_moduledir) $(libkonsolepart_la_LDFLAGS) $(libkonsolepart_la_OBJECTS) $(libkonsolepart_la_LIBADD) $(LIBS)
+libkwrited_main.la: $(libkwrited_main_la_OBJECTS) $(libkwrited_main_la_DEPENDENCIES) 
+	$(CXXLINK) -rpath $(libdir) $(libkwrited_main_la_LDFLAGS) $(libkwrited_main_la_OBJECTS) $(libkwrited_main_la_LIBADD) $(LIBS)
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
@@ -798,16 +833,19 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TEWidget.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TEmuVt102.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TEmulation.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keytrans.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/konsole.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/konsole_child.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/konsole_grantpty.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/konsole_main.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/konsole_main.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/konsole_part.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/konsole_wcwidth.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/konsolebookmarkhandler.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/konsolebookmarkmenu.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kwrited.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kwrited_main.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kwrited_main.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/schema.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/session.Plo@am__quote@
@@ -982,7 +1020,7 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 #>+ 4
-KDE_DIST=x-konsole.desktop sessioniface.h MakeDefaults konsole_part.h konsolerc konsoleiface.h 
+KDE_DIST=konsoleiface.h konsole_part.h x-konsole.desktop konsolerc sessioniface.h MakeDefaults 
 
 DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
 
@@ -1154,50 +1192,37 @@ messages: rc.cpp
 	$(XGETTEXT) rc.cpp *.cpp -o $(podir)/konsole.pot
 	rm -f schemas.cpp
 	rm -f tips.cpp
-
-dummy.cpp:
-	echo > dummy.cpp
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 9
-konsoleiface.kidl: $(srcdir)/konsoleiface.h $(DCOP_DEPENDENCIES)
-	$(DCOPIDL) $(srcdir)/konsoleiface.h > konsoleiface.kidl || ( rm -f konsoleiface.kidl ; /bin/false )
-konsoleiface_skel.cpp: konsoleiface.kidl
-	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub konsoleiface.kidl
-sessioniface.kidl: $(srcdir)/sessioniface.h $(DCOP_DEPENDENCIES)
-	$(DCOPIDL) $(srcdir)/sessioniface.h > sessioniface.kidl || ( rm -f sessioniface.kidl ; /bin/false )
-sessioniface_skel.cpp: sessioniface.kidl
-	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub sessioniface.kidl
-
 #>+ 3
-kwrited.moc: $(srcdir)/kwrited.h
-	$(MOC) $(srcdir)/kwrited.h -o kwrited.moc
+konsolebookmarkmenu.moc: $(srcdir)/konsolebookmarkmenu.h
+	$(MOC) $(srcdir)/konsolebookmarkmenu.h -o konsolebookmarkmenu.moc
 
 #>+ 3
 TEWidget.moc: $(srcdir)/TEWidget.h
 	$(MOC) $(srcdir)/TEWidget.h -o TEWidget.moc
 
 #>+ 3
-konsole_child.moc: $(srcdir)/konsole_child.h
-	$(MOC) $(srcdir)/konsole_child.h -o konsole_child.moc
-
-#>+ 3
 TEmulation.moc: $(srcdir)/TEmulation.h
 	$(MOC) $(srcdir)/TEmulation.h -o TEmulation.moc
 
 #>+ 3
-konsolebookmarkhandler.moc: $(srcdir)/konsolebookmarkhandler.h
-	$(MOC) $(srcdir)/konsolebookmarkhandler.h -o konsolebookmarkhandler.moc
+kwrited.moc: $(srcdir)/kwrited.h
+	$(MOC) $(srcdir)/kwrited.h -o kwrited.moc
 
 #>+ 3
-konsole.moc: $(srcdir)/konsole.h
-	$(MOC) $(srcdir)/konsole.h -o konsole.moc
+TEPty.moc: $(srcdir)/TEPty.h
+	$(MOC) $(srcdir)/TEPty.h -o TEPty.moc
 
 #>+ 3
-konsolebookmarkmenu.moc: $(srcdir)/konsolebookmarkmenu.h
-	$(MOC) $(srcdir)/konsolebookmarkmenu.h -o konsolebookmarkmenu.moc
+konsole_part.moc: $(srcdir)/konsole_part.h
+	$(MOC) $(srcdir)/konsole_part.h -o konsole_part.moc
+
+#>+ 3
+konsole.moc: $(srcdir)/konsole.h
+	$(MOC) $(srcdir)/konsole.h -o konsole.moc
 
 #>+ 3
 session.moc: $(srcdir)/session.h
@@ -1208,12 +1233,22 @@ TEmuVt102.moc: $(srcdir)/TEmuVt102.h
 	$(MOC) $(srcdir)/TEmuVt102.h -o TEmuVt102.moc
 
 #>+ 3
-konsole_part.moc: $(srcdir)/konsole_part.h
-	$(MOC) $(srcdir)/konsole_part.h -o konsole_part.moc
+konsole_child.moc: $(srcdir)/konsole_child.h
+	$(MOC) $(srcdir)/konsole_child.h -o konsole_child.moc
 
 #>+ 3
-TEPty.moc: $(srcdir)/TEPty.h
-	$(MOC) $(srcdir)/TEPty.h -o TEPty.moc
+konsolebookmarkhandler.moc: $(srcdir)/konsolebookmarkhandler.h
+	$(MOC) $(srcdir)/konsolebookmarkhandler.h -o konsolebookmarkhandler.moc
+
+#>+ 9
+konsoleiface.kidl: $(srcdir)/konsoleiface.h $(DCOP_DEPENDENCIES)
+	$(DCOPIDL) $(srcdir)/konsoleiface.h > konsoleiface.kidl || ( rm -f konsoleiface.kidl ; /bin/false )
+konsoleiface_skel.cpp: konsoleiface.kidl
+	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub konsoleiface.kidl
+sessioniface.kidl: $(srcdir)/sessioniface.h $(DCOP_DEPENDENCIES)
+	$(DCOPIDL) $(srcdir)/sessioniface.h > sessioniface.kidl || ( rm -f sessioniface.kidl ; /bin/false )
+sessioniface_skel.cpp: sessioniface.kidl
+	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub sessioniface.kidl
 
 #>+ 8
 libkonsolepart.la.closure: $(libkonsolepart_la_OBJECTS) $(libkonsolepart_la_DEPENDENCIES)
@@ -1226,7 +1261,7 @@ libkonsolepart.la.closure: $(libkonsolep
 
 #>+ 3
 clean-metasources:
-	-rm -f  kwrited.moc TEWidget.moc konsole_child.moc TEmulation.moc konsolebookmarkhandler.moc konsole.moc konsolebookmarkmenu.moc session.moc TEmuVt102.moc konsole_part.moc TEPty.moc
+	-rm -f  konsolebookmarkmenu.moc TEWidget.moc TEmulation.moc kwrited.moc TEPty.moc konsole_part.moc konsole.moc session.moc TEmuVt102.moc konsole_child.moc konsolebookmarkhandler.moc
 
 #>+ 7
 clean-idl:
@@ -1251,19 +1286,19 @@ force-reedit:
 
 
 #>+ 11
-konsole_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/TEPty.cpp $(srcdir)/BlockArray.cpp $(srcdir)/main.cpp $(srcdir)/konsole.cpp $(srcdir)/schema.cpp $(srcdir)/session.cpp $(srcdir)/TEWidget.cpp $(srcdir)/TEmuVt102.cpp $(srcdir)/TEScreen.cpp $(srcdir)/TEmulation.cpp $(srcdir)/TEHistory.cpp $(srcdir)/keytrans.cpp $(srcdir)/konsole_wcwidth.cpp $(srcdir)/konsolebookmarkhandler.cpp $(srcdir)/konsolebookmarkmenu.cpp $(srcdir)/konsole_child.cpp konsoleiface_skel.cpp sessioniface_skel.cpp  TEWidget.moc konsole_child.moc konsolebookmarkhandler.moc TEmulation.moc konsole.moc konsolebookmarkmenu.moc TEmuVt102.moc session.moc TEPty.moc
-	@echo 'creating konsole_la.all_cpp.cpp ...'; \
-	rm -f konsole_la.all_cpp.files konsole_la.all_cpp.final; \
-	echo "#define KDE_USE_FINAL 1" >> konsole_la.all_cpp.final; \
+libkonsole_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/TEPty.cpp $(srcdir)/BlockArray.cpp $(srcdir)/main.cpp $(srcdir)/konsole.cpp $(srcdir)/schema.cpp $(srcdir)/session.cpp $(srcdir)/TEWidget.cpp $(srcdir)/TEmuVt102.cpp $(srcdir)/TEScreen.cpp $(srcdir)/TEmulation.cpp $(srcdir)/TEHistory.cpp $(srcdir)/keytrans.cpp $(srcdir)/konsole_wcwidth.cpp $(srcdir)/konsolebookmarkhandler.cpp $(srcdir)/konsolebookmarkmenu.cpp $(srcdir)/konsole_child.cpp konsoleiface_skel.cpp sessioniface_skel.cpp  konsolebookmarkmenu.moc TEmulation.moc TEWidget.moc TEPty.moc konsole.moc session.moc TEmuVt102.moc konsolebookmarkhandler.moc konsole_child.moc
+	@echo 'creating libkonsole_main_la.all_cpp.cpp ...'; \
+	rm -f libkonsole_main_la.all_cpp.files libkonsole_main_la.all_cpp.final; \
+	echo "#define KDE_USE_FINAL 1" >> libkonsole_main_la.all_cpp.final; \
 	for file in TEPty.cpp BlockArray.cpp main.cpp konsole.cpp schema.cpp session.cpp TEWidget.cpp TEmuVt102.cpp TEScreen.cpp TEmulation.cpp TEHistory.cpp keytrans.cpp konsole_wcwidth.cpp konsolebookmarkhandler.cpp konsolebookmarkmenu.cpp konsole_child.cpp konsoleiface_skel.cpp sessioniface_skel.cpp ; do \
-	  echo "#include \"$$file\"" >> konsole_la.all_cpp.files; \
-	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> konsole_la.all_cpp.final; \
+	  echo "#include \"$$file\"" >> libkonsole_main_la.all_cpp.files; \
+	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkonsole_main_la.all_cpp.final; \
 	done; \
-	cat konsole_la.all_cpp.final konsole_la.all_cpp.files > konsole_la.all_cpp.cpp; \
-	rm -f konsole_la.all_cpp.final konsole_la.all_cpp.files
+	cat libkonsole_main_la.all_cpp.final libkonsole_main_la.all_cpp.files > libkonsole_main_la.all_cpp.cpp; \
+	rm -f libkonsole_main_la.all_cpp.final libkonsole_main_la.all_cpp.files
 
 #>+ 11
-libkonsolepart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/TEPty.cpp $(srcdir)/BlockArray.cpp $(srcdir)/konsole_part.cpp $(srcdir)/schema.cpp $(srcdir)/session.cpp $(srcdir)/TEWidget.cpp $(srcdir)/TEmuVt102.cpp $(srcdir)/TEScreen.cpp $(srcdir)/konsole_wcwidth.cpp $(srcdir)/TEmulation.cpp $(srcdir)/TEHistory.cpp $(srcdir)/keytrans.cpp konsoleiface_skel.cpp sessioniface_skel.cpp  TEWidget.moc TEmulation.moc TEmuVt102.moc session.moc konsole_part.moc TEPty.moc
+libkonsolepart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/TEPty.cpp $(srcdir)/BlockArray.cpp $(srcdir)/konsole_part.cpp $(srcdir)/schema.cpp $(srcdir)/session.cpp $(srcdir)/TEWidget.cpp $(srcdir)/TEmuVt102.cpp $(srcdir)/TEScreen.cpp $(srcdir)/konsole_wcwidth.cpp $(srcdir)/TEmulation.cpp $(srcdir)/TEHistory.cpp $(srcdir)/keytrans.cpp konsoleiface_skel.cpp sessioniface_skel.cpp  TEmulation.moc TEWidget.moc TEPty.moc konsole_part.moc session.moc TEmuVt102.moc
 	@echo 'creating libkonsolepart_la.all_cpp.cpp ...'; \
 	rm -f libkonsolepart_la.all_cpp.files libkonsolepart_la.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> libkonsolepart_la.all_cpp.final; \
@@ -1276,20 +1311,20 @@ libkonsolepart_la.all_cpp.cpp: $(srcdir)
 
 #>+ 3
 clean-final:
-	-rm -f konsole_la.all_cpp.cpp libkonsolepart_la.all_cpp.cpp
+	-rm -f libkonsole_main_la.all_cpp.cpp libkonsolepart_la.all_cpp.cpp
 
 #>+ 2
 final:
-	$(MAKE) konsole_la_OBJECTS="$(konsole_la_final_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_final_OBJECTS)" all-am
+	$(MAKE) libkonsole_main_la_OBJECTS="$(libkonsole_main_la_final_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_final_OBJECTS)" all-am
 #>+ 2
 final-install:
-	$(MAKE) konsole_la_OBJECTS="$(konsole_la_final_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_final_OBJECTS)" install-am
+	$(MAKE) libkonsole_main_la_OBJECTS="$(libkonsole_main_la_final_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_final_OBJECTS)" install-am
 #>+ 2
 no-final:
-	$(MAKE) konsole_la_OBJECTS="$(konsole_la_nofinal_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_nofinal_OBJECTS)" all-am
+	$(MAKE) libkonsole_main_la_OBJECTS="$(libkonsole_main_la_nofinal_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_nofinal_OBJECTS)" all-am
 #>+ 2
 no-final-install:
-	$(MAKE) konsole_la_OBJECTS="$(konsole_la_nofinal_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_nofinal_OBJECTS)" install-am
+	$(MAKE) libkonsole_main_la_OBJECTS="$(libkonsole_main_la_nofinal_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_nofinal_OBJECTS)" install-am
 #>+ 3
 cvs-clean:
 	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
@@ -1299,25 +1334,25 @@ kde-rpo-clean:
 	-rm -f *.rpo
 
 #>+ 23
+konsole.o: konsole.moc 
 konsole_child.lo: konsole_child.moc 
-kwrited.lo: kwrited.moc 
-TEmuVt102.o: TEmuVt102.moc 
-TEWidget.o: TEWidget.moc 
-session.lo: session.moc 
-konsole_child.o: konsole_child.moc 
-TEPty.lo: TEPty.moc 
+konsolebookmarkhandler.lo: konsolebookmarkhandler.moc 
 session.o: session.moc 
 konsole.lo: konsole.moc 
-konsolebookmarkhandler.lo: konsolebookmarkhandler.moc 
-TEmulation.lo: TEmulation.moc 
-konsole.o: konsole.moc 
-konsolebookmarkmenu.o: konsolebookmarkmenu.moc 
-TEPty.o: TEPty.moc 
-TEmuVt102.lo: TEmuVt102.moc 
+TEWidget.lo: TEWidget.moc 
 TEmulation.o: TEmulation.moc 
+konsolebookmarkhandler.o: konsolebookmarkhandler.moc 
+TEmuVt102.o: TEmuVt102.moc 
 konsolebookmarkmenu.lo: konsolebookmarkmenu.moc 
+TEmuVt102.lo: TEmuVt102.moc 
+TEPty.lo: TEPty.moc 
+session.lo: session.moc 
+TEmulation.lo: TEmulation.moc 
+TEPty.o: TEPty.moc 
 konsole_part.lo: konsole_part.moc 
-kwrited.o: kwrited.moc 
-TEWidget.lo: TEWidget.moc 
-konsolebookmarkhandler.o: konsolebookmarkhandler.moc 
 konsole_part.o: konsole_part.moc 
+kwrited.o: kwrited.moc 
+konsole_child.o: konsole_child.moc 
+kwrited.lo: kwrited.moc 
+TEWidget.o: TEWidget.moc 
+konsolebookmarkmenu.o: konsolebookmarkmenu.moc