head 1.8; access; symbols pkgsrc-2013Q2:1.8.0.52 pkgsrc-2013Q2-base:1.8 pkgsrc-2012Q4:1.8.0.50 pkgsrc-2012Q4-base:1.8 pkgsrc-2011Q4:1.8.0.48 pkgsrc-2011Q4-base:1.8 pkgsrc-2011Q2:1.8.0.46 pkgsrc-2011Q2-base:1.8 pkgsrc-2009Q4:1.8.0.44 pkgsrc-2009Q4-base:1.8 pkgsrc-2008Q4:1.8.0.42 pkgsrc-2008Q4-base:1.8 pkgsrc-2008Q3:1.8.0.40 pkgsrc-2008Q3-base:1.8 cube-native-xorg:1.8.0.38 cube-native-xorg-base:1.8 pkgsrc-2008Q2:1.8.0.36 pkgsrc-2008Q2-base:1.8 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.8 date 2004.02.04.14.25.59; author markd; state dead; 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.35.00; author markd; state Exp; branches; next 1.5; 1.5 date 2003.05.22.02.42.50; author markd; state Exp; branches; next 1.4; 1.4 date 2003.03.11.13.10.23; author markd; state Exp; branches; next 1.3; 1.3 date 2003.01.02.09.12.35; author skrll; state Exp; branches; next 1.2; 1.2 date 2002.08.25.19.23.41; author jlam; state Exp; branches; next 1.1; 1.1 date 2002.05.31.13.19.17; author skrll; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2002.05.31.13.19.17; author skrll; state Exp; branches 1.1.1.1.2.1; next ; 1.1.1.1.2.1 date 2002.05.31.13.19.17; author jlam; state dead; branches; next 1.1.1.1.2.2; 1.1.1.1.2.2 date 2002.06.23.19.05.40; author jlam; state Exp; branches; next ; desc @@ 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 @$NetBSD: patch-ch,v 1.7 2004/01/15 10:15:14 markd Exp $ --- konqueror/Makefile.in.orig 2004-01-02 14:06:00.000000000 +1300 +++ konqueror/Makefile.in @@@@ -429,7 +429,7 @@@@ INCLUDES = -I$(top_srcdir)/libkonq -I$(t #SUBDIRS = . kfmexec client iconview dirtree listview keditbookmarks shellcmdplugin about pics sidebar SUBDIRS = . kfmexec client iconview listview keditbookmarks shellcmdplugin about pics sidebar -lib_LTLIBRARIES = konqueror.la +lib_LTLIBRARIES = libkonqueror_main.la konqueror.la konqdatadir = $(kde_datadir)/konqueror konqdata_DATA = konqueror.rc @@@@ -446,7 +446,7 @@@@ include_HEADERS = KonquerorIface.h bin_PROGRAMS = konqueror -#>- konqueror_la_SOURCES = konq_main.cc \ +#>- libkonqueror_main_la_SOURCES = konq_main.cc \ #>- KonquerorIface.cc KonquerorIface.skel \ #>- KonqMainWindowIface.cc KonqMainWindowIface.skel \ #>- KonqViewIface.cc KonqViewIface.skel \ @@@@ -461,7 +461,7 @@@@ bin_PROGRAMS = konqueror #>- konq_browseriface.cc \ #>- delayedinitializer.cc #>+ 14 -konqueror_la_SOURCES=konq_main.cc \ +libkonqueror_main_la_SOURCES=konq_main.cc \ KonquerorIface.cc \ KonqMainWindowIface.cc \ KonqViewIface.cc \ @@@@ -484,11 +484,15 @@@@ noinst_HEADERS = KonqMainWindowIface.h K konq_view.h konq_viewmgr.h version.h +libkonqueror_main_la_LDFLAGS = $(all_libraries) -module -avoid-version +libkonqueror_main_la_LIBADD = ../libkonq/libkonq.la + +konqueror_la_SOURCES = konqueror_main.cc konqueror_la_LDFLAGS = $(all_libraries) -module -avoid-version -konqueror_la_LIBADD = ../libkonq/libkonq.la +konqueror_la_LIBADD = libkonqueror_main.la ../libkonq/libkonq.la -konqueror_SOURCES = dummy.cc -konqueror_LDADD = konqueror.la +konqueror_SOURCES = konqueror_main.cc +konqueror_LDADD = libkonqueror_main.la konqueror_LDFLAGS = $(KDE_RPATH) $(all_libraries) data_DATA = kfmclient.desktop kfmclient_dir.desktop kfmclient_html.desktop kfmclient_war.desktop @@@@ -514,32 +518,37 @@@@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) -konqueror_la_DEPENDENCIES = ../libkonq/libkonq.la -am_konqueror_la_OBJECTS = konq_main.lo KonquerorIface.lo \ +konqueror_la_DEPENDENCIES = libkonqueror_main.la ../libkonq/libkonq.la +am_konqueror_la_OBJECTS = konqueror_main.lo +#>- konqueror_la_OBJECTS = $(am_konqueror_la_OBJECTS) +#>+ 1 +konqueror_la_OBJECTS = konqueror_main.lo +libkonqueror_main_la_DEPENDENCIES = ../libkonq/libkonq.la +am_libkonqueror_main_la_OBJECTS = konq_main.lo KonquerorIface.lo \ KonqMainWindowIface.lo KonqViewIface.lo konq_mainwindow.lo \ konq_guiclients.lo konq_run.lo konq_view.lo konq_viewmgr.lo \ konq_misc.lo konq_frame.lo konq_actions.lo konq_profiledlg.lo \ konq_factory.lo konq_combo.lo konq_browseriface.lo \ delayedinitializer.lo -#>- konqueror_la_OBJECTS = $(am_konqueror_la_OBJECTS) +#>- libkonqueror_main_la_OBJECTS = $(am_libkonqueror_main_la_OBJECTS) #>+ 9 -konqueror_la_final_OBJECTS = konqueror_la.all_cc.lo -konqueror_la_nofinal_OBJECTS = konq_main.lo KonquerorIface.lo \ +libkonqueror_main_la_final_OBJECTS = libkonqueror_main_la.all_cc.lo +libkonqueror_main_la_nofinal_OBJECTS = konq_main.lo KonquerorIface.lo \ KonqMainWindowIface.lo KonqViewIface.lo konq_mainwindow.lo \ konq_guiclients.lo konq_run.lo konq_view.lo konq_viewmgr.lo \ konq_misc.lo konq_frame.lo konq_actions.lo konq_profiledlg.lo \ konq_factory.lo konq_combo.lo konq_browseriface.lo \ delayedinitializer.lo KonquerorIface_skel.lo KonqMainWindowIface_skel.lo KonqViewIface_skel.lo -@@KDE_USE_FINAL_FALSE@@konqueror_la_OBJECTS = $(konqueror_la_nofinal_OBJECTS) -@@KDE_USE_FINAL_TRUE@@konqueror_la_OBJECTS = $(konqueror_la_final_OBJECTS) +@@KDE_USE_FINAL_FALSE@@libkonqueror_main_la_OBJECTS = $(libkonqueror_main_la_nofinal_OBJECTS) +@@KDE_USE_FINAL_TRUE@@libkonqueror_main_la_OBJECTS = $(libkonqueror_main_la_final_OBJECTS) bin_PROGRAMS = konqueror$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) -am_konqueror_OBJECTS = dummy.$(OBJEXT) +am_konqueror_OBJECTS = konqueror_main.$(OBJEXT) #>- konqueror_OBJECTS = $(am_konqueror_OBJECTS) #>+ 1 -konqueror_OBJECTS = dummy.$(OBJEXT) -konqueror_DEPENDENCIES = konqueror.la +konqueror_OBJECTS = konqueror_main.$(OBJEXT) +konqueror_DEPENDENCIES = libkonqueror_main.la DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp @@@@ -548,7 +557,7 @@@@ am__depfiles_maybe = depfiles #>- @@AMDEP_TRUE@@ ./$(DEPDIR)/KonqViewIface.Plo \ #>- @@AMDEP_TRUE@@ ./$(DEPDIR)/KonquerorIface.Plo \ #>- @@AMDEP_TRUE@@ ./$(DEPDIR)/delayedinitializer.Plo \ -#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/konq_actions.Plo \ +#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/konq_actions.Plo \ #>- @@AMDEP_TRUE@@ ./$(DEPDIR)/konq_browseriface.Plo \ #>- @@AMDEP_TRUE@@ ./$(DEPDIR)/konq_combo.Plo \ #>- @@AMDEP_TRUE@@ ./$(DEPDIR)/konq_factory.Plo \ @@@@ -559,13 +568,15 @@@@ am__depfiles_maybe = depfiles #>- @@AMDEP_TRUE@@ ./$(DEPDIR)/konq_misc.Plo \ #>- @@AMDEP_TRUE@@ ./$(DEPDIR)/konq_profiledlg.Plo \ #>- @@AMDEP_TRUE@@ ./$(DEPDIR)/konq_run.Plo ./$(DEPDIR)/konq_view.Plo \ -#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/konq_viewmgr.Plo -#>+ 33 -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@DEP_FILES = $(DEPDIR)/KonquerorIface_skel.P $(DEPDIR)/KonqMainWindowIface_skel.P $(DEPDIR)/KonqViewIface_skel.P $(DEPDIR)/konqueror_la.all_cc.P ./$(DEPDIR)/KonqMainWindowIface.Plo \ +#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/konq_viewmgr.Plo \ +#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/konqueror_main.Plo \ +#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/konqueror_main.Po +#>+ 37 +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@DEP_FILES = $(DEPDIR)/KonquerorIface_skel.P $(DEPDIR)/KonqMainWindowIface_skel.P $(DEPDIR)/KonqViewIface_skel.P $(DEPDIR)/libkonqueror_main_la.all_cc.P ./$(DEPDIR)/KonqMainWindowIface.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/KonqViewIface.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/KonquerorIface.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/delayedinitializer.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/konq_actions.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/konq_actions.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/konq_browseriface.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/konq_combo.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/konq_factory.Plo \ @@@@ -576,12 +587,14 @@@@ am__depfiles_maybe = depfiles @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/konq_misc.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/konq_profiledlg.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/konq_run.Plo ./$(DEPDIR)/konq_view.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/konq_viewmgr.Plo +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/konq_viewmgr.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/konqueror_main.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/konqueror_main.Po @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@DEP_FILES = $(DEPDIR)/KonquerorIface_skel.P $(DEPDIR)/KonqMainWindowIface_skel.P $(DEPDIR)/KonqViewIface_skel.P ./$(DEPDIR)/KonqMainWindowIface.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/KonqViewIface.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/KonquerorIface.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/delayedinitializer.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/konq_actions.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/konq_actions.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/konq_browseriface.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/konq_combo.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/konq_factory.Plo \ @@@@ -592,7 +605,9 @@@@ am__depfiles_maybe = depfiles @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/konq_misc.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/konq_profiledlg.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/konq_run.Plo ./$(DEPDIR)/konq_view.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/konq_viewmgr.Plo +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/konq_viewmgr.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/konqueror_main.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/konqueror_main.Po #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) @@@@ -612,7 +627,8 @@@@ CXXLD = $(CXX) #>+ 2 CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@@ -DIST_SOURCES = $(konqueror_la_SOURCES) $(konqueror_SOURCES) +DIST_SOURCES = $(konqueror_la_SOURCES) $(libkonqueror_main_la_SOURCES) \ + $(konqueror_SOURCES) DATA = $(data_DATA) $(data2_DATA) $(data3_DATA) $(data4_DATA) \ $(data5_DATA) $(kde_apps_DATA) $(kde_services_DATA) \ $(konqdata_DATA) @@@@ -628,7 +644,7 @@@@ RECURSIVE_TARGETS = info-recursive dvi-r DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) AUTHORS ChangeLog \ Makefile.am Makefile.in TODO DIST_SUBDIRS = $(SUBDIRS) -SOURCES = $(konqueror_la_SOURCES) $(konqueror_SOURCES) +SOURCES = $(konqueror_la_SOURCES) $(libkonqueror_main_la_SOURCES) $(konqueror_SOURCES) #>- all: all-recursive #>+ 1 @@@@ -675,6 +691,8 @@@@ clean-libLTLIBRARIES: done konqueror.la: $(konqueror_la_OBJECTS) $(konqueror_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(konqueror_la_LDFLAGS) $(konqueror_la_OBJECTS) $(konqueror_la_LIBADD) $(LIBS) +libkonqueror_main.la: $(libkonqueror_main_la_OBJECTS) $(libkonqueror_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkonqueror_main_la_LDFLAGS) $(libkonqueror_main_la_OBJECTS) $(libkonqueror_main_la_LIBADD) $(LIBS) binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @@$(NORMAL_INSTALL) @@@@ -718,7 +736,6 @@@@ distclean-compile: @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/KonqViewIface.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/KonquerorIface.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/delayedinitializer.Plo@@am__quote@@ -@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/dummy.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/konq_actions.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/konq_browseriface.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/konq_combo.Plo@@am__quote@@ @@@@ -732,6 +749,8 @@@@ distclean-compile: @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/konq_run.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/konq_view.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/konq_viewmgr.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/konqueror_main.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/konqueror_main.Po@@am__quote@@ distclean-depend: -rm -rf ./$(DEPDIR) @@@@ -1066,7 +1085,7 @@@@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=kfmclient_html.desktop kfmclient.desktop IDEAS kfmclient_dir.desktop profile_filepreview.desktop uninstall.desktop konqueror_config.desktop DESIGN konqueror.rc profile_midnightcommander.desktop profile_webbrowsing.desktop profile_filemanagement.desktop Home.desktop konqbrowser.desktop konquerorsu.desktop konqfilemgr.desktop kfmclient_war.desktop convert_kdelnk.sh konqueror.desktop DESIGN_config +KDE_DIST=DESIGN konqfilemgr.desktop convert_kdelnk.sh DESIGN_config profile_midnightcommander.desktop konqueror_config.desktop konqueror.rc konqbrowser.desktop profile_filemanagement.desktop Makefile.in.rej kfmclient_dir.desktop kfmclient_html.desktop kfmclient.desktop uninstall.desktop IDEAS konqueror.desktop profile_filepreview.desktop Home.desktop konquerorsu.desktop kfmclient_war.desktop profile_webbrowsing.desktop DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) @@@@ -1248,9 +1267,6 @@@@ uninstall-info: uninstall-info-recursive #konqueror_static_LDADD = konqueror.la *view/*.la dirtree/*.la $(libdir)/libkhtml.la #konqueror_static_LDFLAGS = $(all_libraries) -static -dummy.cc: - echo > dummy.cc - messages: rc.cpp $(EXTRACTRC) *.rc */*.rc >> rc.cpp $(EXTRACTRC) sidebar/trees/history_module/history_dlg.ui >> rc.cpp @@@@ -1271,32 +1287,24 @@@@ uninstall-local: # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: -#>+ 13 -KonquerorIface.kidl: $(srcdir)/KonquerorIface.h $(DCOP_DEPENDENCIES) - $(DCOPIDL) $(srcdir)/KonquerorIface.h > KonquerorIface.kidl || ( rm -f KonquerorIface.kidl ; false ) -KonquerorIface_skel.cc: KonquerorIface.kidl - $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KonquerorIface.kidl -KonqMainWindowIface.kidl: $(srcdir)/KonqMainWindowIface.h $(DCOP_DEPENDENCIES) - $(DCOPIDL) $(srcdir)/KonqMainWindowIface.h > KonqMainWindowIface.kidl || ( rm -f KonqMainWindowIface.kidl ; false ) -KonqMainWindowIface_skel.cc: KonqMainWindowIface.kidl - $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KonqMainWindowIface.kidl -KonqViewIface.kidl: $(srcdir)/KonqViewIface.h $(DCOP_DEPENDENCIES) - $(DCOPIDL) $(srcdir)/KonqViewIface.h > KonqViewIface.kidl || ( rm -f KonqViewIface.kidl ; false ) -KonqViewIface_skel.cc: KonqViewIface.kidl - $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KonqViewIface.kidl +#>+ 3 +konq_view.moc: $(srcdir)/konq_view.h + $(MOC) $(srcdir)/konq_view.h -o konq_view.moc +#>+ 1 +mocs: konq_view.moc #>+ 3 -konq_viewmgr.moc: $(srcdir)/konq_viewmgr.h - $(MOC) $(srcdir)/konq_viewmgr.h -o konq_viewmgr.moc +konq_browseriface.moc: $(srcdir)/konq_browseriface.h + $(MOC) $(srcdir)/konq_browseriface.h -o konq_browseriface.moc #>+ 1 -mocs: konq_viewmgr.moc +mocs: konq_browseriface.moc #>+ 3 -konq_view.moc: $(srcdir)/konq_view.h - $(MOC) $(srcdir)/konq_view.h -o konq_view.moc +konq_misc.moc: $(srcdir)/konq_misc.h + $(MOC) $(srcdir)/konq_misc.h -o konq_misc.moc #>+ 1 -mocs: konq_view.moc +mocs: konq_misc.moc #>+ 3 delayedinitializer.moc: $(srcdir)/delayedinitializer.h $(MOC) $(srcdir)/delayedinitializer.h -o delayedinitializer.moc @@@@ -1304,23 +1312,23 @@@@ delayedinitializer.moc: $(srcdir)/delaye #>+ 1 mocs: delayedinitializer.moc #>+ 3 -konq_combo.moc: $(srcdir)/konq_combo.h - $(MOC) $(srcdir)/konq_combo.h -o konq_combo.moc - -#>+ 1 -mocs: konq_combo.moc -#>+ 3 konq_mainwindow.moc: $(srcdir)/konq_mainwindow.h $(MOC) $(srcdir)/konq_mainwindow.h -o konq_mainwindow.moc #>+ 1 mocs: konq_mainwindow.moc #>+ 3 -konq_run.moc: $(srcdir)/konq_run.h - $(MOC) $(srcdir)/konq_run.h -o konq_run.moc +konq_profiledlg.moc: $(srcdir)/konq_profiledlg.h + $(MOC) $(srcdir)/konq_profiledlg.h -o konq_profiledlg.moc #>+ 1 -mocs: konq_run.moc +mocs: konq_profiledlg.moc +#>+ 3 +konq_viewmgr.moc: $(srcdir)/konq_viewmgr.h + $(MOC) $(srcdir)/konq_viewmgr.h -o konq_viewmgr.moc + +#>+ 1 +mocs: konq_viewmgr.moc #>+ 3 konq_actions.moc: $(srcdir)/konq_actions.h $(MOC) $(srcdir)/konq_actions.h -o konq_actions.moc @@@@ -1328,11 +1336,11 @@@@ konq_actions.moc: $(srcdir)/konq_actions #>+ 1 mocs: konq_actions.moc #>+ 3 -konq_misc.moc: $(srcdir)/konq_misc.h - $(MOC) $(srcdir)/konq_misc.h -o konq_misc.moc +konq_combo.moc: $(srcdir)/konq_combo.h + $(MOC) $(srcdir)/konq_combo.h -o konq_combo.moc #>+ 1 -mocs: konq_misc.moc +mocs: konq_combo.moc #>+ 3 konq_guiclients.moc: $(srcdir)/konq_guiclients.h $(MOC) $(srcdir)/konq_guiclients.h -o konq_guiclients.moc @@@@ -1340,26 +1348,34 @@@@ konq_guiclients.moc: $(srcdir)/konq_guic #>+ 1 mocs: konq_guiclients.moc #>+ 3 -konq_browseriface.moc: $(srcdir)/konq_browseriface.h - $(MOC) $(srcdir)/konq_browseriface.h -o konq_browseriface.moc +konq_run.moc: $(srcdir)/konq_run.h + $(MOC) $(srcdir)/konq_run.h -o konq_run.moc #>+ 1 -mocs: konq_browseriface.moc +mocs: konq_run.moc #>+ 3 konq_frame.moc: $(srcdir)/konq_frame.h $(MOC) $(srcdir)/konq_frame.h -o konq_frame.moc #>+ 1 mocs: konq_frame.moc -#>+ 3 -konq_profiledlg.moc: $(srcdir)/konq_profiledlg.h - $(MOC) $(srcdir)/konq_profiledlg.h -o konq_profiledlg.moc +#>+ 13 +KonquerorIface.kidl: $(srcdir)/KonquerorIface.h $(DCOP_DEPENDENCIES) + $(DCOPIDL) $(srcdir)/KonquerorIface.h > KonquerorIface.kidl || ( rm -f KonquerorIface.kidl ; false ) +KonquerorIface_skel.cc: KonquerorIface.kidl + $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KonquerorIface.kidl +KonqMainWindowIface.kidl: $(srcdir)/KonqMainWindowIface.h $(DCOP_DEPENDENCIES) + $(DCOPIDL) $(srcdir)/KonqMainWindowIface.h > KonqMainWindowIface.kidl || ( rm -f KonqMainWindowIface.kidl ; false ) +KonqMainWindowIface_skel.cc: KonqMainWindowIface.kidl + $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KonqMainWindowIface.kidl +KonqViewIface.kidl: $(srcdir)/KonqViewIface.h $(DCOP_DEPENDENCIES) + $(DCOPIDL) $(srcdir)/KonqViewIface.h > KonqViewIface.kidl || ( rm -f KonqViewIface.kidl ; false ) +KonqViewIface_skel.cc: KonqViewIface.kidl + $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KonqViewIface.kidl -#>+ 1 -mocs: konq_profiledlg.moc #>+ 3 clean-metasources: - -rm -f konq_viewmgr.moc konq_view.moc delayedinitializer.moc konq_combo.moc konq_mainwindow.moc konq_run.moc konq_actions.moc konq_misc.moc konq_guiclients.moc konq_browseriface.moc konq_frame.moc konq_profiledlg.moc + -rm -f konq_view.moc konq_browseriface.moc konq_misc.moc delayedinitializer.moc konq_mainwindow.moc konq_profiledlg.moc konq_viewmgr.moc konq_actions.moc konq_combo.moc konq_guiclients.moc konq_run.moc konq_frame.moc #>+ 6 clean-idl: @@@@ -1379,33 +1395,33 @@@@ force-reedit: #>+ 11 -konqueror_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konq_main.cc $(srcdir)/KonquerorIface.cc $(srcdir)/KonqMainWindowIface.cc $(srcdir)/KonqViewIface.cc $(srcdir)/konq_mainwindow.cc $(srcdir)/konq_guiclients.cc $(srcdir)/konq_run.cc $(srcdir)/konq_view.cc $(srcdir)/konq_viewmgr.cc $(srcdir)/konq_misc.cc $(srcdir)/konq_frame.cc $(srcdir)/konq_actions.cc $(srcdir)/konq_profiledlg.cc $(srcdir)/konq_factory.cc $(srcdir)/konq_combo.cc $(srcdir)/konq_browseriface.cc $(srcdir)/delayedinitializer.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc konq_viewmgr.moc konq_combo.moc konq_view.moc konq_run.moc konq_browseriface.moc konq_misc.moc delayedinitializer.moc konq_mainwindow.moc konq_actions.moc konq_frame.moc konq_guiclients.moc konq_profiledlg.moc - @@echo 'creating konqueror_la.all_cc.cc ...'; \ - rm -f konqueror_la.all_cc.files konqueror_la.all_cc.final; \ - echo "#define KDE_USE_FINAL 1" >> konqueror_la.all_cc.final; \ +libkonqueror_main_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konq_main.cc $(srcdir)/KonquerorIface.cc $(srcdir)/KonqMainWindowIface.cc $(srcdir)/KonqViewIface.cc $(srcdir)/konq_mainwindow.cc $(srcdir)/konq_guiclients.cc $(srcdir)/konq_run.cc $(srcdir)/konq_view.cc $(srcdir)/konq_viewmgr.cc $(srcdir)/konq_misc.cc $(srcdir)/konq_frame.cc $(srcdir)/konq_actions.cc $(srcdir)/konq_profiledlg.cc $(srcdir)/konq_factory.cc $(srcdir)/konq_combo.cc $(srcdir)/konq_browseriface.cc $(srcdir)/delayedinitializer.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc konq_view.moc konq_browseriface.moc konq_misc.moc konq_profiledlg.moc konq_mainwindow.moc delayedinitializer.moc konq_viewmgr.moc konq_actions.moc konq_combo.moc konq_guiclients.moc konq_frame.moc konq_run.moc + @@echo 'creating libkonqueror_main_la.all_cc.cc ...'; \ + rm -f libkonqueror_main_la.all_cc.files libkonqueror_main_la.all_cc.final; \ + echo "#define KDE_USE_FINAL 1" >> libkonqueror_main_la.all_cc.final; \ for file in konq_main.cc KonquerorIface.cc KonqMainWindowIface.cc KonqViewIface.cc konq_mainwindow.cc konq_guiclients.cc konq_run.cc konq_view.cc konq_viewmgr.cc konq_misc.cc konq_frame.cc konq_actions.cc konq_profiledlg.cc konq_factory.cc konq_combo.cc konq_browseriface.cc delayedinitializer.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc ; do \ - echo "#include \"$$file\"" >> konqueror_la.all_cc.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> konqueror_la.all_cc.final; \ + echo "#include \"$$file\"" >> libkonqueror_main_la.all_cc.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkonqueror_main_la.all_cc.final; \ done; \ - cat konqueror_la.all_cc.final konqueror_la.all_cc.files > konqueror_la.all_cc.cc; \ - rm -f konqueror_la.all_cc.final konqueror_la.all_cc.files + cat libkonqueror_main_la.all_cc.final libkonqueror_main_la.all_cc.files > libkonqueror_main_la.all_cc.cc; \ + rm -f libkonqueror_main_la.all_cc.final libkonqueror_main_la.all_cc.files #>+ 3 clean-final: - -rm -f konqueror_la.all_cc.cc + -rm -f libkonqueror_main_la.all_cc.cc #>+ 2 final: - $(MAKE) konqueror_la_OBJECTS="$(konqueror_la_final_OBJECTS)" all-am + $(MAKE) libkonqueror_main_la_OBJECTS="$(libkonqueror_main_la_final_OBJECTS)" all-am #>+ 2 final-install: - $(MAKE) konqueror_la_OBJECTS="$(konqueror_la_final_OBJECTS)" install-am + $(MAKE) libkonqueror_main_la_OBJECTS="$(libkonqueror_main_la_final_OBJECTS)" install-am #>+ 2 no-final: - $(MAKE) konqueror_la_OBJECTS="$(konqueror_la_nofinal_OBJECTS)" all-am + $(MAKE) libkonqueror_main_la_OBJECTS="$(libkonqueror_main_la_nofinal_OBJECTS)" all-am #>+ 2 no-final-install: - $(MAKE) konqueror_la_OBJECTS="$(konqueror_la_nofinal_OBJECTS)" install-am + $(MAKE) libkonqueror_main_la_OBJECTS="$(libkonqueror_main_la_nofinal_OBJECTS)" install-am #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean @@@@ -1415,27 +1431,27 @@@@ kde-rpo-clean: -rm -f *.rpo #>+ 25 -konq_browseriface.lo: konq_browseriface.moc konq_frame.lo: konq_frame.moc +konq_view.lo: konq_view.moc +konq_profiledlg.o: konq_profiledlg.moc +konq_view.o: konq_view.moc +konq_browseriface.lo: konq_browseriface.moc konq_browseriface.o: konq_browseriface.moc +konq_misc.o: konq_misc.moc konq_combo.lo: konq_combo.moc -konq_combo.o: konq_combo.moc +konq_actions.o: konq_actions.moc +delayedinitializer.o: delayedinitializer.moc konq_profiledlg.lo: konq_profiledlg.moc -konq_mainwindow.o: konq_mainwindow.moc -konq_misc.o: konq_misc.moc -konq_view.lo: konq_view.moc -delayedinitializer.lo: delayedinitializer.moc -konq_viewmgr.o: konq_viewmgr.moc -konq_view.o: konq_view.moc konq_run.lo: konq_run.moc -konq_actions.lo: konq_actions.moc -konq_viewmgr.lo: konq_viewmgr.moc -konq_mainwindow.lo: konq_mainwindow.moc -konq_run.o: konq_run.moc -konq_misc.lo: konq_misc.moc +delayedinitializer.lo: delayedinitializer.moc +konq_guiclients.lo: konq_guiclients.moc konq_frame.o: konq_frame.moc +konq_misc.lo: konq_misc.moc +konq_run.o: konq_run.moc +konq_viewmgr.o: konq_viewmgr.moc +konq_combo.o: konq_combo.moc konq_guiclients.o: konq_guiclients.moc -delayedinitializer.o: delayedinitializer.moc -konq_actions.o: konq_actions.moc -konq_guiclients.lo: konq_guiclients.moc -konq_profiledlg.o: konq_profiledlg.moc +konq_mainwindow.lo: konq_mainwindow.moc +konq_mainwindow.o: konq_mainwindow.moc +konq_viewmgr.lo: konq_viewmgr.moc +konq_actions.lo: konq_actions.moc @ 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 @d1 1 a1 1 $NetBSD$ @ 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 --- konqueror/Makefile.in.orig 2003-07-15 22:03:39.000000000 +1200 d5 1 a5 1 @@@@ -428,7 +428,7 @@@@ INCLUDES = -I$(top_srcdir)/libkonq -I$(t d14 1 a14 1 @@@@ -445,7 +445,7 @@@@ include_HEADERS = KonquerorIface.h d23 1 a23 1 @@@@ -460,7 +460,7 @@@@ bin_PROGRAMS = konqueror d32 1 a32 1 @@@@ -483,11 +483,15 @@@@ noinst_HEADERS = KonqMainWindowIface.h K d51 1 a51 1 @@@@ -512,32 +516,37 @@@@ CONFIG_HEADER = $(top_builddir)/config.h d99 1 a99 1 @@@@ -546,7 +555,7 @@@@ am__depfiles_maybe = depfiles d108 1 a108 1 @@@@ -557,13 +566,15 @@@@ am__depfiles_maybe = depfiles d128 1 a128 1 @@@@ -574,12 +585,14 @@@@ am__depfiles_maybe = depfiles d145 1 a145 1 @@@@ -590,7 +603,9 @@@@ am__depfiles_maybe = depfiles d156 1 a156 1 @@@@ -610,7 +625,8 @@@@ CXXLD = $(CXX) d166 1 a166 1 @@@@ -626,7 +642,7 @@@@ RECURSIVE_TARGETS = info-recursive dvi-r d175 1 a175 1 @@@@ -673,6 +689,8 @@@@ clean-libLTLIBRARIES: d184 1 a184 1 @@@@ -716,7 +734,6 @@@@ distclean-compile: d192 1 a192 1 @@@@ -730,6 +747,8 @@@@ distclean-compile: d201 1 a201 1 @@@@ -1058,7 +1077,7 @@@@ distclean-tags: d205 1 a205 1 -KDE_DIST=profile_midnightcommander.desktop profile_webbrowsing.desktop kfmclient_war.desktop konqfilemgr.desktop kfmclient_dir.desktop DESIGN profile_filepreview.desktop kfmclient_html.desktop konqueror.desktop konqbrowser.desktop uninstall.desktop convert_kdelnk.sh IDEAS konqueror.rc profile_filemanagement.desktop DESIGN_config konquerorsu.desktop Home.desktop kfmclient.desktop konqueror_config.desktop d210 1 a210 1 @@@@ -1240,9 +1259,6 @@@@ uninstall-info: uninstall-info-recursive d220 1 a220 1 @@@@ -1263,26 +1279,24 @@@@ uninstall-local: d244 2 a245 2 -konq_profiledlg.moc: $(srcdir)/konq_profiledlg.h - $(MOC) $(srcdir)/konq_profiledlg.h -o konq_profiledlg.moc d250 1 a250 1 -mocs: konq_profiledlg.moc d252 3 a254 1 +#>+ 3 d257 3 a259 2 + +#>+ 1 d264 13 a276 1 @@@@ -1296,35 +1310,35 @@@@ konq_mainwindow.moc: $(srcdir)/konq_main d280 2 a281 2 -konq_actions.moc: $(srcdir)/konq_actions.h - $(MOC) $(srcdir)/konq_actions.h -o konq_actions.moc d286 1 a286 1 -mocs: konq_actions.moc d288 1 a288 3 #>+ 3 -konq_frame.moc: $(srcdir)/konq_frame.h - $(MOC) $(srcdir)/konq_frame.h -o konq_frame.moc d291 2 a292 3 #>+ 1 -mocs: konq_frame.moc d295 3 a297 5 -konq_browseriface.moc: $(srcdir)/konq_browseriface.h - $(MOC) $(srcdir)/konq_browseriface.h -o konq_browseriface.moc +konq_actions.moc: $(srcdir)/konq_actions.h + $(MOC) $(srcdir)/konq_actions.h -o konq_actions.moc d299 1 a299 2 -mocs: konq_browseriface.moc +mocs: konq_actions.moc d310 3 a312 5 -konq_view.moc: $(srcdir)/konq_view.h - $(MOC) $(srcdir)/konq_view.h -o konq_view.moc +konq_guiclients.moc: $(srcdir)/konq_guiclients.h + $(MOC) $(srcdir)/konq_guiclients.h -o konq_guiclients.moc d314 1 a314 2 -mocs: konq_view.moc +mocs: konq_guiclients.moc d316 5 a320 3 konq_run.moc: $(srcdir)/konq_run.h $(MOC) $(srcdir)/konq_run.h -o konq_run.moc @@@@ -1332,26 +1346,28 @@@@ konq_run.moc: $(srcdir)/konq_run.h d322 2 a323 1 mocs: konq_run.moc d325 2 a326 10 -konq_viewmgr.moc: $(srcdir)/konq_viewmgr.h - $(MOC) $(srcdir)/konq_viewmgr.h -o konq_viewmgr.moc - -#>+ 1 -mocs: konq_viewmgr.moc -#>+ 3 -konq_guiclients.moc: $(srcdir)/konq_guiclients.h - $(MOC) $(srcdir)/konq_guiclients.h -o konq_guiclients.moc +konq_frame.moc: $(srcdir)/konq_frame.h + $(MOC) $(srcdir)/konq_frame.h -o konq_frame.moc d329 1 a329 1 -mocs: konq_guiclients.moc d331 2 a332 3 -konq_combo.moc: $(srcdir)/konq_combo.h - $(MOC) $(srcdir)/konq_combo.h -o konq_combo.moc +mocs: konq_frame.moc d348 1 a348 1 -mocs: konq_combo.moc d351 1 a351 1 - -rm -f konq_profiledlg.moc delayedinitializer.moc konq_mainwindow.moc konq_actions.moc konq_frame.moc konq_browseriface.moc konq_misc.moc konq_view.moc konq_run.moc konq_viewmgr.moc konq_guiclients.moc konq_combo.moc d356 1 a356 1 @@@@ -1371,33 +1387,33 @@@@ force-reedit: d360 1 a360 1 -konqueror_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konq_main.cc $(srcdir)/KonquerorIface.cc $(srcdir)/KonqMainWindowIface.cc $(srcdir)/KonqViewIface.cc $(srcdir)/konq_mainwindow.cc $(srcdir)/konq_guiclients.cc $(srcdir)/konq_run.cc $(srcdir)/konq_view.cc $(srcdir)/konq_viewmgr.cc $(srcdir)/konq_misc.cc $(srcdir)/konq_frame.cc $(srcdir)/konq_actions.cc $(srcdir)/konq_profiledlg.cc $(srcdir)/konq_factory.cc $(srcdir)/konq_combo.cc $(srcdir)/konq_browseriface.cc $(srcdir)/delayedinitializer.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc konq_profiledlg.moc delayedinitializer.moc konq_mainwindow.moc konq_actions.moc konq_frame.moc konq_browseriface.moc konq_misc.moc konq_run.moc konq_view.moc konq_viewmgr.moc konq_guiclients.moc konq_combo.moc d403 1 a403 1 @@@@ -1407,27 +1423,27 @@@@ kde-rpo-clean: d407 1 a407 9 -konq_guiclients.lo: konq_guiclients.moc -konq_run.o: konq_run.moc -konq_mainwindow.lo: konq_mainwindow.moc -konq_combo.o: konq_combo.moc -konq_viewmgr.o: konq_viewmgr.moc -konq_run.lo: konq_run.moc -konq_profiledlg.lo: konq_profiledlg.moc -konq_frame.o: konq_frame.moc -konq_guiclients.o: konq_guiclients.moc d409 1 a409 6 -konq_misc.o: konq_misc.moc -delayedinitializer.o: delayedinitializer.moc -konq_profiledlg.o: konq_profiledlg.moc -konq_browseriface.lo: konq_browseriface.moc konq_view.lo: konq_view.moc -konq_viewmgr.lo: konq_viewmgr.moc d411 1 a411 1 konq_view.o: konq_view.moc d413 1 a413 1 +konq_browseriface.o: konq_browseriface.moc d415 3 a417 2 +konq_combo.lo: konq_combo.moc konq_actions.o: konq_actions.moc d419 13 a431 2 +konq_profiledlg.lo: konq_profiledlg.moc +konq_run.lo: konq_run.moc d434 2 a435 2 +konq_frame.o: konq_frame.moc konq_misc.lo: konq_misc.moc d439 5 a443 1 +konq_guiclients.o: konq_guiclients.moc d445 1 a445 4 konq_mainwindow.o: konq_mainwindow.moc -delayedinitializer.lo: delayedinitializer.moc -konq_combo.lo: konq_combo.moc -konq_browseriface.o: konq_browseriface.moc d447 1 a447 1 konq_actions.lo: konq_actions.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 --- konqueror/Makefile.in.orig Tue May 13 23:07:59 2003 d5 1 a5 1 @@@@ -427,7 +427,7 @@@@ INCLUDES = -I$(top_srcdir)/libkonq -I$(t d14 1 a14 1 @@@@ -444,7 +444,7 @@@@ include_HEADERS = KonquerorIface.h d23 1 a23 1 @@@@ -459,7 +459,7 @@@@ bin_PROGRAMS = konqueror d32 1 a32 1 @@@@ -482,11 +482,15 @@@@ noinst_HEADERS = KonqMainWindowIface.h K d201 1 a201 1 @@@@ -1064,7 +1083,7 @@@@ distclean-tags: d206 1 a206 1 +KDE_DIST=DESIGN konqfilemgr.desktop convert_kdelnk.sh DESIGN_config profile_midnightcommander.desktop konqueror_config.desktop konqueror.rc konqbrowser.desktop profile_filemanagement.desktop kfmclient_dir.desktop kfmclient_html.desktop kfmclient.desktop uninstall.desktop IDEAS konqueror.desktop profile_filepreview.desktop Home.desktop konquerorsu.desktop kfmclient_war.desktop profile_webbrowsing.desktop d210 1 a210 1 @@@@ -1246,9 +1265,6 @@@@ uninstall-info: uninstall-info-recursive d220 1 a220 1 @@@@ -1269,23 +1285,13 @@@@ uninstall-local: d226 1 a226 1 - $(DCOPIDL) $(srcdir)/KonquerorIface.h > KonquerorIface.kidl || ( rm -f KonquerorIface.kidl ; /bin/false ) d230 1 a230 1 - $(DCOPIDL) $(srcdir)/KonqMainWindowIface.h > KonqMainWindowIface.kidl || ( rm -f KonqMainWindowIface.kidl ; /bin/false ) d234 1 a234 1 - $(DCOPIDL) $(srcdir)/KonqViewIface.h > KonqViewIface.kidl || ( rm -f KonqViewIface.kidl ; /bin/false ) d241 2 d249 9 d260 4 a263 3 @@@@ -1296,40 +1302,50 @@@@ konq_mainwindow.moc: $(srcdir)/konq_main $(MOC) $(srcdir)/konq_mainwindow.h -o konq_mainwindow.moc d270 3 d279 3 d288 3 d292 2 a293 2 -konq_view.moc: $(srcdir)/konq_view.h - $(MOC) $(srcdir)/konq_view.h -o konq_view.moc d297 3 d301 2 a302 2 -konq_run.moc: $(srcdir)/konq_run.h - $(MOC) $(srcdir)/konq_run.h -o konq_run.moc d306 9 d318 4 a321 4 +konq_run.moc: $(srcdir)/konq_run.h + $(MOC) $(srcdir)/konq_run.h -o konq_run.moc #>+ 3 d327 2 d332 1 d335 1 a335 1 + $(DCOPIDL) $(srcdir)/KonquerorIface.h > KonquerorIface.kidl || ( rm -f KonquerorIface.kidl ; /bin/false ) d339 1 a339 1 + $(DCOPIDL) $(srcdir)/KonqMainWindowIface.h > KonqMainWindowIface.kidl || ( rm -f KonqMainWindowIface.kidl ; /bin/false ) d343 1 a343 1 + $(DCOPIDL) $(srcdir)/KonqViewIface.h > KonqViewIface.kidl || ( rm -f KonqViewIface.kidl ; /bin/false ) d347 2 d351 2 a352 2 - -rm -f konq_profiledlg.moc delayedinitializer.moc konq_mainwindow.moc konq_actions.moc konq_frame.moc konq_browseriface.moc konq_view.moc konq_run.moc konq_viewmgr.moc konq_guiclients.moc konq_combo.moc + -rm -f konq_view.moc konq_browseriface.moc delayedinitializer.moc konq_mainwindow.moc konq_profiledlg.moc konq_viewmgr.moc konq_actions.moc konq_combo.moc konq_guiclients.moc konq_run.moc konq_frame.moc d356 1 a356 1 @@@@ -1349,33 +1365,33 @@@@ force-reedit: d360 1 a360 1 -konqueror_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konq_main.cc $(srcdir)/KonquerorIface.cc $(srcdir)/KonqMainWindowIface.cc $(srcdir)/KonqViewIface.cc $(srcdir)/konq_mainwindow.cc $(srcdir)/konq_guiclients.cc $(srcdir)/konq_run.cc $(srcdir)/konq_view.cc $(srcdir)/konq_viewmgr.cc $(srcdir)/konq_misc.cc $(srcdir)/konq_frame.cc $(srcdir)/konq_actions.cc $(srcdir)/konq_profiledlg.cc $(srcdir)/konq_factory.cc $(srcdir)/konq_combo.cc $(srcdir)/konq_browseriface.cc $(srcdir)/delayedinitializer.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc konq_profiledlg.moc delayedinitializer.moc konq_mainwindow.moc konq_actions.moc konq_frame.moc konq_browseriface.moc konq_view.moc konq_run.moc konq_viewmgr.moc konq_guiclients.moc konq_combo.moc d364 1 a364 1 +libkonqueror_main_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konq_main.cc $(srcdir)/KonquerorIface.cc $(srcdir)/KonqMainWindowIface.cc $(srcdir)/KonqViewIface.cc $(srcdir)/konq_mainwindow.cc $(srcdir)/konq_guiclients.cc $(srcdir)/konq_run.cc $(srcdir)/konq_view.cc $(srcdir)/konq_viewmgr.cc $(srcdir)/konq_misc.cc $(srcdir)/konq_frame.cc $(srcdir)/konq_actions.cc $(srcdir)/konq_profiledlg.cc $(srcdir)/konq_factory.cc $(srcdir)/konq_combo.cc $(srcdir)/konq_browseriface.cc $(srcdir)/delayedinitializer.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc konq_view.moc konq_browseriface.moc konq_profiledlg.moc konq_mainwindow.moc delayedinitializer.moc konq_viewmgr.moc konq_actions.moc konq_combo.moc konq_guiclients.moc konq_frame.moc konq_run.moc d403 1 a403 1 @@@@ -1385,25 +1401,25 @@@@ kde-rpo-clean: d406 1 a406 1 #>+ 23 d417 1 d427 1 a429 1 -konq_mainwindow.o: konq_mainwindow.moc d433 1 a433 3 delayedinitializer.lo: delayedinitializer.moc -konq_combo.lo: konq_combo.moc -konq_browseriface.o: konq_browseriface.moc d436 1 d442 4 a445 1 +konq_mainwindow.o: konq_mainwindow.moc @ 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 --- konqueror/Makefile.in.orig Fri Jan 17 09:03:09 2003 d5 1 a5 1 @@@@ -291,7 +291,7 @@@@ INCLUDES = -I$(top_srcdir)/libkonq -I$(t d14 1 a14 1 @@@@ -308,7 +308,7 @@@@ include_HEADERS = KonquerorIface.h d23 1 a23 1 @@@@ -323,7 +323,7 @@@@ bin_PROGRAMS = konqueror d32 1 a32 1 @@@@ -346,11 +346,15 @@@@ noinst_HEADERS = KonqMainWindowIface.h K d51 1 a51 1 @@@@ -375,32 +379,37 @@@@ CONFIG_HEADER = $(top_builddir)/config.h a96 1 DEFS = @@DEFS@@ d98 2 a99 1 @@@@ -413,7 +422,7 @@@@ am__depfiles_maybe = depfiles d108 1 a108 1 @@@@ -424,13 +433,15 @@@@ am__depfiles_maybe = depfiles d128 1 a128 1 @@@@ -441,12 +452,14 @@@@ am__depfiles_maybe = depfiles d145 1 a145 1 @@@@ -457,7 +470,9 @@@@ am__depfiles_maybe = depfiles d156 2 a157 1 @@@@ -478,7 +493,8 @@@@ CXXLD = $(CXX) a159 1 CXXFLAGS = @@CXXFLAGS@@ d166 1 a166 1 @@@@ -493,7 +509,7 @@@@ RECURSIVE_TARGETS = info-recursive dvi-r d175 1 a175 1 @@@@ -540,6 +556,8 @@@@ clean-libLTLIBRARIES: d184 1 a184 1 @@@@ -583,7 +601,6 @@@@ distclean-compile: d192 1 a192 1 @@@@ -597,6 +614,8 @@@@ distclean-compile: d201 2 a202 2 @@@@ -889,7 +908,7 @@@@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH d205 2 a206 2 -KDE_DIST=profile_midnightcommander.desktop profile_webbrowsing.desktop kfmclient_war.desktop konq_viewmgr.cc konq_mainwindow.cc konqfilemgr.desktop konq_frame.cc kfmclient_dir.desktop DESIGN KonqMainWindowIface.cc profile_filepreview.desktop konq_combo.cc konq_profiledlg.cc kfmclient_html.desktop konqueror.desktop konq_misc.cc konqbrowser.desktop konq_browseriface.cc uninstall.desktop KonquerorIface.cc convert_kdelnk.sh IDEAS konq_view.cc konqueror.rc profile_filemanagement.desktop DESIGN_config konq_guiclients.cc konq_factory.cc konq_actions.cc konq_run.cc konquerorsu.desktop KonqViewIface.cc delayedinitializer.cc Home.desktop kfmclient.desktop konqueror_config.desktop +KDE_DIST=konq_viewmgr.cc DESIGN konqfilemgr.desktop convert_kdelnk.sh konq_view.cc DESIGN_config profile_midnightcommander.desktop konq_browseriface.cc konq_combo.cc konqueror_config.desktop konqueror.rc konqbrowser.desktop delayedinitializer.cc profile_filemanagement.desktop kfmclient_dir.desktop konq_misc.cc kfmclient_html.desktop kfmclient.desktop uninstall.desktop konq_mainwindow.cc konq_actions.cc konq_frame.cc KonqMainWindowIface.cc IDEAS konqueror.desktop konq_profiledlg.cc konq_run.cc konq_factory.cc konq_guiclients.cc profile_filepreview.desktop Home.desktop KonquerorIface.cc konquerorsu.desktop kfmclient_war.desktop KonqViewIface.cc profile_webbrowsing.desktop d210 1 a210 1 @@@@ -1056,9 +1075,6 @@@@ uninstall-info: uninstall-info-recursive d220 1 a220 1 @@@@ -1079,23 +1095,13 @@@@ uninstall-local: d249 1 a249 1 @@@@ -1106,40 +1112,50 @@@@ konq_mainwindow.moc: $(srcdir)/konq_main d318 1 a318 1 @@@@ -1159,33 +1175,33 @@@@ force-reedit: d365 1 a365 1 @@@@ -1195,25 +1211,25 @@@@ 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 --- konqueror/Makefile.in.orig Fri Dec 27 18:19:11 2002 d5 1 a5 1 @@@@ -293,7 +293,7 @@@@ INCLUDES = -I$(top_srcdir)/libkonq -I$(t d14 1 a14 1 @@@@ -310,7 +310,7 @@@@ include_HEADERS = KonquerorIface.h d23 1 a23 1 @@@@ -325,7 +325,7 @@@@ bin_PROGRAMS = konqueror d32 2 a33 2 @@@@ -341,11 +341,15 @@@@ konqueror_la_SOURCES=konq_main.cc \ delayedinitializer.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc d50 2 a51 2 data_DATA = konquerorsu.desktop kfmclient.desktop kfmclient_dir.desktop kfmclient_html.desktop @@@@ -367,32 +371,37 @@@@ CONFIG_HEADER = $(top_builddir)/config.h d99 54 a152 52 @@@@ -403,7 +412,7 @@@@ depcomp = $(SHELL) $(top_srcdir)/admin/d #>- @@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/KonqMainWindowIface.Plo \ #>- @@AMDEP_TRUE@@ $(DEPDIR)/KonqViewIface.Plo \ #>- @@AMDEP_TRUE@@ $(DEPDIR)/KonquerorIface.Plo \ -#>- @@AMDEP_TRUE@@ $(DEPDIR)/delayedinitializer.Plo $(DEPDIR)/dummy.Po \ +#>- @@AMDEP_TRUE@@ $(DEPDIR)/delayedinitializer.Plo \ #>- @@AMDEP_TRUE@@ $(DEPDIR)/konq_actions.Plo \ #>- @@AMDEP_TRUE@@ $(DEPDIR)/konq_browseriface.Plo \ #>- @@AMDEP_TRUE@@ $(DEPDIR)/konq_combo.Plo $(DEPDIR)/konq_factory.Plo \ @@@@ -414,12 +423,14 @@@@ depcomp = $(SHELL) $(top_srcdir)/admin/d #>- @@AMDEP_TRUE@@ $(DEPDIR)/konq_misc.Plo \ #>- @@AMDEP_TRUE@@ $(DEPDIR)/konq_profiledlg.Plo \ #>- @@AMDEP_TRUE@@ $(DEPDIR)/konq_run.Plo $(DEPDIR)/konq_view.Plo \ -#>- @@AMDEP_TRUE@@ $(DEPDIR)/konq_viewmgr.Plo -#>+ 31 -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@DEP_FILES = $(DEPDIR)/KonquerorIface_skel.P $(DEPDIR)/KonqMainWindowIface_skel.P $(DEPDIR)/KonqViewIface_skel.P $(DEPDIR)/konqueror_la.all_cc.P $(DEPDIR)/KonqMainWindowIface.Plo \ +#>- @@AMDEP_TRUE@@ $(DEPDIR)/konq_viewmgr.Plo \ +#>- @@AMDEP_TRUE@@ $(DEPDIR)/konqueror_main.Plo \ +#>- @@AMDEP_TRUE@@ $(DEPDIR)/konqueror_main.Po +#>+ 35 +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@DEP_FILES = $(DEPDIR)/KonquerorIface_skel.P $(DEPDIR)/KonqMainWindowIface_skel.P $(DEPDIR)/KonqViewIface_skel.P $(DEPDIR)/libkonqueror_main_la.all_cc.P $(DEPDIR)/KonqMainWindowIface.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/KonqViewIface.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/KonquerorIface.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/delayedinitializer.Plo $(DEPDIR)/dummy.Po \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/delayedinitializer.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/konq_actions.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/konq_browseriface.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/konq_combo.Plo $(DEPDIR)/konq_factory.Plo \ @@@@ -430,11 +441,13 @@@@ depcomp = $(SHELL) $(top_srcdir)/admin/d @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/konq_misc.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/konq_profiledlg.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/konq_run.Plo $(DEPDIR)/konq_view.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/konq_viewmgr.Plo +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/konq_viewmgr.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/konqueror_main.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/konqueror_main.Po @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@DEP_FILES = $(DEPDIR)/KonquerorIface_skel.P $(DEPDIR)/KonqMainWindowIface_skel.P $(DEPDIR)/KonqViewIface_skel.P $(DEPDIR)/KonqMainWindowIface.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/KonqViewIface.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/KonquerorIface.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/delayedinitializer.Plo $(DEPDIR)/dummy.Po \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/delayedinitializer.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/konq_actions.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/konq_browseriface.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/konq_combo.Plo $(DEPDIR)/konq_factory.Plo \ @@@@ -445,7 +458,9 @@@@ depcomp = $(SHELL) $(top_srcdir)/admin/d @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/konq_misc.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/konq_profiledlg.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/konq_run.Plo $(DEPDIR)/konq_view.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/konq_viewmgr.Plo +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/konq_viewmgr.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/konqueror_main.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/konqueror_main.Po d156 1 a156 1 @@@@ -466,7 +481,8 @@@@ CXXLD = $(CXX) d164 5 a168 5 $(kdelnk_DATA) $(konqdata_DATA) @@@@ -480,7 +496,7 @@@@ RECURSIVE_TARGETS = info-recursive dvi-r DIST_COMMON = $(include_HEADERS) AUTHORS ChangeLog Makefile.am \ Makefile.in TODO d175 2 a176 2 @@@@ -529,6 +545,8 @@@@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) d181 1 d184 14 a197 15 $(mkinstalldirs) $(DESTDIR)$(bindir) @@@@ -567,7 +585,6 @@@@ distclean-compile: @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/KonqViewIface.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/KonquerorIface.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/delayedinitializer.Plo@@am__quote@@ -@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/dummy.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/konq_actions.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/konq_browseriface.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/konq_combo.Plo@@am__quote@@ @@@@ -581,6 +598,8 @@@@ distclean-compile: @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/konq_run.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/konq_view.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/konq_viewmgr.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/konqueror_main.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/konqueror_main.Po@@am__quote@@ d200 3 a202 3 -rm -rf $(DEPDIR) @@@@ -818,7 +837,7 @@@@ distclean-tags: d205 2 a206 2 -KDE_DIST=profile_midnightcommander.desktop KonqMainWindowIface.h konq_mainwindow.h profile_webbrowsing.desktop konq_viewmgr.cc konq_viewmgr.h konq_mainwindow.cc konqfilemgr.desktop konq_frame.cc kfmclient_dir.desktop DESIGN KonqMainWindowIface.cc profile_filepreview.desktop delayedinitializer.h konq_factory.h konq_profiledlg.h konq_combo.cc konq_profiledlg.cc kfmclient_html.desktop konqueror.desktop konq_misc.cc konqbrowser.desktop konq_frame.h konq_browseriface.cc KonquerorIface.cc konq_view.h konq_guiclients.h convert_kdelnk.sh IDEAS konq_run.h KonqViewIface.h konq_view.cc konqueror.rc konq_main.h profile_filemanagement.desktop DESIGN_config konq_guiclients.cc konq_browseriface.h konq_factory.cc konq_actions.h konq_actions.cc konq_run.cc konquerorsu.desktop KonqViewIface.cc delayedinitializer.cc konq_misc.h Home.desktop kfmclient.desktop konq_openurlrequest.h konqueror_config.desktop version.h konq_combo.h +KDE_DIST=konq_viewmgr.cc DESIGN konqfilemgr.desktop convert_kdelnk.sh konq_misc.h konq_view.cc konq_browseriface.h delayedinitializer.h DESIGN_config profile_midnightcommander.desktop konq_browseriface.cc konq_combo.cc konqueror_config.desktop konqueror.rc konqbrowser.desktop delayedinitializer.cc konq_guiclients.h konq_viewmgr.h profile_filemanagement.desktop konq_mainwindow.h kfmclient_dir.desktop konq_misc.cc kfmclient_html.desktop kfmclient.desktop konq_view.h konq_mainwindow.cc konq_actions.cc konq_frame.cc konq_actions.h KonqMainWindowIface.cc KonqMainWindowIface.h IDEAS konqueror.desktop konq_frame.h konq_profiledlg.cc konq_factory.h konq_run.cc version.h konq_run.h konq_factory.cc konq_combo.h konq_main.h konq_guiclients.cc profile_filepreview.desktop Home.desktop KonquerorIface.cc konquerorsu.desktop KonqViewIface.cc konq_profiledlg.h konq_openurlrequest.h profile_webbrowsing.desktop KonqViewIface.h d210 1 a210 1 @@@@ -976,9 +995,6 @@@@ uninstall-info: uninstall-info-recursive d220 1 a220 1 @@@@ -1007,23 +1023,13 @@@@ uninstall-local: d249 1 a249 1 @@@@ -1034,40 +1040,50 @@@@ konq_mainwindow.moc: $(srcdir)/konq_main d318 1 a318 1 @@@@ -1087,33 +1103,33 @@@@ force-reedit: d365 1 a365 1 @@@@ -1123,25 +1139,25 @@@@ kde-rpo-clean: @ 1.2 log @Merge changes in packages from the buildlink2 branch that have buildlink2.mk files back into the main trunk. @ text @d1 1 a1 1 $NetBSD: patch-ch,v 1.1.2.1 2002/06/23 19:05:40 jlam Exp $ d3 1 a3 1 --- konqueror/Makefile.in.orig Mon May 13 23:57:50 2002 d5 1 a5 1 @@@@ -294,7 +294,7 @@@@ d14 1 a14 1 @@@@ -311,7 +311,7 @@@@ d20 6 a25 6 #>- KonquerorIface.cc KonquerorIface.skel \ #>- KonqMainWindowIface.cc KonqMainWindowIface.skel \ #>- KonqViewIface.cc KonqViewIface.skel \ @@@@ -326,7 +326,7 @@@@ #>- konq_browseriface.cc \ #>- delayedinitializer.cc d29 5 a33 5 KonquerorIface.cc \ KonqMainWindowIface.cc \ KonqViewIface.cc \ @@@@ -342,11 +342,15 @@@@ delayedinitializer.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc d51 1 a51 1 @@@@ -368,33 +372,38 @@@@ d71 1 a71 1 #>+ 10 d80 1 a80 2 delayedinitializer.lo KonquerorIface_skel.lo KonqMainWindowIface_skel.lo KonqViewIface_skel.lo \ - konqueror_la_meta_unload.lo a82 1 + libkonqueror_main_la_meta_unload.lo d99 53 a151 17 @@@@ -405,7 +414,7 @@@@ @@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/KonqMainWindowIface.Plo \ @@AMDEP_TRUE@@ $(DEPDIR)/KonqViewIface.Plo \ @@AMDEP_TRUE@@ $(DEPDIR)/KonquerorIface.Plo \ - @@AMDEP_TRUE@@ $(DEPDIR)/delayedinitializer.Plo $(DEPDIR)/dummy.Po \ + @@AMDEP_TRUE@@ $(DEPDIR)/delayedinitializer.Plo \ @@AMDEP_TRUE@@ $(DEPDIR)/konq_actions.Plo \ @@AMDEP_TRUE@@ $(DEPDIR)/konq_browseriface.Plo \ @@AMDEP_TRUE@@ $(DEPDIR)/konq_combo.Plo $(DEPDIR)/konq_factory.Plo \ @@@@ -416,7 +425,9 @@@@ @@AMDEP_TRUE@@ $(DEPDIR)/konq_misc.Plo \ @@AMDEP_TRUE@@ $(DEPDIR)/konq_profiledlg.Plo \ @@AMDEP_TRUE@@ $(DEPDIR)/konq_run.Plo $(DEPDIR)/konq_view.Plo \ - @@AMDEP_TRUE@@ $(DEPDIR)/konq_viewmgr.Plo + @@AMDEP_TRUE@@ $(DEPDIR)/konq_viewmgr.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/konqueror_main.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/konqueror_main.Po d153 2 a154 3 #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) #>+ 2 @@@@ -436,7 +447,8 @@@@ d164 1 a164 1 @@@@ -450,7 +462,7 @@@@ d173 1 a173 1 @@@@ -499,6 +511,8 @@@@ d182 1 a182 1 @@@@ -537,7 +551,6 @@@@ d190 1 a190 1 @@@@ -551,6 +564,8 @@@@ d199 1 a199 1 @@@@ -788,7 +803,7 @@@@ d203 1 a203 1 -KDE_DIST=konq_misc.h konq_browseriface.h DESIGN_config delayedinitializer.cc konq_viewmgr.h konq_mainwindow.h kfmclient_dir.desktop kfmclient_html.desktop kfmclient.desktop konq_view.h konq_actions.h konq_guiclients.cc Home.desktop konq_profiledlg.h DESIGN convert_kdelnk.sh profile_midnightcommander.desktop konq_browseriface.cc konq_combo.cc konqueror.rc profile_filemanagement.desktop konq_misc.cc konq_frame.cc KonqMainWindowIface.cc IDEAS konqueror.desktop konq_run.cc konq_run.h konq_main.h konquerorsu.desktop KonqViewIface.cc konq_viewmgr.cc konqfilemgr.desktop delayedinitializer.h konqbrowser.desktop konq_actions.cc konq_profiledlg.cc konq_factory.cc profile_filepreview.desktop KonquerorIface.cc konq_openurlrequest.h profile_webbrowsing.desktop konq_view.cc konqueror_config.desktop konq_guiclients.h konq_mainwindow.cc KonqMainWindowIface.h konq_frame.h konq_factory.h version.h konq_combo.h KonqViewIface.h d208 1 a208 1 @@@@ -946,9 +961,6 @@@@ d218 1 a218 1 @@@@ -977,20 +989,6 @@@@ d223 1 a223 1 -KonquerorIface.kidl: $(srcdir)/KonquerorIface.h $(DCOPIDL_DEPENDENCIES) d227 1 a227 1 -KonqMainWindowIface.kidl: $(srcdir)/KonqMainWindowIface.h $(DCOPIDL_DEPENDENCIES) d231 1 a231 1 -KonqViewIface.kidl: $(srcdir)/KonqViewIface.h $(DCOPIDL_DEPENDENCIES) d235 45 a279 1 - d281 4 a284 5 konq_view.moc: $(srcdir)/konq_view.h $(MOC) $(srcdir)/konq_view.h -o konq_view.moc @@@@ -1035,6 +1033,20 @@@@ konq_frame.moc: $(srcdir)/konq_frame.h $(MOC) $(srcdir)/konq_frame.h -o konq_frame.moc d286 9 d296 1 a296 1 +KonquerorIface.kidl: $(srcdir)/KonquerorIface.h $(DCOPIDL_DEPENDENCIES) d300 1 a300 1 +KonqMainWindowIface.kidl: $(srcdir)/KonqMainWindowIface.h $(DCOPIDL_DEPENDENCIES) d304 1 a304 1 +KonqViewIface.kidl: $(srcdir)/KonqViewIface.h $(DCOPIDL_DEPENDENCIES) d308 1 a308 1 + d311 2 a312 2 -rm -f konq_view.moc konq_browseriface.moc delayedinitializer.moc konq_mainwindow.moc konq_profiledlg.moc konq_viewmgr.moc konq_actions.moc konq_combo.moc konq_guiclients.moc konq_run.moc konq_frame.moc @@@@ -1057,28 +1069,28 @@@@ d314 3 a317 40 #>+ 12 -konqueror_la_meta_unload.cc: konq_view.moc konq_browseriface.moc konq_profiledlg.moc konq_mainwindow.moc delayedinitializer.moc konq_viewmgr.moc konq_actions.moc konq_combo.moc konq_guiclients.moc konq_frame.moc konq_run.moc - @@echo 'creating konqueror_la_meta_unload.cc' - @@-rm -f konqueror_la_meta_unload.cc +libkonqueror_main_la_meta_unload.cc: konq_view.moc konq_browseriface.moc konq_profiledlg.moc konq_mainwindow.moc delayedinitializer.moc konq_viewmgr.moc konq_actions.moc konq_combo.moc konq_guiclients.moc konq_frame.moc konq_run.moc + @@echo 'creating libkonqueror_main_la_meta_unload.cc' + @@-rm -f libkonqueror_main_la_meta_unload.cc @@if test ${kde_qtver} = 2; then \ - echo 'static const char * _metalist_konqueror_la[] = {' > konqueror_la_meta_unload.cc ;\ - cat konq_view.moc konq_browseriface.moc konq_profiledlg.moc konq_mainwindow.moc delayedinitializer.moc konq_viewmgr.moc konq_actions.moc konq_combo.moc konq_guiclients.moc konq_frame.moc konq_run.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> konqueror_la_meta_unload.cc ;\ - echo '0};' >> konqueror_la_meta_unload.cc ;\ - echo '#include ' >> konqueror_la_meta_unload.cc ;\ - echo '_UNLOAD(konqueror_la)' >> konqueror_la_meta_unload.cc ;\ - else echo > konqueror_la_meta_unload.cc; fi + echo 'static const char * _metalist_libkonqueror_main_la[] = {' > libkonqueror_main_la_meta_unload.cc ;\ + cat konq_view.moc konq_browseriface.moc konq_profiledlg.moc konq_mainwindow.moc delayedinitializer.moc konq_viewmgr.moc konq_actions.moc konq_combo.moc konq_guiclients.moc konq_frame.moc konq_run.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkonqueror_main_la_meta_unload.cc ;\ + echo '0};' >> libkonqueror_main_la_meta_unload.cc ;\ + echo '#include ' >> libkonqueror_main_la_meta_unload.cc ;\ + echo '_UNLOAD(libkonqueror_main_la)' >> libkonqueror_main_la_meta_unload.cc ;\ + else echo > libkonqueror_main_la_meta_unload.cc; fi #>+ 3 clean-moc-classes: - -rm -f konqueror_la_meta_unload.cc + -rm -f libkonqueror_main_la_meta_unload.cc #>+ 11 -konqueror_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konq_main.cc $(srcdir)/KonquerorIface.cc $(srcdir)/KonqMainWindowIface.cc $(srcdir)/KonqViewIface.cc $(srcdir)/konq_mainwindow.cc $(srcdir)/konq_guiclients.cc $(srcdir)/konq_run.cc $(srcdir)/konq_view.cc $(srcdir)/konq_viewmgr.cc $(srcdir)/konq_misc.cc $(srcdir)/konq_frame.cc $(srcdir)/konq_actions.cc $(srcdir)/konq_profiledlg.cc $(srcdir)/konq_factory.cc $(srcdir)/konq_combo.cc $(srcdir)/konq_browseriface.cc $(srcdir)/delayedinitializer.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc konqueror_la_meta_unload.cc konq_view.moc konq_browseriface.moc delayedinitializer.moc konq_mainwindow.moc konq_profiledlg.moc konq_viewmgr.moc konq_actions.moc konq_combo.moc konq_guiclients.moc konq_run.moc konq_frame.moc +konqueror_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konqueror_main.cc konq_view.moc konq_browseriface.moc delayedinitializer.moc konq_mainwindow.moc konq_profiledlg.moc konq_viewmgr.moc konq_actions.moc konq_combo.moc konq_guiclients.moc konq_run.moc konq_frame.moc @@echo 'creating konqueror_la.all_cc.cc ...'; \ rm -f konqueror_la.all_cc.files konqueror_la.all_cc.final; \ echo "#define KDE_USE_FINAL 1" >> konqueror_la.all_cc.final; \ - for file in konq_main.cc KonquerorIface.cc KonqMainWindowIface.cc KonqViewIface.cc konq_mainwindow.cc konq_guiclients.cc konq_run.cc konq_view.cc konq_viewmgr.cc konq_misc.cc konq_frame.cc konq_actions.cc konq_profiledlg.cc konq_factory.cc konq_combo.cc konq_browseriface.cc delayedinitializer.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc konqueror_la_meta_unload.cc ; do \ + for file in konqueror_main.cc ; do \ echo "#include \"$$file\"" >> konqueror_la.all_cc.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> konqueror_la.all_cc.final; \ done; \ @@@@ -1086,11 +1098,23 @@@@ rm -f konqueror_la.all_cc.final konqueror_la.all_cc.files d320 5 a324 2 -konqueror.all_cc.cc: $(srcdir)/Makefile.in dummy.cc +libkonqueror_main_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konq_main.cc $(srcdir)/KonquerorIface.cc $(srcdir)/KonqMainWindowIface.cc $(srcdir)/KonqViewIface.cc $(srcdir)/konq_mainwindow.cc $(srcdir)/konq_guiclients.cc $(srcdir)/konq_run.cc $(srcdir)/konq_view.cc $(srcdir)/konq_viewmgr.cc $(srcdir)/konq_misc.cc $(srcdir)/konq_frame.cc $(srcdir)/konq_actions.cc $(srcdir)/konq_profiledlg.cc $(srcdir)/konq_factory.cc $(srcdir)/konq_combo.cc $(srcdir)/konq_browseriface.cc $(srcdir)/delayedinitializer.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc libkonqueror_main_la_meta_unload.cc d328 3 a330 1 + for file in konq_main.cc KonquerorIface.cc KonqMainWindowIface.cc KonqViewIface.cc konq_mainwindow.cc konq_guiclients.cc konq_run.cc konq_view.cc konq_viewmgr.cc konq_misc.cc konq_frame.cc konq_actions.cc konq_profiledlg.cc konq_factory.cc konq_combo.cc konq_browseriface.cc delayedinitializer.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc libkonqueror_main_la_meta_unload.cc ; do \ d333 4 a336 2 + done; \ + cat libkonqueror_main_la.all_cc.final libkonqueror_main_la.all_cc.files > libkonqueror_main_la.all_cc.cc; \ a337 12 + +#>+ 11 +konqueror.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konqueror_main.cc @@echo 'creating konqueror.all_cc.cc ...'; \ rm -f konqueror.all_cc.files konqueror.all_cc.final; \ echo "#define KDE_USE_FINAL 1" >> konqueror.all_cc.final; \ - for file in dummy.cc ; do \ + for file in konqueror_main.cc ; do \ echo "#include \"$$file\"" >> konqueror.all_cc.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> konqueror.all_cc.final; \ done; \ @@@@ -1099,20 +1123,20 @@@@ d341 2 a342 2 - -rm -f konqueror_la.all_cc.cc konqueror.all_cc.cc + -rm -f konqueror_la.all_cc.cc libkonqueror_main_la.all_cc.cc konqueror.all_cc.cc d362 43 a404 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-ch was added on branch buildlink2 on 2002-06-23 19:05:40 +0000 @ text @d1 319 @ 1.1.1.1.2.2 log @Merge from pkgsrc-current to buildlink2 branch. @ text @a0 319 $NetBSD: patch-ch,v 1.1.1.1.2.1 2002/06/23 19:05:40 jlam Exp $ --- konqueror/Makefile.in.orig Mon May 13 23:57:50 2002 +++ konqueror/Makefile.in @@@@ -294,7 +294,7 @@@@ #SUBDIRS = . kfmexec client iconview dirtree listview keditbookmarks shellcmdplugin about pics sidebar SUBDIRS = . kfmexec client iconview listview keditbookmarks shellcmdplugin about pics sidebar -lib_LTLIBRARIES = konqueror.la +lib_LTLIBRARIES = libkonqueror_main.la konqueror.la konqdatadir = $(kde_datadir)/konqueror konqdata_DATA = konqueror.rc @@@@ -311,7 +311,7 @@@@ bin_PROGRAMS = konqueror -#>- konqueror_la_SOURCES = konq_main.cc \ +#>- libkonqueror_main_la_SOURCES = konq_main.cc \ #>- KonquerorIface.cc KonquerorIface.skel \ #>- KonqMainWindowIface.cc KonqMainWindowIface.skel \ #>- KonqViewIface.cc KonqViewIface.skel \ @@@@ -326,7 +326,7 @@@@ #>- konq_browseriface.cc \ #>- delayedinitializer.cc #>+ 14 -konqueror_la_SOURCES=konq_main.cc \ +libkonqueror_main_la_SOURCES=konq_main.cc \ KonquerorIface.cc \ KonqMainWindowIface.cc \ KonqViewIface.cc \ @@@@ -342,11 +342,15 @@@@ delayedinitializer.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc +libkonqueror_main_la_LDFLAGS = $(all_libraries) -module -avoid-version +libkonqueror_main_la_LIBADD = ../libkonq/libkonq.la + +konqueror_la_SOURCES = konqueror_main.cc konqueror_la_LDFLAGS = $(all_libraries) -module -avoid-version -konqueror_la_LIBADD = ../libkonq/libkonq.la +konqueror_la_LIBADD = libkonqueror_main.la ../libkonq/libkonq.la -konqueror_SOURCES = dummy.cc -konqueror_LDADD = konqueror.la +konqueror_SOURCES = konqueror_main.cc +konqueror_LDADD = libkonqueror_main.la konqueror_LDFLAGS = $(KDE_RPATH) $(all_libraries) data_DATA = konquerorsu.desktop kfmclient.desktop kfmclient_dir.desktop kfmclient_html.desktop @@@@ -368,33 +372,38 @@@@ CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) -konqueror_la_DEPENDENCIES = ../libkonq/libkonq.la -am_konqueror_la_OBJECTS = konq_main.lo KonquerorIface.lo \ +konqueror_la_DEPENDENCIES = libkonqueror_main.la ../libkonq/libkonq.la +am_konqueror_la_OBJECTS = konqueror_main.lo +#>- konqueror_la_OBJECTS = $(am_konqueror_la_OBJECTS) +#>+ 1 +konqueror_la_OBJECTS = konqueror_main.lo +libkonqueror_main_la_DEPENDENCIES = ../libkonq/libkonq.la +am_libkonqueror_main_la_OBJECTS = konq_main.lo KonquerorIface.lo \ KonqMainWindowIface.lo KonqViewIface.lo konq_mainwindow.lo \ konq_guiclients.lo konq_run.lo konq_view.lo konq_viewmgr.lo \ konq_misc.lo konq_frame.lo konq_actions.lo konq_profiledlg.lo \ konq_factory.lo konq_combo.lo konq_browseriface.lo \ delayedinitializer.lo -#>- konqueror_la_OBJECTS = $(am_konqueror_la_OBJECTS) +#>- libkonqueror_main_la_OBJECTS = $(am_libkonqueror_main_la_OBJECTS) #>+ 10 -konqueror_la_final_OBJECTS = konqueror_la.all_cc.lo -konqueror_la_nofinal_OBJECTS = konq_main.lo KonquerorIface.lo \ +libkonqueror_main_la_final_OBJECTS = libkonqueror_main_la.all_cc.lo +libkonqueror_main_la_nofinal_OBJECTS = konq_main.lo KonquerorIface.lo \ KonqMainWindowIface.lo KonqViewIface.lo konq_mainwindow.lo \ konq_guiclients.lo konq_run.lo konq_view.lo konq_viewmgr.lo \ konq_misc.lo konq_frame.lo konq_actions.lo konq_profiledlg.lo \ konq_factory.lo konq_combo.lo konq_browseriface.lo \ delayedinitializer.lo KonquerorIface_skel.lo KonqMainWindowIface_skel.lo KonqViewIface_skel.lo \ - konqueror_la_meta_unload.lo -@@KDE_USE_FINAL_FALSE@@konqueror_la_OBJECTS = $(konqueror_la_nofinal_OBJECTS) -@@KDE_USE_FINAL_TRUE@@konqueror_la_OBJECTS = $(konqueror_la_final_OBJECTS) + libkonqueror_main_la_meta_unload.lo +@@KDE_USE_FINAL_FALSE@@libkonqueror_main_la_OBJECTS = $(libkonqueror_main_la_nofinal_OBJECTS) +@@KDE_USE_FINAL_TRUE@@libkonqueror_main_la_OBJECTS = $(libkonqueror_main_la_final_OBJECTS) bin_PROGRAMS = konqueror$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) -am_konqueror_OBJECTS = dummy.$(OBJEXT) +am_konqueror_OBJECTS = konqueror_main.$(OBJEXT) #>- konqueror_OBJECTS = $(am_konqueror_OBJECTS) #>+ 1 -konqueror_OBJECTS = dummy.$(OBJEXT) -konqueror_DEPENDENCIES = konqueror.la +konqueror_OBJECTS = konqueror_main.$(OBJEXT) +konqueror_DEPENDENCIES = libkonqueror_main.la DEFS = @@DEFS@@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) @@@@ -405,7 +414,7 @@@@ @@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/KonqMainWindowIface.Plo \ @@AMDEP_TRUE@@ $(DEPDIR)/KonqViewIface.Plo \ @@AMDEP_TRUE@@ $(DEPDIR)/KonquerorIface.Plo \ - @@AMDEP_TRUE@@ $(DEPDIR)/delayedinitializer.Plo $(DEPDIR)/dummy.Po \ + @@AMDEP_TRUE@@ $(DEPDIR)/delayedinitializer.Plo \ @@AMDEP_TRUE@@ $(DEPDIR)/konq_actions.Plo \ @@AMDEP_TRUE@@ $(DEPDIR)/konq_browseriface.Plo \ @@AMDEP_TRUE@@ $(DEPDIR)/konq_combo.Plo $(DEPDIR)/konq_factory.Plo \ @@@@ -416,7 +425,9 @@@@ @@AMDEP_TRUE@@ $(DEPDIR)/konq_misc.Plo \ @@AMDEP_TRUE@@ $(DEPDIR)/konq_profiledlg.Plo \ @@AMDEP_TRUE@@ $(DEPDIR)/konq_run.Plo $(DEPDIR)/konq_view.Plo \ - @@AMDEP_TRUE@@ $(DEPDIR)/konq_viewmgr.Plo + @@AMDEP_TRUE@@ $(DEPDIR)/konq_viewmgr.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/konqueror_main.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/konqueror_main.Po #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) #>+ 2 @@@@ -436,7 +447,8 @@@@ CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@@ CXXFLAGS = @@CXXFLAGS@@ -DIST_SOURCES = $(konqueror_la_SOURCES) $(konqueror_SOURCES) +DIST_SOURCES = $(konqueror_la_SOURCES) $(libkonqueror_main_la_SOURCES) \ + $(konqueror_SOURCES) DATA = $(data_DATA) $(data2_DATA) $(data3_DATA) $(data4_DATA) \ $(kdelnk_DATA) $(konqdata_DATA) @@@@ -450,7 +462,7 @@@@ DIST_COMMON = $(include_HEADERS) AUTHORS ChangeLog Makefile.am \ Makefile.in TODO DIST_SUBDIRS = $(SUBDIRS) -SOURCES = $(konqueror_la_SOURCES) $(konqueror_SOURCES) +SOURCES = $(konqueror_la_SOURCES) $(libkonqueror_main_la_SOURCES) $(konqueror_SOURCES) #>- all: all-recursive #>+ 1 @@@@ -499,6 +511,8 @@@@ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) konqueror.la: $(konqueror_la_OBJECTS) $(konqueror_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(konqueror_la_LDFLAGS) $(konqueror_la_OBJECTS) $(konqueror_la_LIBADD) $(LIBS) +libkonqueror_main.la: $(libkonqueror_main_la_OBJECTS) $(libkonqueror_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkonqueror_main_la_LDFLAGS) $(libkonqueror_main_la_OBJECTS) $(libkonqueror_main_la_LIBADD) $(LIBS) install-binPROGRAMS: $(bin_PROGRAMS) @@$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) @@@@ -537,7 +551,6 @@@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/KonqViewIface.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/KonquerorIface.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/delayedinitializer.Plo@@am__quote@@ -@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/dummy.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/konq_actions.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/konq_browseriface.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/konq_combo.Plo@@am__quote@@ @@@@ -551,6 +564,8 @@@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/konq_run.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/konq_view.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/konq_viewmgr.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/konqueror_main.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/konqueror_main.Po@@am__quote@@ distclean-depend: -rm -rf $(DEPDIR) @@@@ -788,7 +803,7 @@@@ #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=konq_misc.h konq_browseriface.h DESIGN_config delayedinitializer.cc konq_viewmgr.h konq_mainwindow.h kfmclient_dir.desktop kfmclient_html.desktop kfmclient.desktop konq_view.h konq_actions.h konq_guiclients.cc Home.desktop konq_profiledlg.h DESIGN convert_kdelnk.sh profile_midnightcommander.desktop konq_browseriface.cc konq_combo.cc konqueror.rc profile_filemanagement.desktop konq_misc.cc konq_frame.cc KonqMainWindowIface.cc IDEAS konqueror.desktop konq_run.cc konq_run.h konq_main.h konquerorsu.desktop KonqViewIface.cc konq_viewmgr.cc konqfilemgr.desktop delayedinitializer.h konqbrowser.desktop konq_actions.cc konq_profiledlg.cc konq_factory.cc profile_filepreview.desktop KonquerorIface.cc konq_openurlrequest.h profile_webbrowsing.desktop konq_view.cc konqueror_config.desktop konq_guiclients.h konq_mainwindow.cc KonqMainWindowIface.h konq_frame.h konq_factory.h version.h konq_combo.h KonqViewIface.h +KDE_DIST=konq_viewmgr.cc DESIGN konqfilemgr.desktop convert_kdelnk.sh konq_misc.h konq_view.cc konq_browseriface.h delayedinitializer.h DESIGN_config profile_midnightcommander.desktop konq_browseriface.cc konq_combo.cc konqueror_config.desktop konqueror.rc konqbrowser.desktop delayedinitializer.cc konq_guiclients.h konq_viewmgr.h profile_filemanagement.desktop konq_mainwindow.h kfmclient_dir.desktop konq_misc.cc kfmclient_html.desktop kfmclient.desktop konq_view.h konq_mainwindow.cc konq_actions.cc konq_frame.cc konq_actions.h KonqMainWindowIface.cc KonqMainWindowIface.h IDEAS konqueror.desktop konq_frame.h konq_profiledlg.cc konq_factory.h konq_run.cc version.h konq_run.h konq_factory.cc konq_combo.h konq_main.h konq_guiclients.cc profile_filepreview.desktop Home.desktop KonquerorIface.cc konquerorsu.desktop KonqViewIface.cc konq_profiledlg.h konq_openurlrequest.h profile_webbrowsing.desktop KonqViewIface.h DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) @@@@ -946,9 +961,6 @@@@ #konqueror_static_LDADD = konqueror.la *view/*.la dirtree/*.la $(libdir)/libkhtml.la #konqueror_static_LDFLAGS = $(all_libraries) -static -dummy.cc: - echo > dummy.cc - messages: rc.cpp $(EXTRACTRC) *.rc */*.rc >> rc.cpp $(EXTRACTRC) sidebar/trees/history_module/history_dlg.ui >> rc.cpp @@@@ -977,20 +989,6 @@@@ # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: -#>+ 13 -KonquerorIface.kidl: $(srcdir)/KonquerorIface.h $(DCOPIDL_DEPENDENCIES) - $(DCOPIDL) $(srcdir)/KonquerorIface.h > KonquerorIface.kidl || ( rm -f KonquerorIface.kidl ; /bin/false ) -KonquerorIface_skel.cc: KonquerorIface.kidl - $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KonquerorIface.kidl -KonqMainWindowIface.kidl: $(srcdir)/KonqMainWindowIface.h $(DCOPIDL_DEPENDENCIES) - $(DCOPIDL) $(srcdir)/KonqMainWindowIface.h > KonqMainWindowIface.kidl || ( rm -f KonqMainWindowIface.kidl ; /bin/false ) -KonqMainWindowIface_skel.cc: KonqMainWindowIface.kidl - $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KonqMainWindowIface.kidl -KonqViewIface.kidl: $(srcdir)/KonqViewIface.h $(DCOPIDL_DEPENDENCIES) - $(DCOPIDL) $(srcdir)/KonqViewIface.h > KonqViewIface.kidl || ( rm -f KonqViewIface.kidl ; /bin/false ) -KonqViewIface_skel.cc: KonqViewIface.kidl - $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KonqViewIface.kidl - #>+ 3 konq_view.moc: $(srcdir)/konq_view.h $(MOC) $(srcdir)/konq_view.h -o konq_view.moc @@@@ -1035,6 +1033,20 @@@@ konq_frame.moc: $(srcdir)/konq_frame.h $(MOC) $(srcdir)/konq_frame.h -o konq_frame.moc +#>+ 13 +KonquerorIface.kidl: $(srcdir)/KonquerorIface.h $(DCOPIDL_DEPENDENCIES) + $(DCOPIDL) $(srcdir)/KonquerorIface.h > KonquerorIface.kidl || ( rm -f KonquerorIface.kidl ; /bin/false ) +KonquerorIface_skel.cc: KonquerorIface.kidl + $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KonquerorIface.kidl +KonqMainWindowIface.kidl: $(srcdir)/KonqMainWindowIface.h $(DCOPIDL_DEPENDENCIES) + $(DCOPIDL) $(srcdir)/KonqMainWindowIface.h > KonqMainWindowIface.kidl || ( rm -f KonqMainWindowIface.kidl ; /bin/false ) +KonqMainWindowIface_skel.cc: KonqMainWindowIface.kidl + $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KonqMainWindowIface.kidl +KonqViewIface.kidl: $(srcdir)/KonqViewIface.h $(DCOPIDL_DEPENDENCIES) + $(DCOPIDL) $(srcdir)/KonqViewIface.h > KonqViewIface.kidl || ( rm -f KonqViewIface.kidl ; /bin/false ) +KonqViewIface_skel.cc: KonqViewIface.kidl + $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KonqViewIface.kidl + #>+ 3 clean-metasources: -rm -f konq_view.moc konq_browseriface.moc delayedinitializer.moc konq_mainwindow.moc konq_profiledlg.moc konq_viewmgr.moc konq_actions.moc konq_combo.moc konq_guiclients.moc konq_run.moc konq_frame.moc @@@@ -1057,28 +1069,28 @@@@ #>+ 12 -konqueror_la_meta_unload.cc: konq_view.moc konq_browseriface.moc konq_profiledlg.moc konq_mainwindow.moc delayedinitializer.moc konq_viewmgr.moc konq_actions.moc konq_combo.moc konq_guiclients.moc konq_frame.moc konq_run.moc - @@echo 'creating konqueror_la_meta_unload.cc' - @@-rm -f konqueror_la_meta_unload.cc +libkonqueror_main_la_meta_unload.cc: konq_view.moc konq_browseriface.moc konq_profiledlg.moc konq_mainwindow.moc delayedinitializer.moc konq_viewmgr.moc konq_actions.moc konq_combo.moc konq_guiclients.moc konq_frame.moc konq_run.moc + @@echo 'creating libkonqueror_main_la_meta_unload.cc' + @@-rm -f libkonqueror_main_la_meta_unload.cc @@if test ${kde_qtver} = 2; then \ - echo 'static const char * _metalist_konqueror_la[] = {' > konqueror_la_meta_unload.cc ;\ - cat konq_view.moc konq_browseriface.moc konq_profiledlg.moc konq_mainwindow.moc delayedinitializer.moc konq_viewmgr.moc konq_actions.moc konq_combo.moc konq_guiclients.moc konq_frame.moc konq_run.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> konqueror_la_meta_unload.cc ;\ - echo '0};' >> konqueror_la_meta_unload.cc ;\ - echo '#include ' >> konqueror_la_meta_unload.cc ;\ - echo '_UNLOAD(konqueror_la)' >> konqueror_la_meta_unload.cc ;\ - else echo > konqueror_la_meta_unload.cc; fi + echo 'static const char * _metalist_libkonqueror_main_la[] = {' > libkonqueror_main_la_meta_unload.cc ;\ + cat konq_view.moc konq_browseriface.moc konq_profiledlg.moc konq_mainwindow.moc delayedinitializer.moc konq_viewmgr.moc konq_actions.moc konq_combo.moc konq_guiclients.moc konq_frame.moc konq_run.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkonqueror_main_la_meta_unload.cc ;\ + echo '0};' >> libkonqueror_main_la_meta_unload.cc ;\ + echo '#include ' >> libkonqueror_main_la_meta_unload.cc ;\ + echo '_UNLOAD(libkonqueror_main_la)' >> libkonqueror_main_la_meta_unload.cc ;\ + else echo > libkonqueror_main_la_meta_unload.cc; fi #>+ 3 clean-moc-classes: - -rm -f konqueror_la_meta_unload.cc + -rm -f libkonqueror_main_la_meta_unload.cc #>+ 11 -konqueror_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konq_main.cc $(srcdir)/KonquerorIface.cc $(srcdir)/KonqMainWindowIface.cc $(srcdir)/KonqViewIface.cc $(srcdir)/konq_mainwindow.cc $(srcdir)/konq_guiclients.cc $(srcdir)/konq_run.cc $(srcdir)/konq_view.cc $(srcdir)/konq_viewmgr.cc $(srcdir)/konq_misc.cc $(srcdir)/konq_frame.cc $(srcdir)/konq_actions.cc $(srcdir)/konq_profiledlg.cc $(srcdir)/konq_factory.cc $(srcdir)/konq_combo.cc $(srcdir)/konq_browseriface.cc $(srcdir)/delayedinitializer.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc konqueror_la_meta_unload.cc konq_view.moc konq_browseriface.moc delayedinitializer.moc konq_mainwindow.moc konq_profiledlg.moc konq_viewmgr.moc konq_actions.moc konq_combo.moc konq_guiclients.moc konq_run.moc konq_frame.moc +konqueror_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konqueror_main.cc konq_view.moc konq_browseriface.moc delayedinitializer.moc konq_mainwindow.moc konq_profiledlg.moc konq_viewmgr.moc konq_actions.moc konq_combo.moc konq_guiclients.moc konq_run.moc konq_frame.moc @@echo 'creating konqueror_la.all_cc.cc ...'; \ rm -f konqueror_la.all_cc.files konqueror_la.all_cc.final; \ echo "#define KDE_USE_FINAL 1" >> konqueror_la.all_cc.final; \ - for file in konq_main.cc KonquerorIface.cc KonqMainWindowIface.cc KonqViewIface.cc konq_mainwindow.cc konq_guiclients.cc konq_run.cc konq_view.cc konq_viewmgr.cc konq_misc.cc konq_frame.cc konq_actions.cc konq_profiledlg.cc konq_factory.cc konq_combo.cc konq_browseriface.cc delayedinitializer.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc konqueror_la_meta_unload.cc ; do \ + for file in konqueror_main.cc ; do \ echo "#include \"$$file\"" >> konqueror_la.all_cc.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> konqueror_la.all_cc.final; \ done; \ @@@@ -1086,11 +1098,23 @@@@ rm -f konqueror_la.all_cc.final konqueror_la.all_cc.files #>+ 11 -konqueror.all_cc.cc: $(srcdir)/Makefile.in dummy.cc +libkonqueror_main_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konq_main.cc $(srcdir)/KonquerorIface.cc $(srcdir)/KonqMainWindowIface.cc $(srcdir)/KonqViewIface.cc $(srcdir)/konq_mainwindow.cc $(srcdir)/konq_guiclients.cc $(srcdir)/konq_run.cc $(srcdir)/konq_view.cc $(srcdir)/konq_viewmgr.cc $(srcdir)/konq_misc.cc $(srcdir)/konq_frame.cc $(srcdir)/konq_actions.cc $(srcdir)/konq_profiledlg.cc $(srcdir)/konq_factory.cc $(srcdir)/konq_combo.cc $(srcdir)/konq_browseriface.cc $(srcdir)/delayedinitializer.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc libkonqueror_main_la_meta_unload.cc + @@echo 'creating libkonqueror_main_la.all_cc.cc ...'; \ + rm -f libkonqueror_main_la.all_cc.files libkonqueror_main_la.all_cc.final; \ + echo "#define KDE_USE_FINAL 1" >> libkonqueror_main_la.all_cc.final; \ + for file in konq_main.cc KonquerorIface.cc KonqMainWindowIface.cc KonqViewIface.cc konq_mainwindow.cc konq_guiclients.cc konq_run.cc konq_view.cc konq_viewmgr.cc konq_misc.cc konq_frame.cc konq_actions.cc konq_profiledlg.cc konq_factory.cc konq_combo.cc konq_browseriface.cc delayedinitializer.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc libkonqueror_main_la_meta_unload.cc ; do \ + echo "#include \"$$file\"" >> libkonqueror_main_la.all_cc.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkonqueror_main_la.all_cc.final; \ + done; \ + cat libkonqueror_main_la.all_cc.final libkonqueror_main_la.all_cc.files > libkonqueror_main_la.all_cc.cc; \ + rm -f libkonqueror_main_la.all_cc.final libkonqueror_main_la.all_cc.files + +#>+ 11 +konqueror.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konqueror_main.cc @@echo 'creating konqueror.all_cc.cc ...'; \ rm -f konqueror.all_cc.files konqueror.all_cc.final; \ echo "#define KDE_USE_FINAL 1" >> konqueror.all_cc.final; \ - for file in dummy.cc ; do \ + for file in konqueror_main.cc ; do \ echo "#include \"$$file\"" >> konqueror.all_cc.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> konqueror.all_cc.final; \ done; \ @@@@ -1099,20 +1123,20 @@@@ #>+ 3 clean-final: - -rm -f konqueror_la.all_cc.cc konqueror.all_cc.cc + -rm -f konqueror_la.all_cc.cc libkonqueror_main_la.all_cc.cc konqueror.all_cc.cc #>+ 2 final: - $(MAKE) konqueror_la_OBJECTS="$(konqueror_la_final_OBJECTS)" all-am + $(MAKE) libkonqueror_main_la_OBJECTS="$(libkonqueror_main_la_final_OBJECTS)" all-am #>+ 2 final-install: - $(MAKE) konqueror_la_OBJECTS="$(konqueror_la_final_OBJECTS)" install-am + $(MAKE) libkonqueror_main_la_OBJECTS="$(libkonqueror_main_la_final_OBJECTS)" install-am #>+ 2 no-final: - $(MAKE) konqueror_la_OBJECTS="$(konqueror_la_nofinal_OBJECTS)" all-am + $(MAKE) libkonqueror_main_la_OBJECTS="$(libkonqueror_main_la_nofinal_OBJECTS)" all-am #>+ 2 no-final-install: - $(MAKE) konqueror_la_OBJECTS="$(konqueror_la_nofinal_OBJECTS)" install-am + $(MAKE) libkonqueror_main_la_OBJECTS="$(libkonqueror_main_la_nofinal_OBJECTS)" install-am #>+ 3 cvs-clean: $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean @