head 1.9; access; symbols pkgsrc-2013Q2:1.9.0.52 pkgsrc-2013Q2-base:1.9 pkgsrc-2012Q4:1.9.0.50 pkgsrc-2012Q4-base:1.9 pkgsrc-2011Q4:1.9.0.48 pkgsrc-2011Q4-base:1.9 pkgsrc-2011Q2:1.9.0.46 pkgsrc-2011Q2-base:1.9 pkgsrc-2009Q4:1.9.0.44 pkgsrc-2009Q4-base:1.9 pkgsrc-2008Q4:1.9.0.42 pkgsrc-2008Q4-base:1.9 pkgsrc-2008Q3:1.9.0.40 pkgsrc-2008Q3-base:1.9 cube-native-xorg:1.9.0.38 cube-native-xorg-base:1.9 pkgsrc-2008Q2:1.9.0.36 pkgsrc-2008Q2-base:1.9 pkgsrc-2008Q1:1.9.0.34 pkgsrc-2008Q1-base:1.9 pkgsrc-2007Q4:1.9.0.32 pkgsrc-2007Q4-base:1.9 pkgsrc-2007Q3:1.9.0.30 pkgsrc-2007Q3-base:1.9 pkgsrc-2007Q2:1.9.0.28 pkgsrc-2007Q2-base:1.9 pkgsrc-2007Q1:1.9.0.26 pkgsrc-2007Q1-base:1.9 pkgsrc-2006Q4:1.9.0.24 pkgsrc-2006Q4-base:1.9 pkgsrc-2006Q3:1.9.0.22 pkgsrc-2006Q3-base:1.9 pkgsrc-2006Q2:1.9.0.20 pkgsrc-2006Q2-base:1.9 pkgsrc-2006Q1:1.9.0.18 pkgsrc-2006Q1-base:1.9 pkgsrc-2005Q4:1.9.0.16 pkgsrc-2005Q4-base:1.9 pkgsrc-2005Q3:1.9.0.14 pkgsrc-2005Q3-base:1.9 pkgsrc-2005Q2:1.9.0.12 pkgsrc-2005Q2-base:1.9 pkgsrc-2005Q1:1.9.0.10 pkgsrc-2005Q1-base:1.9 pkgsrc-2004Q4:1.9.0.8 pkgsrc-2004Q4-base:1.9 pkgsrc-2004Q3:1.9.0.6 pkgsrc-2004Q3-base:1.9 pkgsrc-2004Q2:1.9.0.4 pkgsrc-2004Q2-base:1.9 pkgsrc-2004Q1:1.9.0.2 pkgsrc-2004Q1-base:1.9 pkgsrc-2003Q4:1.7.0.2 pkgsrc-2003Q4-base:1.7 netbsd-1-6-1:1.4.0.2 netbsd-1-6-1-base:1.4 netbsd-1-6:1.1.1.1.0.4 netbsd-1-6-RELEASE-base:1.1 pkgviews:1.1.1.1.0.6 pkgviews-base:1.1 buildlink2-base:1.1 buildlink2:1.1.1.1.0.2 pkg-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.9 date 2004.02.04.14.25.59; author markd; state dead; branches; next 1.8; 1.8 date 2004.01.15.10.15.14; author markd; state Exp; branches; next 1.7; 1.7 date 2003.07.30.13.35.00; author markd; state Exp; branches; next 1.6; 1.6 date 2003.05.22.02.42.51; author markd; state Exp; branches; next 1.5; 1.5 date 2003.03.11.13.10.24; author markd; state Exp; branches; next 1.4; 1.4 date 2003.01.02.09.12.35; author skrll; state Exp; branches; next 1.3; 1.3 date 2002.08.28.07.15.42; author skrll; state Exp; branches; next 1.2; 1.2 date 2002.08.25.19.23.43; author jlam; state Exp; branches; next 1.1; 1.1 date 2002.05.31.13.19.18; author skrll; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2002.05.31.13.19.18; author skrll; state Exp; branches 1.1.1.1.2.1; next ; 1.1.1.1.2.1 date 2002.05.31.13.19.18; author jlam; state dead; branches; next 1.1.1.1.2.2; 1.1.1.1.2.2 date 2002.06.23.19.05.44; author jlam; state Exp; branches; next ; desc @@ 1.9 log @Update to KDE-3.2 Changes: Base Kate * Moving KATE view management over to KMDI Joseph Wenninger * Basic project managment Christoph Cullmann KControl * Xinerama KControl module, enhanced KDE Xinerama and dual-head support George Staikos * add/update control module for configuring per-domain settings. See Bug 49145. Leo Savernik * Support for per-style configuration settings in the style control center module, a module for Keramik Maksim Orlovich * Add support for installing/removing- and switching Xcursor themes to the mouse KControl module Fredrik Hoeglund * Font installer - create fonts:/ ioslave, and modify KControl module to use this. See http://members.lycos.co.uk/cpdrummond for (old) screenshots/download Craig Drummond KHotKeys * Update to version 2.0, which includes more features like mouse gestures. Lubos Lunak KWin * Full support for latest NETWM spec version in KWin, and seamless usage of other compliant window managers with KDE. Lubos Lunak * New API for window decoration plugins. Lubos Lunak * Focus stealing prevention. Lubos Lunak * Add an option to allow wide borders to some of the window decoration styles Gunnar Schmi DT Kicker * Make addition of non-KDE applications to Kicker easier Alexander Kellett * Enable backgrounds for child panels and all applets, allow for colorization of background pixmaps Aaron J. Seigo * Allow applets to export a menu to the handle Aaron J. Seigo * User defined plain colors for tiles Aaron J. Seigo * Make the panel transparent. Zack Rusin * Add an option to the RMB-menu and to the "Advanced Options" in kcontrol to enable/disable the panel handle when "Custom" size is selected. KDM * More sophisticated session definitions, common with GDM Oswald Buddenhagen * Pluggable greeter input methods; better architectural compliance with PAM's input model. Oswald Buddenhagen Various (kwin, kdesktop, kcontrol, ksmserver) * Optimally support the X Resize and Rotate extension. Hamish Rodda All KDE applications (kdebase/kdenetwork/kdepim/kdegraphics,...) * No absolute paths to user home directories in KDE config files. This allows to support roaming users. Helge Deller Konsole * Add a better interface to konsolepart for other apps. Dominique Devriese * Added "Set Selection End" to right mouse button menu. * Column text selecting when Ctrl and Alt are pressed * Uses now KTabWidget, allows tab context menus and more Stephan Binner * Utilize KNotify (e.g. passive popup) for "Activity", "Bell", "Shell Exit" and "Silence" events * ZModem up- and download (requires rzsz) Waldo Bastian * Make bidi rendering (for RTL languages) configurable. Meni Livne KEditBookmarks * Export to HTML and printing of bookmark collection. Alexander Kellett * Recursive favicon updates in bookmark editor. Alexander Kellett * Field for incremental searching on titles. Alexander Kellett * Opera and Internet Explorer bookmark collection exporting. Alexander Kellett * Bookmark editor now includes an extra pane to allow title/url editing without use of context menu / keyboard shortcuts. Alexander Kellett * More detailed bookmark access information (last viewed, first seen, view counts). Alexander Kellett * Recursive - entire collection, per folder - alphabetical sorting Alexander Kellett Konqueror * Enhanced Konqueror statusbar and kpart statusbar extension. Statusbar notifications for secure connections, wallet, js errors. David Faure, George Staikos * Bookmarklets support in the form of a "Mini-tools" konq-plugin Alexander Kellett * Addition of an advanced Add Bookmark dialog. Alexander Kellett * Read-only bookmark menu includes. Alexander Kellett * Ability to select which items should be shown in the bookmark bar. Alexander Kellett * Servicemenu improvements: placed in a common Actions submenu, allow grouping into submenus, allow for separators, allow simple mimetype globbing Aaron J. Seigo * Bookmarking of all loaded tabs as a folder. Alexander Kellett * Lightweight bookmark editing from within bookmarks menu via context menu. Alexander Kellett * New sidebar module: Web. Implements sidebar modules similar to those introduced in Netscape 6/Mozilla. George Staikos * Konqueror "preloading", often reducing Konqueror startup time. Lubos Lunak * Spellchecking in text forms and spelling highlighting Scott Wheeler, Don Sanders Tabbed Browsing * "New Tab" and "Close Tab" buttons besides the tab bar Stephan Binner * Loading/read state indication by tab color Stephan Binner * Drag and drop support from/to tabs and to empty tab bar space Stephan Binner * Allow to reorder tabs with pressed middle mouse button Stephan Binner * Middle mouse button on tabs or empty tab bar space opens clipboard content Stephan Binner * Support for opening external URLs and popups in new tabs Stephan Binner * Optional permanent close buttons within tabs and permanent shown tab bar Stephan Binner KHTML part * KHTML: Implement caret mode. This is a prerequisite for designmode. See Bug 48302. Leo Savernik * KHTML: add infrastructure for per-domain settings. See Bug 49145. Leo Savernik * better support for samba shares through libsmbclient of samba 3.0 Stephan Kulow KIO Slaves * kio_smtp: SMTP pipelining support for faster submission, esp. over high-latency links. Marc Mutz KDesktop * Added GUI for "Mouse wheel over desktop switches desktop" option. * Make screen savers capable of being DPMS aware, so they can be disabled when watching a movie or TV if the app sets up X DPMS appropriately. Gregor Jasny * Screen locker: pluggable greeter input methods; better architectural compliance with PAM's input model. Oswald Buddenhagen * Shadow behind the text of the desktop icons, for more readability Laur Ivan * E-mail addresses entered in "Run Command..." (Alt-F2) will start mailer. Waldo Bastian * Numeric expression in "Run Command..." (Alt-F2) is evaluated. Waldo Bastian @ text @$NetBSD: patch-ct,v 1.8 2004/01/15 10:15:14 markd Exp $ --- konsole/konsole/Makefile.in.orig 2004-01-02 14:06:01.000000000 +1300 +++ konsole/konsole/Makefile.in @@@@ -439,7 +439,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 @@@@ -474,30 +474,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) @@@@ -533,27 +541,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 \ @@@@ -566,25 +579,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 @@@@ -593,44 +611,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) \ @@@@ -659,14 +689,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 @@@@ -743,11 +774,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) @@@@ -800,16 +835,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@@ @@@@ -984,7 +1022,7 @@@@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=MakeDefaults konsole_part.h x-konsole.desktop sessioniface.h konsolerc konsoleiface.h +KDE_DIST=konsoleiface.h konsole_part.h Makefile.in.rej x-konsole.desktop konsolerc sessioniface.h MakeDefaults DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) @@@@ -1155,23 +1193,16 @@@@ 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 ; 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 ; false ) -sessioniface_skel.cpp: sessioniface.kidl - $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub sessioniface.kidl +#>+ 3 +konsolebookmarkmenu.moc: $(srcdir)/konsolebookmarkmenu.h + $(MOC) $(srcdir)/konsolebookmarkmenu.h -o konsolebookmarkmenu.moc +#>+ 1 +mocs: konsolebookmarkmenu.moc #>+ 3 TEWidget.moc: $(srcdir)/TEWidget.h $(MOC) $(srcdir)/TEWidget.h -o TEWidget.moc @@@@ -1179,17 +1210,11 @@@@ TEWidget.moc: $(srcdir)/TEWidget.h #>+ 1 mocs: TEWidget.moc #>+ 3 -TEmuVt102.moc: $(srcdir)/TEmuVt102.h - $(MOC) $(srcdir)/TEmuVt102.h -o TEmuVt102.moc - -#>+ 1 -mocs: TEmuVt102.moc -#>+ 3 -session.moc: $(srcdir)/session.h - $(MOC) $(srcdir)/session.h -o session.moc +TEmulation.moc: $(srcdir)/TEmulation.h + $(MOC) $(srcdir)/TEmulation.h -o TEmulation.moc #>+ 1 -mocs: session.moc +mocs: TEmulation.moc #>+ 3 kwrited.moc: $(srcdir)/kwrited.h $(MOC) $(srcdir)/kwrited.h -o kwrited.moc @@@@ -1209,17 +1234,23 @@@@ konsole_part.moc: $(srcdir)/konsole_part #>+ 1 mocs: konsole_part.moc #>+ 3 -TEmulation.moc: $(srcdir)/TEmulation.h - $(MOC) $(srcdir)/TEmulation.h -o TEmulation.moc +konsole.moc: $(srcdir)/konsole.h + $(MOC) $(srcdir)/konsole.h -o konsole.moc #>+ 1 -mocs: TEmulation.moc +mocs: konsole.moc #>+ 3 -konsolebookmarkhandler.moc: $(srcdir)/konsolebookmarkhandler.h - $(MOC) $(srcdir)/konsolebookmarkhandler.h -o konsolebookmarkhandler.moc +session.moc: $(srcdir)/session.h + $(MOC) $(srcdir)/session.h -o session.moc #>+ 1 -mocs: konsolebookmarkhandler.moc +mocs: session.moc +#>+ 3 +TEmuVt102.moc: $(srcdir)/TEmuVt102.h + $(MOC) $(srcdir)/TEmuVt102.h -o TEmuVt102.moc + +#>+ 1 +mocs: TEmuVt102.moc #>+ 3 konsole_child.moc: $(srcdir)/konsole_child.h $(MOC) $(srcdir)/konsole_child.h -o konsole_child.moc @@@@ -1227,17 +1258,21 @@@@ konsole_child.moc: $(srcdir)/konsole_chi #>+ 1 mocs: konsole_child.moc #>+ 3 -konsole.moc: $(srcdir)/konsole.h - $(MOC) $(srcdir)/konsole.h -o konsole.moc +konsolebookmarkhandler.moc: $(srcdir)/konsolebookmarkhandler.h + $(MOC) $(srcdir)/konsolebookmarkhandler.h -o konsolebookmarkhandler.moc #>+ 1 -mocs: konsole.moc -#>+ 3 -konsolebookmarkmenu.moc: $(srcdir)/konsolebookmarkmenu.h - $(MOC) $(srcdir)/konsolebookmarkmenu.h -o konsolebookmarkmenu.moc +mocs: konsolebookmarkhandler.moc +#>+ 9 +konsoleiface.kidl: $(srcdir)/konsoleiface.h $(DCOP_DEPENDENCIES) + $(DCOPIDL) $(srcdir)/konsoleiface.h > konsoleiface.kidl || ( rm -f konsoleiface.kidl ; 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 ; false ) +sessioniface_skel.cpp: sessioniface.kidl + $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub sessioniface.kidl -#>+ 1 -mocs: konsolebookmarkmenu.moc #>+ 8 libkonsolepart.la.closure: $(libkonsolepart_la_OBJECTS) $(libkonsolepart_la_DEPENDENCIES) @@echo "int main() {return 0;}" > libkonsolepart_la_closure.cpp @@@@ -1249,7 +1284,7 @@@@ libkonsolepart.la.closure: $(libkonsolep #>+ 3 clean-metasources: - -rm -f TEWidget.moc TEmuVt102.moc session.moc kwrited.moc TEPty.moc konsole_part.moc TEmulation.moc konsolebookmarkhandler.moc konsole_child.moc konsole.moc konsolebookmarkmenu.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: @@@@ -1274,19 +1309,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 session.moc TEmuVt102.moc TEWidget.moc TEPty.moc TEmulation.moc konsolebookmarkhandler.moc konsole_child.moc konsole.moc konsolebookmarkmenu.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 session.moc TEmuVt102.moc TEWidget.moc konsole_part.moc TEPty.moc TEmulation.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; \ @@@@ -1299,20 +1334,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 @@@@ -1323,24 +1358,24 @@@@ kde-rpo-clean: #>+ 23 konsole.o: konsole.moc -kwrited.lo: kwrited.moc -TEmuVt102.o: TEmuVt102.moc -session.lo: session.moc -TEPty.lo: TEPty.moc +konsole_child.lo: konsole_child.moc konsolebookmarkhandler.lo: konsolebookmarkhandler.moc session.o: session.moc -TEmulation.lo: TEmulation.moc -TEWidget.lo: TEWidget.moc -konsolebookmarkmenu.lo: konsolebookmarkmenu.moc -kwrited.o: kwrited.moc -konsolebookmarkmenu.o: konsolebookmarkmenu.moc konsole.lo: konsole.moc +TEWidget.lo: TEWidget.moc +TEmulation.o: TEmulation.moc konsolebookmarkhandler.o: konsolebookmarkhandler.moc -konsole_child.lo: konsole_child.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 -TEmulation.o: TEmulation.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 -TEPty.o: TEPty.moc -TEmuVt102.lo: TEmuVt102.moc -konsole_part.o: konsole_part.moc +konsolebookmarkmenu.o: konsolebookmarkmenu.moc @ 1.8 log @Update to KDE-3.1.5. Changes: * konqueror: Fixed "Location bar forgets what you type if you dont press enter and change tabs" * konqueror: Fixed "tabs resize (shrink) when clicked on while loading" * konqueror: Don't show hardcoded shortcuts in tab context menu * konqueror: Made "Detach Tab" create new konqueror window of proper size * konqueror: Set location bar URL for new tabs immediately * konsole: Fixed "List Sessions" feature. Also add a kdm rc.d script (from Julio M. Merino Vidal) @ text @d1 1 a1 1 $NetBSD$ @ 1.7 log @Update kdebase to 3.1.3. Changes: * kate: Make saving of remote files during shutdown work. * kcontrol/colors: Don't reset widget selection dropdown when selecting a different theme * kcontrol/filetypes: Fixed removing of mimetypes specified by a .kdelnk file * kcontrol/input: fix application of large & white cursors * kcontrol/services: don't show kxmlrpcd, kalarmd and kwrited if they're not installed * kdesud: support empty passwords * kdm: Fix i18n support for the GuiStyle and ColorScheme combos * kdm: don't reset local Xserver if termination is requsted * keditbookmarks: Various bufixes * kio_sftp: Support OpenSSH 3.6+ * kio_sftp: Support older sftp protocol revisions * kio_smb: Huge update for samba 3.0. * kicker: Improve icon scaling in service menus * kicker: "Terminal Sessions" special button supports sessions with dots in filename * kicker: "Terminal Sessions" special button with same sort order as the one in Konsole. * kicker: Fix mimetype resolution in the quickbrowser * kicker: Fixes for stuck tooltips * kicker: Do not create local directories for .desktop files used in service buttons if no needed * kicker: Fix apply button not working for quickstart menu entries settings * kicker: Fix hide button preference effects reversed * kicker:Various fixes for recent apps history * kicker/minipager: don't show redundant tooltips when the page already shows names * konsole: Added Ctrl+Shift+N as alternate default shortcut for "New Session". * konsole: Fixed fixed-width with proportional-font drawing routine. * konsole: Fixed problems with mouse and paste support and detached windows. * konsole: Let new color schemes take effect once kcmkonsole tells to do so. * konsole: Wheel mouse fixes for Mode_Mouse1000. * konqueror: Flicker fixes inside the iconview * konqueror: Fix for inter-process copy-past with the listview * konqueror: Make sure the tab close button is properly enabled when a 2nd tab is first open through context menu entries * konqueror: Made Ctrl+Enter for new tab in URL combo working again. * konqueror: Various sidebar fixes * konqueror: make sure that the location label truly disappears when disabled * konqueror: konqueror warning for repeated POSTs * konqueror: Konqueror crash when dragging image from about:konqueror * konqueror: Improve tracking of listviewitems so that we don't crash when they get deleted somewhat unexpectedly * konqueror: Don't crash when updating toolbars without a part load * konqueror: Properly handle 'stop' when still listing the directory in the info list view * konqueror: Efficiency fix: make sure only one konqueror instance saves the history when it changes * konqueror: Don't use deleted KFileItems. * Don't crash when doing a copy w/o a currentItem * konqueror: Stop activity when the user tries hard to enter a URL * konqueror: Properly calculate column indices for the meta info listview * konqueror: Hide the find part on a second click on its toolbar button * konqueror: Handle _top/_blank, and so on, case-insensitively * libkonq: make sure KFileTip does not hold on to stale file items * libkonq: precaution: make sure that no preview jobs hold on to icon view's items when it's cleared * libkonq: fixes to cut-and-paste * libkonq: network-friendlier paste button state polling * kwin: Fix deactivation of window when loosing focus * kwin: New windows are drawn above open menus * kwin: Some non-resizable windows can still be resized * kwin: Fixes for click raise * kwin: If a window is hover-unshaded, then it's not shaded for the outside world * kwin: Keramik decoration: Properly detect XShape on Solaris * nsplugins: Fix relative URLs. @ text @d3 1 a3 1 --- konsole/konsole/Makefile.in.orig 2003-07-15 22:03:42.000000000 +1200 d5 1 a5 1 @@@@ -438,7 +438,7 @@@@ INCLUDES = -I. $(all_includes) d14 1 a14 1 @@@@ -473,30 +473,38 @@@@ libkonsolepart_la_LDFLAGS = $(all_librar d62 1 a62 1 @@@@ -531,27 +539,32 @@@@ CONFIG_HEADER = $(top_builddir)/config.h d113 1 a113 1 @@@@ -564,25 +577,30 @@@@ libkonsolepart_la_nofinal_OBJECTS = TEPt d150 1 a150 1 @@@@ -591,44 +609,56 @@@@ am__depfiles_maybe = depfiles d218 1 a218 1 @@@@ -657,14 +687,15 @@@@ CXXLD = $(CXX) d236 1 a236 1 @@@@ -741,11 +772,15 @@@@ konsole.la: $(konsole_la_OBJECTS) $(kons d252 1 a252 1 @@@@ -798,16 +833,19 @@@@ distclean-compile: d273 1 a273 1 @@@@ -982,7 +1020,7 @@@@ distclean-tags: d277 1 a277 1 -KDE_DIST=x-konsole.desktop sessioniface.h MakeDefaults konsole_part.h konsolerc konsoleiface.h d282 1 a282 1 @@@@ -1154,29 +1192,16 @@@@ messages: rc.cpp d302 1 a302 4 - #>+ 3 -kwrited.moc: $(srcdir)/kwrited.h - $(MOC) $(srcdir)/kwrited.h -o kwrited.moc d306 1 a306 2 #>+ 1 -mocs: kwrited.moc d311 1 a311 1 @@@@ -1184,35 +1209,35 @@@@ TEWidget.moc: $(srcdir)/TEWidget.h d315 2 a316 2 -konsole_child.moc: $(srcdir)/konsole_child.h - $(MOC) $(srcdir)/konsole_child.h -o konsole_child.moc d319 1 a319 1 -mocs: konsole_child.moc d321 4 a324 2 TEmulation.moc: $(srcdir)/TEmulation.h $(MOC) $(srcdir)/TEmulation.h -o TEmulation.moc d327 2 a328 1 mocs: TEmulation.moc d330 3 a332 5 -konsolebookmarkhandler.moc: $(srcdir)/konsolebookmarkhandler.h - $(MOC) $(srcdir)/konsolebookmarkhandler.h -o konsolebookmarkhandler.moc +kwrited.moc: $(srcdir)/kwrited.h + $(MOC) $(srcdir)/kwrited.h -o kwrited.moc d334 1 a334 2 -mocs: konsolebookmarkhandler.moc +mocs: kwrited.moc d336 4 a339 4 -konsole.moc: $(srcdir)/konsole.h - $(MOC) $(srcdir)/konsole.h -o konsole.moc +TEPty.moc: $(srcdir)/TEPty.h + $(MOC) $(srcdir)/TEPty.h -o TEPty.moc d342 2 a343 2 -mocs: konsole.moc +mocs: TEPty.moc d345 4 a348 4 -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 d351 2 a352 2 -mocs: konsolebookmarkmenu.moc +mocs: konsole_part.moc d354 2 a355 2 +konsole.moc: $(srcdir)/konsole.h + $(MOC) $(srcdir)/konsole.h -o konsole.moc d358 1 a358 1 +mocs: konsole.moc d360 3 a362 3 session.moc: $(srcdir)/session.h $(MOC) $(srcdir)/session.h -o session.moc @@@@ -1226,17 +1251,27 @@@@ TEmuVt102.moc: $(srcdir)/TEmuVt102.h d364 1 a364 1 mocs: TEmuVt102.moc d366 2 a367 11 -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 #>+ 1 -mocs: konsole_part.moc +mocs: konsole_child.moc #>+ 3 -TEPty.moc: $(srcdir)/TEPty.h - $(MOC) $(srcdir)/TEPty.h -o TEPty.moc d372 4 a375 1 -mocs: TEPty.moc d386 3 a388 1 + d392 1 a392 1 @@@@ -1248,7 +1283,7 @@@@ libkonsolepart.la.closure: $(libkonsolep d396 1 a396 1 - -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 d401 1 a401 1 @@@@ -1273,19 +1308,19 @@@@ force-reedit: d405 1 a405 1 -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 d425 1 a425 1 -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 d430 1 a430 1 @@@@ -1298,20 +1333,20 @@@@ libkonsolepart_la.all_cpp.cpp: $(srcdir) d456 1 a456 2 @@@@ -1321,25 +1356,25 @@@@ kde-rpo-clean: -rm -f *.rpo d459 1 a459 2 +konsole.o: konsole.moc konsole_child.lo: konsole_child.moc a461 1 -TEWidget.o: TEWidget.moc a462 1 -konsole_child.o: konsole_child.moc d464 2 a465 1 +konsolebookmarkhandler.lo: konsolebookmarkhandler.moc a466 2 konsole.lo: konsole.moc -konsolebookmarkhandler.lo: konsolebookmarkhandler.moc d468 3 a470 1 -konsole.o: konsole.moc d472 1 a472 2 -TEPty.o: TEPty.moc -TEmuVt102.lo: TEmuVt102.moc d474 3 a476 2 TEmulation.o: TEmulation.moc +konsolebookmarkhandler.o: konsolebookmarkhandler.moc d478 1 a478 1 konsolebookmarkmenu.lo: konsolebookmarkmenu.moc d485 2 a486 4 -kwrited.o: kwrited.moc -TEWidget.lo: TEWidget.moc -konsolebookmarkhandler.o: konsolebookmarkhandler.moc konsole_part.o: konsole_part.moc d488 1 a488 1 +konsole_child.o: konsole_child.moc d490 4 a493 1 +TEWidget.o: TEWidget.moc @ 1.6 log @Update KDE to 3.1.2. Changes: kdelibs: * https authentication through proxy fixed. * KZip failed for some .zip archives. * Fixed a bug in socket code that made KDEPrint crash. * kspell: Support for Hebrew spell checking using hspell (requires hspell 0.5). kdebase: * kwin: Alt+Tab works while drag'n'drop (unless the application also grabs keyboard). * kio_smtp: Doesn't eat 100% CPU when connection breaks and fixed a confusing error message when AUTH failed ("Unknown Command" vs. "Authorization failed") * kscreensaver: Fixed issue where kdesktop_lock would stay running indefinitely in the background if it could not grab the keyboard/mouse, preventing the screen from being locked manually. * kscreensaver: Screensavers are now stopped when asking for the password [#56803] * kio_smb: Several bugfixes for the smbro-ioslave. * kdesktop: fixed minicli layout problem with Qt 3.1.2 * kdm: fixed incorrect user window width with Qt 3.1.2 * Konqueror: Create DCOP interface for mainwindow when object begins to exist. * Konqueror: Fixed tab open delays when it can't reach website. * Konsole: Don't flicker when selecting entire lines. * Konsole: Crash, selection and sort fixes in schema and session editors. * Konsole: Fixed mouse-wheel in mouse mode. * Konsole: Allow programs to resize windows if enabled. * Konsole: Keep output steady when triple-click selecting. * Konsole: Added "Print" menu command. * kicker: Fixed kasbar only drawing last icon from a group. @ text @d3 1 a3 1 --- konsole/konsole/Makefile.in.orig Tue May 13 23:08:00 2003 d5 1 a5 1 @@@@ -437,7 +437,7 @@@@ INCLUDES = -I. $(all_includes) d14 1 a14 1 @@@@ -472,30 +472,38 @@@@ libkonsolepart_la_LDFLAGS = $(all_librar d278 1 a278 1 +KDE_DIST=konsoleiface.h konsole_part.h x-konsole.desktop konsolerc sessioniface.h MakeDefaults d282 1 a282 1 @@@@ -1154,50 +1192,37 @@@@ messages: rc.cpp d295 1 a295 1 - $(DCOPIDL) $(srcdir)/konsoleiface.h > konsoleiface.kidl || ( rm -f konsoleiface.kidl ; /bin/false ) d299 1 a299 1 - $(DCOPIDL) $(srcdir)/sessioniface.h > sessioniface.kidl || ( rm -f sessioniface.kidl ; /bin/false ) d309 3 d315 3 a317 1 d322 2 d328 2 d336 3 d345 3 d353 4 a356 1 + d360 3 a362 1 d365 4 a368 3 @@@@ -1208,12 +1233,22 @@@@ TEmuVt102.moc: $(srcdir)/TEmuVt102.h $(MOC) $(srcdir)/TEmuVt102.h -o TEmuVt102.moc d375 3 d383 4 a386 1 + d389 1 a389 1 + $(DCOPIDL) $(srcdir)/konsoleiface.h > konsoleiface.kidl || ( rm -f konsoleiface.kidl ; /bin/false ) d393 1 a393 1 + $(DCOPIDL) $(srcdir)/sessioniface.h > sessioniface.kidl || ( rm -f sessioniface.kidl ; /bin/false ) d396 1 a396 1 d399 2 a400 1 @@@@ -1226,7 +1261,7 @@@@ libkonsolepart.la.closure: $(libkonsolep d409 1 a409 1 @@@@ -1251,19 +1286,19 @@@@ force-reedit: d438 1 a438 1 @@@@ -1276,20 +1311,20 @@@@ libkonsolepart_la.all_cpp.cpp: $(srcdir) d464 1 a464 1 @@@@ -1299,25 +1334,25 @@@@ kde-rpo-clean: @ 1.5 log @Update KDE to 3.1. Many bugfixes and functionality enhancements including: General New default widget style: Keramik New default icon theme: Crystal Created and enhanced framework to effectively disable certain features of the GUI, like for example shell access, disallowing to select custom wall papers. "Kiosk mode" Usability improvements: Kicker: Context menu, applet menus, wording and panel feature consistency improved Kicker: Redesigned control module. KCalc: Usability Improvements. KSnapshot: Usability Improvements. KsCD: User Interface Improvements in configuration and information dialogs kdelibs Extended the DCOP commandline client to enable nonGUI applications (such as shell scripts) to use DCOP send DCOP messages to multiple users and/or sessions concurrently Added to notification dialog to allow applications to configure their notifications with a common GUI. Added "Open File", "Open Destination" and "Keep window open" to download progress dialog. KDatePicker has now week number display and selection. Added KLocale support for setting/retrieving the first day of a week Support for "Multimedia keys" on your keyboard. Added on-demand icon loading support to improve startup performance of applications. KHTML: Improvements to printing support. Page Info and Frame info dialog. Auto-Scroll support of webpages using Shift combined with arrow keys. Many, many Bugfixes and improvements. Small codebase merges with Safari. The main merge is planned for a future release however, as it requires more testing. KIO: Modified thumbnail ioslave that can extract a thumbnail from the file directly if it contains one, rather than generating one itself. Added fish:// protocol slave, which can access remote filesystems via SSH and SCP Cleanups and Corrections in smtp:// protocol slave. Activated rtsp:// protocol slave. Added support for Public Key Authentication and interopability with newer versions of OpenSSH to sftp:// protocol slave. KSSL: SSL certificate policies can now be configured based on the host name @ text @d3 1 a3 1 --- konsole/konsole/Makefile.in.orig Fri Jan 17 09:03:10 2003 d5 1 a5 1 @@@@ -301,7 +301,7 @@@@ INCLUDES = -I. $(all_includes) d14 1 a14 1 @@@@ -336,30 +336,38 @@@@ libkonsolepart_la_LDFLAGS = $(all_librar d32 1 a32 1 +kwrited_LDADD = libkwrited_main.la d47 1 a47 1 +libkonsole_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(LIBUTIL) $(XTESTLIB) d51 1 a51 1 -konsole_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(LIBUTIL) $(XTESTLIB) d56 1 a56 1 -konsole_LDADD = konsole.la $(LIB_KIO) d62 1 a62 1 @@@@ -394,27 +402,32 @@@@ CONFIG_HEADER = $(top_builddir)/config.h d113 1 a113 1 @@@@ -427,25 +440,30 @@@@ libkonsolepart_la_nofinal_OBJECTS = TEPt a147 1 DEFS = @@DEFS@@ d149 2 a150 1 @@@@ -458,44 +476,56 @@@@ am__depfiles_maybe = depfiles d218 2 a219 1 @@@@ -526,14 +556,15 @@@@ CXXLINK = $(LIBTOOL) --mode=link --tag=C a220 1 CXXFLAGS = @@CXXFLAGS@@ d236 1 a236 1 @@@@ -610,11 +641,15 @@@@ konsole.la: $(konsole_la_OBJECTS) $(kons d252 1 a252 1 @@@@ -667,16 +702,19 @@@@ distclean-compile: d273 2 a274 2 @@@@ -805,7 +843,7 @@@@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH d277 2 a278 2 -KDE_DIST=x-konsole.desktop sessioniface.h TEScreen.cpp MakeDefaults konsole_part.h konsolebookmarkmenu.cpp TEmulation.cpp konsole_child.cpp keytrans.cpp konsolerc konsoleiface.h konsolebookmarkhandler.cpp TEHistory.cpp konsole_wcwidth.cpp +KDE_DIST=keytrans.cpp konsoleiface.h konsole_part.h konsolebookmarkmenu.cpp konsole_wcwidth.cpp x-konsole.desktop konsolerc konsole_child.cpp sessioniface.h MakeDefaults TEHistory.cpp TEScreen.cpp TEmulation.cpp konsolebookmarkhandler.cpp d282 1 a282 1 @@@@ -962,50 +1000,37 @@@@ messages: rc.cpp d345 1 a345 1 @@@@ -1016,12 +1041,22 @@@@ TEmuVt102.moc: $(srcdir)/TEmuVt102.h d372 1 a372 1 @@@@ -1034,7 +1069,7 @@@@ libkonsolepart.la.closure: $(libkonsolep d381 1 a381 1 @@@@ -1059,19 +1094,19 @@@@ force-reedit: d410 1 a410 1 @@@@ -1084,20 +1119,20 @@@@ libkonsolepart_la.all_cpp.cpp: $(srcdir) d436 1 a436 1 @@@@ -1107,25 +1142,25 @@@@ kde-rpo-clean: @ 1.4 log @Update KDE to the 3.0.5a distribution. Packages are numbered 3.0.5.1 or 1.0.5.1 accordingly. Fixes and changes are: Multiple vulnerabilities. kdelibs KHTML : Fixed several crashes and misrenderings. rlogin.protocol: fixed command execution in specially crafted urls. kdebase KAddressbook: Don't squeeze columns on startup/properly restore column width settings. kdenetwork lisa, reslisa: Fixed several security vulnerabilities. kdesdk Cervisia: Show long lines in diff view always completely. @ text @d3 1 a3 1 --- konsole/konsole/Makefile.in.orig Fri Dec 27 18:19:11 2002 d5 1 a5 1 @@@@ -303,7 +303,9 @@@@ INCLUDES = $(all_includes) d9 3 a11 4 -lib_LTLIBRARIES = libkonsolepart.la kwrited.la konsole.la +lib_LTLIBRARIES = libkonsolepart.la libkwrited_main.la kwrited.la \ + libkonsole_main.la konsole.la + d14 2 a15 3 # install it under kde_module @@@@ -336,28 +338,36 @@@@ libkonsolepart_la_LDFLAGS = $(all_librar libkonsolepart_la_LIBADD = $(LIBUTIL) @@XTESTLIB@@ $(LIB_KPARTS) d32 1 a32 1 +kwrited_LDADD = libkwrited_main.la d36 10 a45 4 -konsole_la_SOURCES = main.cpp konsole.cpp -konsole_la_LIBADD = libkonsolepart.la +libkonsole_main_la_SOURCES = main.cpp konsole.cpp +libkonsole_main_la_LIBADD = libkonsolepart.la d47 1 d50 2 a52 1 konsole_la_LDFLAGS = $(all_libraries) -module -avoid-version d54 7 a60 10 # konsole executable - has all the sources, doesn't link kparts, saves startup time #>- konsole_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 +#>- konsole_wcwidth.cpp konsole_main.cpp #>+ 3 konsole_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 konsoleiface_skel.cpp sessioniface_skel.cpp + konsole_wcwidth.cpp konsole_main.cpp konsoleiface_skel.cpp sessioniface_skel.cpp d62 1 a62 3 konsole_LDADD = $(LIB_KSYCOCA) $(LIBUTIL) $(LIB_KFILE) @@XTESTLIB@@ $(LIB_KDEUI) konsole_LDFLAGS = $(all_libraries) $(KDE_RPATH) @@@@ -391,19 +401,24 @@@@ CONFIG_HEADER = $(top_builddir)/config.h d64 1 a64 1 LTLIBRARIES = $(lib_LTLIBRARIES) d66 6 a71 2 -konsole_la_DEPENDENCIES = libkonsolepart.la -am_konsole_la_OBJECTS = main.lo konsole.lo d75 1 a75 1 -#>+ 4 d77 5 a81 1 -konsole_la_nofinal_OBJECTS = main.lo konsole.lo d94 6 a99 2 +libkonsole_main_la_DEPENDENCIES = libkonsolepart.la +am_libkonsole_main_la_OBJECTS = main.lo konsole.lo d101 1 a101 1 +#>+ 4 d103 5 a107 1 +libkonsole_main_la_nofinal_OBJECTS = main.lo konsole.lo d113 1 a113 1 @@@@ -416,6 +431,11 @@@@ libkonsolepart_la_nofinal_OBJECTS = TEPt d125 3 a127 6 @@@@ -424,7 +444,7 @@@@ am_konsole_OBJECTS = TEPty.$(OBJEXT) Blo konsole.$(OBJEXT) schema.$(OBJEXT) session.$(OBJEXT) \ TEWidget.$(OBJEXT) TEmuVt102.$(OBJEXT) TEScreen.$(OBJEXT) \ TEmulation.$(OBJEXT) TEHistory.$(OBJEXT) keytrans.$(OBJEXT) \ - konsole_wcwidth.$(OBJEXT) + konsole_wcwidth.$(OBJEXT) konsole_main.$(OBJEXT) d129 8 a136 12 #>+ 8 konsole_final_OBJECTS = konsole.all_cpp.o @@@@ -432,7 +452,7 @@@@ konsole_nofinal_OBJECTS = TEPty.$(OBJEXT konsole.$(OBJEXT) schema.$(OBJEXT) session.$(OBJEXT) \ TEWidget.$(OBJEXT) TEmuVt102.$(OBJEXT) TEScreen.$(OBJEXT) \ TEmulation.$(OBJEXT) TEHistory.$(OBJEXT) keytrans.$(OBJEXT) \ - konsole_wcwidth.$(OBJEXT) konsoleiface_skel.$(OBJEXT) sessioniface_skel.$(OBJEXT) + konsole_wcwidth.$(OBJEXT) konsole_main.$(OBJEXT) konsoleiface_skel.$(OBJEXT) sessioniface_skel.$(OBJEXT) @@KDE_USE_FINAL_FALSE@@konsole_OBJECTS = $(konsole_nofinal_OBJECTS) @@KDE_USE_FINAL_TRUE@@konsole_OBJECTS = $(konsole_final_OBJECTS) konsole_DEPENDENCIES = @@@@ -442,11 +462,11 @@@@ am_konsole_grantpty_OBJECTS = konsole_gr a137 1 konsole_grantpty_LDADD = $(LDADD) d150 66 a215 78 @@@@ -461,32 +481,40 @@@@ depcomp = $(SHELL) $(top_srcdir)/admin/d #>- @@AMDEP_TRUE@@ $(DEPDIR)/TEWidget.Plo $(DEPDIR)/TEWidget.Po \ #>- @@AMDEP_TRUE@@ $(DEPDIR)/TEmuVt102.Plo $(DEPDIR)/TEmuVt102.Po \ #>- @@AMDEP_TRUE@@ $(DEPDIR)/TEmulation.Plo $(DEPDIR)/TEmulation.Po \ -#>- @@AMDEP_TRUE@@ $(DEPDIR)/dummy.Po $(DEPDIR)/keytrans.Plo \ -#>- @@AMDEP_TRUE@@ $(DEPDIR)/keytrans.Po $(DEPDIR)/konsole.Plo \ -#>- @@AMDEP_TRUE@@ $(DEPDIR)/konsole.Po $(DEPDIR)/konsole_grantpty.Po \ +#>- @@AMDEP_TRUE@@ $(DEPDIR)/keytrans.Plo $(DEPDIR)/keytrans.Po \ +#>- @@AMDEP_TRUE@@ $(DEPDIR)/konsole.Plo $(DEPDIR)/konsole.Po \ +#>- @@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)/konsole_wcwidth.Po $(DEPDIR)/kwrited.Plo \ -#>- @@AMDEP_TRUE@@ $(DEPDIR)/main.Plo $(DEPDIR)/main.Po \ -#>- @@AMDEP_TRUE@@ $(DEPDIR)/schema.Plo $(DEPDIR)/schema.Po \ -#>- @@AMDEP_TRUE@@ $(DEPDIR)/session.Plo $(DEPDIR)/session.Po -#>+ 33 -@@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)/konsole.all_cpp.P $(DEPDIR)/BlockArray.Plo $(DEPDIR)/BlockArray.Po \ +#>- @@AMDEP_TRUE@@ $(DEPDIR)/kwrited_main.Plo \ +#>- @@AMDEP_TRUE@@ $(DEPDIR)/kwrited_main.Po $(DEPDIR)/main.Plo \ +#>- @@AMDEP_TRUE@@ $(DEPDIR)/main.Po $(DEPDIR)/schema.Plo \ +#>- @@AMDEP_TRUE@@ $(DEPDIR)/schema.Po $(DEPDIR)/session.Plo \ +#>- @@AMDEP_TRUE@@ $(DEPDIR)/session.Po +#>+ 41 +@@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)/konsole.all_cpp.P $(DEPDIR)/BlockArray.Plo $(DEPDIR)/BlockArray.Po \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/TEHistory.Plo $(DEPDIR)/TEHistory.Po \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/TEPty.Plo $(DEPDIR)/TEPty.Po \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/TEScreen.Plo $(DEPDIR)/TEScreen.Po \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/TEWidget.Plo $(DEPDIR)/TEWidget.Po \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/TEmuVt102.Plo $(DEPDIR)/TEmuVt102.Po \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/TEmulation.Plo $(DEPDIR)/TEmulation.Po \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/dummy.Po $(DEPDIR)/keytrans.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/keytrans.Po $(DEPDIR)/konsole.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/konsole.Po $(DEPDIR)/konsole_grantpty.Po \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/keytrans.Plo $(DEPDIR)/keytrans.Po \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/konsole.Plo $(DEPDIR)/konsole.Po \ +@@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)/konsole_wcwidth.Po $(DEPDIR)/kwrited.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/main.Plo $(DEPDIR)/main.Po \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/schema.Plo $(DEPDIR)/schema.Po \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/session.Plo $(DEPDIR)/session.Po +@@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)/main.Po $(DEPDIR)/schema.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/schema.Po $(DEPDIR)/session.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/session.Po @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@DEP_FILES = $(DEPDIR)/konsoleiface_skel.P $(DEPDIR)/sessioniface_skel.P $(DEPDIR)/BlockArray.Plo $(DEPDIR)/BlockArray.Po \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/TEHistory.Plo $(DEPDIR)/TEHistory.Po \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/TEPty.Plo $(DEPDIR)/TEPty.Po \ @@@@ -494,15 +522,19 @@@@ depcomp = $(SHELL) $(top_srcdir)/admin/d @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/TEWidget.Plo $(DEPDIR)/TEWidget.Po \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/TEmuVt102.Plo $(DEPDIR)/TEmuVt102.Po \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/TEmulation.Plo $(DEPDIR)/TEmulation.Po \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/dummy.Po $(DEPDIR)/keytrans.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/keytrans.Po $(DEPDIR)/konsole.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/konsole.Po $(DEPDIR)/konsole_grantpty.Po \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/keytrans.Plo $(DEPDIR)/keytrans.Po \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/konsole.Plo $(DEPDIR)/konsole.Po \ +@@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)/konsole_wcwidth.Po $(DEPDIR)/kwrited.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/main.Plo $(DEPDIR)/main.Po \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/schema.Plo $(DEPDIR)/schema.Po \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/session.Plo $(DEPDIR)/session.Po +@@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)/main.Po $(DEPDIR)/schema.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/schema.Po $(DEPDIR)/session.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/session.Po d218 1 a218 2 $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@@@ -532,14 +564,15 @@@@ CXXLINK = $(LIBTOOL) --mode=link --tag=C d236 1 a236 1 @@@@ -590,11 +623,15 @@@@ konsole.la: $(konsole_la_OBJECTS) $(kons d246 1 a246 1 $(CXXLINK) -rpath $(libdir) $(libkonsolepart_la_LDFLAGS) $(libkonsolepart_la_OBJECTS) $(libkonsolepart_la_LIBADD) $(LIBS) d249 1 d252 23 a274 24 $(mkinstalldirs) $(DESTDIR)$(bindir) @@@@ -649,16 +686,19 @@@@ distclean-compile: @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/TEmuVt102.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/TEmulation.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/TEmulation.Po@@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)/keytrans.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/konsole.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/konsole.Po@@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)/konsole_wcwidth.Po@@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)/main.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/schema.Plo@@am__quote@@ @@@@ -776,7 +816,7 @@@@ distclean-tags: d277 2 a278 2 -KDE_DIST=x-konsole.desktop sessioniface.h TEScreen.cpp MakeDefaults konsole_part.h TEmulation.cpp keytrans.cpp konsolerc konsoleiface.h TEHistory.cpp konsole_wcwidth.cpp +KDE_DIST=keytrans.cpp konsoleiface.h konsole_part.h konsole_wcwidth.cpp x-konsole.desktop konsolerc sessioniface.h MakeDefaults TEHistory.cpp TEScreen.cpp TEmulation.cpp d282 2 a283 1 @@@@ -918,9 +958,6 @@@@ messages: rc.cpp d286 1 a286 1 d289 2 a290 5 - #>- konsole.lo: konsole.o #>+ 1 konsole.lo: konsole.moc konsole.o @@@@ -929,8 +966,12 @@@@ konsole.lo: konsole.moc konsole.o d293 10 d306 30 a343 9 TEWidget.moc: $(srcdir)/TEWidget.h @@@@ -941,10 +982,6 @@@@ TEmulation.moc: $(srcdir)/TEmulation.h $(MOC) $(srcdir)/TEmulation.h -o TEmulation.moc #>+ 3 -konsole.moc: $(srcdir)/konsole.h - $(MOC) $(srcdir)/konsole.h -o konsole.moc - -#>+ 3 d345 1 a345 3 $(MOC) $(srcdir)/session.h -o session.moc @@@@ -953,8 +990,8 @@@@ TEmuVt102.moc: $(srcdir)/TEmuVt102.h d351 2 a352 2 +kwrited.moc: $(srcdir)/kwrited.h + $(MOC) $(srcdir)/kwrited.h -o kwrited.moc d355 18 a372 2 TEPty.moc: $(srcdir)/TEPty.h @@@@ -981,7 +1018,7 @@@@ libkonsolepart.la.closure: $(libkonsolep d376 2 a377 2 - -rm -f kwrited.moc TEWidget.moc TEmulation.moc konsole.moc session.moc TEmuVt102.moc konsole_part.moc TEPty.moc + -rm -f konsole_part.moc konsole.moc TEWidget.moc TEmulation.moc session.moc TEmuVt102.moc kwrited.moc TEPty.moc d381 1 a381 1 @@@@ -1006,19 +1043,19 @@@@ force-reedit: d385 1 a385 1 -konsole_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/konsole.cpp konsole.moc d389 1 a389 1 +libkonsole_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/konsole.cpp konsole.moc d393 1 a393 1 for file in main.cpp konsole.cpp ; do \ d405 1 a405 1 -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 session.moc TEmuVt102.moc konsole_part.moc TEPty.moc d410 1 a410 15 @@@@ -1030,11 +1067,11 @@@@ libkonsolepart_la.all_cpp.cpp: $(srcdir) rm -f libkonsolepart_la.all_cpp.final libkonsolepart_la.all_cpp.files #>+ 11 -konsole.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 konsoleiface_skel.cpp sessioniface_skel.cpp TEWidget.moc TEmulation.moc konsole.moc session.moc TEmuVt102.moc TEPty.moc +konsole.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)/konsole_main.cpp konsoleiface_skel.cpp sessioniface_skel.cpp TEmulation.moc TEWidget.moc TEPty.moc konsole.moc session.moc TEmuVt102.moc @@echo 'creating konsole.all_cpp.cpp ...'; \ rm -f konsole.all_cpp.files konsole.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> konsole.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 konsoleiface_skel.cpp sessioniface_skel.cpp ; do \ + 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 konsole_main.cpp konsoleiface_skel.cpp sessioniface_skel.cpp ; do \ echo "#include \"$$file\"" >> konsole.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> konsole.all_cpp.final; \ done; \ @@@@ -1043,20 +1080,20 @@@@ konsole.all_cpp.cpp: $(srcdir)/Makefile. d414 2 a415 2 - -rm -f konsole_la.all_cpp.cpp libkonsolepart_la.all_cpp.cpp konsole.all_cpp.cpp + -rm -f libkonsole_main_la.all_cpp.cpp libkonsolepart_la.all_cpp.cpp konsole.all_cpp.cpp d419 2 a420 2 - $(MAKE) konsole_la_OBJECTS="$(konsole_la_final_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_final_OBJECTS)" konsole_OBJECTS="$(konsole_final_OBJECTS)" all-am + $(MAKE) libkonsole_main_la_OBJECTS="$(libkonsole_main_la_final_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_final_OBJECTS)" konsole_OBJECTS="$(konsole_final_OBJECTS)" all-am d423 2 a424 2 - $(MAKE) konsole_la_OBJECTS="$(konsole_la_final_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_final_OBJECTS)" konsole_OBJECTS="$(konsole_final_OBJECTS)" install-am + $(MAKE) libkonsole_main_la_OBJECTS="$(libkonsole_main_la_final_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_final_OBJECTS)" konsole_OBJECTS="$(konsole_final_OBJECTS)" install-am d427 2 a428 2 - $(MAKE) konsole_la_OBJECTS="$(konsole_la_nofinal_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_nofinal_OBJECTS)" konsole_OBJECTS="$(konsole_nofinal_OBJECTS)" all-am + $(MAKE) libkonsole_main_la_OBJECTS="$(libkonsole_main_la_nofinal_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_nofinal_OBJECTS)" konsole_OBJECTS="$(konsole_nofinal_OBJECTS)" all-am d431 2 a432 2 - $(MAKE) konsole_la_OBJECTS="$(konsole_la_nofinal_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_nofinal_OBJECTS)" konsole_OBJECTS="$(konsole_nofinal_OBJECTS)" install-am + $(MAKE) libkonsole_main_la_OBJECTS="$(libkonsole_main_la_nofinal_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_nofinal_OBJECTS)" konsole_OBJECTS="$(konsole_nofinal_OBJECTS)" install-am d436 1 a436 1 @@@@ -1066,18 +1103,18 @@@@ kde-rpo-clean: d439 3 a441 1 #>+ 16 d446 1 d448 4 a451 1 -session.o: session.moc d453 9 a462 1 konsole.o: konsole.moc a464 2 TEPty.o: TEPty.moc -TEmuVt102.lo: TEmuVt102.moc d466 1 d468 1 a468 5 +session.o: session.moc +TEWidget.lo: TEWidget.moc TEmulation.o: TEmulation.moc -konsole_part.o: konsole_part.moc kwrited.o: kwrited.moc d470 4 a473 1 +konsole_part.o: konsole_part.moc a474 1 +TEmuVt102.o: TEmuVt102.moc d476 1 @ 1.3 log @Update to KDE 3.0.3. While I'm here do the a.out dance for kuickshow and a couple of other minor clean ups. Changes are: kdelibs kprocess / kprocctrl: fix problem with hanging kdevelop. Javascript (core): more robust stack overflow check Javascript (html): allow to set a JS (non-CSS) property to a style object Javascript (html): improved result of navigator.platform using uname() Javascript (html): more aggressive garbage collection on clear, fixing many crashes Javascript (html): global object (window) has a correct object prototype now khtml: several crashes and bugs fixed kssl: Always verify the basic constraints on certificates (SECURITY) kdefx: Make the blending routine used by transparent menus work properly on big-endian platforms kdeui: Fix KDialog::setPlainCaption() kdebase Build fixes for IRIX / MipsPro (kcontrol, konqueror, konsole). Kicker: Quick browser escapes ampersand characters in file names. Konsole: Don't prepend ESC if Meta is pressed if key definition is for "+Alt". Konsole: Fixed crashes at startup related to broken font installations. Konsole: Fixed crashes when selecting in history buffer. krdb: Smarter handling of multiple and symlinked KDE and Qt installs when exporting plugin path to Qt. kdenetwork KMail: allow an ampersand as last char of an URL. KMail: Don't crash when custom drafts or sent-mail folders have been deleted or renamed. KMail: Fix auto charset detection for empty strings. KMail/KNode: Correctly handle quotes in user ids of OpenPGP keys. KMail: Make custom (global) Bcc headers work correctly with encryption and distribution list expansion. kdepim KAlarm: Fix session restoration often not occurring at login. KAlarm: Adjust wrong summer times stored by KDE 3.0.0 version of KAlarm. KAlarm: Make Close button on message window not the default button to reduce chance of accidental acknowledgement. KAlarm: Make Help button in configuration dialog display KAlarm handbook. KNotes: Compile fix for Qt 3.0.5 KOrganizer: Fixed context menu of todo list/view and event list which disappeared when using Qt 3.0.5 @ text @d3 1 a3 1 --- konsole/konsole/Makefile.in.orig Wed Aug 7 18:19:54 2002 d5 1 a5 1 @@@@ -304,7 +304,9 @@@@ INCLUDES = $(all_includes) d16 1 a16 1 @@@@ -337,18 +339,26 @@@@ libkonsolepart_la_LDFLAGS = $(all_librar d49 4 a52 1 @@@@ -358,7 +368,7 @@@@ konsole_la_LDFLAGS = $(all_libraries) -m d55 3 a57 3 TEScreen.cpp TEmulation.cpp TEHistory.cpp keytrans.cpp \ - konsole_wcwidth.cpp konsoleiface_skel.cpp sessioniface_skel.cpp + konsole_wcwidth.cpp konsole_main.cpp konsoleiface_skel.cpp sessioniface_skel.cpp d61 1 a61 1 @@@@ -392,24 +402,25 @@@@ CONFIG_HEADER = $(top_builddir)/config.h d70 1 a70 1 -#>+ 5 d72 1 a72 2 -konsole_la_nofinal_OBJECTS = main.lo konsole.lo \ - konsole_la_meta_unload.lo d82 2 a83 1 +#>+ 1 d88 1 a88 6 #>+ 5 -kwrited_la_final_OBJECTS = kwrited_la.all_cpp.lo -kwrited_la_nofinal_OBJECTS = kwrited.lo \ - kwrited_la_meta_unload.lo -@@KDE_USE_FINAL_FALSE@@kwrited_la_OBJECTS = $(kwrited_la_nofinal_OBJECTS) -@@KDE_USE_FINAL_TRUE@@kwrited_la_OBJECTS = $(kwrited_la_final_OBJECTS) d90 1 a90 2 +libkonsole_main_la_nofinal_OBJECTS = main.lo konsole.lo \ + libkonsole_main_la_meta_unload.lo d96 2 a97 2 @@@@ -423,6 +434,15 @@@@ libkonsolepart_la_nofinal_OBJECTS = TEPt libkonsolepart_la_meta_unload.lo d103 2 a104 6 +#>+ 5 +libkwrited_main_la_final_OBJECTS = libkwrited_main_la.all_cpp.lo +libkwrited_main_la_nofinal_OBJECTS = kwrited.lo \ + libkwrited_main_la_meta_unload.lo +@@KDE_USE_FINAL_FALSE@@libkwrited_main_la_OBJECTS = $(libkwrited_main_la_nofinal_OBJECTS) +@@KDE_USE_FINAL_TRUE@@libkwrited_main_la_OBJECTS = $(libkwrited_main_la_final_OBJECTS) d108 1 a108 1 @@@@ -431,7 +451,7 @@@@ am_konsole_OBJECTS = TEPty.$(OBJEXT) Blo d115 1 a115 1 #>+ 9 d117 1 a117 1 @@@@ -439,7 +459,7 @@@@ konsole_nofinal_OBJECTS = TEPty.$(OBJEXT d121 2 a122 3 - konsole_wcwidth.$(OBJEXT) konsoleiface_skel.$(OBJEXT) sessioniface_skel.$(OBJEXT) \ + konsole_wcwidth.$(OBJEXT) konsole_main.$(OBJEXT) konsoleiface_skel.$(OBJEXT) sessioniface_skel.$(OBJEXT) \ konsole_meta_unload.o d125 2 a126 1 @@@@ -450,11 +470,11 @@@@ am_konsole_grantpty_OBJECTS = konsole_gr d141 79 a219 23 @@@@ -469,15 +489,19 @@@@ depcomp = $(SHELL) $(top_srcdir)/admin/d @@AMDEP_TRUE@@ $(DEPDIR)/TEWidget.Plo $(DEPDIR)/TEWidget.Po \ @@AMDEP_TRUE@@ $(DEPDIR)/TEmuVt102.Plo $(DEPDIR)/TEmuVt102.Po \ @@AMDEP_TRUE@@ $(DEPDIR)/TEmulation.Plo $(DEPDIR)/TEmulation.Po \ - @@AMDEP_TRUE@@ $(DEPDIR)/dummy.Po $(DEPDIR)/keytrans.Plo \ - @@AMDEP_TRUE@@ $(DEPDIR)/keytrans.Po $(DEPDIR)/konsole.Plo \ - @@AMDEP_TRUE@@ $(DEPDIR)/konsole.Po $(DEPDIR)/konsole_grantpty.Po \ + @@AMDEP_TRUE@@ $(DEPDIR)/keytrans.Plo $(DEPDIR)/keytrans.Po \ + @@AMDEP_TRUE@@ $(DEPDIR)/konsole.Plo $(DEPDIR)/konsole.Po \ + @@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)/konsole_wcwidth.Po $(DEPDIR)/kwrited.Plo \ - @@AMDEP_TRUE@@ $(DEPDIR)/main.Plo $(DEPDIR)/main.Po \ - @@AMDEP_TRUE@@ $(DEPDIR)/schema.Plo $(DEPDIR)/schema.Po \ - @@AMDEP_TRUE@@ $(DEPDIR)/session.Plo $(DEPDIR)/session.Po + @@AMDEP_TRUE@@ $(DEPDIR)/kwrited_main.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/kwrited_main.Po $(DEPDIR)/main.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/main.Po $(DEPDIR)/schema.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/schema.Po $(DEPDIR)/session.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/session.Po d222 1 a222 2 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ @@@@ -506,14 +530,15 @@@@ CXXLINK = $(LIBTOOL) --mode=link --tag=C d240 1 a240 1 @@@@ -564,11 +589,15 @@@@ konsole.la: $(konsole_la_OBJECTS) $(kons d256 1 a256 1 @@@@ -623,16 +652,19 @@@@ distclean-compile: d277 1 a277 1 @@@@ -750,7 +782,7 @@@@ distclean-tags: d281 2 a282 2 -KDE_DIST=konsoleiface.h konsole_wcwidth.cpp MakeDefaults TEHistory.cpp TEScreen.cpp TEmulation.cpp sessioniface.h keytrans.cpp x-konsole.desktop konsolerc konsole_part.h +KDE_DIST=TEWidget.cpp keytrans.cpp konsoleiface.h konsole_part.h konsole_wcwidth.cpp x-konsole.desktop session.cpp konsolerc sessioniface.h MakeDefaults TEHistory.cpp TEScreen.cpp TEmuVt102.cpp TEmulation.cpp d286 1 a286 1 @@@@ -892,9 +924,6 @@@@ messages: rc.cpp d293 24 a316 17 konsole.lo: konsole.o # 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. @@@@ -978,29 +1007,16 @@@@ force-reedit: #>+ 12 -konsole_la_meta_unload.cpp: konsole.moc - @@echo 'creating konsole_la_meta_unload.cpp' - @@-rm -f konsole_la_meta_unload.cpp - @@if test ${kde_qtver} = 2; then \ - echo 'static const char * _metalist_konsole_la[] = {' > konsole_la_meta_unload.cpp ;\ - cat konsole.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> konsole_la_meta_unload.cpp ;\ - echo '0};' >> konsole_la_meta_unload.cpp ;\ - echo '#include ' >> konsole_la_meta_unload.cpp ;\ - echo '_UNLOAD(konsole_la)' >> konsole_la_meta_unload.cpp ;\ - else echo > konsole_la_meta_unload.cpp; fi d318 12 a329 45 - -#>+ 12 -kwrited_la_meta_unload.cpp: kwrited.moc - @@echo 'creating kwrited_la_meta_unload.cpp' - @@-rm -f kwrited_la_meta_unload.cpp +libkonsole_main_la_meta_unload.cpp: konsole.moc + @@echo 'creating libkonsole_main_la_meta_unload.cpp' + @@-rm -f libkonsole_main_la_meta_unload.cpp @@if test ${kde_qtver} = 2; then \ - echo 'static const char * _metalist_kwrited_la[] = {' > kwrited_la_meta_unload.cpp ;\ - cat kwrited.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kwrited_la_meta_unload.cpp ;\ - echo '0};' >> kwrited_la_meta_unload.cpp ;\ - echo '#include ' >> kwrited_la_meta_unload.cpp ;\ - echo '_UNLOAD(kwrited_la)' >> kwrited_la_meta_unload.cpp ;\ - else echo > kwrited_la_meta_unload.cpp; fi + echo 'static const char * _metalist_libkonsole_main_la[] = {' > libkonsole_main_la_meta_unload.cpp ;\ + cat konsole.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkonsole_main_la_meta_unload.cpp ;\ + echo '0};' >> libkonsole_main_la_meta_unload.cpp ;\ + echo '#include ' >> libkonsole_main_la_meta_unload.cpp ;\ + echo '_UNLOAD(libkonsole_main_la)' >> libkonsole_main_la_meta_unload.cpp ;\ + else echo > libkonsole_main_la_meta_unload.cpp; fi #>+ 12 @@@@ -1017,6 +1033,19 @@@@ libkonsolepart_la_meta_unload.cpp: TEmu #>+ 12 +libkwrited_main_la_meta_unload.cpp: kwrited.moc + @@echo 'creating libkwrited_main_la_meta_unload.cpp' + @@-rm -f libkwrited_main_la_meta_unload.cpp + @@if test ${kde_qtver} = 2; then \ + echo 'static const char * _metalist_libkwrited_main_la[] = {' > libkwrited_main_la_meta_unload.cpp ;\ + cat kwrited.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkwrited_main_la_meta_unload.cpp ;\ + echo '0};' >> libkwrited_main_la_meta_unload.cpp ;\ + echo '#include ' >> libkwrited_main_la_meta_unload.cpp ;\ + echo '_UNLOAD(libkwrited_main_la)' >> libkwrited_main_la_meta_unload.cpp ;\ + else echo > libkwrited_main_la_meta_unload.cpp; fi + + +#>+ 12 konsole_meta_unload.cpp: TEmulation.moc TEWidget.moc TEPty.moc konsole.moc session.moc TEmuVt102.moc @@echo 'creating konsole_meta_unload.cpp' @@-rm -f konsole_meta_unload.cpp @@@@ -1031,14 +1060,14 @@@@ konsole_meta_unload.cpp: TEmulation.moc d332 2 a333 3 clean-moc-classes: - -rm -f konsole_la_meta_unload.cpp kwrited_la_meta_unload.cpp libkonsolepart_la_meta_unload.cpp konsole_meta_unload.cpp + -rm -f libkonsole_main_la_meta_unload.cpp libkonsolepart_la_meta_unload.cpp libkwrited_main_la_meta_unload.cpp konsole_meta_unload.cpp d335 8 a342 13 #>+ 11 -konsole_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/konsole.cpp konsole_la_meta_unload.cpp konsole_part.moc konsole.moc TEWidget.moc TEmulation.moc session.moc TEmuVt102.moc kwrited.moc TEPty.moc +konsole_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/konsole_main.cpp konsole_part.moc konsole.moc TEWidget.moc TEmulation.moc session.moc TEmuVt102.moc kwrited.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; \ - for file in main.cpp konsole.cpp konsole_la_meta_unload.cpp ; do \ + for file in konsole_main.cpp ; do \ echo "#include \"$$file\"" >> konsole_la.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> konsole_la.all_cpp.final; \ done; \ @@@@ -1046,11 +1075,11 @@@@ konsole_la.all_cpp.cpp: $(srcdir)/Makefi rm -f konsole_la.all_cpp.final konsole_la.all_cpp.files a343 13 #>+ 11 -kwrited_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwrited.cpp kwrited_la_meta_unload.cpp +kwrited_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwrited_main.cpp @@echo 'creating kwrited_la.all_cpp.cpp ...'; \ rm -f kwrited_la.all_cpp.files kwrited_la.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kwrited_la.all_cpp.final; \ - for file in kwrited.cpp kwrited_la_meta_unload.cpp ; do \ + for file in kwrited_main.cpp ; do \ echo "#include \"$$file\"" >> kwrited_la.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kwrited_la.all_cpp.final; \ done; \ @@@@ -1058,6 +1087,18 @@@@ kwrited_la.all_cpp.cpp: $(srcdir)/Makefi rm -f kwrited_la.all_cpp.final kwrited_la.all_cpp.files d346 5 a350 1 +libkonsole_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/konsole.cpp libkonsole_main_la_meta_unload.cpp d354 3 a356 1 + for file in main.cpp konsole.cpp libkonsole_main_la_meta_unload.cpp ; do \ d359 4 a362 2 + done; \ + cat libkonsole_main_la.all_cpp.final libkonsole_main_la.all_cpp.files > libkonsole_main_la.all_cpp.cpp; \ d364 4 a367 3 + +#>+ 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 libkonsolepart_la_meta_unload.cpp d370 2 a371 1 @@@@ -1070,11 +1111,23 @@@@ libkonsolepart_la.all_cpp.cpp: $(srcdir) d375 2 a376 14 -konsole.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 konsoleiface_skel.cpp sessioniface_skel.cpp konsole_meta_unload.cpp +libkwrited_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwrited.cpp libkwrited_main_la_meta_unload.cpp + @@echo 'creating libkwrited_main_la.all_cpp.cpp ...'; \ + rm -f libkwrited_main_la.all_cpp.files libkwrited_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkwrited_main_la.all_cpp.final; \ + for file in kwrited.cpp libkwrited_main_la_meta_unload.cpp ; do \ + echo "#include \"$$file\"" >> libkwrited_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkwrited_main_la.all_cpp.final; \ + done; \ + cat libkwrited_main_la.all_cpp.final libkwrited_main_la.all_cpp.files > libkwrited_main_la.all_cpp.cpp; \ + rm -f libkwrited_main_la.all_cpp.final libkwrited_main_la.all_cpp.files + +#>+ 11 +konsole.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)/konsole_main.cpp konsoleiface_skel.cpp sessioniface_skel.cpp konsole_meta_unload.cpp d380 2 a381 2 - 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 konsoleiface_skel.cpp sessioniface_skel.cpp konsole_meta_unload.cpp ; do \ + 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 konsole_main.cpp konsoleiface_skel.cpp sessioniface_skel.cpp konsole_meta_unload.cpp ; do \ d385 1 a385 15 @@@@ -1082,11 +1135,11 @@@@ konsole.all_cpp.cpp: $(srcdir)/Makefile. rm -f konsole.all_cpp.final konsole.all_cpp.files #>+ 11 -kwrited.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp +kwrited.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwrited_main.cpp @@echo 'creating kwrited.all_cpp.cpp ...'; \ rm -f kwrited.all_cpp.files kwrited.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kwrited.all_cpp.final; \ - for file in dummy.cpp ; do \ + for file in kwrited_main.cpp ; do \ echo "#include \"$$file\"" >> kwrited.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kwrited.all_cpp.final; \ done; \ @@@@ -1095,20 +1148,20 @@@@ kwrited.all_cpp.cpp: $(srcdir)/Makefile. d389 2 a390 2 - -rm -f konsole_la.all_cpp.cpp kwrited_la.all_cpp.cpp libkonsolepart_la.all_cpp.cpp konsole.all_cpp.cpp kwrited.all_cpp.cpp + -rm -f konsole_la.all_cpp.cpp kwrited_la.all_cpp.cpp libkonsole_main_la.all_cpp.cpp libkonsolepart_la.all_cpp.cpp libkwrited_main_la.all_cpp.cpp konsole.all_cpp.cpp kwrited.all_cpp.cpp d394 2 a395 2 - $(MAKE) konsole_la_OBJECTS="$(konsole_la_final_OBJECTS)" kwrited_la_OBJECTS="$(kwrited_la_final_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_final_OBJECTS)" konsole_OBJECTS="$(konsole_final_OBJECTS)" all-am + $(MAKE) libkonsole_main_la_OBJECTS="$(libkonsole_main_la_final_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_final_OBJECTS)" libkwrited_main_la_OBJECTS="$(libkwrited_main_la_final_OBJECTS)" konsole_OBJECTS="$(konsole_final_OBJECTS)" all-am d398 2 a399 2 - $(MAKE) konsole_la_OBJECTS="$(konsole_la_final_OBJECTS)" kwrited_la_OBJECTS="$(kwrited_la_final_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_final_OBJECTS)" konsole_OBJECTS="$(konsole_final_OBJECTS)" install-am + $(MAKE) libkonsole_main_la_OBJECTS="$(libkonsole_main_la_final_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_final_OBJECTS)" libkwrited_main_la_OBJECTS="$(libkwrited_main_la_final_OBJECTS)" konsole_OBJECTS="$(konsole_final_OBJECTS)" install-am d402 2 a403 2 - $(MAKE) konsole_la_OBJECTS="$(konsole_la_nofinal_OBJECTS)" kwrited_la_OBJECTS="$(kwrited_la_nofinal_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_nofinal_OBJECTS)" konsole_OBJECTS="$(konsole_nofinal_OBJECTS)" all-am + $(MAKE) libkonsole_main_la_OBJECTS="$(libkonsole_main_la_nofinal_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_nofinal_OBJECTS)" libkwrited_main_la_OBJECTS="$(libkwrited_main_la_nofinal_OBJECTS)" konsole_OBJECTS="$(konsole_nofinal_OBJECTS)" all-am d406 2 a407 2 - $(MAKE) konsole_la_OBJECTS="$(konsole_la_nofinal_OBJECTS)" kwrited_la_OBJECTS="$(kwrited_la_nofinal_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_nofinal_OBJECTS)" konsole_OBJECTS="$(konsole_nofinal_OBJECTS)" install-am + $(MAKE) libkonsole_main_la_OBJECTS="$(libkonsole_main_la_nofinal_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_nofinal_OBJECTS)" libkwrited_main_la_OBJECTS="$(libkwrited_main_la_nofinal_OBJECTS)" konsole_OBJECTS="$(konsole_nofinal_OBJECTS)" install-am d410 30 a439 1 $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean @ 1.2 log @Merge changes in packages from the buildlink2 branch that have buildlink2.mk files back into the main trunk. @ text @d1 1 a1 1 $NetBSD: patch-ct,v 1.1.2.1 2002/06/23 19:05:44 jlam Exp $ d3 1 a3 1 --- konsole/konsole/Makefile.in.orig Mon May 13 23:57:52 2002 d5 1 a5 1 @@@@ -304,7 +304,9 @@@@ d16 2 a17 2 @@@@ -337,28 +339,39 @@@@ libkonsolepart_la_LIBADD = $(LIB_KPARTS) $(LIBUTIL) @@XTESTLIB@@ d49 4 a52 6 -#>- konsole_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 -#>+ 3 -konsole_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 \ a53 8 +#>- konsole_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 konsole_main.cpp +#>+ 4 +konsole_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 \ a54 1 + d56 1 a56 1 konsole_LDADD = $(LIB_KDEUI) $(LIB_KSYCOCA) $(LIBUTIL) $(LIB_KFILE) @@XTESTLIB@@ d58 1 a58 1 @@@@ -392,24 +405,25 @@@@ d99 1 a99 1 @@@@ -423,6 +437,15 @@@@ d115 1 a115 1 @@@@ -431,7 +454,7 @@@@ d124 1 a124 1 @@@@ -439,7 +462,7 @@@@ d133 1 a133 1 @@@@ -450,11 +473,11 @@@@ d148 1 a148 1 @@@@ -469,15 +492,19 @@@@ d174 1 a174 1 @@@@ -506,14 +533,15 @@@@ d192 1 a192 1 @@@@ -564,11 +592,15 @@@@ d208 1 a208 1 @@@@ -623,16 +655,19 @@@@ d229 1 a229 1 @@@@ -750,7 +785,7 @@@@ d238 1 a238 1 @@@@ -892,9 +927,6 @@@@ d248 1 a248 1 @@@@ -978,29 +1010,16 @@@@ d287 1 a287 1 @@@@ -1017,6 +1036,19 @@@@ d307 1 a307 1 @@@@ -1031,14 +1063,14 @@@@ d325 1 a325 1 @@@@ -1046,11 +1078,11 @@@@ d339 1 a339 1 @@@@ -1058,6 +1090,18 @@@@ d358 1 a358 1 @@@@ -1070,11 +1114,23 @@@@ d384 1 a384 1 @@@@ -1082,11 +1138,11 @@@@ d398 1 a398 1 @@@@ -1095,20 +1151,20 @@@@ @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ @ 1.1.1.1 log @Initial import of a kdebase3 pkg @ text @@ 1.1.1.1.2.1 log @file patch-ct was added on branch buildlink2 on 2002-06-23 19:05:44 +0000 @ text @d1 434 @ 1.1.1.1.2.2 log @Merge from pkgsrc-current to buildlink2 branch. @ text @a0 434 $NetBSD: patch-ct,v 1.1.1.1.2.1 2002/06/23 19:05:44 jlam Exp $ --- konsole/konsole/Makefile.in.orig Mon May 13 23:57:52 2002 +++ konsole/konsole/Makefile.in @@@@ -304,7 +304,9 @@@@ # you can add here more. This one gets installed bin_PROGRAMS = konsole konsole_grantpty kwrited #kcmkonsole -lib_LTLIBRARIES = libkonsolepart.la kwrited.la konsole.la +lib_LTLIBRARIES = libkonsolepart.la 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 # install it under kde_module @@@@ -337,28 +339,39 @@@@ libkonsolepart_la_LIBADD = $(LIB_KPARTS) $(LIBUTIL) @@XTESTLIB@@ # 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 = main.cpp konsole.cpp -konsole_la_LIBADD = libkonsolepart.la +libkonsole_main_la_SOURCES = main.cpp konsole.cpp +libkonsole_main_la_LIBADD = libkonsolepart.la +libkonsole_main_la_LDFLAGS = $(all_libraries) + +konsole_la_SOURCES = konsole_main.cpp +konsole_la_LIBADD = libkonsole_main.la konsole_la_LDFLAGS = $(all_libraries) -module -avoid-version # konsole executable - has all the sources, doesn't link kparts, saves startup time -#>- konsole_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 -#>+ 3 -konsole_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 konsoleiface_skel.cpp sessioniface_skel.cpp +#>- konsole_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 konsole_main.cpp +#>+ 4 +konsole_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 konsole_main.cpp konsoleiface_skel.cpp sessioniface_skel.cpp + konsole_LDADD = $(LIB_KDEUI) $(LIB_KSYCOCA) $(LIBUTIL) $(LIB_KFILE) @@XTESTLIB@@ konsole_LDFLAGS = $(all_libraries) $(KDE_RPATH) @@@@ -392,24 +405,25 @@@@ CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) -konsole_la_DEPENDENCIES = libkonsolepart.la -am_konsole_la_OBJECTS = main.lo konsole.lo +konsole_la_DEPENDENCIES = libkonsole_main.la +am_konsole_la_OBJECTS = konsole_main.lo #>- konsole_la_OBJECTS = $(am_konsole_la_OBJECTS) -#>+ 5 -konsole_la_final_OBJECTS = konsole_la.all_cpp.lo -konsole_la_nofinal_OBJECTS = main.lo konsole.lo \ - konsole_la_meta_unload.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_main.lo +libkonsole_main_la_DEPENDENCIES = libkonsolepart.la +am_libkonsole_main_la_OBJECTS = main.lo konsole.lo +#>- libkonsole_main_la_OBJECTS = $(am_libkonsole_main_la_OBJECTS) #>+ 5 -kwrited_la_final_OBJECTS = kwrited_la.all_cpp.lo -kwrited_la_nofinal_OBJECTS = kwrited.lo \ - kwrited_la_meta_unload.lo -@@KDE_USE_FINAL_FALSE@@kwrited_la_OBJECTS = $(kwrited_la_nofinal_OBJECTS) -@@KDE_USE_FINAL_TRUE@@kwrited_la_OBJECTS = $(kwrited_la_final_OBJECTS) +libkonsole_main_la_final_OBJECTS = libkonsole_main_la.all_cpp.lo +libkonsole_main_la_nofinal_OBJECTS = main.lo konsole.lo \ + libkonsole_main_la_meta_unload.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 \ @@@@ -423,6 +437,15 @@@@ libkonsolepart_la_meta_unload.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) +#>+ 5 +libkwrited_main_la_final_OBJECTS = libkwrited_main_la.all_cpp.lo +libkwrited_main_la_nofinal_OBJECTS = kwrited.lo \ + libkwrited_main_la_meta_unload.lo +@@KDE_USE_FINAL_FALSE@@libkwrited_main_la_OBJECTS = $(libkwrited_main_la_nofinal_OBJECTS) +@@KDE_USE_FINAL_TRUE@@libkwrited_main_la_OBJECTS = $(libkwrited_main_la_final_OBJECTS) bin_PROGRAMS = konsole$(EXEEXT) konsole_grantpty$(EXEEXT) \ kwrited$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) @@@@ -431,7 +454,7 @@@@ konsole.$(OBJEXT) schema.$(OBJEXT) session.$(OBJEXT) \ TEWidget.$(OBJEXT) TEmuVt102.$(OBJEXT) TEScreen.$(OBJEXT) \ TEmulation.$(OBJEXT) TEHistory.$(OBJEXT) keytrans.$(OBJEXT) \ - konsole_wcwidth.$(OBJEXT) + konsole_wcwidth.$(OBJEXT) konsole_main.$(OBJEXT) #>- konsole_OBJECTS = $(am_konsole_OBJECTS) #>+ 9 konsole_final_OBJECTS = konsole.all_cpp.o @@@@ -439,7 +462,7 @@@@ konsole.$(OBJEXT) schema.$(OBJEXT) session.$(OBJEXT) \ TEWidget.$(OBJEXT) TEmuVt102.$(OBJEXT) TEScreen.$(OBJEXT) \ TEmulation.$(OBJEXT) TEHistory.$(OBJEXT) keytrans.$(OBJEXT) \ - konsole_wcwidth.$(OBJEXT) konsoleiface_skel.$(OBJEXT) sessioniface_skel.$(OBJEXT) \ + konsole_wcwidth.$(OBJEXT) konsole_main.$(OBJEXT) konsoleiface_skel.$(OBJEXT) sessioniface_skel.$(OBJEXT) \ konsole_meta_unload.o @@KDE_USE_FINAL_FALSE@@konsole_OBJECTS = $(konsole_nofinal_OBJECTS) @@KDE_USE_FINAL_TRUE@@konsole_OBJECTS = $(konsole_final_OBJECTS) @@@@ -450,11 +473,11 @@@@ konsole_grantpty_OBJECTS = konsole_grantpty.$(OBJEXT) konsole_grantpty_LDADD = $(LDADD) 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 DEFS = @@DEFS@@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) @@@@ -469,15 +492,19 @@@@ @@AMDEP_TRUE@@ $(DEPDIR)/TEWidget.Plo $(DEPDIR)/TEWidget.Po \ @@AMDEP_TRUE@@ $(DEPDIR)/TEmuVt102.Plo $(DEPDIR)/TEmuVt102.Po \ @@AMDEP_TRUE@@ $(DEPDIR)/TEmulation.Plo $(DEPDIR)/TEmulation.Po \ - @@AMDEP_TRUE@@ $(DEPDIR)/dummy.Po $(DEPDIR)/keytrans.Plo \ - @@AMDEP_TRUE@@ $(DEPDIR)/keytrans.Po $(DEPDIR)/konsole.Plo \ - @@AMDEP_TRUE@@ $(DEPDIR)/konsole.Po $(DEPDIR)/konsole_grantpty.Po \ + @@AMDEP_TRUE@@ $(DEPDIR)/keytrans.Plo $(DEPDIR)/keytrans.Po \ + @@AMDEP_TRUE@@ $(DEPDIR)/konsole.Plo $(DEPDIR)/konsole.Po \ + @@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)/konsole_wcwidth.Po $(DEPDIR)/kwrited.Plo \ - @@AMDEP_TRUE@@ $(DEPDIR)/main.Plo $(DEPDIR)/main.Po \ - @@AMDEP_TRUE@@ $(DEPDIR)/schema.Plo $(DEPDIR)/schema.Po \ - @@AMDEP_TRUE@@ $(DEPDIR)/session.Plo $(DEPDIR)/session.Po + @@AMDEP_TRUE@@ $(DEPDIR)/kwrited_main.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/kwrited_main.Po $(DEPDIR)/main.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/main.Po $(DEPDIR)/schema.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/schema.Po $(DEPDIR)/session.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/session.Po COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ @@@@ -506,14 +533,15 @@@@ $(AM_LDFLAGS) $(LDFLAGS) -o $@@ CXXFLAGS = @@CXXFLAGS@@ 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 @@@@ -564,11 +592,15 @@@@ $(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 $(libdir) $(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) install-binPROGRAMS: $(bin_PROGRAMS) @@$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) @@@@ -623,16 +655,19 @@@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/TEmuVt102.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/TEmulation.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/TEmulation.Po@@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)/keytrans.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/konsole.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/konsole.Po@@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)/konsole_wcwidth.Po@@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)/main.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/schema.Plo@@am__quote@@ @@@@ -750,7 +785,7 @@@@ #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=konsoleiface.h konsole_wcwidth.cpp MakeDefaults TEHistory.cpp TEScreen.cpp TEmulation.cpp sessioniface.h keytrans.cpp x-konsole.desktop konsolerc konsole_part.h +KDE_DIST=TEWidget.cpp keytrans.cpp konsoleiface.h konsole_part.h konsole_wcwidth.cpp x-konsole.desktop session.cpp konsolerc sessioniface.h MakeDefaults TEHistory.cpp TEScreen.cpp TEmuVt102.cpp TEmulation.cpp DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) @@@@ -892,9 +927,6 @@@@ rm -f schemas.cpp rm -f tips.cpp -dummy.cpp: - echo > dummy.cpp - konsole.lo: konsole.o # 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. @@@@ -978,29 +1010,16 @@@@ #>+ 12 -konsole_la_meta_unload.cpp: konsole.moc - @@echo 'creating konsole_la_meta_unload.cpp' - @@-rm -f konsole_la_meta_unload.cpp - @@if test ${kde_qtver} = 2; then \ - echo 'static const char * _metalist_konsole_la[] = {' > konsole_la_meta_unload.cpp ;\ - cat konsole.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> konsole_la_meta_unload.cpp ;\ - echo '0};' >> konsole_la_meta_unload.cpp ;\ - echo '#include ' >> konsole_la_meta_unload.cpp ;\ - echo '_UNLOAD(konsole_la)' >> konsole_la_meta_unload.cpp ;\ - else echo > konsole_la_meta_unload.cpp; fi - - -#>+ 12 -kwrited_la_meta_unload.cpp: kwrited.moc - @@echo 'creating kwrited_la_meta_unload.cpp' - @@-rm -f kwrited_la_meta_unload.cpp +libkonsole_main_la_meta_unload.cpp: konsole.moc + @@echo 'creating libkonsole_main_la_meta_unload.cpp' + @@-rm -f libkonsole_main_la_meta_unload.cpp @@if test ${kde_qtver} = 2; then \ - echo 'static const char * _metalist_kwrited_la[] = {' > kwrited_la_meta_unload.cpp ;\ - cat kwrited.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kwrited_la_meta_unload.cpp ;\ - echo '0};' >> kwrited_la_meta_unload.cpp ;\ - echo '#include ' >> kwrited_la_meta_unload.cpp ;\ - echo '_UNLOAD(kwrited_la)' >> kwrited_la_meta_unload.cpp ;\ - else echo > kwrited_la_meta_unload.cpp; fi + echo 'static const char * _metalist_libkonsole_main_la[] = {' > libkonsole_main_la_meta_unload.cpp ;\ + cat konsole.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkonsole_main_la_meta_unload.cpp ;\ + echo '0};' >> libkonsole_main_la_meta_unload.cpp ;\ + echo '#include ' >> libkonsole_main_la_meta_unload.cpp ;\ + echo '_UNLOAD(libkonsole_main_la)' >> libkonsole_main_la_meta_unload.cpp ;\ + else echo > libkonsole_main_la_meta_unload.cpp; fi #>+ 12 @@@@ -1017,6 +1036,19 @@@@ #>+ 12 +libkwrited_main_la_meta_unload.cpp: kwrited.moc + @@echo 'creating libkwrited_main_la_meta_unload.cpp' + @@-rm -f libkwrited_main_la_meta_unload.cpp + @@if test ${kde_qtver} = 2; then \ + echo 'static const char * _metalist_libkwrited_main_la[] = {' > libkwrited_main_la_meta_unload.cpp ;\ + cat kwrited.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkwrited_main_la_meta_unload.cpp ;\ + echo '0};' >> libkwrited_main_la_meta_unload.cpp ;\ + echo '#include ' >> libkwrited_main_la_meta_unload.cpp ;\ + echo '_UNLOAD(libkwrited_main_la)' >> libkwrited_main_la_meta_unload.cpp ;\ + else echo > libkwrited_main_la_meta_unload.cpp; fi + + +#>+ 12 konsole_meta_unload.cpp: TEmulation.moc TEWidget.moc TEPty.moc konsole.moc session.moc TEmuVt102.moc @@echo 'creating konsole_meta_unload.cpp' @@-rm -f konsole_meta_unload.cpp @@@@ -1031,14 +1063,14 @@@@ #>+ 3 clean-moc-classes: - -rm -f konsole_la_meta_unload.cpp kwrited_la_meta_unload.cpp libkonsolepart_la_meta_unload.cpp konsole_meta_unload.cpp + -rm -f libkonsole_main_la_meta_unload.cpp libkonsolepart_la_meta_unload.cpp libkwrited_main_la_meta_unload.cpp konsole_meta_unload.cpp #>+ 11 -konsole_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/konsole.cpp konsole_la_meta_unload.cpp konsole_part.moc konsole.moc TEWidget.moc TEmulation.moc session.moc TEmuVt102.moc kwrited.moc TEPty.moc +konsole_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/konsole_main.cpp konsole_part.moc konsole.moc TEWidget.moc TEmulation.moc session.moc TEmuVt102.moc kwrited.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; \ - for file in main.cpp konsole.cpp konsole_la_meta_unload.cpp ; do \ + for file in konsole_main.cpp ; do \ echo "#include \"$$file\"" >> konsole_la.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> konsole_la.all_cpp.final; \ done; \ @@@@ -1046,11 +1078,11 @@@@ rm -f konsole_la.all_cpp.final konsole_la.all_cpp.files #>+ 11 -kwrited_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwrited.cpp kwrited_la_meta_unload.cpp +kwrited_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwrited_main.cpp @@echo 'creating kwrited_la.all_cpp.cpp ...'; \ rm -f kwrited_la.all_cpp.files kwrited_la.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kwrited_la.all_cpp.final; \ - for file in kwrited.cpp kwrited_la_meta_unload.cpp ; do \ + for file in kwrited_main.cpp ; do \ echo "#include \"$$file\"" >> kwrited_la.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kwrited_la.all_cpp.final; \ done; \ @@@@ -1058,6 +1090,18 @@@@ rm -f kwrited_la.all_cpp.final kwrited_la.all_cpp.files #>+ 11 +libkonsole_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/konsole.cpp libkonsole_main_la_meta_unload.cpp + @@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 main.cpp konsole.cpp libkonsole_main_la_meta_unload.cpp ; do \ + 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 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 libkonsolepart_la_meta_unload.cpp @@echo 'creating libkonsolepart_la.all_cpp.cpp ...'; \ rm -f libkonsolepart_la.all_cpp.files libkonsolepart_la.all_cpp.final; \ @@@@ -1070,11 +1114,23 @@@@ rm -f libkonsolepart_la.all_cpp.final libkonsolepart_la.all_cpp.files #>+ 11 -konsole.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 konsoleiface_skel.cpp sessioniface_skel.cpp konsole_meta_unload.cpp +libkwrited_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwrited.cpp libkwrited_main_la_meta_unload.cpp + @@echo 'creating libkwrited_main_la.all_cpp.cpp ...'; \ + rm -f libkwrited_main_la.all_cpp.files libkwrited_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkwrited_main_la.all_cpp.final; \ + for file in kwrited.cpp libkwrited_main_la_meta_unload.cpp ; do \ + echo "#include \"$$file\"" >> libkwrited_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkwrited_main_la.all_cpp.final; \ + done; \ + cat libkwrited_main_la.all_cpp.final libkwrited_main_la.all_cpp.files > libkwrited_main_la.all_cpp.cpp; \ + rm -f libkwrited_main_la.all_cpp.final libkwrited_main_la.all_cpp.files + +#>+ 11 +konsole.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)/konsole_main.cpp konsoleiface_skel.cpp sessioniface_skel.cpp konsole_meta_unload.cpp @@echo 'creating konsole.all_cpp.cpp ...'; \ rm -f konsole.all_cpp.files konsole.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> konsole.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 konsoleiface_skel.cpp sessioniface_skel.cpp konsole_meta_unload.cpp ; do \ + 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 konsole_main.cpp konsoleiface_skel.cpp sessioniface_skel.cpp konsole_meta_unload.cpp ; do \ echo "#include \"$$file\"" >> konsole.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> konsole.all_cpp.final; \ done; \ @@@@ -1082,11 +1138,11 @@@@ rm -f konsole.all_cpp.final konsole.all_cpp.files #>+ 11 -kwrited.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp +kwrited.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwrited_main.cpp @@echo 'creating kwrited.all_cpp.cpp ...'; \ rm -f kwrited.all_cpp.files kwrited.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kwrited.all_cpp.final; \ - for file in dummy.cpp ; do \ + for file in kwrited_main.cpp ; do \ echo "#include \"$$file\"" >> kwrited.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kwrited.all_cpp.final; \ done; \ @@@@ -1095,20 +1151,20 @@@@ #>+ 3 clean-final: - -rm -f konsole_la.all_cpp.cpp kwrited_la.all_cpp.cpp libkonsolepart_la.all_cpp.cpp konsole.all_cpp.cpp kwrited.all_cpp.cpp + -rm -f konsole_la.all_cpp.cpp kwrited_la.all_cpp.cpp libkonsole_main_la.all_cpp.cpp libkonsolepart_la.all_cpp.cpp libkwrited_main_la.all_cpp.cpp konsole.all_cpp.cpp kwrited.all_cpp.cpp #>+ 2 final: - $(MAKE) konsole_la_OBJECTS="$(konsole_la_final_OBJECTS)" kwrited_la_OBJECTS="$(kwrited_la_final_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_final_OBJECTS)" konsole_OBJECTS="$(konsole_final_OBJECTS)" all-am + $(MAKE) libkonsole_main_la_OBJECTS="$(libkonsole_main_la_final_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_final_OBJECTS)" libkwrited_main_la_OBJECTS="$(libkwrited_main_la_final_OBJECTS)" konsole_OBJECTS="$(konsole_final_OBJECTS)" all-am #>+ 2 final-install: - $(MAKE) konsole_la_OBJECTS="$(konsole_la_final_OBJECTS)" kwrited_la_OBJECTS="$(kwrited_la_final_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_final_OBJECTS)" konsole_OBJECTS="$(konsole_final_OBJECTS)" install-am + $(MAKE) libkonsole_main_la_OBJECTS="$(libkonsole_main_la_final_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_final_OBJECTS)" libkwrited_main_la_OBJECTS="$(libkwrited_main_la_final_OBJECTS)" konsole_OBJECTS="$(konsole_final_OBJECTS)" install-am #>+ 2 no-final: - $(MAKE) konsole_la_OBJECTS="$(konsole_la_nofinal_OBJECTS)" kwrited_la_OBJECTS="$(kwrited_la_nofinal_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_nofinal_OBJECTS)" konsole_OBJECTS="$(konsole_nofinal_OBJECTS)" all-am + $(MAKE) libkonsole_main_la_OBJECTS="$(libkonsole_main_la_nofinal_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_nofinal_OBJECTS)" libkwrited_main_la_OBJECTS="$(libkwrited_main_la_nofinal_OBJECTS)" konsole_OBJECTS="$(konsole_nofinal_OBJECTS)" all-am #>+ 2 no-final-install: - $(MAKE) konsole_la_OBJECTS="$(konsole_la_nofinal_OBJECTS)" kwrited_la_OBJECTS="$(kwrited_la_nofinal_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_nofinal_OBJECTS)" konsole_OBJECTS="$(konsole_nofinal_OBJECTS)" install-am + $(MAKE) libkonsole_main_la_OBJECTS="$(libkonsole_main_la_nofinal_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_nofinal_OBJECTS)" libkwrited_main_la_OBJECTS="$(libkwrited_main_la_nofinal_OBJECTS)" konsole_OBJECTS="$(konsole_nofinal_OBJECTS)" install-am #>+ 3 cvs-clean: $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean @