head 1.9; access; symbols pkgsrc-2017Q3:1.8.0.116 pkgsrc-2017Q3-base:1.8 pkgsrc-2017Q2:1.8.0.112 pkgsrc-2017Q2-base:1.8 pkgsrc-2017Q1:1.8.0.110 pkgsrc-2017Q1-base:1.8 pkgsrc-2016Q4:1.8.0.108 pkgsrc-2016Q4-base:1.8 pkgsrc-2016Q3:1.8.0.106 pkgsrc-2016Q3-base:1.8 pkgsrc-2016Q2:1.8.0.104 pkgsrc-2016Q2-base:1.8 pkgsrc-2016Q1:1.8.0.102 pkgsrc-2016Q1-base:1.8 pkgsrc-2015Q4:1.8.0.100 pkgsrc-2015Q4-base:1.8 pkgsrc-2015Q3:1.8.0.98 pkgsrc-2015Q3-base:1.8 pkgsrc-2015Q2:1.8.0.96 pkgsrc-2015Q2-base:1.8 pkgsrc-2015Q1:1.8.0.94 pkgsrc-2015Q1-base:1.8 pkgsrc-2014Q4:1.8.0.92 pkgsrc-2014Q4-base:1.8 pkgsrc-2014Q3:1.8.0.90 pkgsrc-2014Q3-base:1.8 pkgsrc-2014Q2:1.8.0.88 pkgsrc-2014Q2-base:1.8 pkgsrc-2014Q1:1.8.0.86 pkgsrc-2014Q1-base:1.8 pkgsrc-2013Q4:1.8.0.84 pkgsrc-2013Q4-base:1.8 pkgsrc-2013Q3:1.8.0.82 pkgsrc-2013Q3-base:1.8 pkgsrc-2013Q2:1.8.0.80 pkgsrc-2013Q2-base:1.8 pkgsrc-2013Q1:1.8.0.78 pkgsrc-2013Q1-base:1.8 pkgsrc-2012Q4:1.8.0.76 pkgsrc-2012Q4-base:1.8 pkgsrc-2012Q3:1.8.0.74 pkgsrc-2012Q3-base:1.8 pkgsrc-2012Q2:1.8.0.72 pkgsrc-2012Q2-base:1.8 pkgsrc-2012Q1:1.8.0.70 pkgsrc-2012Q1-base:1.8 pkgsrc-2011Q4:1.8.0.68 pkgsrc-2011Q4-base:1.8 pkgsrc-2011Q3:1.8.0.66 pkgsrc-2011Q3-base:1.8 pkgsrc-2011Q2:1.8.0.64 pkgsrc-2011Q2-base:1.8 pkgsrc-2011Q1:1.8.0.62 pkgsrc-2011Q1-base:1.8 pkgsrc-2010Q4:1.8.0.60 pkgsrc-2010Q4-base:1.8 pkgsrc-2010Q3:1.8.0.58 pkgsrc-2010Q3-base:1.8 pkgsrc-2010Q2:1.8.0.56 pkgsrc-2010Q2-base:1.8 pkgsrc-2010Q1:1.8.0.54 pkgsrc-2010Q1-base:1.8 pkgsrc-2009Q4:1.8.0.52 pkgsrc-2009Q4-base:1.8 pkgsrc-2009Q3:1.8.0.50 pkgsrc-2009Q3-base:1.8 pkgsrc-2009Q2:1.8.0.48 pkgsrc-2009Q2-base:1.8 pkgsrc-2009Q1:1.8.0.46 pkgsrc-2009Q1-base:1.8 pkgsrc-2008Q4:1.8.0.44 pkgsrc-2008Q4-base:1.8 pkgsrc-2008Q3:1.8.0.42 pkgsrc-2008Q3-base:1.8 cube-native-xorg:1.8.0.40 cube-native-xorg-base:1.8 pkgsrc-2008Q2:1.8.0.38 pkgsrc-2008Q2-base:1.8 cwrapper:1.8.0.36 pkgsrc-2008Q1:1.8.0.34 pkgsrc-2008Q1-base:1.8 pkgsrc-2007Q4:1.8.0.32 pkgsrc-2007Q4-base:1.8 pkgsrc-2007Q3:1.8.0.30 pkgsrc-2007Q3-base:1.8 pkgsrc-2007Q2:1.8.0.28 pkgsrc-2007Q2-base:1.8 pkgsrc-2007Q1:1.8.0.26 pkgsrc-2007Q1-base:1.8 pkgsrc-2006Q4:1.8.0.24 pkgsrc-2006Q4-base:1.8 pkgsrc-2006Q3:1.8.0.22 pkgsrc-2006Q3-base:1.8 pkgsrc-2006Q2:1.8.0.20 pkgsrc-2006Q2-base:1.8 pkgsrc-2006Q1:1.8.0.18 pkgsrc-2006Q1-base:1.8 pkgsrc-2005Q4:1.8.0.16 pkgsrc-2005Q4-base:1.8 pkgsrc-2005Q3:1.8.0.14 pkgsrc-2005Q3-base:1.8 pkgsrc-2005Q2:1.8.0.12 pkgsrc-2005Q2-base:1.8 pkgsrc-2005Q1:1.8.0.10 pkgsrc-2005Q1-base:1.8 pkgsrc-2004Q4:1.8.0.8 pkgsrc-2004Q4-base:1.8 pkgsrc-2004Q3:1.8.0.6 pkgsrc-2004Q3-base:1.8 pkgsrc-2004Q2:1.8.0.4 pkgsrc-2004Q2-base:1.8 pkgsrc-2004Q1:1.8.0.2 pkgsrc-2004Q1-base:1.8 pkgsrc-2003Q4:1.6.0.2 pkgsrc-2003Q4-base:1.6 netbsd-1-6-1:1.3.0.2 netbsd-1-6-1-base:1.3 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 2017.09.26.10.27.21; author wiz; state dead; branches; next 1.8; commitid 9ARpkXTuh9Wg2H8A; 1.8 date 2004.02.04.14.25.58; author markd; state Exp; branches; next 1.7; 1.7 date 2004.01.15.10.15.14; author markd; state Exp; branches; next 1.6; 1.6 date 2003.07.30.13.34.59; author markd; state Exp; branches; next 1.5; 1.5 date 2003.05.22.02.42.47; author markd; state Exp; branches; next 1.4; 1.4 date 2003.03.11.13.10.18; author markd; state Exp; branches; next 1.3; 1.3 date 2003.01.02.09.12.33; author skrll; state Exp; branches; next 1.2; 1.2 date 2002.08.25.19.23.36; author jlam; state Exp; branches; next 1.1; 1.1 date 2002.05.31.13.18.40; author skrll; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2002.05.31.13.18.40; author skrll; state Exp; branches 1.1.1.1.2.1; next ; 1.1.1.1.2.1 date 2002.05.31.13.18.40; author jlam; state dead; branches; next 1.1.1.1.2.2; 1.1.1.1.2.2 date 2002.06.23.19.05.13; author jlam; state Exp; branches; next ; desc @@ 1.9 log @*: remove qt3 and the packages using it, including KDE3 Announced in https://mail-index.netbsd.org/pkgsrc-users/2017/09/10/msg025556.html @ text @$NetBSD: patch-ac,v 1.8 2004/02/04 14:25:58 markd Exp $ --- libkonq/favicons/move_favicons.sh.orig 2003-11-30 22:43:25.000000000 +1300 +++ libkonq/favicons/move_favicons.sh @@@@ -1,8 +1,8 @@@@ #!/bin/sh prefix=$(kde-config --localprefix) -source1="$prefix/share/icons/favicons" -source2="$prefix/share/cache/favicons" +source1="$prefix/share/kde/icons/favicons" +source2="$prefix/share/kde/cache/favicons" dest="$(kde-config --path cache)/favicons" if [ -n "$prefix" -a -d "$source1" ]; then @ 1.8 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 @d1 1 a1 1 $NetBSD$ @ 1.7 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 @d3 11 a13 9 --- kate/app/Makefile.in.orig 2004-01-02 14:05:55.000000000 +1300 +++ kate/app/Makefile.in @@@@ -422,7 +422,7 @@@@ target_os = @@target_os@@ target_vendor = @@target_vendor@@ x_includes = @@x_includes@@ x_libraries = @@x_libraries@@ -lib_LTLIBRARIES = libkateinterfaces.la kate.la kwrite.la +lib_LTLIBRARIES = libkateinterfaces.la libkate_main.la kate.la libkwrite_main.la kwrite.la bin_PROGRAMS = kate kwrite d15 1 a15 521 #>- libkateinterfaces_la_SOURCES = kateapp.cpp kateconfigdialog.cpp kateconfigplugindialogpage.cpp \ @@@@ -442,20 +442,28 @@@@ libkateinterfaces_la_SOURCES=kateapp.cpp libkateinterfaces_la_LIBADD = ../interfaces/libkateinterfacesprivate.la -lkscript ../lib/libkmultitabbar.la libkateinterfaces_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -kate_la_SOURCES = katemain.cpp -kate_la_LIBADD = libkateinterfaces.la +libkate_main_la_SOURCES = katemain.cpp +libkate_main_la_LIBADD = libkateinterfaces.la +libkate_main_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) + +kate_la_SOURCES = dummy_main.cpp +kate_la_LIBADD = libkate_main.la kate_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -kwrite_la_SOURCES = kwritemain.cpp katefiledialog.cpp kwritedialogs.cpp -kwrite_la_LIBADD = -lktexteditor +libkwrite_main_la_SOURCES = kwritemain.cpp katefiledialog.cpp kwritedialogs.cpp +libkwrite_main_la_LIBADD = -lktexteditor +libkwrite_main_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) + +kwrite_la_SOURCES = dummy_main.cpp +kwrite_la_LIBADD = libkwrite_main.la kwrite_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -kate_SOURCES = dummy_kate.cpp -kate_LDADD = kate.la +kate_SOURCES = dummy_main.cpp +kate_LDADD = libkate_main.la kate_LDFLAGS = $(KDE_RPATH) $(all_libraries) -kwrite_SOURCES = dummy_kwrite.cpp -kwrite_LDADD = kwrite.la +kwrite_SOURCES = dummy_main.cpp +kwrite_LDADD = libkwrite_main.la kwrite_LDFLAGS = $(KDE_RPATH) $(all_libraries) #>- METASOURCES = AUTO @@@@ -468,19 +476,21 @@@@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) -kate_la_DEPENDENCIES = libkateinterfaces.la -am_kate_la_OBJECTS = katemain.lo +kate_la_DEPENDENCIES = libkate_main.la +am_kate_la_OBJECTS = dummy_main.lo #>- kate_la_OBJECTS = $(am_kate_la_OBJECTS) #>+ 1 -kate_la_OBJECTS = katemain.lo -kwrite_la_DEPENDENCIES = -am_kwrite_la_OBJECTS = kwritemain.lo katefiledialog.lo kwritedialogs.lo +kate_la_OBJECTS = dummy_main.lo +kwrite_la_DEPENDENCIES = libkwrite_main.la +am_kwrite_la_OBJECTS = dummy_main.lo #>- kwrite_la_OBJECTS = $(am_kwrite_la_OBJECTS) -#>+ 4 -kwrite_la_final_OBJECTS = kwrite_la.all_cpp.lo -kwrite_la_nofinal_OBJECTS = kwritemain.lo katefiledialog.lo kwritedialogs.lo -@@KDE_USE_FINAL_FALSE@@kwrite_la_OBJECTS = $(kwrite_la_nofinal_OBJECTS) -@@KDE_USE_FINAL_TRUE@@kwrite_la_OBJECTS = $(kwrite_la_final_OBJECTS) +#>+ 1 +kwrite_la_OBJECTS = dummy_main.lo +libkate_main_la_DEPENDENCIES = libkateinterfaces.la +am_libkate_main_la_OBJECTS = katemain.lo +#>- libkate_main_la_OBJECTS = $(am_libkate_main_la_OBJECTS) +#>+ 1 +libkate_main_la_OBJECTS = katemain.lo libkateinterfaces_la_DEPENDENCIES = \ ../interfaces/libkateinterfacesprivate.la \ ../lib/libkmultitabbar.la @@@@ -503,25 +513,35 @@@@ libkateinterfaces_la_nofinal_OBJECTS = k katedockcontainer.lo kateIface_skel.lo @@KDE_USE_FINAL_FALSE@@libkateinterfaces_la_OBJECTS = $(libkateinterfaces_la_nofinal_OBJECTS) @@KDE_USE_FINAL_TRUE@@libkateinterfaces_la_OBJECTS = $(libkateinterfaces_la_final_OBJECTS) +libkwrite_main_la_DEPENDENCIES = +am_libkwrite_main_la_OBJECTS = kwritemain.lo katefiledialog.lo \ + kwritedialogs.lo +#>- libkwrite_main_la_OBJECTS = $(am_libkwrite_main_la_OBJECTS) +#>+ 5 +libkwrite_main_la_final_OBJECTS = libkwrite_main_la.all_cpp.lo +libkwrite_main_la_nofinal_OBJECTS = kwritemain.lo katefiledialog.lo \ + kwritedialogs.lo +@@KDE_USE_FINAL_FALSE@@libkwrite_main_la_OBJECTS = $(libkwrite_main_la_nofinal_OBJECTS) +@@KDE_USE_FINAL_TRUE@@libkwrite_main_la_OBJECTS = $(libkwrite_main_la_final_OBJECTS) bin_PROGRAMS = kate$(EXEEXT) kwrite$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) -am_kate_OBJECTS = dummy_kate.$(OBJEXT) +am_kate_OBJECTS = dummy_main.$(OBJEXT) #>- kate_OBJECTS = $(am_kate_OBJECTS) #>+ 1 -kate_OBJECTS = dummy_kate.$(OBJEXT) -kate_DEPENDENCIES = kate.la -am_kwrite_OBJECTS = dummy_kwrite.$(OBJEXT) +kate_OBJECTS = dummy_main.$(OBJEXT) +kate_DEPENDENCIES = libkate_main.la +am_kwrite_OBJECTS = dummy_main.$(OBJEXT) #>- kwrite_OBJECTS = $(am_kwrite_OBJECTS) #>+ 1 -kwrite_OBJECTS = dummy_kwrite.$(OBJEXT) -kwrite_DEPENDENCIES = kwrite.la +kwrite_OBJECTS = dummy_main.$(OBJEXT) +kwrite_DEPENDENCIES = libkwrite_main.la DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles -#>- @@AMDEP_TRUE@@DEP_FILES = ./$(DEPDIR)/dummy_kate.Po \ -#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/dummy_kwrite.Po \ +#>- @@AMDEP_TRUE@@DEP_FILES = ./$(DEPDIR)/dummy_main.Plo \ +#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/dummy_main.Po \ #>- @@AMDEP_TRUE@@ ./$(DEPDIR)/kactionselector.Plo \ #>- @@AMDEP_TRUE@@ ./$(DEPDIR)/kateapp.Plo \ #>- @@AMDEP_TRUE@@ ./$(DEPDIR)/kateconfigdialog.Plo \ @@@@ -544,8 +564,8 @@@@ am__depfiles_maybe = depfiles #>- @@AMDEP_TRUE@@ ./$(DEPDIR)/kwritedialogs.Plo \ #>- @@AMDEP_TRUE@@ ./$(DEPDIR)/kwritemain.Plo #>+ 47 -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@DEP_FILES = $(DEPDIR)/kateIface_skel.P $(DEPDIR)/kwrite_la.all_cpp.P $(DEPDIR)/libkateinterfaces_la.all_cpp.P ./$(DEPDIR)/dummy_kate.Po \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/dummy_kwrite.Po \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@DEP_FILES = $(DEPDIR)/kateIface_skel.P $(DEPDIR)/libkateinterfaces_la.all_cpp.P $(DEPDIR)/libkwrite_main_la.all_cpp.P ./$(DEPDIR)/dummy_main.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/dummy_main.Po \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kactionselector.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kateapp.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kateconfigdialog.Plo \ @@@@ -567,8 +587,8 @@@@ am__depfiles_maybe = depfiles @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kbookmarkhandler.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kwritedialogs.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kwritemain.Plo -@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@DEP_FILES = $(DEPDIR)/kateIface_skel.P ./$(DEPDIR)/dummy_kate.Po \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/dummy_kwrite.Po \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@DEP_FILES = $(DEPDIR)/kateIface_skel.P ./$(DEPDIR)/dummy_main.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/dummy_main.Po \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kactionselector.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kateapp.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kateconfigdialog.Plo \ @@@@ -610,10 +630,10 @@@@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@@ DIST_SOURCES = $(kate_la_SOURCES) $(kwrite_la_SOURCES) \ - $(libkateinterfaces_la_SOURCES) $(kate_SOURCES) \ - $(kwrite_SOURCES) + $(libkate_main_la_SOURCES) $(libkateinterfaces_la_SOURCES) \ + $(libkwrite_main_la_SOURCES) $(kate_SOURCES) $(kwrite_SOURCES) DIST_COMMON = Makefile.am Makefile.in -SOURCES = $(kate_la_SOURCES) $(kwrite_la_SOURCES) $(libkateinterfaces_la_SOURCES) $(kate_SOURCES) $(kwrite_SOURCES) +SOURCES = $(kate_la_SOURCES) $(kwrite_la_SOURCES) $(libkate_main_la_SOURCES) $(libkateinterfaces_la_SOURCES) $(libkwrite_main_la_SOURCES) $(kate_SOURCES) $(kwrite_SOURCES) #>- all: all-am #>+ 1 @@@@ -662,8 +682,12 @@@@ kate.la: $(kate_la_OBJECTS) $(kate_la_DE $(CXXLINK) -rpath $(libdir) $(kate_la_LDFLAGS) $(kate_la_OBJECTS) $(kate_la_LIBADD) $(LIBS) kwrite.la: $(kwrite_la_OBJECTS) $(kwrite_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kwrite_la_LDFLAGS) $(kwrite_la_OBJECTS) $(kwrite_la_LIBADD) $(LIBS) +libkate_main.la: $(libkate_main_la_OBJECTS) $(libkate_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkate_main_la_LDFLAGS) $(libkate_main_la_OBJECTS) $(libkate_main_la_LIBADD) $(LIBS) libkateinterfaces.la: $(libkateinterfaces_la_OBJECTS) $(libkateinterfaces_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(libkateinterfaces_la_LDFLAGS) $(libkateinterfaces_la_OBJECTS) $(libkateinterfaces_la_LIBADD) $(LIBS) +libkwrite_main.la: $(libkwrite_main_la_OBJECTS) $(libkwrite_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkwrite_main_la_LDFLAGS) $(libkwrite_main_la_OBJECTS) $(libkwrite_main_la_LIBADD) $(LIBS) binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @@$(NORMAL_INSTALL) @@@@ -706,8 +730,8 @@@@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/dummy_kate.Po@@am__quote@@ -@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/dummy_kwrite.Po@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/dummy_main.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/dummy_main.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/kactionselector.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/kateapp.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/kateconfigdialog.Plo@@am__quote@@ @@@@ -831,7 +855,7 @@@@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=kateconfigdialog.h katemailfilesdialog.h kateviewspace.h katemainwindow.h kwritedialogs.h katedockcontainer.h katefiledialog.h kateconfigplugindialogpage.h katefileselector.h kateconsole.h katesplitter.h katepluginmanager.h kwritemain.h kategrepdialog.h kateapp.h kactionselector.h kateIface.h katedocmanager.h kateviewmanager.h katemain.h kbookmarkhandler.h katefilelist.h +KDE_DIST=katemailfilesdialog.h katefileselector.h kateIface.h kateapp.h kbookmarkhandler.h katefiledialog.h katesplitter.h kwritemain.h Makefile.in.rej kateconfigplugindialogpage.h kwritedialogs.h kategrepdialog.h kateviewspace.h katemain.h kateconfigdialog.h katedockcontainer.h kactionselector.h katepluginmanager.h kateconsole.h katefilelist.h katemainwindow.h kateviewmanager.h katedocmanager.h DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) @@@@ -968,46 +992,40 @@@@ uninstall-am: uninstall-binPROGRAMS unin dummy_kate_la.cpp: echo > dummy_kate_la.cpp - -dummy_kate.cpp: - echo > dummy_kate.cpp - -dummy_kwrite.cpp: - echo > dummy_kwrite.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: #>+ 3 -kateconsole.moc: $(srcdir)/kateconsole.h - $(MOC) $(srcdir)/kateconsole.h -o kateconsole.moc +katefilelist.moc: $(srcdir)/katefilelist.h + $(MOC) $(srcdir)/katefilelist.h -o katefilelist.moc #>+ 1 -mocs: kateconsole.moc +mocs: katefilelist.moc #>+ 3 -katefiledialog.moc: $(srcdir)/katefiledialog.h - $(MOC) $(srcdir)/katefiledialog.h -o katefiledialog.moc +kateconfigdialog.moc: $(srcdir)/kateconfigdialog.h + $(MOC) $(srcdir)/kateconfigdialog.h -o kateconfigdialog.moc #>+ 1 -mocs: katefiledialog.moc +mocs: kateconfigdialog.moc #>+ 3 -katesplitter.moc: $(srcdir)/katesplitter.h - $(MOC) $(srcdir)/katesplitter.h -o katesplitter.moc +kateconfigplugindialogpage.moc: $(srcdir)/kateconfigplugindialogpage.h + $(MOC) $(srcdir)/kateconfigplugindialogpage.h -o kateconfigplugindialogpage.moc #>+ 1 -mocs: katesplitter.moc +mocs: kateconfigplugindialogpage.moc #>+ 3 -katepluginmanager.moc: $(srcdir)/katepluginmanager.h - $(MOC) $(srcdir)/katepluginmanager.h -o katepluginmanager.moc +katemainwindow.moc: $(srcdir)/katemainwindow.h + $(MOC) $(srcdir)/katemainwindow.h -o katemainwindow.moc #>+ 1 -mocs: katepluginmanager.moc +mocs: katemainwindow.moc #>+ 3 -katedocmanager.moc: $(srcdir)/katedocmanager.h - $(MOC) $(srcdir)/katedocmanager.h -o katedocmanager.moc +katemailfilesdialog.moc: $(srcdir)/katemailfilesdialog.h + $(MOC) $(srcdir)/katemailfilesdialog.h -o katemailfilesdialog.moc #>+ 1 -mocs: katedocmanager.moc +mocs: katemailfilesdialog.moc #>+ 3 kbookmarkhandler.moc: $(srcdir)/kbookmarkhandler.h $(MOC) $(srcdir)/kbookmarkhandler.h -o kbookmarkhandler.moc @@@@ -1015,17 +1033,11 @@@@ kbookmarkhandler.moc: $(srcdir)/kbookmar #>+ 1 mocs: kbookmarkhandler.moc #>+ 3 -kateconfigplugindialogpage.moc: $(srcdir)/kateconfigplugindialogpage.h - $(MOC) $(srcdir)/kateconfigplugindialogpage.h -o kateconfigplugindialogpage.moc - -#>+ 1 -mocs: kateconfigplugindialogpage.moc -#>+ 3 -katemainwindow.moc: $(srcdir)/katemainwindow.h - $(MOC) $(srcdir)/katemainwindow.h -o katemainwindow.moc +kactionselector.moc: $(srcdir)/kactionselector.h + $(MOC) $(srcdir)/kactionselector.h -o kactionselector.moc #>+ 1 -mocs: katemainwindow.moc +mocs: kactionselector.moc #>+ 3 katedockcontainer.moc: $(srcdir)/katedockcontainer.h $(MOC) $(srcdir)/katedockcontainer.h -o katedockcontainer.moc @@@@ -1033,71 +1045,77 @@@@ katedockcontainer.moc: $(srcdir)/katedoc #>+ 1 mocs: katedockcontainer.moc #>+ 3 -kateviewmanager.moc: $(srcdir)/kateviewmanager.h - $(MOC) $(srcdir)/kateviewmanager.h -o kateviewmanager.moc +kategrepdialog.moc: $(srcdir)/kategrepdialog.h + $(MOC) $(srcdir)/kategrepdialog.h -o kategrepdialog.moc #>+ 1 -mocs: kateviewmanager.moc +mocs: kategrepdialog.moc #>+ 3 -katemailfilesdialog.moc: $(srcdir)/katemailfilesdialog.h - $(MOC) $(srcdir)/katemailfilesdialog.h -o katemailfilesdialog.moc +kateconsole.moc: $(srcdir)/kateconsole.h + $(MOC) $(srcdir)/kateconsole.h -o kateconsole.moc #>+ 1 -mocs: katemailfilesdialog.moc +mocs: kateconsole.moc #>+ 3 -kwritemain.moc: $(srcdir)/kwritemain.h - $(MOC) $(srcdir)/kwritemain.h -o kwritemain.moc +katefileselector.moc: $(srcdir)/katefileselector.h + $(MOC) $(srcdir)/katefileselector.h -o katefileselector.moc #>+ 1 -mocs: kwritemain.moc +mocs: katefileselector.moc #>+ 3 -kateviewspace.moc: $(srcdir)/kateviewspace.h - $(MOC) $(srcdir)/kateviewspace.h -o kateviewspace.moc +katesplitter.moc: $(srcdir)/katesplitter.h + $(MOC) $(srcdir)/katesplitter.h -o katesplitter.moc #>+ 1 -mocs: kateviewspace.moc +mocs: katesplitter.moc #>+ 3 -kateapp.moc: $(srcdir)/kateapp.h - $(MOC) $(srcdir)/kateapp.h -o kateapp.moc +kateviewmanager.moc: $(srcdir)/kateviewmanager.h + $(MOC) $(srcdir)/kateviewmanager.h -o kateviewmanager.moc #>+ 1 -mocs: kateapp.moc +mocs: kateviewmanager.moc #>+ 3 -kwritedialogs.moc: $(srcdir)/kwritedialogs.h - $(MOC) $(srcdir)/kwritedialogs.h -o kwritedialogs.moc +kwritemain.moc: $(srcdir)/kwritemain.h + $(MOC) $(srcdir)/kwritemain.h -o kwritemain.moc #>+ 1 -mocs: kwritedialogs.moc +mocs: kwritemain.moc #>+ 3 -kactionselector.moc: $(srcdir)/kactionselector.h - $(MOC) $(srcdir)/kactionselector.h -o kactionselector.moc +kateapp.moc: $(srcdir)/kateapp.h + $(MOC) $(srcdir)/kateapp.h -o kateapp.moc #>+ 1 -mocs: kactionselector.moc +mocs: kateapp.moc #>+ 3 -kateconfigdialog.moc: $(srcdir)/kateconfigdialog.h - $(MOC) $(srcdir)/kateconfigdialog.h -o kateconfigdialog.moc +kateviewspace.moc: $(srcdir)/kateviewspace.h + $(MOC) $(srcdir)/kateviewspace.h -o kateviewspace.moc #>+ 1 -mocs: kateconfigdialog.moc +mocs: kateviewspace.moc #>+ 3 -kategrepdialog.moc: $(srcdir)/kategrepdialog.h - $(MOC) $(srcdir)/kategrepdialog.h -o kategrepdialog.moc +katefiledialog.moc: $(srcdir)/katefiledialog.h + $(MOC) $(srcdir)/katefiledialog.h -o katefiledialog.moc #>+ 1 -mocs: kategrepdialog.moc +mocs: katefiledialog.moc #>+ 3 -katefilelist.moc: $(srcdir)/katefilelist.h - $(MOC) $(srcdir)/katefilelist.h -o katefilelist.moc +katedocmanager.moc: $(srcdir)/katedocmanager.h + $(MOC) $(srcdir)/katedocmanager.h -o katedocmanager.moc #>+ 1 -mocs: katefilelist.moc +mocs: katedocmanager.moc #>+ 3 -katefileselector.moc: $(srcdir)/katefileselector.h - $(MOC) $(srcdir)/katefileselector.h -o katefileselector.moc +katepluginmanager.moc: $(srcdir)/katepluginmanager.h + $(MOC) $(srcdir)/katepluginmanager.h -o katepluginmanager.moc #>+ 1 -mocs: katefileselector.moc +mocs: katepluginmanager.moc +#>+ 3 +kwritedialogs.moc: $(srcdir)/kwritedialogs.h + $(MOC) $(srcdir)/kwritedialogs.h -o kwritedialogs.moc + +#>+ 1 +mocs: kwritedialogs.moc #>+ 5 kateIface.kidl: $(srcdir)/kateIface.h $(DCOP_DEPENDENCIES) $(DCOPIDL) $(srcdir)/kateIface.h > kateIface.kidl || ( rm -f kateIface.kidl ; false ) @@@@ -1106,7 +1124,7 @@@@ kateIface_skel.cpp: kateIface.kidl #>+ 3 clean-metasources: - -rm -f kateconsole.moc katefiledialog.moc katesplitter.moc katepluginmanager.moc katedocmanager.moc kbookmarkhandler.moc kateconfigplugindialogpage.moc katemainwindow.moc katedockcontainer.moc kateviewmanager.moc katemailfilesdialog.moc kwritemain.moc kateviewspace.moc kateapp.moc kwritedialogs.moc kactionselector.moc kateconfigdialog.moc kategrepdialog.moc katefilelist.moc katefileselector.moc + -rm -f katefilelist.moc kateconfigdialog.moc kateconfigplugindialogpage.moc katemainwindow.moc katemailfilesdialog.moc kbookmarkhandler.moc kactionselector.moc katedockcontainer.moc kategrepdialog.moc kateconsole.moc katefileselector.moc katesplitter.moc kateviewmanager.moc kwritemain.moc kateapp.moc kateviewspace.moc katefiledialog.moc katedocmanager.moc katepluginmanager.moc kwritedialogs.moc #>+ 4 clean-idl: @@@@ -1124,19 +1142,7 @@@@ force-reedit: #>+ 11 -kwrite_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwritemain.cpp $(srcdir)/katefiledialog.cpp $(srcdir)/kwritedialogs.cpp katefiledialog.moc kwritemain.moc kwritedialogs.moc - @@echo 'creating kwrite_la.all_cpp.cpp ...'; \ - rm -f kwrite_la.all_cpp.files kwrite_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kwrite_la.all_cpp.final; \ - for file in kwritemain.cpp katefiledialog.cpp kwritedialogs.cpp ; do \ - echo "#include \"$$file\"" >> kwrite_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kwrite_la.all_cpp.final; \ - done; \ - cat kwrite_la.all_cpp.final kwrite_la.all_cpp.files > kwrite_la.all_cpp.cpp; \ - rm -f kwrite_la.all_cpp.final kwrite_la.all_cpp.files - -#>+ 11 -libkateinterfaces_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kateapp.cpp $(srcdir)/kateconfigdialog.cpp $(srcdir)/kateconfigplugindialogpage.cpp $(srcdir)/kateconsole.cpp $(srcdir)/katedocmanager.cpp $(srcdir)/katefilelist.cpp $(srcdir)/katefileselector.cpp $(srcdir)/katemainwindow.cpp $(srcdir)/katepluginmanager.cpp $(srcdir)/katesplitter.cpp $(srcdir)/kateviewmanager.cpp $(srcdir)/kateviewspace.cpp $(srcdir)/kategrepdialog.cpp $(srcdir)/katefiledialog.cpp $(srcdir)/katemailfilesdialog.cpp $(srcdir)/kbookmarkhandler.cpp $(srcdir)/kactionselector.cpp $(srcdir)/katedockcontainer.cpp kateIface_skel.cpp kateconsole.moc katefiledialog.moc katesplitter.moc katepluginmanager.moc katedocmanager.moc kbookmarkhandler.moc kateconfigplugindialogpage.moc katemainwindow.moc katedockcontainer.moc kateviewmanager.moc katemailfilesdialog.moc kateviewspace.moc kateapp.moc kateconfigdialog.moc kactionselector.moc kategrepdialog.moc katefilelist.moc katefileselector.moc +libkateinterfaces_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kateapp.cpp $(srcdir)/kateconfigdialog.cpp $(srcdir)/kateconfigplugindialogpage.cpp $(srcdir)/kateconsole.cpp $(srcdir)/katedocmanager.cpp $(srcdir)/katefilelist.cpp $(srcdir)/katefileselector.cpp $(srcdir)/katemainwindow.cpp $(srcdir)/katepluginmanager.cpp $(srcdir)/katesplitter.cpp $(srcdir)/kateviewmanager.cpp $(srcdir)/kateviewspace.cpp $(srcdir)/kategrepdialog.cpp $(srcdir)/katefiledialog.cpp $(srcdir)/katemailfilesdialog.cpp $(srcdir)/kbookmarkhandler.cpp $(srcdir)/kactionselector.cpp $(srcdir)/katedockcontainer.cpp kateIface_skel.cpp katefilelist.moc kbookmarkhandler.moc katemailfilesdialog.moc katemainwindow.moc kateconfigplugindialogpage.moc kateconfigdialog.moc kactionselector.moc katedockcontainer.moc kateconsole.moc kategrepdialog.moc katefileselector.moc katesplitter.moc kateviewmanager.moc kateapp.moc kateviewspace.moc katefiledialog.moc katedocmanager.moc katepluginmanager.moc @@echo 'creating libkateinterfaces_la.all_cpp.cpp ...'; \ rm -f libkateinterfaces_la.all_cpp.files libkateinterfaces_la.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> libkateinterfaces_la.all_cpp.final; \ @@@@ -1147,22 +1153,34 @@@@ libkateinterfaces_la.all_cpp.cpp: $(srcd cat libkateinterfaces_la.all_cpp.final libkateinterfaces_la.all_cpp.files > libkateinterfaces_la.all_cpp.cpp; \ rm -f libkateinterfaces_la.all_cpp.final libkateinterfaces_la.all_cpp.files +#>+ 11 +libkwrite_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwritemain.cpp $(srcdir)/katefiledialog.cpp $(srcdir)/kwritedialogs.cpp kwritemain.moc katefiledialog.moc kwritedialogs.moc + @@echo 'creating libkwrite_main_la.all_cpp.cpp ...'; \ + rm -f libkwrite_main_la.all_cpp.files libkwrite_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkwrite_main_la.all_cpp.final; \ + for file in kwritemain.cpp katefiledialog.cpp kwritedialogs.cpp ; do \ + echo "#include \"$$file\"" >> libkwrite_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkwrite_main_la.all_cpp.final; \ + done; \ + cat libkwrite_main_la.all_cpp.final libkwrite_main_la.all_cpp.files > libkwrite_main_la.all_cpp.cpp; \ + rm -f libkwrite_main_la.all_cpp.final libkwrite_main_la.all_cpp.files + #>+ 3 clean-final: - -rm -f kwrite_la.all_cpp.cpp libkateinterfaces_la.all_cpp.cpp + -rm -f libkateinterfaces_la.all_cpp.cpp libkwrite_main_la.all_cpp.cpp #>+ 2 final: - $(MAKE) kwrite_la_OBJECTS="$(kwrite_la_final_OBJECTS)" libkateinterfaces_la_OBJECTS="$(libkateinterfaces_la_final_OBJECTS)" all-am + $(MAKE) libkateinterfaces_la_OBJECTS="$(libkateinterfaces_la_final_OBJECTS)" libkwrite_main_la_OBJECTS="$(libkwrite_main_la_final_OBJECTS)" all-am #>+ 2 final-install: - $(MAKE) kwrite_la_OBJECTS="$(kwrite_la_final_OBJECTS)" libkateinterfaces_la_OBJECTS="$(libkateinterfaces_la_final_OBJECTS)" install-am + $(MAKE) libkateinterfaces_la_OBJECTS="$(libkateinterfaces_la_final_OBJECTS)" libkwrite_main_la_OBJECTS="$(libkwrite_main_la_final_OBJECTS)" install-am #>+ 2 no-final: - $(MAKE) kwrite_la_OBJECTS="$(kwrite_la_nofinal_OBJECTS)" libkateinterfaces_la_OBJECTS="$(libkateinterfaces_la_nofinal_OBJECTS)" all-am + $(MAKE) libkateinterfaces_la_OBJECTS="$(libkateinterfaces_la_nofinal_OBJECTS)" libkwrite_main_la_OBJECTS="$(libkwrite_main_la_nofinal_OBJECTS)" all-am #>+ 2 no-final-install: - $(MAKE) kwrite_la_OBJECTS="$(kwrite_la_nofinal_OBJECTS)" libkateinterfaces_la_OBJECTS="$(libkateinterfaces_la_nofinal_OBJECTS)" install-am + $(MAKE) libkateinterfaces_la_OBJECTS="$(libkateinterfaces_la_nofinal_OBJECTS)" libkwrite_main_la_OBJECTS="$(libkwrite_main_la_nofinal_OBJECTS)" install-am #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean @@@@ -1172,43 +1190,43 @@@@ kde-rpo-clean: -rm -f *.rpo #>+ 41 -kateconfigplugindialogpage.o: kateconfigplugindialogpage.moc -katefiledialog.lo: katefiledialog.moc -kateconfigdialog.lo: kateconfigdialog.moc -kactionselector.o: kactionselector.moc -kateconfigplugindialogpage.lo: kateconfigplugindialogpage.moc -kateconfigdialog.o: kateconfigdialog.moc -kbookmarkhandler.lo: kbookmarkhandler.moc -katesplitter.lo: katesplitter.moc -kactionselector.lo: kactionselector.moc -kategrepdialog.lo: kategrepdialog.moc -kwritedialogs.o: kwritedialogs.moc -kwritemain.o: kwritemain.moc -kateconsole.lo: kateconsole.moc -kwritedialogs.lo: kwritedialogs.moc -katedockcontainer.lo: katedockcontainer.moc -katefileselector.o: katefileselector.moc kateapp.lo: kateapp.moc -katedockcontainer.o: katedockcontainer.moc katemainwindow.lo: katemainwindow.moc -katemainwindow.o: katemainwindow.moc -katefilelist.o: katefilelist.moc -kateviewmanager.lo: kateviewmanager.moc +kateconfigplugindialogpage.lo: kateconfigplugindialogpage.moc +katemailfilesdialog.o: katemailfilesdialog.moc +katefileselector.o: katefileselector.moc +kateconsole.lo: kateconsole.moc +kbookmarkhandler.o: kbookmarkhandler.moc +kateapp.o: kateapp.moc +katefiledialog.lo: katefiledialog.moc +katefiledialog.o: katefiledialog.moc katedocmanager.lo: katedocmanager.moc +katesplitter.o: katesplitter.moc +kwritemain.o: kwritemain.moc katemailfilesdialog.lo: katemailfilesdialog.moc -katemailfilesdialog.o: katemailfilesdialog.moc +katefilelist.lo: katefilelist.moc +kactionselector.lo: kactionselector.moc +katesplitter.lo: katesplitter.moc +kateconfigplugindialogpage.o: kateconfigplugindialogpage.moc +kwritemain.lo: kwritemain.moc +kwritedialogs.o: kwritedialogs.moc +kwritedialogs.lo: kwritedialogs.moc +kategrepdialog.o: kategrepdialog.moc kateviewspace.o: kateviewspace.moc katepluginmanager.lo: katepluginmanager.moc -katefilelist.lo: katefilelist.moc +kateconfigdialog.o: kateconfigdialog.moc +katedockcontainer.o: katedockcontainer.moc +kactionselector.o: kactionselector.moc katepluginmanager.o: katepluginmanager.moc +kateconsole.o: kateconsole.moc +kategrepdialog.lo: kategrepdialog.moc +katefilelist.o: katefilelist.moc +katemainwindow.o: katemainwindow.moc kateviewmanager.o: kateviewmanager.moc +kbookmarkhandler.lo: kbookmarkhandler.moc +kateviewspace.lo: kateviewspace.moc katedocmanager.o: katedocmanager.moc -kbookmarkhandler.o: kbookmarkhandler.moc +katedockcontainer.lo: katedockcontainer.moc +kateconfigdialog.lo: kateconfigdialog.moc katefileselector.lo: katefileselector.moc -kategrepdialog.o: kategrepdialog.moc -kateviewspace.lo: kateviewspace.moc -kateapp.o: kateapp.moc -kwritemain.lo: kwritemain.moc -katesplitter.o: katesplitter.moc -kateconsole.o: kateconsole.moc -katefiledialog.o: katefiledialog.moc +kateviewmanager.lo: kateviewmanager.moc @ 1.6 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 --- kate/app/Makefile.in.orig 2003-07-15 22:03:17.000000000 +1200 d5 1 a5 1 @@@@ -421,7 +421,7 @@@@ target_os = @@target_os@@ d14 1 a14 1 @@@@ -441,20 +441,28 @@@@ libkateinterfaces_la_SOURCES=kateapp.cpp d51 1 a51 1 @@@@ -466,19 +474,21 @@@@ CONFIG_HEADER = $(top_builddir)/config.h d83 1 a83 1 @@@@ -501,25 +511,35 @@@@ libkateinterfaces_la_nofinal_OBJECTS = k d127 1 a127 1 @@@@ -542,8 +562,8 @@@@ am__depfiles_maybe = depfiles d138 1 a138 1 @@@@ -565,8 +585,8 @@@@ am__depfiles_maybe = depfiles d149 1 a149 1 @@@@ -608,10 +628,10 @@@@ CXXLD = $(CXX) d163 1 a163 1 @@@@ -660,8 +680,12 @@@@ kate.la: $(kate_la_OBJECTS) $(kate_la_DE d176 1 a176 1 @@@@ -704,8 +728,8 @@@@ mostlyclean-compile: d187 1 a187 1 @@@@ -829,7 +853,7 @@@@ distclean-tags: d191 1 a191 1 -KDE_DIST=katefiledialog.h katemailfilesdialog.h kateapp.h katepluginmanager.h katefileselector.h katedocmanager.h kateviewspace.h katemain.h kateconfigplugindialogpage.h katesplitter.h kactionselector.h kateconfigdialog.h katemainwindow.h kwritemain.h kbookmarkhandler.h kateviewmanager.h kateIface.h katefilelist.h kwritedialogs.h kateconsole.h katedockcontainer.h kategrepdialog.h d196 1 a196 1 @@@@ -967,28 +991,28 @@@@ uninstall-am: uninstall-binPROGRAMS unin d211 2 d215 3 a217 2 + +#>+ 1 d219 5 a223 3 +#>+ 3 kateconfigdialog.moc: $(srcdir)/kateconfigdialog.h $(MOC) $(srcdir)/kateconfigdialog.h -o kateconfigdialog.moc d226 2 a227 1 mocs: kateconfigdialog.moc d229 2 a230 2 -kateconsole.moc: $(srcdir)/kateconsole.h - $(MOC) $(srcdir)/kateconsole.h -o kateconsole.moc d235 1 a235 1 -mocs: kateconsole.moc d238 5 a242 3 katemainwindow.moc: $(srcdir)/katemainwindow.h $(MOC) $(srcdir)/katemainwindow.h -o katemainwindow.moc @@@@ -996,41 +1020,41 @@@@ katemainwindow.moc: $(srcdir)/katemainwi d244 2 a245 1 mocs: katemainwindow.moc d256 3 a258 5 -kategrepdialog.moc: $(srcdir)/kategrepdialog.h - $(MOC) $(srcdir)/kategrepdialog.h -o kategrepdialog.moc +kbookmarkhandler.moc: $(srcdir)/kbookmarkhandler.h + $(MOC) $(srcdir)/kbookmarkhandler.h -o kbookmarkhandler.moc d260 1 a260 2 -mocs: kategrepdialog.moc +mocs: kbookmarkhandler.moc d262 8 a269 2 -kwritemain.moc: $(srcdir)/kwritemain.h - $(MOC) $(srcdir)/kwritemain.h -o kwritemain.moc d274 1 a274 1 -mocs: kwritemain.moc d277 3 a279 5 -kateviewspace.moc: $(srcdir)/kateviewspace.h - $(MOC) $(srcdir)/kateviewspace.h -o kateviewspace.moc +katedockcontainer.moc: $(srcdir)/katedockcontainer.h + $(MOC) $(srcdir)/katedockcontainer.h -o katedockcontainer.moc d281 1 a281 2 -mocs: kateviewspace.moc +mocs: katedockcontainer.moc d283 2 a284 2 -kbookmarkhandler.moc: $(srcdir)/kbookmarkhandler.h - $(MOC) $(srcdir)/kbookmarkhandler.h -o kbookmarkhandler.moc d289 1 a289 1 -mocs: kbookmarkhandler.moc d292 2 a293 2 -katefiledialog.moc: $(srcdir)/katefiledialog.h - $(MOC) $(srcdir)/katefiledialog.h -o katefiledialog.moc d298 1 a298 1 -mocs: katefiledialog.moc d301 5 a305 3 katefileselector.moc: $(srcdir)/katefileselector.h $(MOC) $(srcdir)/katefileselector.h -o katefileselector.moc @@@@ -1038,29 +1062,23 @@@@ katefileselector.moc: $(srcdir)/katefile d307 2 a308 1 mocs: katefileselector.moc d310 2 a311 8 -katedockcontainer.moc: $(srcdir)/katedockcontainer.h - $(MOC) $(srcdir)/katedockcontainer.h -o katedockcontainer.moc - -#>+ 1 -mocs: katedockcontainer.moc -#>+ 3 -katepluginmanager.moc: $(srcdir)/katepluginmanager.h - $(MOC) $(srcdir)/katepluginmanager.h -o katepluginmanager.moc d316 1 a316 1 -mocs: katepluginmanager.moc d319 2 a320 2 -katemailfilesdialog.moc: $(srcdir)/katemailfilesdialog.h - $(MOC) $(srcdir)/katemailfilesdialog.h -o katemailfilesdialog.moc d325 1 a325 1 -mocs: katemailfilesdialog.moc d328 2 a329 2 -katefilelist.moc: $(srcdir)/katefilelist.h - $(MOC) $(srcdir)/katefilelist.h -o katefilelist.moc d334 1 a334 1 -mocs: katefilelist.moc d337 5 a341 3 kateapp.moc: $(srcdir)/kateapp.h $(MOC) $(srcdir)/kateapp.h -o kateapp.moc @@@@ -1068,29 +1086,29 @@@@ kateapp.moc: $(srcdir)/kateapp.h d343 2 a344 1 mocs: kateapp.moc d346 2 a347 2 -katesplitter.moc: $(srcdir)/katesplitter.h - $(MOC) $(srcdir)/katesplitter.h -o katesplitter.moc d352 1 a352 1 -mocs: katesplitter.moc d355 2 a356 2 -kateviewmanager.moc: $(srcdir)/kateviewmanager.h - $(MOC) $(srcdir)/kateviewmanager.h -o kateviewmanager.moc d361 1 a361 1 -mocs: kateviewmanager.moc d364 2 a365 2 -kactionselector.moc: $(srcdir)/kactionselector.h - $(MOC) $(srcdir)/kactionselector.h -o kactionselector.moc d370 1 a370 1 -mocs: kactionselector.moc d373 2 a374 2 -kateconfigplugindialogpage.moc: $(srcdir)/kateconfigplugindialogpage.h - $(MOC) $(srcdir)/kateconfigplugindialogpage.h -o kateconfigplugindialogpage.moc d379 1 a379 1 -mocs: kateconfigplugindialogpage.moc d381 10 a390 4 #>+ 3 kwritedialogs.moc: $(srcdir)/kwritedialogs.h $(MOC) $(srcdir)/kwritedialogs.h -o kwritedialogs.moc @@@@ -1105,7 +1123,7 @@@@ kateIface_skel.cpp: kateIface.kidl d394 1 a394 1 - -rm -f kateconfigdialog.moc kateconsole.moc katemainwindow.moc katedocmanager.moc kategrepdialog.moc kwritemain.moc kateviewspace.moc kbookmarkhandler.moc katefiledialog.moc katefileselector.moc katedockcontainer.moc katepluginmanager.moc katemailfilesdialog.moc katefilelist.moc kateapp.moc katesplitter.moc kateviewmanager.moc kactionselector.moc kateconfigplugindialogpage.moc kwritedialogs.moc d399 1 a399 1 @@@@ -1123,19 +1141,7 @@@@ force-reedit: d403 1 a403 1 -kwrite_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwritemain.cpp $(srcdir)/katefiledialog.cpp $(srcdir)/kwritedialogs.cpp kwritemain.moc katefiledialog.moc kwritedialogs.moc d415 1 a415 1 -libkateinterfaces_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kateapp.cpp $(srcdir)/kateconfigdialog.cpp $(srcdir)/kateconfigplugindialogpage.cpp $(srcdir)/kateconsole.cpp $(srcdir)/katedocmanager.cpp $(srcdir)/katefilelist.cpp $(srcdir)/katefileselector.cpp $(srcdir)/katemainwindow.cpp $(srcdir)/katepluginmanager.cpp $(srcdir)/katesplitter.cpp $(srcdir)/kateviewmanager.cpp $(srcdir)/kateviewspace.cpp $(srcdir)/kategrepdialog.cpp $(srcdir)/katefiledialog.cpp $(srcdir)/katemailfilesdialog.cpp $(srcdir)/kbookmarkhandler.cpp $(srcdir)/kactionselector.cpp $(srcdir)/katedockcontainer.cpp kateIface_skel.cpp kateconfigdialog.moc katemainwindow.moc kateconsole.moc katedocmanager.moc kategrepdialog.moc kateviewspace.moc kbookmarkhandler.moc katefileselector.moc katefiledialog.moc katedockcontainer.moc katepluginmanager.moc katemailfilesdialog.moc katefilelist.moc kateapp.moc katesplitter.moc kateviewmanager.moc kactionselector.moc kateconfigplugindialogpage.moc d420 1 a420 1 @@@@ -1146,22 +1152,34 @@@@ libkateinterfaces_la.all_cpp.cpp: $(srcd d460 1 a460 1 @@@@ -1171,43 +1189,43 @@@@ kde-rpo-clean: d464 7 a470 2 -kategrepdialog.o: kategrepdialog.moc -kateapp.o: kateapp.moc d472 14 a485 2 +kateapp.lo: kateapp.moc +katemainwindow.lo: katemainwindow.moc d489 2 a490 4 kateconsole.lo: kateconsole.moc kbookmarkhandler.o: kbookmarkhandler.moc -kactionselector.o: kactionselector.moc -kategrepdialog.lo: kategrepdialog.moc d494 5 a498 12 +katedocmanager.lo: katedocmanager.moc katesplitter.o: katesplitter.moc -katefileselector.lo: katefileselector.moc kwritemain.o: kwritemain.moc -kwritedialogs.lo: kwritedialogs.moc -kateconfigplugindialogpage.lo: kateconfigplugindialogpage.moc -katedockcontainer.lo: katedockcontainer.moc -kateconfigplugindialogpage.o: kateconfigplugindialogpage.moc -katefileselector.o: katefileselector.moc -katefiledialog.o: katefiledialog.moc -kateconsole.o: kateconsole.moc +katemailfilesdialog.lo: katemailfilesdialog.moc d500 1 a500 3 kactionselector.lo: kactionselector.moc -kateviewmanager.o: kateviewmanager.moc -katemainwindow.lo: katemainwindow.moc d504 1 a504 1 kwritedialogs.o: kwritedialogs.moc d507 5 a511 8 +kateviewspace.o: kateviewspace.moc +katepluginmanager.lo: katepluginmanager.moc kateconfigdialog.o: kateconfigdialog.moc -kwritemain.lo: kwritemain.moc -kateviewmanager.lo: kateviewmanager.moc -katefiledialog.lo: katefiledialog.moc katedockcontainer.o: katedockcontainer.moc -kbookmarkhandler.lo: kbookmarkhandler.moc d513 1 a513 1 +katepluginmanager.o: katepluginmanager.moc d517 2 a518 3 katemainwindow.o: katemainwindow.moc -katedocmanager.lo: katedocmanager.moc +kateviewmanager.o: kateviewmanager.moc d522 1 d524 3 a526 7 kateconfigdialog.lo: kateconfigdialog.moc -katepluginmanager.lo: katepluginmanager.moc -katemailfilesdialog.o: katemailfilesdialog.moc -katemailfilesdialog.lo: katemailfilesdialog.moc -katefilelist.lo: katefilelist.moc -katepluginmanager.o: katepluginmanager.moc -kateviewspace.o: kateviewspace.moc d528 5 a532 3 -katefilelist.o: katefilelist.moc -kateapp.lo: kateapp.moc +katefileselector.lo: katefileselector.moc @ 1.5 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 --- kate/app/Makefile.in.orig Tue May 13 23:07:53 2003 d5 1 a5 1 @@@@ -420,7 +420,7 @@@@ target_os = @@target_os@@ d14 1 a14 1 @@@@ -440,20 +440,28 @@@@ libkateinterfaces_la_SOURCES=kateapp.cpp d192 1 a192 1 +KDE_DIST=katemailfilesdialog.h katefileselector.h kateIface.h kateapp.h kbookmarkhandler.h katefiledialog.h katesplitter.h kwritemain.h kateconfigplugindialogpage.h kwritedialogs.h kategrepdialog.h kateviewspace.h katemain.h kateconfigdialog.h katedockcontainer.h kactionselector.h katepluginmanager.h kateconsole.h katefilelist.h katemainwindow.h kateviewmanager.h katedocmanager.h d196 1 a196 1 @@@@ -967,91 +991,85 @@@@ uninstall-am: uninstall-binPROGRAMS unin d214 2 d220 2 d228 3 d234 3 a236 1 d243 3 d252 3 d261 3 d270 3 d279 3 d288 3 d294 3 a296 1 d301 2 d309 3 d318 3 d327 3 d333 3 a335 1 d342 3 d351 3 d360 3 d369 3 d374 2 a375 1 @@@@ -1065,7 +1083,7 @@@@ kateIface_skel.cpp: kateIface.kidl d384 1 a384 1 @@@@ -1083,19 +1101,7 @@@@ force-reedit: d405 1 a405 1 @@@@ -1106,22 +1112,34 @@@@ libkateinterfaces_la.all_cpp.cpp: $(srcd d445 1 a445 1 @@@@ -1131,43 +1149,43 @@@@ kde-rpo-clean: @ 1.4 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 --- kate/app/Makefile.in.orig Fri Jan 17 09:03:04 2003 d5 2 a6 2 @@@@ -284,7 +284,7 @@@@ qt_includes = @@qt_includes@@ qt_libraries = @@qt_libraries@@ d14 1 a14 1 @@@@ -304,20 +304,28 @@@@ libkateinterfaces_la_SOURCES=kateapp.cpp d51 1 a51 1 @@@@ -329,19 +337,21 @@@@ CONFIG_HEADER = $(top_builddir)/config.h d83 1 a83 1 @@@@ -364,19 +374,29 @@@@ libkateinterfaces_la_nofinal_OBJECTS = k a116 1 DEFS = @@DEFS@@ a117 2 @@@@ -385,8 +405,8 @@@@ LDFLAGS = @@LDFLAGS@@ LIBS = @@LIBS@@ d127 1 a127 1 @@@@ -409,8 +429,8 @@@@ am__depfiles_maybe = depfiles d138 1 a138 1 @@@@ -432,8 +452,8 @@@@ am__depfiles_maybe = depfiles d149 2 a150 1 @@@@ -476,10 +496,10 @@@@ CXXLINK = $(LIBTOOL) --mode=link --tag=C a151 1 CXXFLAGS = @@CXXFLAGS@@ d163 1 a163 1 @@@@ -528,8 +548,12 @@@@ kate.la: $(kate_la_OBJECTS) $(kate_la_DE d176 1 a176 1 @@@@ -572,8 +596,8 @@@@ mostlyclean-compile: d187 2 a188 2 @@@@ -665,7 +689,7 @@@@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH d191 2 a192 2 -KDE_DIST=katefilelist.cpp katefiledialog.h katemailfilesdialog.h kateapp.h katepluginmanager.h kategrepdialog.cpp katefileselector.h katedocmanager.h katesplitter.cpp kateviewmanager.cpp kateviewspace.h katemain.h katedockcontainer.cpp kateconsole.cpp kateconfigplugindialogpage.h katesplitter.h kactionselector.h kateconfigdialog.h katemainwindow.h kwritemain.h katepluginmanager.cpp kbookmarkhandler.h kateviewmanager.h katemailfilesdialog.cpp kateIface.h katedocmanager.cpp katefilelist.h kwritedialogs.h kbookmarkhandler.cpp katefileselector.cpp kateconsole.h kateviewspace.cpp katemainwindow.cpp kactionselector.cpp katedockcontainer.h kategrepdialog.h +KDE_DIST=katemailfilesdialog.h katefileselector.h kateIface.h katemainwindow.cpp kateviewspace.cpp kateapp.h kbookmarkhandler.h katemailfilesdialog.cpp kactionselector.cpp katefiledialog.h katesplitter.h kwritemain.h kategrepdialog.cpp kateconfigplugindialogpage.h kateviewmanager.cpp kwritedialogs.h kategrepdialog.h kateviewspace.h katesplitter.cpp katemain.h kateconfigdialog.h katefilelist.cpp katedockcontainer.h kactionselector.h katefileselector.cpp katepluginmanager.h kateconsole.h katedockcontainer.cpp kateconsole.cpp katefilelist.h katemainwindow.h kateviewmanager.h katedocmanager.h katedocmanager.cpp katepluginmanager.cpp kbookmarkhandler.cpp d196 1 a196 1 @@@@ -788,91 +812,85 @@@@ uninstall-am: uninstall-binPROGRAMS unin d320 1 a320 1 @@@@ -886,7 +904,7 @@@@ kateIface_skel.cpp: kateIface.kidl d329 1 a329 1 @@@@ -904,19 +922,7 @@@@ force-reedit: d350 1 a350 1 @@@@ -927,22 +933,34 @@@@ libkateinterfaces_la.all_cpp.cpp: $(srcd d390 1 a390 1 @@@@ -952,43 +970,43 @@@@ kde-rpo-clean: @ 1.3 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 --- kate/app/Makefile.in.orig Fri Dec 27 18:19:11 2002 d5 2 a6 1 @@@@ -286,35 +286,45 @@@@ qt_libraries = @@qt_libraries@@ d9 2 a10 3 -lib_LTLIBRARIES = kate.la kwrite.la +lib_LTLIBRARIES = libkate_main.la kate.la libkwrite_main.la kwrite.la d13 2 a14 25 -#>- kate_la_SOURCES = kateapp.cpp kateconfigdialog.cpp kateconfigplugindialogpage.cpp \ -#>- kateconsole.cpp katedocmanager.cpp katefilelist.cpp katefileselector.cpp \ -#>- katemainwindow.cpp katepluginmanager.cpp katesplitter.cpp \ -#>- kateviewmanager.cpp kateviewspace.cpp katemain.cpp \ -#>- kateappIface.skel kateIface.skel kategrepdialog.cpp katefiledialog.cpp -#>+ 5 -kate_la_SOURCES=kateapp.cpp kateconfigdialog.cpp kateconfigplugindialogpage.cpp \ - kateconsole.cpp katedocmanager.cpp katefilelist.cpp katefileselector.cpp \ - katemainwindow.cpp katepluginmanager.cpp katesplitter.cpp \ - kateviewmanager.cpp kateviewspace.cpp katemain.cpp \ - kategrepdialog.cpp katefiledialog.cpp kateappIface_skel.cpp kateIface_skel.cpp +#>- libkate_main_la_SOURCES = kateapp.cpp kateconfigdialog.cpp \ +#>- kateconfigplugindialogpage.cpp kateconsole.cpp katedocmanager.cpp \ +#>- katefilelist.cpp katefileselector.cpp katemainwindow.cpp \ +#>- katepluginmanager.cpp katesplitter.cpp kateviewmanager.cpp \ +#>- kateviewspace.cpp katemain.cpp kateappIface.skel kateIface.skel \ +#>- kategrepdialog.cpp katefiledialog.cpp +#>+ 6 +libkate_main_la_SOURCES=kateapp.cpp kateconfigdialog.cpp \ + kateconfigplugindialogpage.cpp kateconsole.cpp katedocmanager.cpp \ + katefilelist.cpp katefileselector.cpp katemainwindow.cpp \ + katepluginmanager.cpp katesplitter.cpp kateviewmanager.cpp \ + kateviewspace.cpp katemain.cpp \ + kategrepdialog.cpp katefiledialog.cpp kateappIface_skel.cpp kateIface_skel.cpp d16 6 a21 2 -kate_la_LIBADD = ../interfaces/libkateinterfaces.la -lkscript +libkate_main_la_LIBADD = ../interfaces/libkateinterfaces.la -lkscript d26 1 a26 1 kate_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version d28 4 a31 4 -kwrite_la_SOURCES = kwritemain.cpp katefiledialog.cpp -kwrite_la_LIBADD = ../interfaces/libkateinterfaces.la +libkwrite_main_la_SOURCES = kwritemain.cpp katefiledialog.cpp +libkwrite_main_la_LIBADD = ../interfaces/libkateinterfaces.la d38 1 a38 1 -kate_SOURCES = dummy.cpp d44 1 a44 1 -kwrite_SOURCES = dummy.cpp d50 2 a51 2 INCLUDES = -DKATEPART_NOT_INSTALLED -I../interfaces $(all_includes) @@@@ -326,45 +336,55 @@@@ CONFIG_HEADER = $(top_builddir)/config.h d55 2 a56 2 -kate_la_DEPENDENCIES = ../interfaces/libkateinterfaces.la -am_kate_la_OBJECTS = kateapp.lo kateconfigdialog.lo \ d59 5 a63 2 +#>- kate_la_OBJECTS = $(am_kate_la_OBJECTS) +#>+ 1 d67 6 a72 1 +#>- kwrite_la_OBJECTS = $(am_kwrite_la_OBJECTS) d75 2 a76 8 +libkate_main_la_DEPENDENCIES = ../interfaces/libkateinterfaces.la +am_libkate_main_la_OBJECTS = kateapp.lo kateconfigdialog.lo \ kateconfigplugindialogpage.lo kateconsole.lo katedocmanager.lo \ katefilelist.lo katefileselector.lo katemainwindow.lo \ katepluginmanager.lo katesplitter.lo kateviewmanager.lo \ kateviewspace.lo katemain.lo kategrepdialog.lo \ katefiledialog.lo -#>- kate_la_OBJECTS = $(am_kate_la_OBJECTS) d78 12 a89 19 #>+ 9 -kate_la_final_OBJECTS = kate_la.all_cpp.lo -kate_la_nofinal_OBJECTS = kateapp.lo kateconfigdialog.lo \ +libkate_main_la_final_OBJECTS = libkate_main_la.all_cpp.lo +libkate_main_la_nofinal_OBJECTS = kateapp.lo kateconfigdialog.lo \ kateconfigplugindialogpage.lo kateconsole.lo katedocmanager.lo \ katefilelist.lo katefileselector.lo katemainwindow.lo \ katepluginmanager.lo katesplitter.lo kateviewmanager.lo \ kateviewspace.lo katemain.lo kategrepdialog.lo \ katefiledialog.lo kateappIface_skel.lo kateIface_skel.lo -@@KDE_USE_FINAL_FALSE@@kate_la_OBJECTS = $(kate_la_nofinal_OBJECTS) -@@KDE_USE_FINAL_TRUE@@kate_la_OBJECTS = $(kate_la_final_OBJECTS) -kwrite_la_DEPENDENCIES = ../interfaces/libkateinterfaces.la -am_kwrite_la_OBJECTS = kwritemain.lo katefiledialog.lo -#>- kwrite_la_OBJECTS = $(am_kwrite_la_OBJECTS) +@@KDE_USE_FINAL_FALSE@@libkate_main_la_OBJECTS = $(libkate_main_la_nofinal_OBJECTS) +@@KDE_USE_FINAL_TRUE@@libkate_main_la_OBJECTS = $(libkate_main_la_final_OBJECTS) +libkwrite_main_la_DEPENDENCIES = ../interfaces/libkateinterfaces.la +am_libkwrite_main_la_OBJECTS = kwritemain.lo katefiledialog.lo d91 1 a91 5 #>+ 4 -kwrite_la_final_OBJECTS = kwrite_la.all_cpp.lo -kwrite_la_nofinal_OBJECTS = kwritemain.lo katefiledialog.lo -@@KDE_USE_FINAL_FALSE@@kwrite_la_OBJECTS = $(kwrite_la_nofinal_OBJECTS) -@@KDE_USE_FINAL_TRUE@@kwrite_la_OBJECTS = $(kwrite_la_final_OBJECTS) d93 2 a94 1 +libkwrite_main_la_nofinal_OBJECTS = kwritemain.lo katefiledialog.lo d100 1 a100 1 -am_kate_OBJECTS = dummy.$(OBJEXT) d104 1 a104 1 -kate_OBJECTS = dummy.$(OBJEXT) d106 1 a106 1 -am_kwrite_OBJECTS = dummy.$(OBJEXT) d112 1 a112 1 -kwrite_OBJECTS = dummy.$(OBJEXT) d119 1 a119 2 @@@@ -372,7 +392,8 @@@@ CPPFLAGS = @@CPPFLAGS@@ LDFLAGS = @@LDFLAGS@@ d122 31 a152 30 -#>- @@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kateapp.Plo \ +#>- @@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/dummy_main.Plo $(DEPDIR)/dummy_main.Po \ +#>- @@AMDEP_TRUE@@ $(DEPDIR)/kateapp.Plo \ #>- @@AMDEP_TRUE@@ $(DEPDIR)/kateconfigdialog.Plo \ #>- @@AMDEP_TRUE@@ $(DEPDIR)/kateconfigplugindialogpage.Plo \ #>- @@AMDEP_TRUE@@ $(DEPDIR)/kateconsole.Plo \ @@@@ -387,8 +408,9 @@@@ depcomp = $(SHELL) $(top_srcdir)/admin/d #>- @@AMDEP_TRUE@@ $(DEPDIR)/kateviewmanager.Plo \ #>- @@AMDEP_TRUE@@ $(DEPDIR)/kateviewspace.Plo \ #>- @@AMDEP_TRUE@@ $(DEPDIR)/kwritemain.Plo -#>+ 31 -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@DEP_FILES = $(DEPDIR)/kateappIface_skel.P $(DEPDIR)/kateIface_skel.P $(DEPDIR)/kate_la.all_cpp.P $(DEPDIR)/kwrite_la.all_cpp.P $(DEPDIR)/dummy.Po $(DEPDIR)/kateapp.Plo \ +#>+ 33 +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@DEP_FILES = $(DEPDIR)/kateappIface_skel.P $(DEPDIR)/kateIface_skel.P $(DEPDIR)/libkate_main_la.all_cpp.P $(DEPDIR)/libkwrite_main_la.all_cpp.P $(DEPDIR)/dummy_main.Plo $(DEPDIR)/dummy_main.Po \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kateapp.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kateconfigdialog.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kateconfigplugindialogpage.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kateconsole.Plo \ @@@@ -403,7 +425,8 @@@@ depcomp = $(SHELL) $(top_srcdir)/admin/d @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kateviewmanager.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kateviewspace.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kwritemain.Plo -@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@DEP_FILES = $(DEPDIR)/kateappIface_skel.P $(DEPDIR)/kateIface_skel.P $(DEPDIR)/dummy.Po $(DEPDIR)/kateapp.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@DEP_FILES = $(DEPDIR)/kateappIface_skel.P $(DEPDIR)/kateIface_skel.P $(DEPDIR)/dummy_main.Plo $(DEPDIR)/dummy_main.Po \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kateapp.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kateconfigdialog.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kateconfigplugindialogpage.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kateconsole.Plo \ @@@@ -438,10 +461,11 @@@@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ d155 2 a156 1 -DIST_SOURCES = $(kate_la_SOURCES) $(kwrite_la_SOURCES) $(kate_SOURCES) \ d158 2 a159 3 +DIST_SOURCES = $(kate_la_SOURCES) $(kwrite_la_SOURCES) \ + $(libkate_main_la_SOURCES) $(libkwrite_main_la_SOURCES) \ + $(kate_SOURCES) $(kwrite_SOURCES) d161 2 a162 2 -SOURCES = $(kate_la_SOURCES) $(kwrite_la_SOURCES) $(kate_SOURCES) $(kwrite_SOURCES) +SOURCES = $(kate_la_SOURCES) $(kwrite_la_SOURCES) $(libkate_main_la_SOURCES) $(libkwrite_main_la_SOURCES) $(kate_SOURCES) $(kwrite_SOURCES) d166 1 a166 1 @@@@ -492,6 +516,10 @@@@ kate.la: $(kate_la_OBJECTS) $(kate_la_DE d172 2 d176 1 d179 1 a179 2 $(mkinstalldirs) $(DESTDIR)$(bindir) @@@@ -529,7 +557,8 @@@@ mostlyclean-compile: d183 9 a191 8 -@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/dummy.Po@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/dummy_main.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/dummy_main.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kateapp.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kateconfigdialog.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kateconfigplugindialogpage.Plo@@am__quote@@ @@@@ -604,7 +633,7 @@@@ distclean-tags: d194 2 a195 2 -KDE_DIST=katefilelist.cpp katemain.cpp katefiledialog.h katepluginmanager.h katefileselector.h kateviewmanager.cpp kateviewspace.h kateconsole.cpp kateconfigdialog.h kwritemain.h katedocmanager.cpp katefilelist.h katefileselector.cpp kateconsole.h kateviewspace.cpp katemainwindow.cpp kateapp.h kategrepdialog.cpp katedocmanager.h katesplitter.cpp katemain.h kateconfigplugindialogpage.h katesplitter.h kateappIface.h katemainwindow.h katepluginmanager.cpp kateviewmanager.h kateIface.h kategrepdialog.h +KDE_DIST=katemain.cpp katefileselector.h kateIface.h katemainwindow.cpp kateviewspace.cpp kateapp.h katefiledialog.h katesplitter.h kwritemain.h kategrepdialog.cpp kateappIface.h kateconfigplugindialogpage.h kateviewmanager.cpp kategrepdialog.h kateviewspace.h katesplitter.cpp katemain.h katefilelist.cpp kateconfigdialog.h katefileselector.cpp katepluginmanager.h kateconsole.h kateconsole.cpp katefilelist.h katemainwindow.h kateviewmanager.h katedocmanager.cpp katedocmanager.h katepluginmanager.cpp kateconfigplugindialogpage.cpp d199 1 a199 3 @@@@ -718,46 +747,37 @@@@ uninstall-am: uninstall-binPROGRAMS unin tags uninstall uninstall-am uninstall-binPROGRAMS \ uninstall-info-am uninstall-libLTLIBRARIES d201 2 d204 5 a208 2 -dummy.cpp: - echo > dummy.cpp d213 4 a216 9 -#>+ 9 -kateappIface.kidl: $(srcdir)/kateappIface.h $(DCOP_DEPENDENCIES) - $(DCOPIDL) $(srcdir)/kateappIface.h > kateappIface.kidl || ( rm -f kateappIface.kidl ; /bin/false ) -kateappIface_skel.cpp: kateappIface.kidl - $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub kateappIface.kidl -kateIface.kidl: $(srcdir)/kateIface.h $(DCOP_DEPENDENCIES) - $(DCOPIDL) $(srcdir)/kateIface.h > kateIface.kidl || ( rm -f kateIface.kidl ; /bin/false ) -kateIface_skel.cpp: kateIface.kidl - $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub kateIface.kidl d218 2 a219 8 +kateviewmanager.moc: $(srcdir)/kateviewmanager.h + $(MOC) $(srcdir)/kateviewmanager.h -o kateviewmanager.moc #>+ 3 -kateconfigdialog.moc: $(srcdir)/kateconfigdialog.h - $(MOC) $(srcdir)/kateconfigdialog.h -o kateconfigdialog.moc +katesplitter.moc: $(srcdir)/katesplitter.h + $(MOC) $(srcdir)/katesplitter.h -o katesplitter.moc d224 2 a225 2 +katefileselector.moc: $(srcdir)/katefileselector.h + $(MOC) $(srcdir)/katefileselector.h -o katefileselector.moc d228 2 a229 4 -katemainwindow.moc: $(srcdir)/katemainwindow.h - $(MOC) $(srcdir)/katemainwindow.h -o katemainwindow.moc +katefilelist.moc: $(srcdir)/katefilelist.h + $(MOC) $(srcdir)/katefilelist.h -o katefilelist.moc d234 2 a235 2 +kateconfigdialog.moc: $(srcdir)/kateconfigdialog.h + $(MOC) $(srcdir)/kateconfigdialog.h -o kateconfigdialog.moc d240 46 a285 2 +kateconfigplugindialogpage.moc: $(srcdir)/kateconfigplugindialogpage.h + $(MOC) $(srcdir)/kateconfigplugindialogpage.h -o kateconfigplugindialogpage.moc d290 2 a291 2 +katemainwindow.moc: $(srcdir)/katemainwindow.h + $(MOC) $(srcdir)/katemainwindow.h -o katemainwindow.moc d295 1 a295 2 @@@@ -772,32 +792,38 @@@@ kateviewspace.moc: $(srcdir)/kateviewspa $(MOC) $(srcdir)/kateviewspace.h -o kateviewspace.moc d300 4 a303 2 - -#>+ 3 d310 2 a311 2 -katefileselector.moc: $(srcdir)/katefileselector.h - $(MOC) $(srcdir)/katefileselector.h -o katefileselector.moc a315 6 -katefiledialog.moc: $(srcdir)/katefiledialog.h - $(MOC) $(srcdir)/katefiledialog.h -o katefiledialog.moc +kategrepdialog.moc: $(srcdir)/kategrepdialog.h + $(MOC) $(srcdir)/kategrepdialog.h -o kategrepdialog.moc #>+ 3 d318 2 a319 2 +kateconsole.moc: $(srcdir)/kateconsole.h + $(MOC) $(srcdir)/kateconsole.h -o kateconsole.moc d322 2 a323 2 katepluginmanager.moc: $(srcdir)/katepluginmanager.h $(MOC) $(srcdir)/katepluginmanager.h -o katepluginmanager.moc a324 10 +#>+ 9 +kateappIface.kidl: $(srcdir)/kateappIface.h $(DCOP_DEPENDENCIES) + $(DCOPIDL) $(srcdir)/kateappIface.h > kateappIface.kidl || ( rm -f kateappIface.kidl ; /bin/false ) +kateappIface_skel.cpp: kateappIface.kidl + $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub kateappIface.kidl +kateIface.kidl: $(srcdir)/kateIface.h $(DCOP_DEPENDENCIES) + $(DCOPIDL) $(srcdir)/kateIface.h > kateIface.kidl || ( rm -f kateIface.kidl ; /bin/false ) +kateIface_skel.cpp: kateIface.kidl + $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub kateIface.kidl + d327 2 a328 2 - -rm -f kateconfigdialog.moc kateconsole.moc katemainwindow.moc katedocmanager.moc kategrepdialog.moc katefilelist.moc kateapp.moc kwritemain.moc kateviewspace.moc katesplitter.moc kateviewmanager.moc katefileselector.moc katefiledialog.moc kateconfigplugindialogpage.moc katepluginmanager.moc + -rm -f kateviewmanager.moc katesplitter.moc katefileselector.moc katefilelist.moc kateconfigdialog.moc kateconfigplugindialogpage.moc katemainwindow.moc kateapp.moc kwritemain.moc kateviewspace.moc katefiledialog.moc katedocmanager.moc kategrepdialog.moc kateconsole.moc katepluginmanager.moc d330 1 a330 1 #>+ 5 d332 1 a332 2 @@@@ -816,45 +842,45 @@@@ force-reedit: a333 19 #>+ 11 -kate_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kateapp.cpp $(srcdir)/kateconfigdialog.cpp $(srcdir)/kateconfigplugindialogpage.cpp $(srcdir)/kateconsole.cpp $(srcdir)/katedocmanager.cpp $(srcdir)/katefilelist.cpp $(srcdir)/katefileselector.cpp $(srcdir)/katemainwindow.cpp $(srcdir)/katepluginmanager.cpp $(srcdir)/katesplitter.cpp $(srcdir)/kateviewmanager.cpp $(srcdir)/kateviewspace.cpp $(srcdir)/katemain.cpp $(srcdir)/kategrepdialog.cpp $(srcdir)/katefiledialog.cpp kateappIface_skel.cpp kateIface_skel.cpp kateconfigdialog.moc katemainwindow.moc kateconsole.moc katedocmanager.moc katefilelist.moc kategrepdialog.moc kateapp.moc kateviewspace.moc kateviewmanager.moc katesplitter.moc katefiledialog.moc katefileselector.moc kateconfigplugindialogpage.moc katepluginmanager.moc - @@echo 'creating kate_la.all_cpp.cpp ...'; \ - rm -f kate_la.all_cpp.files kate_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kate_la.all_cpp.final; \ +libkate_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kateapp.cpp $(srcdir)/kateconfigdialog.cpp $(srcdir)/kateconfigplugindialogpage.cpp $(srcdir)/kateconsole.cpp $(srcdir)/katedocmanager.cpp $(srcdir)/katefilelist.cpp $(srcdir)/katefileselector.cpp $(srcdir)/katemainwindow.cpp $(srcdir)/katepluginmanager.cpp $(srcdir)/katesplitter.cpp $(srcdir)/kateviewmanager.cpp $(srcdir)/kateviewspace.cpp $(srcdir)/katemain.cpp $(srcdir)/kategrepdialog.cpp $(srcdir)/katefiledialog.cpp kateappIface_skel.cpp kateIface_skel.cpp katefilelist.moc katefileselector.moc katesplitter.moc kateviewmanager.moc katemainwindow.moc kateconfigplugindialogpage.moc kateconfigdialog.moc kateapp.moc kateviewspace.moc katefiledialog.moc kateconsole.moc kategrepdialog.moc katedocmanager.moc katepluginmanager.moc + @@echo 'creating libkate_main_la.all_cpp.cpp ...'; \ + rm -f libkate_main_la.all_cpp.files libkate_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkate_main_la.all_cpp.final; \ for file in kateapp.cpp kateconfigdialog.cpp kateconfigplugindialogpage.cpp kateconsole.cpp katedocmanager.cpp katefilelist.cpp katefileselector.cpp katemainwindow.cpp katepluginmanager.cpp katesplitter.cpp kateviewmanager.cpp kateviewspace.cpp katemain.cpp kategrepdialog.cpp katefiledialog.cpp kateappIface_skel.cpp kateIface_skel.cpp ; do \ - echo "#include \"$$file\"" >> kate_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kate_la.all_cpp.final; \ + echo "#include \"$$file\"" >> libkate_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkate_main_la.all_cpp.final; \ done; \ - cat kate_la.all_cpp.final kate_la.all_cpp.files > kate_la.all_cpp.cpp; \ - rm -f kate_la.all_cpp.final kate_la.all_cpp.files + cat libkate_main_la.all_cpp.final libkate_main_la.all_cpp.files > libkate_main_la.all_cpp.cpp; \ + rm -f libkate_main_la.all_cpp.final libkate_main_la.all_cpp.files d336 1 a336 1 -kwrite_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwritemain.cpp $(srcdir)/katefiledialog.cpp kwritemain.moc katefiledialog.moc d340 19 a358 1 +libkwrite_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwritemain.cpp $(srcdir)/katefiledialog.cpp kwritemain.moc katefiledialog.moc d362 1 a362 3 for file in kwritemain.cpp katefiledialog.cpp ; do \ - echo "#include \"$$file\"" >> kwrite_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kwrite_la.all_cpp.final; \ d365 1 a365 3 done; \ - cat kwrite_la.all_cpp.final kwrite_la.all_cpp.files > kwrite_la.all_cpp.cpp; \ - rm -f kwrite_la.all_cpp.final kwrite_la.all_cpp.files d368 1 a368 1 d371 2 a372 2 - -rm -f kate_la.all_cpp.cpp kwrite_la.all_cpp.cpp + -rm -f libkate_main_la.all_cpp.cpp libkwrite_main_la.all_cpp.cpp d376 2 a377 2 - $(MAKE) kate_la_OBJECTS="$(kate_la_final_OBJECTS)" kwrite_la_OBJECTS="$(kwrite_la_final_OBJECTS)" all-am + $(MAKE) libkate_main_la_OBJECTS="$(libkate_main_la_final_OBJECTS)" libkwrite_main_la_OBJECTS="$(libkwrite_main_la_final_OBJECTS)" all-am d380 2 a381 2 - $(MAKE) kate_la_OBJECTS="$(kate_la_final_OBJECTS)" kwrite_la_OBJECTS="$(kwrite_la_final_OBJECTS)" install-am + $(MAKE) libkate_main_la_OBJECTS="$(libkate_main_la_final_OBJECTS)" libkwrite_main_la_OBJECTS="$(libkwrite_main_la_final_OBJECTS)" install-am d384 2 a385 2 - $(MAKE) kate_la_OBJECTS="$(kate_la_nofinal_OBJECTS)" kwrite_la_OBJECTS="$(kwrite_la_nofinal_OBJECTS)" all-am + $(MAKE) libkate_main_la_OBJECTS="$(libkate_main_la_nofinal_OBJECTS)" libkwrite_main_la_OBJECTS="$(libkwrite_main_la_nofinal_OBJECTS)" all-am d388 2 a389 2 - $(MAKE) kate_la_OBJECTS="$(kate_la_nofinal_OBJECTS)" kwrite_la_OBJECTS="$(kwrite_la_nofinal_OBJECTS)" install-am + $(MAKE) libkate_main_la_OBJECTS="$(libkate_main_la_nofinal_OBJECTS)" libkwrite_main_la_OBJECTS="$(libkwrite_main_la_nofinal_OBJECTS)" install-am d393 1 a393 1 @@@@ -864,33 +890,33 @@@@ kde-rpo-clean: d396 1 a396 1 #>+ 31 d400 8 a407 1 -kateconsole.lo: kateconsole.moc d409 5 d415 2 a416 2 -katesplitter.o: katesplitter.moc -kwritemain.o: kwritemain.moc d418 2 a419 3 +kwritemain.lo: kwritemain.moc +kateapp.lo: kateapp.moc kateconfigplugindialogpage.o: kateconfigplugindialogpage.moc d423 3 d427 6 a432 2 katemainwindow.lo: katemainwindow.moc +kateconfigplugindialogpage.lo: kateconfigplugindialogpage.moc d439 4 a443 1 +katefileselector.o: katefileselector.moc a444 1 +kateconsole.lo: kateconsole.moc a445 1 +kateapp.o: kateapp.moc a446 1 katefiledialog.lo: katefiledialog.moc d448 1 a448 1 +katefiledialog.o: katefiledialog.moc d450 1 a450 1 katedocmanager.lo: katedocmanager.moc a451 1 +katesplitter.o: katesplitter.moc d453 1 a453 3 +kwritemain.o: kwritemain.moc +katefileselector.lo: katefileselector.moc +kateviewmanager.lo: kateviewmanager.moc d456 3 a458 1 katefilelist.lo: katefilelist.moc d462 1 d464 2 a465 2 -katefilelist.o: katefilelist.moc +katesplitter.lo: katesplitter.moc @ 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-ac,v 1.1.2.1 2002/06/23 19:05:13 jlam Exp $ d3 1 a3 1 --- kate/app/Makefile.in.orig Mon May 13 23:57:35 2002 d5 1 a5 1 @@@@ -287,35 +287,45 @@@@ d14 4 a17 4 -#>- kateconsole.cpp katedocmanager.cpp katefilelist.cpp katefileselector.cpp \ -#>- katemainwindow.cpp katepluginmanager.cpp katesplitter.cpp \ -#>- kateviewmanager.cpp kateviewspace.cpp katemain.cpp \ -#>- kateappIface.skel kateIface.skel kategrepdialog.cpp katefiledialog.cpp d25 5 a29 5 +#>- kateconfigplugindialogpage.cpp kateconsole.cpp katedocmanager.cpp \ +#>- katefilelist.cpp katefileselector.cpp katemainwindow.cpp \ +#>- katepluginmanager.cpp katesplitter.cpp kateviewmanager.cpp \ +#>- kateviewspace.cpp katemain.cpp kateappIface.skel kateIface.skel \ +#>- kategrepdialog.cpp katefiledialog.cpp a36 1 + d38 2 d42 1 a42 2 -kate_la_LIBADD = ../interfaces/libkateinterfaces.la -lkscript d70 1 a70 1 @@@@ -327,47 +337,57 @@@@ d95 1 a95 1 #>+ 10 d104 1 a104 2 katefiledialog.lo kateappIface_skel.lo kateIface_skel.lo \ - kate_la_meta_unload.lo a109 1 + libkate_main_la_meta_unload.lo d115 1 a115 1 #>+ 5 d117 1 a117 2 -kwrite_la_nofinal_OBJECTS = kwritemain.lo katefiledialog.lo \ - kwrite_la_meta_unload.lo d121 1 a121 2 +libkwrite_main_la_nofinal_OBJECTS = kwritemain.lo katefiledialog.lo \ + libkwrite_main_la_meta_unload.lo d146 1 a146 1 @@@@ -375,7 +395,8 @@@@ d150 29 a178 7 -@@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kateapp.Plo \ +@@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/dummy_main.Plo $(DEPDIR)/dummy_main.Po \ + @@AMDEP_TRUE@@ $(DEPDIR)/kateapp.Plo \ @@AMDEP_TRUE@@ $(DEPDIR)/kateconfigdialog.Plo \ @@AMDEP_TRUE@@ $(DEPDIR)/kateconfigplugindialogpage.Plo \ @@AMDEP_TRUE@@ $(DEPDIR)/kateconsole.Plo \ @@@@ -409,10 +430,11 @@@@ d193 1 a193 1 @@@@ -463,6 +485,10 @@@@ d204 1 a204 1 @@@@ -500,7 +526,8 @@@@ d214 1 a214 1 @@@@ -575,7 +602,7 @@@@ d218 1 a218 1 -KDE_DIST=katemain.cpp katefileselector.h katemainwindow.cpp kateapp.h katefiledialog.h katesplitter.h kwritemain.h kategrepdialog.cpp kateconfigplugindialogpage.h kateappIface.h kateviewmanager.cpp katemain.h kateconfigdialog.h katefilelist.cpp katedocmanager.h kateIface.h kateviewspace.cpp kategrepdialog.h kateviewspace.h katesplitter.cpp katefileselector.cpp katepluginmanager.h kateconsole.h kateconsole.cpp katefilelist.h katemainwindow.h kateviewmanager.h katedocmanager.cpp katepluginmanager.cpp d223 1 a223 1 @@@@ -689,23 +716,10 @@@@ d235 1 a235 1 -kateappIface.kidl: $(srcdir)/kateappIface.h $(DCOPIDL_DEPENDENCIES) d239 1 a239 1 -kateIface.kidl: $(srcdir)/kateIface.h $(DCOPIDL_DEPENDENCIES) d243 48 d292 24 a316 3 kateviewmanager.moc: $(srcdir)/kateviewmanager.h $(MOC) $(srcdir)/kateviewmanager.h -o kateviewmanager.moc @@@@ -766,6 +780,16 @@@@ d321 1 a321 1 +kateappIface.kidl: $(srcdir)/kateappIface.h $(DCOPIDL_DEPENDENCIES) d325 1 a325 1 +kateIface.kidl: $(srcdir)/kateIface.h $(DCOPIDL_DEPENDENCIES) d332 2 a333 2 -rm -f kateviewmanager.moc katesplitter.moc katefileselector.moc katefilelist.moc kateconfigdialog.moc kateconfigplugindialogpage.moc katemainwindow.moc kateapp.moc kwritemain.moc kateviewspace.moc katefiledialog.moc katedocmanager.moc kategrepdialog.moc kateconsole.moc katepluginmanager.moc @@@@ -787,41 +811,41 @@@@ d335 3 a337 43 #>+ 12 -kate_la_meta_unload.cpp: katefilelist.moc katefileselector.moc katesplitter.moc kateviewmanager.moc katemainwindow.moc kateconfigplugindialogpage.moc kateconfigdialog.moc kateapp.moc kateviewspace.moc katefiledialog.moc kateconsole.moc kategrepdialog.moc katedocmanager.moc katepluginmanager.moc - @@echo 'creating kate_la_meta_unload.cpp' - @@-rm -f kate_la_meta_unload.cpp +libkate_main_la_meta_unload.cpp: katefilelist.moc katefileselector.moc katesplitter.moc kateviewmanager.moc katemainwindow.moc kateconfigplugindialogpage.moc kateconfigdialog.moc kateapp.moc kateviewspace.moc katefiledialog.moc kateconsole.moc kategrepdialog.moc katedocmanager.moc katepluginmanager.moc + @@echo 'creating libkate_main_la_meta_unload.cpp' + @@-rm -f libkate_main_la_meta_unload.cpp @@if test ${kde_qtver} = 2; then \ - echo 'static const char * _metalist_kate_la[] = {' > kate_la_meta_unload.cpp ;\ - cat katefilelist.moc katefileselector.moc katesplitter.moc kateviewmanager.moc katemainwindow.moc kateconfigplugindialogpage.moc kateconfigdialog.moc kateapp.moc kateviewspace.moc katefiledialog.moc kateconsole.moc kategrepdialog.moc katedocmanager.moc katepluginmanager.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kate_la_meta_unload.cpp ;\ - echo '0};' >> kate_la_meta_unload.cpp ;\ - echo '#include ' >> kate_la_meta_unload.cpp ;\ - echo '_UNLOAD(kate_la)' >> kate_la_meta_unload.cpp ;\ - else echo > kate_la_meta_unload.cpp; fi + echo 'static const char * _metalist_libkate_main_la[] = {' > libkate_main_la_meta_unload.cpp ;\ + cat katefilelist.moc katefileselector.moc katesplitter.moc kateviewmanager.moc katemainwindow.moc kateconfigplugindialogpage.moc kateconfigdialog.moc kateapp.moc kateviewspace.moc katefiledialog.moc kateconsole.moc kategrepdialog.moc katedocmanager.moc katepluginmanager.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkate_main_la_meta_unload.cpp ;\ + echo '0};' >> libkate_main_la_meta_unload.cpp ;\ + echo '#include ' >> libkate_main_la_meta_unload.cpp ;\ + echo '_UNLOAD(libkate_main_la)' >> libkate_main_la_meta_unload.cpp ;\ + else echo > libkate_main_la_meta_unload.cpp; fi #>+ 12 -kwrite_la_meta_unload.cpp: kwritemain.moc katefiledialog.moc - @@echo 'creating kwrite_la_meta_unload.cpp' - @@-rm -f kwrite_la_meta_unload.cpp +libkwrite_main_la_meta_unload.cpp: kwritemain.moc katefiledialog.moc + @@echo 'creating libkwrite_main_la_meta_unload.cpp' + @@-rm -f libkwrite_main_la_meta_unload.cpp @@if test ${kde_qtver} = 2; then \ - echo 'static const char * _metalist_kwrite_la[] = {' > kwrite_la_meta_unload.cpp ;\ - cat kwritemain.moc katefiledialog.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kwrite_la_meta_unload.cpp ;\ - echo '0};' >> kwrite_la_meta_unload.cpp ;\ - echo '#include ' >> kwrite_la_meta_unload.cpp ;\ - echo '_UNLOAD(kwrite_la)' >> kwrite_la_meta_unload.cpp ;\ - else echo > kwrite_la_meta_unload.cpp; fi + echo 'static const char * _metalist_libkwrite_main_la[] = {' > libkwrite_main_la_meta_unload.cpp ;\ + cat kwritemain.moc katefiledialog.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkwrite_main_la_meta_unload.cpp ;\ + echo '0};' >> libkwrite_main_la_meta_unload.cpp ;\ + echo '#include ' >> libkwrite_main_la_meta_unload.cpp ;\ + echo '_UNLOAD(libkwrite_main_la)' >> libkwrite_main_la_meta_unload.cpp ;\ + else echo > libkwrite_main_la_meta_unload.cpp; fi a339 19 #>+ 3 clean-moc-classes: - -rm -f kate_la_meta_unload.cpp kwrite_la_meta_unload.cpp + -rm -f libkate_main_la_meta_unload.cpp libkwrite_main_la_meta_unload.cpp #>+ 11 -kate_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kateapp.cpp $(srcdir)/kateconfigdialog.cpp $(srcdir)/kateconfigplugindialogpage.cpp $(srcdir)/kateconsole.cpp $(srcdir)/katedocmanager.cpp $(srcdir)/katefilelist.cpp $(srcdir)/katefileselector.cpp $(srcdir)/katemainwindow.cpp $(srcdir)/katepluginmanager.cpp $(srcdir)/katesplitter.cpp $(srcdir)/kateviewmanager.cpp $(srcdir)/kateviewspace.cpp $(srcdir)/katemain.cpp $(srcdir)/kategrepdialog.cpp $(srcdir)/katefiledialog.cpp kateappIface_skel.cpp kateIface_skel.cpp kate_la_meta_unload.cpp kateviewmanager.moc katesplitter.moc katefileselector.moc katefilelist.moc kateconfigdialog.moc kateconfigplugindialogpage.moc katemainwindow.moc kateapp.moc kwritemain.moc kateviewspace.moc katefiledialog.moc katedocmanager.moc kategrepdialog.moc kateconsole.moc katepluginmanager.moc +kate_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dummy_main.cpp kateviewmanager.moc katesplitter.moc katefileselector.moc katefilelist.moc kateconfigdialog.moc kateconfigplugindialogpage.moc katemainwindow.moc kateapp.moc kwritemain.moc kateviewspace.moc katefiledialog.moc katedocmanager.moc kategrepdialog.moc kateconsole.moc katepluginmanager.moc @@echo 'creating kate_la.all_cpp.cpp ...'; \ rm -f kate_la.all_cpp.files kate_la.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kate_la.all_cpp.final; \ - for file in kateapp.cpp kateconfigdialog.cpp kateconfigplugindialogpage.cpp kateconsole.cpp katedocmanager.cpp katefilelist.cpp katefileselector.cpp katemainwindow.cpp katepluginmanager.cpp katesplitter.cpp kateviewmanager.cpp kateviewspace.cpp katemain.cpp kategrepdialog.cpp katefiledialog.cpp kateappIface_skel.cpp kateIface_skel.cpp kate_la_meta_unload.cpp ; do \ + for file in dummy_main.cpp ; do \ echo "#include \"$$file\"" >> kate_la.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kate_la.all_cpp.final; \ done; \ @@@@ -829,11 +853,11 @@@@ rm -f kate_la.all_cpp.final kate_la.all_cpp.files d341 5 a345 16 -kwrite_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwritemain.cpp $(srcdir)/katefiledialog.cpp kwrite_la_meta_unload.cpp +kwrite_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dummy_main.cpp @@echo 'creating kwrite_la.all_cpp.cpp ...'; \ rm -f kwrite_la.all_cpp.files kwrite_la.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kwrite_la.all_cpp.final; \ - for file in kwritemain.cpp katefiledialog.cpp kwrite_la_meta_unload.cpp ; do \ + for file in dummy_main.cpp ; do \ echo "#include \"$$file\"" >> kwrite_la.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kwrite_la.all_cpp.final; \ done; \ @@@@ -841,11 +865,35 @@@@ rm -f kwrite_la.all_cpp.final kwrite_la.all_cpp.files #>+ 11 -kate.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp +libkate_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kateapp.cpp $(srcdir)/kateconfigdialog.cpp $(srcdir)/kateconfigplugindialogpage.cpp $(srcdir)/kateconsole.cpp $(srcdir)/katedocmanager.cpp $(srcdir)/katefilelist.cpp $(srcdir)/katefileselector.cpp $(srcdir)/katemainwindow.cpp $(srcdir)/katepluginmanager.cpp $(srcdir)/katesplitter.cpp $(srcdir)/kateviewmanager.cpp $(srcdir)/kateviewspace.cpp $(srcdir)/katemain.cpp $(srcdir)/kategrepdialog.cpp $(srcdir)/katefiledialog.cpp kateappIface_skel.cpp kateIface_skel.cpp libkate_main_la_meta_unload.cpp d349 3 a351 1 + for file in kateapp.cpp kateconfigdialog.cpp kateconfigplugindialogpage.cpp kateconsole.cpp katedocmanager.cpp katefilelist.cpp katefileselector.cpp katemainwindow.cpp katepluginmanager.cpp katesplitter.cpp kateviewmanager.cpp kateviewspace.cpp katemain.cpp kategrepdialog.cpp katefiledialog.cpp kateappIface_skel.cpp kateIface_skel.cpp libkate_main_la_meta_unload.cpp ; do \ d354 4 a357 2 + done; \ + cat libkate_main_la.all_cpp.final libkate_main_la.all_cpp.files > libkate_main_la.all_cpp.cpp; \ d359 7 a365 3 + +#>+ 11 +libkwrite_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwritemain.cpp $(srcdir)/katefiledialog.cpp libkwrite_main_la_meta_unload.cpp d369 3 a371 1 + for file in kwritemain.cpp katefiledialog.cpp libkwrite_main_la_meta_unload.cpp ; do \ d374 4 a377 2 + done; \ + cat libkwrite_main_la.all_cpp.final libkwrite_main_la.all_cpp.files > libkwrite_main_la.all_cpp.cpp; \ a378 26 + +#>+ 11 +kate.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dummy_main.cpp @@echo 'creating kate.all_cpp.cpp ...'; \ rm -f kate.all_cpp.files kate.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kate.all_cpp.final; \ - for file in dummy.cpp ; do \ + for file in dummy_main.cpp ; do \ echo "#include \"$$file\"" >> kate.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kate.all_cpp.final; \ done; \ @@@@ -853,11 +901,11 @@@@ rm -f kate.all_cpp.final kate.all_cpp.files #>+ 11 -kwrite.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp +kwrite.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dummy_main.cpp @@echo 'creating kwrite.all_cpp.cpp ...'; \ rm -f kwrite.all_cpp.files kwrite.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kwrite.all_cpp.final; \ - for file in dummy.cpp ; do \ + for file in dummy_main.cpp ; do \ echo "#include \"$$file\"" >> kwrite.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kwrite.all_cpp.final; \ done; \ @@@@ -866,20 +914,20 @@@@ d382 2 a383 2 - -rm -f kate_la.all_cpp.cpp kwrite_la.all_cpp.cpp kate.all_cpp.cpp kwrite.all_cpp.cpp + -rm -f kate_la.all_cpp.cpp kwrite_la.all_cpp.cpp libkate_main_la.all_cpp.cpp libkwrite_main_la.all_cpp.cpp kate.all_cpp.cpp kwrite.all_cpp.cpp d403 56 a458 1 $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean @ 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-ac was added on branch buildlink2 on 2002-06-23 19:05:13 +0000 @ text @d1 400 @ 1.1.1.1.2.2 log @Merge from pkgsrc-current to buildlink2 branch. @ text @a0 400 $NetBSD: patch-ac,v 1.1.1.1.2.1 2002/06/23 19:05:13 jlam Exp $ --- kate/app/Makefile.in.orig Mon May 13 23:57:35 2002 +++ kate/app/Makefile.in @@@@ -287,35 +287,45 @@@@ x_includes = @@x_includes@@ x_libraries = @@x_libraries@@ -lib_LTLIBRARIES = kate.la kwrite.la +lib_LTLIBRARIES = libkate_main.la kate.la libkwrite_main.la kwrite.la bin_PROGRAMS = kate kwrite -#>- kate_la_SOURCES = kateapp.cpp kateconfigdialog.cpp kateconfigplugindialogpage.cpp \ -#>- kateconsole.cpp katedocmanager.cpp katefilelist.cpp katefileselector.cpp \ -#>- katemainwindow.cpp katepluginmanager.cpp katesplitter.cpp \ -#>- kateviewmanager.cpp kateviewspace.cpp katemain.cpp \ -#>- kateappIface.skel kateIface.skel kategrepdialog.cpp katefiledialog.cpp -#>+ 5 -kate_la_SOURCES=kateapp.cpp kateconfigdialog.cpp kateconfigplugindialogpage.cpp \ - kateconsole.cpp katedocmanager.cpp katefilelist.cpp katefileselector.cpp \ - katemainwindow.cpp katepluginmanager.cpp katesplitter.cpp \ - kateviewmanager.cpp kateviewspace.cpp katemain.cpp \ - kategrepdialog.cpp katefiledialog.cpp kateappIface_skel.cpp kateIface_skel.cpp +#>- libkate_main_la_SOURCES = kateapp.cpp kateconfigdialog.cpp \ +#>- kateconfigplugindialogpage.cpp kateconsole.cpp katedocmanager.cpp \ +#>- katefilelist.cpp katefileselector.cpp katemainwindow.cpp \ +#>- katepluginmanager.cpp katesplitter.cpp kateviewmanager.cpp \ +#>- kateviewspace.cpp katemain.cpp kateappIface.skel kateIface.skel \ +#>- kategrepdialog.cpp katefiledialog.cpp +#>+ 6 +libkate_main_la_SOURCES=kateapp.cpp kateconfigdialog.cpp \ + kateconfigplugindialogpage.cpp kateconsole.cpp katedocmanager.cpp \ + katefilelist.cpp katefileselector.cpp katemainwindow.cpp \ + katepluginmanager.cpp katesplitter.cpp kateviewmanager.cpp \ + kateviewspace.cpp katemain.cpp \ + kategrepdialog.cpp katefiledialog.cpp kateappIface_skel.cpp kateIface_skel.cpp + +libkate_main_la_LIBADD = ../interfaces/libkateinterfaces.la -lkscript +libkate_main_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -kate_la_LIBADD = ../interfaces/libkateinterfaces.la -lkscript +kate_la_SOURCES = dummy_main.cpp +kate_la_LIBADD = libkate_main.la kate_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -kwrite_la_SOURCES = kwritemain.cpp katefiledialog.cpp -kwrite_la_LIBADD = ../interfaces/libkateinterfaces.la +libkwrite_main_la_SOURCES = kwritemain.cpp katefiledialog.cpp +libkwrite_main_la_LIBADD = ../interfaces/libkateinterfaces.la +libkwrite_main_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) + +kwrite_la_SOURCES = dummy_main.cpp +kwrite_la_LIBADD = libkwrite_main.la kwrite_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -kate_SOURCES = dummy.cpp -kate_LDADD = kate.la +kate_SOURCES = dummy_main.cpp +kate_LDADD = libkate_main.la kate_LDFLAGS = $(KDE_RPATH) $(all_libraries) -kwrite_SOURCES = dummy.cpp -kwrite_LDADD = kwrite.la +kwrite_SOURCES = dummy_main.cpp +kwrite_LDADD = libkwrite_main.la kwrite_LDFLAGS = $(KDE_RPATH) $(all_libraries) INCLUDES = -DKATEPART_NOT_INSTALLED -I../interfaces $(all_includes) @@@@ -327,47 +337,57 @@@@ CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) -kate_la_DEPENDENCIES = ../interfaces/libkateinterfaces.la -am_kate_la_OBJECTS = kateapp.lo kateconfigdialog.lo \ +kate_la_DEPENDENCIES = libkate_main.la +am_kate_la_OBJECTS = dummy_main.lo +#>- kate_la_OBJECTS = $(am_kate_la_OBJECTS) +#>+ 1 +kate_la_OBJECTS = dummy_main.lo +kwrite_la_DEPENDENCIES = libkwrite_main.la +am_kwrite_la_OBJECTS = dummy_main.lo +#>- kwrite_la_OBJECTS = $(am_kwrite_la_OBJECTS) +#>+ 1 +kwrite_la_OBJECTS = dummy_main.lo +libkate_main_la_DEPENDENCIES = ../interfaces/libkateinterfaces.la +am_libkate_main_la_OBJECTS = kateapp.lo kateconfigdialog.lo \ kateconfigplugindialogpage.lo kateconsole.lo katedocmanager.lo \ katefilelist.lo katefileselector.lo katemainwindow.lo \ katepluginmanager.lo katesplitter.lo kateviewmanager.lo \ kateviewspace.lo katemain.lo kategrepdialog.lo \ katefiledialog.lo -#>- kate_la_OBJECTS = $(am_kate_la_OBJECTS) +#>- libkate_main_la_OBJECTS = $(am_libkate_main_la_OBJECTS) #>+ 10 -kate_la_final_OBJECTS = kate_la.all_cpp.lo -kate_la_nofinal_OBJECTS = kateapp.lo kateconfigdialog.lo \ +libkate_main_la_final_OBJECTS = libkate_main_la.all_cpp.lo +libkate_main_la_nofinal_OBJECTS = kateapp.lo kateconfigdialog.lo \ kateconfigplugindialogpage.lo kateconsole.lo katedocmanager.lo \ katefilelist.lo katefileselector.lo katemainwindow.lo \ katepluginmanager.lo katesplitter.lo kateviewmanager.lo \ kateviewspace.lo katemain.lo kategrepdialog.lo \ katefiledialog.lo kateappIface_skel.lo kateIface_skel.lo \ - kate_la_meta_unload.lo -@@KDE_USE_FINAL_FALSE@@kate_la_OBJECTS = $(kate_la_nofinal_OBJECTS) -@@KDE_USE_FINAL_TRUE@@kate_la_OBJECTS = $(kate_la_final_OBJECTS) -kwrite_la_DEPENDENCIES = ../interfaces/libkateinterfaces.la -am_kwrite_la_OBJECTS = kwritemain.lo katefiledialog.lo -#>- kwrite_la_OBJECTS = $(am_kwrite_la_OBJECTS) + libkate_main_la_meta_unload.lo +@@KDE_USE_FINAL_FALSE@@libkate_main_la_OBJECTS = $(libkate_main_la_nofinal_OBJECTS) +@@KDE_USE_FINAL_TRUE@@libkate_main_la_OBJECTS = $(libkate_main_la_final_OBJECTS) +libkwrite_main_la_DEPENDENCIES = ../interfaces/libkateinterfaces.la +am_libkwrite_main_la_OBJECTS = kwritemain.lo katefiledialog.lo +#>- libkwrite_main_la_OBJECTS = $(am_libkwrite_main_la_OBJECTS) #>+ 5 -kwrite_la_final_OBJECTS = kwrite_la.all_cpp.lo -kwrite_la_nofinal_OBJECTS = kwritemain.lo katefiledialog.lo \ - kwrite_la_meta_unload.lo -@@KDE_USE_FINAL_FALSE@@kwrite_la_OBJECTS = $(kwrite_la_nofinal_OBJECTS) -@@KDE_USE_FINAL_TRUE@@kwrite_la_OBJECTS = $(kwrite_la_final_OBJECTS) +libkwrite_main_la_final_OBJECTS = libkwrite_main_la.all_cpp.lo +libkwrite_main_la_nofinal_OBJECTS = kwritemain.lo katefiledialog.lo \ + libkwrite_main_la_meta_unload.lo +@@KDE_USE_FINAL_FALSE@@libkwrite_main_la_OBJECTS = $(libkwrite_main_la_nofinal_OBJECTS) +@@KDE_USE_FINAL_TRUE@@libkwrite_main_la_OBJECTS = $(libkwrite_main_la_final_OBJECTS) bin_PROGRAMS = kate$(EXEEXT) kwrite$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) -am_kate_OBJECTS = dummy.$(OBJEXT) +am_kate_OBJECTS = dummy_main.$(OBJEXT) #>- kate_OBJECTS = $(am_kate_OBJECTS) #>+ 1 -kate_OBJECTS = dummy.$(OBJEXT) -kate_DEPENDENCIES = kate.la -am_kwrite_OBJECTS = dummy.$(OBJEXT) +kate_OBJECTS = dummy_main.$(OBJEXT) +kate_DEPENDENCIES = libkate_main.la +am_kwrite_OBJECTS = dummy_main.$(OBJEXT) #>- kwrite_OBJECTS = $(am_kwrite_OBJECTS) #>+ 1 -kwrite_OBJECTS = dummy.$(OBJEXT) -kwrite_DEPENDENCIES = kwrite.la +kwrite_OBJECTS = dummy_main.$(OBJEXT) +kwrite_DEPENDENCIES = libkwrite_main.la DEFS = @@DEFS@@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) @@@@ -375,7 +395,8 @@@@ LDFLAGS = @@LDFLAGS@@ LIBS = @@LIBS@@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp -@@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kateapp.Plo \ +@@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/dummy_main.Plo $(DEPDIR)/dummy_main.Po \ + @@AMDEP_TRUE@@ $(DEPDIR)/kateapp.Plo \ @@AMDEP_TRUE@@ $(DEPDIR)/kateconfigdialog.Plo \ @@AMDEP_TRUE@@ $(DEPDIR)/kateconfigplugindialogpage.Plo \ @@AMDEP_TRUE@@ $(DEPDIR)/kateconsole.Plo \ @@@@ -409,10 +430,11 @@@@ CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@@ CXXFLAGS = @@CXXFLAGS@@ -DIST_SOURCES = $(kate_la_SOURCES) $(kwrite_la_SOURCES) $(kate_SOURCES) \ - $(kwrite_SOURCES) +DIST_SOURCES = $(kate_la_SOURCES) $(kwrite_la_SOURCES) \ + $(libkate_main_la_SOURCES) $(libkwrite_main_la_SOURCES) \ + $(kate_SOURCES) $(kwrite_SOURCES) DIST_COMMON = Makefile.am Makefile.in -SOURCES = $(kate_la_SOURCES) $(kwrite_la_SOURCES) $(kate_SOURCES) $(kwrite_SOURCES) +SOURCES = $(kate_la_SOURCES) $(kwrite_la_SOURCES) $(libkate_main_la_SOURCES) $(libkwrite_main_la_SOURCES) $(kate_SOURCES) $(kwrite_SOURCES) #>- all: all-am #>+ 1 @@@@ -463,6 +485,10 @@@@ $(CXXLINK) -rpath $(libdir) $(kate_la_LDFLAGS) $(kate_la_OBJECTS) $(kate_la_LIBADD) $(LIBS) kwrite.la: $(kwrite_la_OBJECTS) $(kwrite_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kwrite_la_LDFLAGS) $(kwrite_la_OBJECTS) $(kwrite_la_LIBADD) $(LIBS) +libkate_main.la: $(libkate_main_la_OBJECTS) $(libkate_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkate_main_la_LDFLAGS) $(libkate_main_la_OBJECTS) $(libkate_main_la_LIBADD) $(LIBS) +libkwrite_main.la: $(libkwrite_main_la_OBJECTS) $(libkwrite_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkwrite_main_la_LDFLAGS) $(libkwrite_main_la_OBJECTS) $(libkwrite_main_la_LIBADD) $(LIBS) install-binPROGRAMS: $(bin_PROGRAMS) @@$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) @@@@ -500,7 +526,8 @@@@ distclean-compile: -rm -f *.tab.c -@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/dummy.Po@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/dummy_main.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/dummy_main.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kateapp.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kateconfigdialog.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kateconfigplugindialogpage.Plo@@am__quote@@ @@@@ -575,7 +602,7 @@@@ #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=katemain.cpp katefileselector.h katemainwindow.cpp kateapp.h katefiledialog.h katesplitter.h kwritemain.h kategrepdialog.cpp kateconfigplugindialogpage.h kateappIface.h kateviewmanager.cpp katemain.h kateconfigdialog.h katefilelist.cpp katedocmanager.h kateIface.h kateviewspace.cpp kategrepdialog.h kateviewspace.h katesplitter.cpp katefileselector.cpp katepluginmanager.h kateconsole.h kateconsole.cpp katefilelist.h katemainwindow.h kateviewmanager.h katedocmanager.cpp katepluginmanager.cpp +KDE_DIST=katemain.cpp katefileselector.h kateIface.h katemainwindow.cpp kateviewspace.cpp kateapp.h katefiledialog.h katesplitter.h kwritemain.h kategrepdialog.cpp kateappIface.h kateconfigplugindialogpage.h kateviewmanager.cpp kategrepdialog.h kateviewspace.h katesplitter.cpp katemain.h katefilelist.cpp kateconfigdialog.h katefileselector.cpp katepluginmanager.h kateconsole.h kateconsole.cpp katefilelist.h katemainwindow.h kateviewmanager.h katedocmanager.cpp katedocmanager.h katepluginmanager.cpp kateconfigplugindialogpage.cpp DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) @@@@ -689,23 +716,10 @@@@ tags uninstall uninstall-am uninstall-binPROGRAMS \ uninstall-info-am uninstall-libLTLIBRARIES - -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 -kateappIface.kidl: $(srcdir)/kateappIface.h $(DCOPIDL_DEPENDENCIES) - $(DCOPIDL) $(srcdir)/kateappIface.h > kateappIface.kidl || ( rm -f kateappIface.kidl ; /bin/false ) -kateappIface_skel.cpp: kateappIface.kidl - $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub kateappIface.kidl -kateIface.kidl: $(srcdir)/kateIface.h $(DCOPIDL_DEPENDENCIES) - $(DCOPIDL) $(srcdir)/kateIface.h > kateIface.kidl || ( rm -f kateIface.kidl ; /bin/false ) -kateIface_skel.cpp: kateIface.kidl - $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub kateIface.kidl - #>+ 3 kateviewmanager.moc: $(srcdir)/kateviewmanager.h $(MOC) $(srcdir)/kateviewmanager.h -o kateviewmanager.moc @@@@ -766,6 +780,16 @@@@ katepluginmanager.moc: $(srcdir)/katepluginmanager.h $(MOC) $(srcdir)/katepluginmanager.h -o katepluginmanager.moc +#>+ 9 +kateappIface.kidl: $(srcdir)/kateappIface.h $(DCOPIDL_DEPENDENCIES) + $(DCOPIDL) $(srcdir)/kateappIface.h > kateappIface.kidl || ( rm -f kateappIface.kidl ; /bin/false ) +kateappIface_skel.cpp: kateappIface.kidl + $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub kateappIface.kidl +kateIface.kidl: $(srcdir)/kateIface.h $(DCOPIDL_DEPENDENCIES) + $(DCOPIDL) $(srcdir)/kateIface.h > kateIface.kidl || ( rm -f kateIface.kidl ; /bin/false ) +kateIface_skel.cpp: kateIface.kidl + $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub kateIface.kidl + #>+ 3 clean-metasources: -rm -f kateviewmanager.moc katesplitter.moc katefileselector.moc katefilelist.moc kateconfigdialog.moc kateconfigplugindialogpage.moc katemainwindow.moc kateapp.moc kwritemain.moc kateviewspace.moc katefiledialog.moc katedocmanager.moc kategrepdialog.moc kateconsole.moc katepluginmanager.moc @@@@ -787,41 +811,41 @@@@ #>+ 12 -kate_la_meta_unload.cpp: katefilelist.moc katefileselector.moc katesplitter.moc kateviewmanager.moc katemainwindow.moc kateconfigplugindialogpage.moc kateconfigdialog.moc kateapp.moc kateviewspace.moc katefiledialog.moc kateconsole.moc kategrepdialog.moc katedocmanager.moc katepluginmanager.moc - @@echo 'creating kate_la_meta_unload.cpp' - @@-rm -f kate_la_meta_unload.cpp +libkate_main_la_meta_unload.cpp: katefilelist.moc katefileselector.moc katesplitter.moc kateviewmanager.moc katemainwindow.moc kateconfigplugindialogpage.moc kateconfigdialog.moc kateapp.moc kateviewspace.moc katefiledialog.moc kateconsole.moc kategrepdialog.moc katedocmanager.moc katepluginmanager.moc + @@echo 'creating libkate_main_la_meta_unload.cpp' + @@-rm -f libkate_main_la_meta_unload.cpp @@if test ${kde_qtver} = 2; then \ - echo 'static const char * _metalist_kate_la[] = {' > kate_la_meta_unload.cpp ;\ - cat katefilelist.moc katefileselector.moc katesplitter.moc kateviewmanager.moc katemainwindow.moc kateconfigplugindialogpage.moc kateconfigdialog.moc kateapp.moc kateviewspace.moc katefiledialog.moc kateconsole.moc kategrepdialog.moc katedocmanager.moc katepluginmanager.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kate_la_meta_unload.cpp ;\ - echo '0};' >> kate_la_meta_unload.cpp ;\ - echo '#include ' >> kate_la_meta_unload.cpp ;\ - echo '_UNLOAD(kate_la)' >> kate_la_meta_unload.cpp ;\ - else echo > kate_la_meta_unload.cpp; fi + echo 'static const char * _metalist_libkate_main_la[] = {' > libkate_main_la_meta_unload.cpp ;\ + cat katefilelist.moc katefileselector.moc katesplitter.moc kateviewmanager.moc katemainwindow.moc kateconfigplugindialogpage.moc kateconfigdialog.moc kateapp.moc kateviewspace.moc katefiledialog.moc kateconsole.moc kategrepdialog.moc katedocmanager.moc katepluginmanager.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkate_main_la_meta_unload.cpp ;\ + echo '0};' >> libkate_main_la_meta_unload.cpp ;\ + echo '#include ' >> libkate_main_la_meta_unload.cpp ;\ + echo '_UNLOAD(libkate_main_la)' >> libkate_main_la_meta_unload.cpp ;\ + else echo > libkate_main_la_meta_unload.cpp; fi #>+ 12 -kwrite_la_meta_unload.cpp: kwritemain.moc katefiledialog.moc - @@echo 'creating kwrite_la_meta_unload.cpp' - @@-rm -f kwrite_la_meta_unload.cpp +libkwrite_main_la_meta_unload.cpp: kwritemain.moc katefiledialog.moc + @@echo 'creating libkwrite_main_la_meta_unload.cpp' + @@-rm -f libkwrite_main_la_meta_unload.cpp @@if test ${kde_qtver} = 2; then \ - echo 'static const char * _metalist_kwrite_la[] = {' > kwrite_la_meta_unload.cpp ;\ - cat kwritemain.moc katefiledialog.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kwrite_la_meta_unload.cpp ;\ - echo '0};' >> kwrite_la_meta_unload.cpp ;\ - echo '#include ' >> kwrite_la_meta_unload.cpp ;\ - echo '_UNLOAD(kwrite_la)' >> kwrite_la_meta_unload.cpp ;\ - else echo > kwrite_la_meta_unload.cpp; fi + echo 'static const char * _metalist_libkwrite_main_la[] = {' > libkwrite_main_la_meta_unload.cpp ;\ + cat kwritemain.moc katefiledialog.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkwrite_main_la_meta_unload.cpp ;\ + echo '0};' >> libkwrite_main_la_meta_unload.cpp ;\ + echo '#include ' >> libkwrite_main_la_meta_unload.cpp ;\ + echo '_UNLOAD(libkwrite_main_la)' >> libkwrite_main_la_meta_unload.cpp ;\ + else echo > libkwrite_main_la_meta_unload.cpp; fi #>+ 3 clean-moc-classes: - -rm -f kate_la_meta_unload.cpp kwrite_la_meta_unload.cpp + -rm -f libkate_main_la_meta_unload.cpp libkwrite_main_la_meta_unload.cpp #>+ 11 -kate_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kateapp.cpp $(srcdir)/kateconfigdialog.cpp $(srcdir)/kateconfigplugindialogpage.cpp $(srcdir)/kateconsole.cpp $(srcdir)/katedocmanager.cpp $(srcdir)/katefilelist.cpp $(srcdir)/katefileselector.cpp $(srcdir)/katemainwindow.cpp $(srcdir)/katepluginmanager.cpp $(srcdir)/katesplitter.cpp $(srcdir)/kateviewmanager.cpp $(srcdir)/kateviewspace.cpp $(srcdir)/katemain.cpp $(srcdir)/kategrepdialog.cpp $(srcdir)/katefiledialog.cpp kateappIface_skel.cpp kateIface_skel.cpp kate_la_meta_unload.cpp kateviewmanager.moc katesplitter.moc katefileselector.moc katefilelist.moc kateconfigdialog.moc kateconfigplugindialogpage.moc katemainwindow.moc kateapp.moc kwritemain.moc kateviewspace.moc katefiledialog.moc katedocmanager.moc kategrepdialog.moc kateconsole.moc katepluginmanager.moc +kate_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dummy_main.cpp kateviewmanager.moc katesplitter.moc katefileselector.moc katefilelist.moc kateconfigdialog.moc kateconfigplugindialogpage.moc katemainwindow.moc kateapp.moc kwritemain.moc kateviewspace.moc katefiledialog.moc katedocmanager.moc kategrepdialog.moc kateconsole.moc katepluginmanager.moc @@echo 'creating kate_la.all_cpp.cpp ...'; \ rm -f kate_la.all_cpp.files kate_la.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kate_la.all_cpp.final; \ - for file in kateapp.cpp kateconfigdialog.cpp kateconfigplugindialogpage.cpp kateconsole.cpp katedocmanager.cpp katefilelist.cpp katefileselector.cpp katemainwindow.cpp katepluginmanager.cpp katesplitter.cpp kateviewmanager.cpp kateviewspace.cpp katemain.cpp kategrepdialog.cpp katefiledialog.cpp kateappIface_skel.cpp kateIface_skel.cpp kate_la_meta_unload.cpp ; do \ + for file in dummy_main.cpp ; do \ echo "#include \"$$file\"" >> kate_la.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kate_la.all_cpp.final; \ done; \ @@@@ -829,11 +853,11 @@@@ rm -f kate_la.all_cpp.final kate_la.all_cpp.files #>+ 11 -kwrite_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwritemain.cpp $(srcdir)/katefiledialog.cpp kwrite_la_meta_unload.cpp +kwrite_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dummy_main.cpp @@echo 'creating kwrite_la.all_cpp.cpp ...'; \ rm -f kwrite_la.all_cpp.files kwrite_la.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kwrite_la.all_cpp.final; \ - for file in kwritemain.cpp katefiledialog.cpp kwrite_la_meta_unload.cpp ; do \ + for file in dummy_main.cpp ; do \ echo "#include \"$$file\"" >> kwrite_la.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kwrite_la.all_cpp.final; \ done; \ @@@@ -841,11 +865,35 @@@@ rm -f kwrite_la.all_cpp.final kwrite_la.all_cpp.files #>+ 11 -kate.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp +libkate_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kateapp.cpp $(srcdir)/kateconfigdialog.cpp $(srcdir)/kateconfigplugindialogpage.cpp $(srcdir)/kateconsole.cpp $(srcdir)/katedocmanager.cpp $(srcdir)/katefilelist.cpp $(srcdir)/katefileselector.cpp $(srcdir)/katemainwindow.cpp $(srcdir)/katepluginmanager.cpp $(srcdir)/katesplitter.cpp $(srcdir)/kateviewmanager.cpp $(srcdir)/kateviewspace.cpp $(srcdir)/katemain.cpp $(srcdir)/kategrepdialog.cpp $(srcdir)/katefiledialog.cpp kateappIface_skel.cpp kateIface_skel.cpp libkate_main_la_meta_unload.cpp + @@echo 'creating libkate_main_la.all_cpp.cpp ...'; \ + rm -f libkate_main_la.all_cpp.files libkate_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkate_main_la.all_cpp.final; \ + for file in kateapp.cpp kateconfigdialog.cpp kateconfigplugindialogpage.cpp kateconsole.cpp katedocmanager.cpp katefilelist.cpp katefileselector.cpp katemainwindow.cpp katepluginmanager.cpp katesplitter.cpp kateviewmanager.cpp kateviewspace.cpp katemain.cpp kategrepdialog.cpp katefiledialog.cpp kateappIface_skel.cpp kateIface_skel.cpp libkate_main_la_meta_unload.cpp ; do \ + echo "#include \"$$file\"" >> libkate_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkate_main_la.all_cpp.final; \ + done; \ + cat libkate_main_la.all_cpp.final libkate_main_la.all_cpp.files > libkate_main_la.all_cpp.cpp; \ + rm -f libkate_main_la.all_cpp.final libkate_main_la.all_cpp.files + +#>+ 11 +libkwrite_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwritemain.cpp $(srcdir)/katefiledialog.cpp libkwrite_main_la_meta_unload.cpp + @@echo 'creating libkwrite_main_la.all_cpp.cpp ...'; \ + rm -f libkwrite_main_la.all_cpp.files libkwrite_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkwrite_main_la.all_cpp.final; \ + for file in kwritemain.cpp katefiledialog.cpp libkwrite_main_la_meta_unload.cpp ; do \ + echo "#include \"$$file\"" >> libkwrite_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkwrite_main_la.all_cpp.final; \ + done; \ + cat libkwrite_main_la.all_cpp.final libkwrite_main_la.all_cpp.files > libkwrite_main_la.all_cpp.cpp; \ + rm -f libkwrite_main_la.all_cpp.final libkwrite_main_la.all_cpp.files + +#>+ 11 +kate.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dummy_main.cpp @@echo 'creating kate.all_cpp.cpp ...'; \ rm -f kate.all_cpp.files kate.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kate.all_cpp.final; \ - for file in dummy.cpp ; do \ + for file in dummy_main.cpp ; do \ echo "#include \"$$file\"" >> kate.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kate.all_cpp.final; \ done; \ @@@@ -853,11 +901,11 @@@@ rm -f kate.all_cpp.final kate.all_cpp.files #>+ 11 -kwrite.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp +kwrite.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dummy_main.cpp @@echo 'creating kwrite.all_cpp.cpp ...'; \ rm -f kwrite.all_cpp.files kwrite.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kwrite.all_cpp.final; \ - for file in dummy.cpp ; do \ + for file in dummy_main.cpp ; do \ echo "#include \"$$file\"" >> kwrite.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kwrite.all_cpp.final; \ done; \ @@@@ -866,20 +914,20 @@@@ #>+ 3 clean-final: - -rm -f kate_la.all_cpp.cpp kwrite_la.all_cpp.cpp kate.all_cpp.cpp kwrite.all_cpp.cpp + -rm -f kate_la.all_cpp.cpp kwrite_la.all_cpp.cpp libkate_main_la.all_cpp.cpp libkwrite_main_la.all_cpp.cpp kate.all_cpp.cpp kwrite.all_cpp.cpp #>+ 2 final: - $(MAKE) kate_la_OBJECTS="$(kate_la_final_OBJECTS)" kwrite_la_OBJECTS="$(kwrite_la_final_OBJECTS)" all-am + $(MAKE) libkate_main_la_OBJECTS="$(libkate_main_la_final_OBJECTS)" libkwrite_main_la_OBJECTS="$(libkwrite_main_la_final_OBJECTS)" all-am #>+ 2 final-install: - $(MAKE) kate_la_OBJECTS="$(kate_la_final_OBJECTS)" kwrite_la_OBJECTS="$(kwrite_la_final_OBJECTS)" install-am + $(MAKE) libkate_main_la_OBJECTS="$(libkate_main_la_final_OBJECTS)" libkwrite_main_la_OBJECTS="$(libkwrite_main_la_final_OBJECTS)" install-am #>+ 2 no-final: - $(MAKE) kate_la_OBJECTS="$(kate_la_nofinal_OBJECTS)" kwrite_la_OBJECTS="$(kwrite_la_nofinal_OBJECTS)" all-am + $(MAKE) libkate_main_la_OBJECTS="$(libkate_main_la_nofinal_OBJECTS)" libkwrite_main_la_OBJECTS="$(libkwrite_main_la_nofinal_OBJECTS)" all-am #>+ 2 no-final-install: - $(MAKE) kate_la_OBJECTS="$(kate_la_nofinal_OBJECTS)" kwrite_la_OBJECTS="$(kwrite_la_nofinal_OBJECTS)" install-am + $(MAKE) libkate_main_la_OBJECTS="$(libkate_main_la_nofinal_OBJECTS)" libkwrite_main_la_OBJECTS="$(libkwrite_main_la_nofinal_OBJECTS)" install-am #>+ 3 cvs-clean: $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean @