head 1.10; access; symbols pkgsrc-2013Q2:1.10.0.28 pkgsrc-2013Q2-base:1.10 pkgsrc-2012Q4:1.10.0.26 pkgsrc-2012Q4-base:1.10 pkgsrc-2011Q4:1.10.0.24 pkgsrc-2011Q4-base:1.10 pkgsrc-2011Q2:1.10.0.22 pkgsrc-2011Q2-base:1.10 pkgsrc-2009Q4:1.10.0.20 pkgsrc-2009Q4-base:1.10 pkgsrc-2008Q4:1.10.0.18 pkgsrc-2008Q4-base:1.10 pkgsrc-2008Q3:1.10.0.16 pkgsrc-2008Q3-base:1.10 cube-native-xorg:1.10.0.14 cube-native-xorg-base:1.10 pkgsrc-2008Q2:1.10.0.12 pkgsrc-2008Q2-base:1.10 pkgsrc-2008Q1:1.10.0.10 pkgsrc-2008Q1-base:1.10 pkgsrc-2007Q4:1.10.0.8 pkgsrc-2007Q4-base:1.10 pkgsrc-2007Q3:1.10.0.6 pkgsrc-2007Q3-base:1.10 pkgsrc-2007Q2:1.10.0.4 pkgsrc-2007Q2-base:1.10 pkgsrc-2007Q1:1.10.0.2 pkgsrc-2007Q1-base:1.10 pkgsrc-2006Q4:1.9.0.6 pkgsrc-2006Q4-base:1.9 pkgsrc-2006Q3:1.9.0.4 pkgsrc-2006Q3-base:1.9 pkgsrc-2006Q2:1.9.0.2 pkgsrc-2006Q2-base:1.9 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.10 date 2007.01.26.02.49.25; author markd; state dead; branches; next 1.9; 1.9 date 2006.04.24.22.16.14; author markd; state Exp; branches; next 1.8; 1.8 date 2004.02.04.14.25.58; 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.34.59; author markd; state Exp; branches; next 1.5; 1.5 date 2003.05.22.02.42.48; author markd; state Exp; branches; next 1.4; 1.4 date 2003.03.11.13.10.19; 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.37; author jlam; state Exp; branches; next 1.1; 1.1 date 2002.05.31.13.18.58; author skrll; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2002.05.31.13.18.58; author skrll; state Exp; branches 1.1.1.1.2.1; next ; 1.1.1.1.2.1 date 2002.05.31.13.18.58; author jlam; state dead; branches; next 1.1.1.1.2.2; 1.1.1.1.2.2 date 2002.06.23.19.05.19; author jlam; state Exp; branches; next ; desc @@ 1.10 log @Update KDE to 3.5.6 kicker * More support for compiz as a window manager. * Pick up timezone changes when reconfiguring. * Prevent the systray from flickering e.g. when a new window is opened/closed. KWin * Claim _NET_WM_CM_Sn compositing manager selection when compositing. * Fix mouse dragging in dual-head non-xinerama mode. * Fix crash while switching show desktop state. * Avoid focus problems with non-click-to-focus policies. * Fix click-raise with a compositing manager running. * Fix X resources leaks in kompmgr. * Fix click-raise interaction with panels. * Avoid possible race condition when withdrawing windows. kdesktop * Fix crash when typing "56+" in minicli (i.e. when bc gives a parse error). * Fix F5 not doing anything on the desktop. * Fix OpenGL screensavers rendering. kmenu * Install the Games/Kids Games file with the correct filename. Kate * Added session chooser panel applet and KMenu extension. konqueror * DCOP support for splitting the view. * Make the konqueror main window a group leader to ensure modal dialogs from one window do not block other konqueror main windows. * Dynamically enable/disable "Empty Trash" entry. * Fix crash when scanning for new plugins, then changing plugin settings. * Fix crash after a lot of cut&paste operations in tree view. konsole * Correct calculation of colour values in 256-colour mode. * Fix crash when saving history twice. * Fix crash if setting font to a size which is larger than the terminal display. kioslave * fish:/ kioslave is now able to handle files > 2GB. * Fix correct display of file size transfers > 2GB in smb:/. * Fix files that start with # showing as folders in fish:/. * Symlinks in trash now show symlink size instead of file size. * Fix correct calculation of percent diskfree. kfind * Fix URL usage with filenames including special chars. * Show a user-friendly URL in the "Look in:" field. ksysguard * Only show the penguin for linux systems. Otherwise use the system icon. * Set the focus to the search line when started with ctrl+esc. Fix the tab ordering. * Fix various stability problems. * Fix when you reorder the sensors. * Number of horizontal lines in the plotter was off by one. Plus it tries hard to show the top bar when asked to. * Fix (mostly) the selection of processes. * Make the setting dialogs non-modal, so it doesn't freeze kicker when you use them. * Displaying a number (LCD style) now works even with tiny kicker. * Make the connection to ksysguardd more robust. kcontrol * Fonts settings module by default does not affect system-wide font rendering settings. @ text @$NetBSD: patch-ao,v 1.9 2006/04/24 22:16:14 markd Exp $ --- kcontrol/nics/nic.cpp.orig 2006-04-17 14:30:47.642462000 +1200 +++ kcontrol/nics/nic.cpp @@@@ -215,6 +215,7 @@@@ NICList* findNICs() tmp->netmask=i18n("Unknown"); ifcopy=*ifr; +#ifdef SIOCGIFHWADDR result=ioctl(sockfd,SIOCGIFHWADDR,&ifcopy); if (result==0) { @@@@ -222,6 +223,17 @@@@ NICList* findNICs() tmp->HWaddr = HWaddr2String(n); } else +#else +#ifdef SIOCGENADDR + result=ioctl(sockfd,SIOCGENADDR,&ifcopy); + if (result==0) + { + char *n = &ifcopy.ifr_ifru.ifru_enaddr[0]; + tmp->HWaddr = HWaddr2String(n); + } + else +#endif +#endif tmp->HWaddr = i18n("Unknown"); nl->append(tmp); @ 1.9 log @Fix build on Solaris (doesn't have SIOCGIFHWADDR) @ text @d1 1 a1 1 $NetBSD$ @ 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: patch-ao,v 1.7 2004/01/15 10:15:14 markd Exp $ d3 26 a28 3 --- kcontrol/kcontrol/Makefile.in.orig 2004-01-02 14:05:56.000000000 +1300 +++ kcontrol/kcontrol/Makefile.in @@@@ -447,52 +447,65 @@@@ INCLUDES = $(all_includes) d30 1 a30 642 SUBDIRS = . pics -CLEANFILES = dummy.cpp - bin_PROGRAMS = kcontrol kcmshell kcminit -lib_LTLIBRARIES = kcontrol.la kcmshell.la kcminit.la +lib_LTLIBRARIES = libkcontrol_main.la kcontrol.la \ + libkcmshell_main.la kcmshell.la \ + libkcminit_main.la kcminit.la + -#>- kcontrol_la_SOURCES = main.cpp toplevel.cpp indexwidget.cpp searchwidget.cpp \ -#>- helpwidget.cpp moduleinfo.cpp modules.cpp proxywidget.cpp \ -#>- modloader.cpp dockcontainer.cpp aboutwidget.cpp global.cpp \ -#>- quickhelp.cpp moduletreeview.cpp moduleiconview.cpp \ +#>- libkcontrol_main_la_SOURCES = main.cpp toplevel.cpp indexwidget.cpp \ +#>- searchwidget.cpp helpwidget.cpp moduleinfo.cpp modules.cpp \ +#>- proxywidget.cpp modloader.cpp dockcontainer.cpp aboutwidget.cpp \ +#>- global.cpp quickhelp.cpp moduletreeview.cpp moduleiconview.cpp \ #>- kecdialog.cpp kcrootonly.cpp moduleIface.cpp moduleIface.skel #>+ 5 -kcontrol_la_SOURCES=main.cpp toplevel.cpp indexwidget.cpp searchwidget.cpp \ - helpwidget.cpp moduleinfo.cpp modules.cpp proxywidget.cpp \ - modloader.cpp dockcontainer.cpp aboutwidget.cpp global.cpp \ - quickhelp.cpp moduletreeview.cpp moduleiconview.cpp \ +libkcontrol_main_la_SOURCES=main.cpp toplevel.cpp indexwidget.cpp \ + searchwidget.cpp helpwidget.cpp moduleinfo.cpp modules.cpp \ + proxywidget.cpp modloader.cpp dockcontainer.cpp aboutwidget.cpp \ + global.cpp quickhelp.cpp moduletreeview.cpp moduleiconview.cpp \ kecdialog.cpp kcrootonly.cpp moduleIface.cpp moduleIface_skel.cpp -kcontrol_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) +libkcontrol_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) +libkcontrol_main_la_LDFLAGS = $(all_libraries) + +kcontrol_la_SOURCES = kcontrol_main.cpp +kcontrol_la_LIBADD = libkcontrol_main.la kcontrol_la_LDFLAGS = $(all_libraries) -module -avoid-version -#>- kcmshell_la_SOURCES = kcmshell.cpp moduleinfo.cpp modloader.cpp kecdialog.cpp \ -#>- proxywidget.cpp kcdialog.cpp global.cpp \ -#>- kcdialog.skel -#>+ 3 -kcmshell_la_SOURCES=kcmshell.cpp moduleinfo.cpp modloader.cpp kecdialog.cpp \ - proxywidget.cpp kcdialog.cpp global.cpp \ - kcdialog_skel.cpp +#>- libkcmshell_main_la_SOURCES = kcmshell.cpp moduleinfo.cpp modloader.cpp \ +#>- kecdialog.cpp proxywidget.cpp kcdialog.cpp global.cpp \ +#>- kcdialog.skel +#>+ 3 +libkcmshell_main_la_SOURCES=kcmshell.cpp moduleinfo.cpp modloader.cpp \ + kecdialog.cpp proxywidget.cpp kcdialog.cpp global.cpp \ + kcdialog_skel.cpp -kcmshell_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) +libkcmshell_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) +libkcmshell_main_la_LDFLAGS = $(all_libraries) + +kcmshell_la_SOURCES = kcmshell_main.cpp +kcmshell_la_LIBADD = libkcmshell_main.la kcmshell_la_LDFLAGS = $(all_libraries) -module -avoid-version +libkcminit_main_la_SOURCES = kcminit.cpp global.cpp +libkcminit_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) +libkcminit_main_la_LDFLAGS = $(all_libraries) + kcminit_la_SOURCES = kcminit.cpp global.cpp -kcminit_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) +kcminit_la_LIBADD = libkcminit_main.la kcminit_la_LDFLAGS = $(all_libraries) -module -avoid-version -kcontrol_SOURCES = dummy.cpp -kcontrol_LDADD = kcontrol.la +kcontrol_SOURCES = kcontrol_main.cpp +kcontrol_LDADD = libkcontrol_main.la kcontrol_LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic -kcmshell_SOURCES = dummy.cpp -kcmshell_LDADD = kcmshell.la +kcmshell_SOURCES = kcmshell_main.cpp +kcmshell_LDADD = libkcmshell_main.la kcmshell_LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic -kcminit_SOURCES = dummy.cpp -kcminit_LDADD = kcminit.la +kcminit_SOURCES = kcminit_main.cpp +kcminit_LDADD = libkcminit_main.la kcminit_LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic rccontroldir = $(kde_datadir)/kcontrol @@@@ -512,7 +525,7 @@@@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) -kcminit_la_DEPENDENCIES = +kcminit_la_DEPENDENCIES = libkcminit_main.la am_kcminit_la_OBJECTS = kcminit.lo global.lo #>- kcminit_la_OBJECTS = $(am_kcminit_la_OBJECTS) #>+ 4 @@@@ -520,60 +533,84 @@@@ kcminit_la_final_OBJECTS = kcminit_la.al kcminit_la_nofinal_OBJECTS = kcminit.lo global.lo @@KDE_USE_FINAL_FALSE@@kcminit_la_OBJECTS = $(kcminit_la_nofinal_OBJECTS) @@KDE_USE_FINAL_TRUE@@kcminit_la_OBJECTS = $(kcminit_la_final_OBJECTS) -kcmshell_la_DEPENDENCIES = -am_kcmshell_la_OBJECTS = kcmshell.lo moduleinfo.lo modloader.lo \ - kecdialog.lo proxywidget.lo kcdialog.lo global.lo +kcmshell_la_DEPENDENCIES = libkcmshell_main.la +am_kcmshell_la_OBJECTS = kcmshell_main.lo #>- kcmshell_la_OBJECTS = $(am_kcmshell_la_OBJECTS) +#>+ 1 +kcmshell_la_OBJECTS = kcmshell_main.lo +kcontrol_la_DEPENDENCIES = libkcontrol_main.la +am_kcontrol_la_OBJECTS = kcontrol_main.lo +#>- kcontrol_la_OBJECTS = $(am_kcontrol_la_OBJECTS) +#>+ 1 +kcontrol_la_OBJECTS = kcontrol_main.lo +libkcminit_main_la_DEPENDENCIES = +am_libkcminit_main_la_OBJECTS = kcminit.lo global.lo +#>- libkcminit_main_la_OBJECTS = $(am_libkcminit_main_la_OBJECTS) +#>+ 4 +libkcminit_main_la_final_OBJECTS = libkcminit_main_la.all_cpp.lo +libkcminit_main_la_nofinal_OBJECTS = kcminit.lo global.lo +@@KDE_USE_FINAL_FALSE@@libkcminit_main_la_OBJECTS = $(libkcminit_main_la_nofinal_OBJECTS) +@@KDE_USE_FINAL_TRUE@@libkcminit_main_la_OBJECTS = $(libkcminit_main_la_final_OBJECTS) +libkcmshell_main_la_DEPENDENCIES = +am_libkcmshell_main_la_OBJECTS = kcmshell.lo moduleinfo.lo modloader.lo \ + kecdialog.lo proxywidget.lo kcdialog.lo global.lo +#>- libkcmshell_main_la_OBJECTS = $(am_libkcmshell_main_la_OBJECTS) #>+ 5 -kcmshell_la_final_OBJECTS = kcmshell_la.all_cpp.lo -kcmshell_la_nofinal_OBJECTS = kcmshell.lo moduleinfo.lo modloader.lo \ +libkcmshell_main_la_final_OBJECTS = libkcmshell_main_la.all_cpp.lo +libkcmshell_main_la_nofinal_OBJECTS = kcmshell.lo moduleinfo.lo modloader.lo \ kecdialog.lo proxywidget.lo kcdialog.lo global.lo kcdialog_skel.lo -@@KDE_USE_FINAL_FALSE@@kcmshell_la_OBJECTS = $(kcmshell_la_nofinal_OBJECTS) -@@KDE_USE_FINAL_TRUE@@kcmshell_la_OBJECTS = $(kcmshell_la_final_OBJECTS) -kcontrol_la_DEPENDENCIES = -am_kcontrol_la_OBJECTS = main.lo toplevel.lo indexwidget.lo \ +@@KDE_USE_FINAL_FALSE@@libkcmshell_main_la_OBJECTS = $(libkcmshell_main_la_nofinal_OBJECTS) +@@KDE_USE_FINAL_TRUE@@libkcmshell_main_la_OBJECTS = $(libkcmshell_main_la_final_OBJECTS) +libkcontrol_main_la_DEPENDENCIES = +am_libkcontrol_main_la_OBJECTS = main.lo toplevel.lo indexwidget.lo \ searchwidget.lo helpwidget.lo moduleinfo.lo modules.lo \ proxywidget.lo modloader.lo dockcontainer.lo aboutwidget.lo \ global.lo quickhelp.lo moduletreeview.lo moduleiconview.lo \ kecdialog.lo kcrootonly.lo moduleIface.lo -#>- kcontrol_la_OBJECTS = $(am_kcontrol_la_OBJECTS) +#>- libkcontrol_main_la_OBJECTS = $(am_libkcontrol_main_la_OBJECTS) #>+ 8 -kcontrol_la_final_OBJECTS = kcontrol_la.all_cpp.lo -kcontrol_la_nofinal_OBJECTS = main.lo toplevel.lo indexwidget.lo \ +libkcontrol_main_la_final_OBJECTS = libkcontrol_main_la.all_cpp.lo +libkcontrol_main_la_nofinal_OBJECTS = main.lo toplevel.lo indexwidget.lo \ searchwidget.lo helpwidget.lo moduleinfo.lo modules.lo \ proxywidget.lo modloader.lo dockcontainer.lo aboutwidget.lo \ global.lo quickhelp.lo moduletreeview.lo moduleiconview.lo \ kecdialog.lo kcrootonly.lo moduleIface.lo moduleIface_skel.lo -@@KDE_USE_FINAL_FALSE@@kcontrol_la_OBJECTS = $(kcontrol_la_nofinal_OBJECTS) -@@KDE_USE_FINAL_TRUE@@kcontrol_la_OBJECTS = $(kcontrol_la_final_OBJECTS) +@@KDE_USE_FINAL_FALSE@@libkcontrol_main_la_OBJECTS = $(libkcontrol_main_la_nofinal_OBJECTS) +@@KDE_USE_FINAL_TRUE@@libkcontrol_main_la_OBJECTS = $(libkcontrol_main_la_final_OBJECTS) bin_PROGRAMS = kcontrol$(EXEEXT) kcmshell$(EXEEXT) kcminit$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) -am_kcminit_OBJECTS = dummy.$(OBJEXT) +am_kcminit_OBJECTS = kcminit_main.$(OBJEXT) #>- kcminit_OBJECTS = $(am_kcminit_OBJECTS) #>+ 1 -kcminit_OBJECTS = dummy.$(OBJEXT) -kcminit_DEPENDENCIES = kcminit.la -am_kcmshell_OBJECTS = dummy.$(OBJEXT) +kcminit_OBJECTS = kcminit_main.$(OBJEXT) +kcminit_DEPENDENCIES = libkcminit_main.la +am_kcmshell_OBJECTS = kcmshell_main.$(OBJEXT) #>- kcmshell_OBJECTS = $(am_kcmshell_OBJECTS) #>+ 1 -kcmshell_OBJECTS = dummy.$(OBJEXT) -kcmshell_DEPENDENCIES = kcmshell.la -am_kcontrol_OBJECTS = dummy.$(OBJEXT) +kcmshell_OBJECTS = kcmshell_main.$(OBJEXT) +kcmshell_DEPENDENCIES = libkcmshell_main.la +am_kcontrol_OBJECTS = kcontrol_main.$(OBJEXT) #>- kcontrol_OBJECTS = $(am_kcontrol_OBJECTS) #>+ 1 -kcontrol_OBJECTS = dummy.$(OBJEXT) -kcontrol_DEPENDENCIES = kcontrol.la +kcontrol_OBJECTS = kcontrol_main.$(OBJEXT) +kcontrol_DEPENDENCIES = libkcontrol_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)/aboutwidget.Plo \ -#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/dockcontainer.Plo ./$(DEPDIR)/dummy.Po \ +#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/dockcontainer.Plo \ #>- @@AMDEP_TRUE@@ ./$(DEPDIR)/global.Plo ./$(DEPDIR)/helpwidget.Plo \ #>- @@AMDEP_TRUE@@ ./$(DEPDIR)/indexwidget.Plo \ #>- @@AMDEP_TRUE@@ ./$(DEPDIR)/kcdialog.Plo ./$(DEPDIR)/kcminit.Plo \ -#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/kcmshell.Plo ./$(DEPDIR)/kcrootonly.Plo \ +#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/kcminit_main.Po \ +#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/kcmshell.Plo \ +#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/kcmshell_main.Plo \ +#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/kcmshell_main.Po \ +#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/kcontrol_main.Plo \ +#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/kcontrol_main.Po \ +#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/kcrootonly.Plo \ #>- @@AMDEP_TRUE@@ ./$(DEPDIR)/kecdialog.Plo ./$(DEPDIR)/main.Plo \ #>- @@AMDEP_TRUE@@ ./$(DEPDIR)/modloader.Plo \ #>- @@AMDEP_TRUE@@ ./$(DEPDIR)/moduleIface.Plo \ @@@@ -584,13 +621,19 @@@@ am__depfiles_maybe = depfiles #>- @@AMDEP_TRUE@@ ./$(DEPDIR)/quickhelp.Plo \ #>- @@AMDEP_TRUE@@ ./$(DEPDIR)/searchwidget.Plo \ #>- @@AMDEP_TRUE@@ ./$(DEPDIR)/toplevel.Plo -#>+ 33 -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@DEP_FILES = $(DEPDIR)/kcdialog_skel.P $(DEPDIR)/moduleIface_skel.P $(DEPDIR)/kcminit_la.all_cpp.P $(DEPDIR)/kcmshell_la.all_cpp.P $(DEPDIR)/kcontrol_la.all_cpp.P ./$(DEPDIR)/aboutwidget.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/dockcontainer.Plo ./$(DEPDIR)/dummy.Po \ +#>+ 45 +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@DEP_FILES = $(DEPDIR)/kcdialog_skel.P $(DEPDIR)/moduleIface_skel.P $(DEPDIR)/kcminit_la.all_cpp.P $(DEPDIR)/libkcminit_main_la.all_cpp.P $(DEPDIR)/libkcmshell_main_la.all_cpp.P $(DEPDIR)/libkcontrol_main_la.all_cpp.P ./$(DEPDIR)/aboutwidget.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/dockcontainer.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/global.Plo ./$(DEPDIR)/helpwidget.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/indexwidget.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kcdialog.Plo ./$(DEPDIR)/kcminit.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kcmshell.Plo ./$(DEPDIR)/kcrootonly.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kcminit_main.Po \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kcmshell.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kcmshell_main.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kcmshell_main.Po \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kcontrol_main.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kcontrol_main.Po \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kcrootonly.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kecdialog.Plo ./$(DEPDIR)/main.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/modloader.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/moduleIface.Plo \ @@@@ -602,11 +645,17 @@@@ am__depfiles_maybe = depfiles @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/searchwidget.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/toplevel.Plo @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@DEP_FILES = $(DEPDIR)/kcdialog_skel.P $(DEPDIR)/moduleIface_skel.P ./$(DEPDIR)/aboutwidget.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/dockcontainer.Plo ./$(DEPDIR)/dummy.Po \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/dockcontainer.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/global.Plo ./$(DEPDIR)/helpwidget.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/indexwidget.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kcdialog.Plo ./$(DEPDIR)/kcminit.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kcmshell.Plo ./$(DEPDIR)/kcrootonly.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kcminit_main.Po \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kcmshell.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kcmshell_main.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kcmshell_main.Po \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kcontrol_main.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kcontrol_main.Po \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kcrootonly.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kecdialog.Plo ./$(DEPDIR)/main.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/modloader.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/moduleIface.Plo \ @@@@ -637,8 +686,9 @@@@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@@ DIST_SOURCES = $(kcminit_la_SOURCES) $(kcmshell_la_SOURCES) \ - $(kcontrol_la_SOURCES) $(kcminit_SOURCES) $(kcmshell_SOURCES) \ - $(kcontrol_SOURCES) + $(kcontrol_la_SOURCES) $(libkcminit_main_la_SOURCES) \ + $(libkcmshell_main_la_SOURCES) $(libkcontrol_main_la_SOURCES) \ + $(kcminit_SOURCES) $(kcmshell_SOURCES) $(kcontrol_SOURCES) DATA = $(data_DATA) $(rccontrol_DATA) $(rcinfo_DATA) @@@@ -649,7 +699,7 @@@@ RECURSIVE_TARGETS = info-recursive dvi-r check-recursive installcheck-recursive DIST_COMMON = Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) -SOURCES = $(kcminit_la_SOURCES) $(kcmshell_la_SOURCES) $(kcontrol_la_SOURCES) $(kcminit_SOURCES) $(kcmshell_SOURCES) $(kcontrol_SOURCES) +SOURCES = $(kcminit_la_SOURCES) $(kcmshell_la_SOURCES) $(kcontrol_la_SOURCES) $(libkcminit_main_la_SOURCES) $(libkcmshell_main_la_SOURCES) $(libkcontrol_main_la_SOURCES) $(kcminit_SOURCES) $(kcmshell_SOURCES) $(kcontrol_SOURCES) #>- all: all-recursive #>+ 1 @@@@ -700,6 +750,12 @@@@ kcmshell.la: $(kcmshell_la_OBJECTS) $(kc $(CXXLINK) -rpath $(libdir) $(kcmshell_la_LDFLAGS) $(kcmshell_la_OBJECTS) $(kcmshell_la_LIBADD) $(LIBS) kcontrol.la: $(kcontrol_la_OBJECTS) $(kcontrol_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kcontrol_la_LDFLAGS) $(kcontrol_la_OBJECTS) $(kcontrol_la_LIBADD) $(LIBS) +libkcminit_main.la: $(libkcminit_main_la_OBJECTS) $(libkcminit_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkcminit_main_la_LDFLAGS) $(libkcminit_main_la_OBJECTS) $(libkcminit_main_la_LIBADD) $(LIBS) +libkcmshell_main.la: $(libkcmshell_main_la_OBJECTS) $(libkcmshell_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkcmshell_main_la_LDFLAGS) $(libkcmshell_main_la_OBJECTS) $(libkcmshell_main_la_LIBADD) $(LIBS) +libkcontrol_main.la: $(libkcontrol_main_la_OBJECTS) $(libkcontrol_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkcontrol_main_la_LDFLAGS) $(libkcontrol_main_la_OBJECTS) $(libkcontrol_main_la_LIBADD) $(LIBS) binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @@$(NORMAL_INSTALL) @@@@ -747,13 +803,17 @@@@ distclean-compile: @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/aboutwidget.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/dockcontainer.Plo@@am__quote@@ -@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/dummy.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/global.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/helpwidget.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/indexwidget.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/kcdialog.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/kcminit.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/kcminit_main.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/kcmshell.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/kcmshell_main.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/kcmshell_main.Po@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/kcontrol_main.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/kcontrol_main.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/kcrootonly.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/kecdialog.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/main.Plo@@am__quote@@ @@@@ -993,7 +1053,7 @@@@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=cr16-app-kcontrol.png cr32-app-kcontrol.png moduleIface.h kcontrolui.rc cr48-app-kcontrol.png kcrootonly.h kcmshell.h cr64-app-kcontrol.png modulemenu.h modulemenu.cpp KControl_NoDisplay.desktop helpwidget.h moduleiconview.h KControl.desktop modloader.h moduleinfo.h aboutwidget.h quickhelp.h dockcontainer.h toplevel.h kinfocenterui.rc global.h moduletreeview.h indexwidget.h modules.h main.h kcdialog.h kecdialog.h proxywidget.h searchwidget.h version.h cr128-app-kcontrol.png kinfocenter.desktop +KDE_DIST=kcontrolui.rc indexwidget.h cr64-app-kcontrol.png kinfocenterui.rc proxywidget.h dockcontainer.h cr32-app-kcontrol.png modulemenu.h quickhelp.h cr128-app-kcontrol.png searchwidget.h main.h Makefile.in.rej moduletreeview.h kcdialog.h kecdialog.h moduleIface.h aboutwidget.h kinfocenter.desktop kcrootonly.h toplevel.h helpwidget.h KControl.desktop cr48-app-kcontrol.png modules.h version.h cr16-app-kcontrol.png moduleiconview.h KControl_NoDisplay.desktop moduleinfo.h global.h kcmshell.h modulemenu.cpp modloader.h DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) @@@@ -1067,7 +1127,6 @@@@ install-strip: mostlyclean-generic: clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) @@@@ -1172,67 +1231,58 @@@@ install-data-local: KControl_NoDisplay.d messages: rc.cpp $(XGETTEXT) *.cpp -o $(podir)/kcontrol.pot - -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: #>+ 3 -kcmshell.moc: $(srcdir)/kcmshell.h - $(MOC) $(srcdir)/kcmshell.h -o kcmshell.moc - -#>+ 1 -mocs: kcmshell.moc -#>+ 3 -proxywidget.moc: $(srcdir)/proxywidget.h - $(MOC) $(srcdir)/proxywidget.h -o proxywidget.moc +indexwidget.moc: $(srcdir)/indexwidget.h + $(MOC) $(srcdir)/indexwidget.h -o indexwidget.moc #>+ 1 -mocs: proxywidget.moc +mocs: indexwidget.moc #>+ 3 -moduletreeview.moc: $(srcdir)/moduletreeview.h - $(MOC) $(srcdir)/moduletreeview.h -o moduletreeview.moc +main.moc: $(srcdir)/main.h + $(MOC) $(srcdir)/main.h -o main.moc #>+ 1 -mocs: moduletreeview.moc +mocs: main.moc #>+ 3 -toplevel.moc: $(srcdir)/toplevel.h - $(MOC) $(srcdir)/toplevel.h -o toplevel.moc +moduleinfo.moc: $(srcdir)/moduleinfo.h + $(MOC) $(srcdir)/moduleinfo.h -o moduleinfo.moc #>+ 1 -mocs: toplevel.moc +mocs: moduleinfo.moc #>+ 3 -aboutwidget.moc: $(srcdir)/aboutwidget.h - $(MOC) $(srcdir)/aboutwidget.h -o aboutwidget.moc +kcmshell.moc: $(srcdir)/kcmshell.h + $(MOC) $(srcdir)/kcmshell.h -o kcmshell.moc #>+ 1 -mocs: aboutwidget.moc +mocs: kcmshell.moc #>+ 3 -kecdialog.moc: $(srcdir)/kecdialog.h - $(MOC) $(srcdir)/kecdialog.h -o kecdialog.moc +helpwidget.moc: $(srcdir)/helpwidget.h + $(MOC) $(srcdir)/helpwidget.h -o helpwidget.moc #>+ 1 -mocs: kecdialog.moc +mocs: helpwidget.moc #>+ 3 -moduleiconview.moc: $(srcdir)/moduleiconview.h - $(MOC) $(srcdir)/moduleiconview.h -o moduleiconview.moc +toplevel.moc: $(srcdir)/toplevel.h + $(MOC) $(srcdir)/toplevel.h -o toplevel.moc #>+ 1 -mocs: moduleiconview.moc +mocs: toplevel.moc #>+ 3 -moduleIface.moc: $(srcdir)/moduleIface.h - $(MOC) $(srcdir)/moduleIface.h -o moduleIface.moc +moduletreeview.moc: $(srcdir)/moduletreeview.h + $(MOC) $(srcdir)/moduletreeview.h -o moduletreeview.moc #>+ 1 -mocs: moduleIface.moc +mocs: moduletreeview.moc #>+ 3 -dockcontainer.moc: $(srcdir)/dockcontainer.h - $(MOC) $(srcdir)/dockcontainer.h -o dockcontainer.moc +kecdialog.moc: $(srcdir)/kecdialog.h + $(MOC) $(srcdir)/kecdialog.h -o kecdialog.moc #>+ 1 -mocs: dockcontainer.moc +mocs: kecdialog.moc #>+ 3 modulemenu.moc: $(srcdir)/modulemenu.h $(MOC) $(srcdir)/modulemenu.h -o modulemenu.moc @@@@ -1240,17 +1290,17 @@@@ modulemenu.moc: $(srcdir)/modulemenu.h #>+ 1 mocs: modulemenu.moc #>+ 3 -moduleinfo.moc: $(srcdir)/moduleinfo.h - $(MOC) $(srcdir)/moduleinfo.h -o moduleinfo.moc +modules.moc: $(srcdir)/modules.h + $(MOC) $(srcdir)/modules.h -o modules.moc #>+ 1 -mocs: moduleinfo.moc +mocs: modules.moc #>+ 3 -quickhelp.moc: $(srcdir)/quickhelp.h - $(MOC) $(srcdir)/quickhelp.h -o quickhelp.moc +moduleiconview.moc: $(srcdir)/moduleiconview.h + $(MOC) $(srcdir)/moduleiconview.h -o moduleiconview.moc #>+ 1 -mocs: quickhelp.moc +mocs: moduleiconview.moc #>+ 3 kcdialog.moc: $(srcdir)/kcdialog.h $(MOC) $(srcdir)/kcdialog.h -o kcdialog.moc @@@@ -1264,29 +1314,35 @@@@ searchwidget.moc: $(srcdir)/searchwidget #>+ 1 mocs: searchwidget.moc #>+ 3 -modules.moc: $(srcdir)/modules.h - $(MOC) $(srcdir)/modules.h -o modules.moc +moduleIface.moc: $(srcdir)/moduleIface.h + $(MOC) $(srcdir)/moduleIface.h -o moduleIface.moc #>+ 1 -mocs: modules.moc +mocs: moduleIface.moc #>+ 3 -helpwidget.moc: $(srcdir)/helpwidget.h - $(MOC) $(srcdir)/helpwidget.h -o helpwidget.moc +aboutwidget.moc: $(srcdir)/aboutwidget.h + $(MOC) $(srcdir)/aboutwidget.h -o aboutwidget.moc #>+ 1 -mocs: helpwidget.moc +mocs: aboutwidget.moc #>+ 3 -indexwidget.moc: $(srcdir)/indexwidget.h - $(MOC) $(srcdir)/indexwidget.h -o indexwidget.moc +proxywidget.moc: $(srcdir)/proxywidget.h + $(MOC) $(srcdir)/proxywidget.h -o proxywidget.moc #>+ 1 -mocs: indexwidget.moc +mocs: proxywidget.moc #>+ 3 -main.moc: $(srcdir)/main.h - $(MOC) $(srcdir)/main.h -o main.moc +dockcontainer.moc: $(srcdir)/dockcontainer.h + $(MOC) $(srcdir)/dockcontainer.h -o dockcontainer.moc #>+ 1 -mocs: main.moc +mocs: dockcontainer.moc +#>+ 3 +quickhelp.moc: $(srcdir)/quickhelp.h + $(MOC) $(srcdir)/quickhelp.h -o quickhelp.moc + +#>+ 1 +mocs: quickhelp.moc #>+ 5 kcdialog.kidl: $(srcdir)/kcdialog.h $(DCOP_DEPENDENCIES) $(DCOPIDL) $(srcdir)/kcdialog.h > kcdialog.kidl || ( rm -f kcdialog.kidl ; false ) @@@@ -1301,7 +1357,7 @@@@ moduleIface_skel.cpp: moduleIface.kidl #>+ 3 clean-metasources: - -rm -f kcmshell.moc proxywidget.moc moduletreeview.moc toplevel.moc aboutwidget.moc kecdialog.moc moduleiconview.moc moduleIface.moc dockcontainer.moc modulemenu.moc moduleinfo.moc quickhelp.moc kcdialog.moc searchwidget.moc modules.moc helpwidget.moc indexwidget.moc main.moc + -rm -f indexwidget.moc main.moc moduleinfo.moc kcmshell.moc helpwidget.moc toplevel.moc moduletreeview.moc kecdialog.moc modulemenu.moc modules.moc moduleiconview.moc kcdialog.moc searchwidget.moc moduleIface.moc aboutwidget.moc proxywidget.moc dockcontainer.moc quickhelp.moc #>+ 5 clean-idl: @@@@ -1352,45 +1408,57 @@@@ kcminit_la.all_cpp.cpp: $(srcdir)/Makefi rm -f kcminit_la.all_cpp.final kcminit_la.all_cpp.files #>+ 11 -kcmshell_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcmshell.cpp $(srcdir)/moduleinfo.cpp $(srcdir)/modloader.cpp $(srcdir)/kecdialog.cpp $(srcdir)/proxywidget.cpp $(srcdir)/kcdialog.cpp $(srcdir)/global.cpp kcdialog_skel.cpp kcmshell.moc proxywidget.moc kecdialog.moc moduleinfo.moc kcdialog.moc - @@echo 'creating kcmshell_la.all_cpp.cpp ...'; \ - rm -f kcmshell_la.all_cpp.files kcmshell_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kcmshell_la.all_cpp.final; \ +libkcminit_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcminit.cpp $(srcdir)/global.cpp + @@echo 'creating libkcminit_main_la.all_cpp.cpp ...'; \ + rm -f libkcminit_main_la.all_cpp.files libkcminit_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkcminit_main_la.all_cpp.final; \ + for file in kcminit.cpp global.cpp ; do \ + echo "#include \"$$file\"" >> libkcminit_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkcminit_main_la.all_cpp.final; \ + done; \ + cat libkcminit_main_la.all_cpp.final libkcminit_main_la.all_cpp.files > libkcminit_main_la.all_cpp.cpp; \ + rm -f libkcminit_main_la.all_cpp.final libkcminit_main_la.all_cpp.files + +#>+ 11 +libkcmshell_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcmshell.cpp $(srcdir)/moduleinfo.cpp $(srcdir)/modloader.cpp $(srcdir)/kecdialog.cpp $(srcdir)/proxywidget.cpp $(srcdir)/kcdialog.cpp $(srcdir)/global.cpp kcdialog_skel.cpp kcmshell.moc moduleinfo.moc kecdialog.moc kcdialog.moc proxywidget.moc + @@echo 'creating libkcmshell_main_la.all_cpp.cpp ...'; \ + rm -f libkcmshell_main_la.all_cpp.files libkcmshell_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkcmshell_main_la.all_cpp.final; \ for file in kcmshell.cpp moduleinfo.cpp modloader.cpp kecdialog.cpp proxywidget.cpp kcdialog.cpp global.cpp kcdialog_skel.cpp ; do \ - echo "#include \"$$file\"" >> kcmshell_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcmshell_la.all_cpp.final; \ + echo "#include \"$$file\"" >> libkcmshell_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkcmshell_main_la.all_cpp.final; \ done; \ - cat kcmshell_la.all_cpp.final kcmshell_la.all_cpp.files > kcmshell_la.all_cpp.cpp; \ - rm -f kcmshell_la.all_cpp.final kcmshell_la.all_cpp.files + cat libkcmshell_main_la.all_cpp.final libkcmshell_main_la.all_cpp.files > libkcmshell_main_la.all_cpp.cpp; \ + rm -f libkcmshell_main_la.all_cpp.final libkcmshell_main_la.all_cpp.files #>+ 11 -kcontrol_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/indexwidget.cpp $(srcdir)/searchwidget.cpp $(srcdir)/helpwidget.cpp $(srcdir)/moduleinfo.cpp $(srcdir)/modules.cpp $(srcdir)/proxywidget.cpp $(srcdir)/modloader.cpp $(srcdir)/dockcontainer.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/global.cpp $(srcdir)/quickhelp.cpp $(srcdir)/moduletreeview.cpp $(srcdir)/moduleiconview.cpp $(srcdir)/kecdialog.cpp $(srcdir)/kcrootonly.cpp $(srcdir)/moduleIface.cpp moduleIface_skel.cpp proxywidget.moc moduletreeview.moc toplevel.moc aboutwidget.moc kecdialog.moc moduleiconview.moc moduleIface.moc dockcontainer.moc moduleinfo.moc quickhelp.moc searchwidget.moc main.moc indexwidget.moc helpwidget.moc modules.moc - @@echo 'creating kcontrol_la.all_cpp.cpp ...'; \ - rm -f kcontrol_la.all_cpp.files kcontrol_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kcontrol_la.all_cpp.final; \ +libkcontrol_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/indexwidget.cpp $(srcdir)/searchwidget.cpp $(srcdir)/helpwidget.cpp $(srcdir)/moduleinfo.cpp $(srcdir)/modules.cpp $(srcdir)/proxywidget.cpp $(srcdir)/modloader.cpp $(srcdir)/dockcontainer.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/global.cpp $(srcdir)/quickhelp.cpp $(srcdir)/moduletreeview.cpp $(srcdir)/moduleiconview.cpp $(srcdir)/kecdialog.cpp $(srcdir)/kcrootonly.cpp $(srcdir)/moduleIface.cpp moduleIface_skel.cpp indexwidget.moc main.moc moduleinfo.moc helpwidget.moc toplevel.moc moduletreeview.moc kecdialog.moc modules.moc moduleiconview.moc searchwidget.moc moduleIface.moc aboutwidget.moc proxywidget.moc quickhelp.moc dockcontainer.moc + @@echo 'creating libkcontrol_main_la.all_cpp.cpp ...'; \ + rm -f libkcontrol_main_la.all_cpp.files libkcontrol_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkcontrol_main_la.all_cpp.final; \ for file in main.cpp toplevel.cpp indexwidget.cpp searchwidget.cpp helpwidget.cpp moduleinfo.cpp modules.cpp proxywidget.cpp modloader.cpp dockcontainer.cpp aboutwidget.cpp global.cpp quickhelp.cpp moduletreeview.cpp moduleiconview.cpp kecdialog.cpp kcrootonly.cpp moduleIface.cpp moduleIface_skel.cpp ; do \ - echo "#include \"$$file\"" >> kcontrol_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcontrol_la.all_cpp.final; \ + echo "#include \"$$file\"" >> libkcontrol_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkcontrol_main_la.all_cpp.final; \ done; \ - cat kcontrol_la.all_cpp.final kcontrol_la.all_cpp.files > kcontrol_la.all_cpp.cpp; \ - rm -f kcontrol_la.all_cpp.final kcontrol_la.all_cpp.files + cat libkcontrol_main_la.all_cpp.final libkcontrol_main_la.all_cpp.files > libkcontrol_main_la.all_cpp.cpp; \ + rm -f libkcontrol_main_la.all_cpp.final libkcontrol_main_la.all_cpp.files #>+ 3 clean-final: - -rm -f kcminit_la.all_cpp.cpp kcmshell_la.all_cpp.cpp kcontrol_la.all_cpp.cpp + -rm -f kcminit_la.all_cpp.cpp libkcminit_main_la.all_cpp.cpp libkcmshell_main_la.all_cpp.cpp libkcontrol_main_la.all_cpp.cpp #>+ 2 final: - $(MAKE) kcminit_la_OBJECTS="$(kcminit_la_final_OBJECTS)" kcmshell_la_OBJECTS="$(kcmshell_la_final_OBJECTS)" kcontrol_la_OBJECTS="$(kcontrol_la_final_OBJECTS)" all-am + $(MAKE) kcminit_la_OBJECTS="$(kcminit_la_final_OBJECTS)" libkcminit_main_la_OBJECTS="$(libkcminit_main_la_final_OBJECTS)" libkcmshell_main_la_OBJECTS="$(libkcmshell_main_la_final_OBJECTS)" libkcontrol_main_la_OBJECTS="$(libkcontrol_main_la_final_OBJECTS)" all-am #>+ 2 final-install: - $(MAKE) kcminit_la_OBJECTS="$(kcminit_la_final_OBJECTS)" kcmshell_la_OBJECTS="$(kcmshell_la_final_OBJECTS)" kcontrol_la_OBJECTS="$(kcontrol_la_final_OBJECTS)" install-am + $(MAKE) kcminit_la_OBJECTS="$(kcminit_la_final_OBJECTS)" libkcminit_main_la_OBJECTS="$(libkcminit_main_la_final_OBJECTS)" libkcmshell_main_la_OBJECTS="$(libkcmshell_main_la_final_OBJECTS)" libkcontrol_main_la_OBJECTS="$(libkcontrol_main_la_final_OBJECTS)" install-am #>+ 2 no-final: - $(MAKE) kcminit_la_OBJECTS="$(kcminit_la_nofinal_OBJECTS)" kcmshell_la_OBJECTS="$(kcmshell_la_nofinal_OBJECTS)" kcontrol_la_OBJECTS="$(kcontrol_la_nofinal_OBJECTS)" all-am + $(MAKE) kcminit_la_OBJECTS="$(kcminit_la_nofinal_OBJECTS)" libkcminit_main_la_OBJECTS="$(libkcminit_main_la_nofinal_OBJECTS)" libkcmshell_main_la_OBJECTS="$(libkcmshell_main_la_nofinal_OBJECTS)" libkcontrol_main_la_OBJECTS="$(libkcontrol_main_la_nofinal_OBJECTS)" all-am #>+ 2 no-final-install: - $(MAKE) kcminit_la_OBJECTS="$(kcminit_la_nofinal_OBJECTS)" kcmshell_la_OBJECTS="$(kcmshell_la_nofinal_OBJECTS)" kcontrol_la_OBJECTS="$(kcontrol_la_nofinal_OBJECTS)" install-am + $(MAKE) kcminit_la_OBJECTS="$(kcminit_la_nofinal_OBJECTS)" libkcminit_main_la_OBJECTS="$(libkcminit_main_la_nofinal_OBJECTS)" libkcmshell_main_la_OBJECTS="$(libkcmshell_main_la_nofinal_OBJECTS)" libkcontrol_main_la_OBJECTS="$(libkcontrol_main_la_nofinal_OBJECTS)" install-am #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean @@@@ -1400,39 +1468,39 @@@@ kde-rpo-clean: -rm -f *.rpo #>+ 37 +searchwidget.lo: searchwidget.moc +toplevel.lo: toplevel.moc +helpwidget.lo: helpwidget.moc +indexwidget.o: indexwidget.moc +moduleIface.lo: moduleIface.moc +kcdialog.lo: kcdialog.moc aboutwidget.lo: aboutwidget.moc -moduleiconview.o: moduleiconview.moc +indexwidget.lo: indexwidget.moc +kecdialog.lo: kecdialog.moc dockcontainer.o: dockcontainer.moc -main.o: main.moc -kcdialog.lo: kcdialog.moc +proxywidget.o: proxywidget.moc modulemenu.o: modulemenu.moc -toplevel.o: toplevel.moc -moduleinfo.lo: moduleinfo.moc -indexwidget.o: indexwidget.moc +moduletreeview.lo: moduletreeview.moc +quickhelp.o: quickhelp.moc +searchwidget.o: searchwidget.moc +main.o: main.moc +moduletreeview.o: moduletreeview.moc dockcontainer.lo: dockcontainer.moc -quickhelp.lo: quickhelp.moc +kcdialog.o: kcdialog.moc moduleIface.o: moduleIface.moc kecdialog.o: kecdialog.moc -proxywidget.o: proxywidget.moc -moduleiconview.lo: moduleiconview.moc -kcdialog.o: kcdialog.moc -searchwidget.lo: searchwidget.moc -quickhelp.o: quickhelp.moc -searchwidget.o: searchwidget.moc -main.lo: main.moc -kcmshell.o: kcmshell.moc -toplevel.lo: toplevel.moc -aboutwidget.o: aboutwidget.moc -modules.lo: modules.moc -moduleIface.lo: moduleIface.moc -kecdialog.lo: kecdialog.moc proxywidget.lo: proxywidget.moc +aboutwidget.o: aboutwidget.moc +quickhelp.lo: quickhelp.moc +main.lo: main.moc +moduleiconview.lo: moduleiconview.moc +toplevel.o: toplevel.moc +helpwidget.o: helpwidget.moc +moduleinfo.lo: moduleinfo.moc +modules.o: modules.moc kcmshell.lo: kcmshell.moc +moduleiconview.o: moduleiconview.moc +modules.lo: modules.moc moduleinfo.o: moduleinfo.moc -indexwidget.lo: indexwidget.moc -helpwidget.lo: helpwidget.moc -moduletreeview.lo: moduletreeview.moc -moduletreeview.o: moduletreeview.moc +kcmshell.o: kcmshell.moc modulemenu.lo: modulemenu.moc -modules.o: modules.moc -helpwidget.o: helpwidget.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 --- kcontrol/kcontrol/Makefile.in.orig 2003-07-15 22:03:19.000000000 +1200 d5 1 a5 1 @@@@ -446,52 +446,65 @@@@ INCLUDES = $(all_includes) d98 1 a98 1 @@@@ -510,7 +523,7 @@@@ CONFIG_HEADER = $(top_builddir)/config.h d107 1 a107 1 @@@@ -518,60 +531,84 @@@@ kcminit_la_final_OBJECTS = kcminit_la.al d217 1 a217 1 @@@@ -582,13 +619,19 @@@@ am__depfiles_maybe = depfiles d241 1 a241 1 @@@@ -600,11 +643,17 @@@@ am__depfiles_maybe = depfiles d261 1 a261 1 @@@@ -635,8 +684,9 @@@@ CXXLD = $(CXX) d273 1 a273 1 @@@@ -647,7 +697,7 @@@@ RECURSIVE_TARGETS = info-recursive dvi-r d282 1 a282 1 @@@@ -698,6 +748,12 @@@@ kcmshell.la: $(kcmshell_la_OBJECTS) $(kc d295 1 a295 1 @@@@ -745,13 +801,17 @@@@ distclean-compile: d314 1 a314 1 @@@@ -985,7 +1045,7 @@@@ distclean-tags: d318 1 a318 1 -KDE_DIST=cr32-app-kcontrol.png cr48-app-kcontrol.png kcdialog.h proxywidget.h quickhelp.h KControl_NoDisplay.desktop cr64-app-kcontrol.png aboutwidget.h global.h toplevel.h modulemenu.h modulemenu.cpp kinfocenterui.rc kcontrolui.rc kcmshell.h kinfocenter.desktop helpwidget.h main.h moduleinfo.h moduletreeview.h searchwidget.h moduleiconview.h dockcontainer.h kecdialog.h cr16-app-kcontrol.png version.h cr128-app-kcontrol.png indexwidget.h KControl.desktop moduleIface.h modules.h modloader.h kcrootonly.h d323 1 a323 1 @@@@ -1059,7 +1119,6 @@@@ install-strip: d331 1 a331 1 @@@@ -1164,49 +1223,34 @@@@ install-data-local: KControl_NoDisplay.d d343 2 a344 2 -moduleinfo.moc: $(srcdir)/moduleinfo.h - $(MOC) $(srcdir)/moduleinfo.h -o moduleinfo.moc d347 1 a347 1 -mocs: moduleinfo.moc d349 4 a352 2 indexwidget.moc: $(srcdir)/indexwidget.h $(MOC) $(srcdir)/indexwidget.h -o indexwidget.moc d355 2 a356 1 mocs: indexwidget.moc d358 2 a359 8 -moduleiconview.moc: $(srcdir)/moduleiconview.h - $(MOC) $(srcdir)/moduleiconview.h -o moduleiconview.moc - -#>+ 1 -mocs: moduleiconview.moc -#>+ 3 -dockcontainer.moc: $(srcdir)/dockcontainer.h - $(MOC) $(srcdir)/dockcontainer.h -o dockcontainer.moc d364 1 a364 1 -mocs: dockcontainer.moc d367 2 a368 2 -aboutwidget.moc: $(srcdir)/aboutwidget.h - $(MOC) $(srcdir)/aboutwidget.h -o aboutwidget.moc d373 1 a373 1 -mocs: aboutwidget.moc d376 2 a377 2 -proxywidget.moc: $(srcdir)/proxywidget.h - $(MOC) $(srcdir)/proxywidget.h -o proxywidget.moc d382 1 a382 1 -mocs: proxywidget.moc d385 5 a389 3 helpwidget.moc: $(srcdir)/helpwidget.h $(MOC) $(srcdir)/helpwidget.h -o helpwidget.moc @@@@ -1214,17 +1258,29 @@@@ helpwidget.moc: $(srcdir)/helpwidget.h d391 2 a392 1 mocs: helpwidget.moc d394 2 a395 2 -quickhelp.moc: $(srcdir)/quickhelp.h - $(MOC) $(srcdir)/quickhelp.h -o quickhelp.moc d400 1 a400 1 -mocs: quickhelp.moc d403 2 a404 2 -main.moc: $(srcdir)/main.h - $(MOC) $(srcdir)/main.h -o main.moc d409 1 a409 1 -mocs: main.moc d411 3 a413 1 +#>+ 3 d416 3 a418 2 + +#>+ 1 a419 6 +#>+ 3 +modulemenu.moc: $(srcdir)/modulemenu.h + $(MOC) $(srcdir)/modulemenu.h -o modulemenu.moc + +#>+ 1 +mocs: modulemenu.moc d421 11 a431 3 modules.moc: $(srcdir)/modules.h $(MOC) $(srcdir)/modules.h -o modules.moc @@@@ -1232,53 +1288,53 @@@@ modules.moc: $(srcdir)/modules.h d433 2 a434 1 mocs: modules.moc d436 2 a437 2 -kcdialog.moc: $(srcdir)/kcdialog.h - $(MOC) $(srcdir)/kcdialog.h -o kcdialog.moc d442 1 a442 1 -mocs: kcdialog.moc d445 3 a447 5 -moduletreeview.moc: $(srcdir)/moduletreeview.h - $(MOC) $(srcdir)/moduletreeview.h -o moduletreeview.moc +kcdialog.moc: $(srcdir)/kcdialog.h + $(MOC) $(srcdir)/kcdialog.h -o kcdialog.moc d449 1 a449 2 -mocs: moduletreeview.moc +mocs: kcdialog.moc d451 2 a452 11 -kecdialog.moc: $(srcdir)/kecdialog.h - $(MOC) $(srcdir)/kecdialog.h -o kecdialog.moc +searchwidget.moc: $(srcdir)/searchwidget.h + $(MOC) $(srcdir)/searchwidget.h -o searchwidget.moc #>+ 1 -mocs: kecdialog.moc +mocs: searchwidget.moc #>+ 3 -toplevel.moc: $(srcdir)/toplevel.h - $(MOC) $(srcdir)/toplevel.h -o toplevel.moc d457 1 a457 1 -mocs: toplevel.moc d460 2 a461 2 -modulemenu.moc: $(srcdir)/modulemenu.h - $(MOC) $(srcdir)/modulemenu.h -o modulemenu.moc d466 1 a466 1 -mocs: modulemenu.moc d469 2 a470 2 -kcmshell.moc: $(srcdir)/kcmshell.h - $(MOC) $(srcdir)/kcmshell.h -o kcmshell.moc d475 1 a475 1 -mocs: kcmshell.moc d478 2 a479 2 -moduleIface.moc: $(srcdir)/moduleIface.h - $(MOC) $(srcdir)/moduleIface.h -o moduleIface.moc d484 1 a484 1 -mocs: moduleIface.moc d486 1 a486 3 #>+ 3 -searchwidget.moc: $(srcdir)/searchwidget.h - $(MOC) $(srcdir)/searchwidget.h -o searchwidget.moc d489 2 a490 3 #>+ 1 -mocs: searchwidget.moc d495 1 a495 1 @@@@ -1293,7 +1349,7 @@@@ moduleIface_skel.cpp: moduleIface.kidl d499 1 a499 1 - -rm -f moduleinfo.moc indexwidget.moc moduleiconview.moc dockcontainer.moc aboutwidget.moc proxywidget.moc helpwidget.moc quickhelp.moc main.moc modules.moc kcdialog.moc moduletreeview.moc kecdialog.moc toplevel.moc modulemenu.moc kcmshell.moc moduleIface.moc searchwidget.moc d504 1 a504 1 @@@@ -1344,45 +1400,57 @@@@ kcminit_la.all_cpp.cpp: $(srcdir)/Makefi d508 1 a508 1 -kcmshell_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcmshell.cpp $(srcdir)/moduleinfo.cpp $(srcdir)/modloader.cpp $(srcdir)/kecdialog.cpp $(srcdir)/proxywidget.cpp $(srcdir)/kcdialog.cpp $(srcdir)/global.cpp kcdialog_skel.cpp kecdialog.moc kcdialog.moc moduleinfo.moc proxywidget.moc kcmshell.moc d540 1 a540 1 -kcontrol_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/indexwidget.cpp $(srcdir)/searchwidget.cpp $(srcdir)/helpwidget.cpp $(srcdir)/moduleinfo.cpp $(srcdir)/modules.cpp $(srcdir)/proxywidget.cpp $(srcdir)/modloader.cpp $(srcdir)/dockcontainer.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/global.cpp $(srcdir)/quickhelp.cpp $(srcdir)/moduletreeview.cpp $(srcdir)/moduleiconview.cpp $(srcdir)/kecdialog.cpp $(srcdir)/kcrootonly.cpp $(srcdir)/moduleIface.cpp moduleIface_skel.cpp indexwidget.moc dockcontainer.moc moduleiconview.moc helpwidget.moc kecdialog.moc moduletreeview.moc searchwidget.moc moduleinfo.moc aboutwidget.moc proxywidget.moc quickhelp.moc main.moc modules.moc toplevel.moc moduleIface.moc d583 1 a583 1 @@@@ -1392,39 +1460,39 @@@@ kde-rpo-clean: a586 1 -quickhelp.o: quickhelp.moc d588 2 a589 19 toplevel.lo: toplevel.moc -moduletreeview.lo: moduletreeview.moc -main.lo: main.moc -kcmshell.lo: kcmshell.moc -kcdialog.lo: kcdialog.moc -searchwidget.o: searchwidget.moc -modulemenu.lo: modulemenu.moc -moduleinfo.lo: moduleinfo.moc -dockcontainer.o: dockcontainer.moc -moduleiconview.o: moduleiconview.moc -modules.o: modules.moc -proxywidget.lo: proxywidget.moc -kcmshell.o: kcmshell.moc -dockcontainer.lo: dockcontainer.moc -quickhelp.lo: quickhelp.moc -indexwidget.o: indexwidget.moc -kcdialog.o: kcdialog.moc helpwidget.lo: helpwidget.moc -modulemenu.o: modulemenu.moc d594 4 d599 3 a601 4 indexwidget.lo: indexwidget.moc -helpwidget.o: helpwidget.moc -moduleinfo.o: moduleinfo.moc -aboutwidget.o: aboutwidget.moc d603 2 a604 9 -moduleIface.o: moduleIface.moc -moduletreeview.o: moduletreeview.moc kecdialog.lo: kecdialog.moc -searchwidget.lo: searchwidget.moc +dockcontainer.o: dockcontainer.moc proxywidget.o: proxywidget.moc -moduleIface.lo: moduleIface.moc -moduleiconview.lo: moduleiconview.moc +modulemenu.o: modulemenu.moc d610 2 a611 1 +dockcontainer.lo: dockcontainer.moc d613 1 a613 1 +moduleIface.o: moduleIface.moc d615 14 a628 1 +proxywidget.lo: proxywidget.moc d637 1 a637 1 +kcmshell.lo: kcmshell.moc d639 6 a644 2 modules.lo: modules.moc +moduleinfo.o: moduleinfo.moc d646 3 a648 1 +modulemenu.lo: modulemenu.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 --- kcontrol/kcontrol/Makefile.in.orig Tue May 13 23:07:54 2003 d5 1 a5 1 @@@@ -445,52 +445,65 @@@@ INCLUDES = $(all_includes) d314 1 a314 1 @@@@ -991,7 +1051,7 @@@@ distclean-tags: d319 1 a319 1 +KDE_DIST=kcontrolui.rc indexwidget.h cr64-app-kcontrol.png kinfocenterui.rc proxywidget.h dockcontainer.h cr32-app-kcontrol.png modulemenu.h quickhelp.h cr128-app-kcontrol.png searchwidget.h main.h moduletreeview.h kcdialog.h kecdialog.h moduleIface.h aboutwidget.h kinfocenter.desktop kcrootonly.h toplevel.h helpwidget.h KControl.desktop cr48-app-kcontrol.png modules.h version.h cr16-app-kcontrol.png moduleiconview.h KControl_NoDisplay.desktop moduleinfo.h global.h kcmshell.h modulemenu.cpp modloader.h d323 1 a323 1 @@@@ -1065,7 +1125,6 @@@@ install-strip: d331 1 a331 1 @@@@ -1170,84 +1229,81 @@@@ install-data-local: KControl_NoDisplay.d d346 2 d352 2 d358 2 d366 3 d375 3 d384 3 d390 3 a392 1 d399 3 d407 4 a410 1 + d415 2 d420 3 a422 1 d426 3 a428 1 d435 3 d444 3 d453 3 d462 3 d471 3 d480 3 d489 3 d498 3 d503 2 a504 1 @@@@ -1263,7 +1319,7 @@@@ moduleIface_skel.cpp: moduleIface.kidl d513 1 a513 1 @@@@ -1314,45 +1370,57 @@@@ kcminit_la.all_cpp.cpp: $(srcdir)/Makefi d592 1 a592 1 @@@@ -1362,39 +1430,39 @@@@ 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 --- kcontrol/kcontrol/Makefile.in.orig Fri Jan 17 09:03:05 2003 d5 1 a5 1 @@@@ -309,52 +309,65 @@@@ INCLUDES = $(all_includes) d98 1 a98 1 @@@@ -373,7 +386,7 @@@@ CONFIG_HEADER = $(top_builddir)/config.h d107 1 a107 1 @@@@ -381,50 +394,68 @@@@ kcminit_la_final_OBJECTS = kcminit_la.al a196 1 DEFS = @@DEFS@@ a197 1 @@@@ -434,11 +465,17 @@@@ LIBS = @@LIBS@@ d217 1 a217 1 @@@@ -449,13 +486,19 @@@@ am__depfiles_maybe = depfiles d241 1 a241 1 @@@@ -467,11 +510,17 @@@@ am__depfiles_maybe = depfiles d261 2 a262 1 @@@@ -503,8 +552,9 @@@@ CXXLINK = $(LIBTOOL) --mode=link --tag=C a263 1 CXXFLAGS = @@CXXFLAGS@@ d273 2 a274 2 @@@@ -514,7 +564,7 @@@@ RECURSIVE_TARGETS = info-recursive dvi-r uninstall-recursive check-recursive installcheck-recursive d282 1 a282 1 @@@@ -565,6 +615,12 @@@@ kcmshell.la: $(kcmshell_la_OBJECTS) $(kc d295 1 a295 1 @@@@ -612,13 +668,17 @@@@ distclean-compile: d314 2 a315 2 @@@@ -816,7 +876,7 @@@@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH d318 2 a319 2 -KDE_DIST=cr32-app-kcontrol.png quickhelp.cpp cr48-app-kcontrol.png kcdialog.h proxywidget.h moduletreeview.cpp quickhelp.h KControl_NoDisplay.desktop cr64-app-kcontrol.png helpwidget.cpp aboutwidget.h global.h toplevel.h modulemenu.h kcrootonly.cpp modulemenu.cpp kinfocenterui.rc modules.cpp kcontrolui.rc kcmshell.h kinfocenter.desktop helpwidget.h main.h moduleinfo.h moduletreeview.h searchwidget.h proxywidget.cpp moduleIface.cpp moduleiconview.h dockcontainer.cpp dockcontainer.h kcdialog.cpp kecdialog.h cr16-app-kcontrol.png aboutwidget.cpp version.h cr128-app-kcontrol.png indexwidget.h KControl.desktop moduleIface.h modules.h modloader.h moduleiconview.cpp kcrootonly.h +KDE_DIST=kcontrolui.rc indexwidget.h cr64-app-kcontrol.png kinfocenterui.rc proxywidget.h dockcontainer.h cr32-app-kcontrol.png modulemenu.h aboutwidget.cpp quickhelp.h cr128-app-kcontrol.png searchwidget.h modules.cpp main.h kecdialog.cpp moduletreeview.h moduleiconview.cpp kcdialog.h kecdialog.h moduleIface.h searchwidget.cpp aboutwidget.h kinfocenter.desktop kcrootonly.cpp kcrootonly.h dockcontainer.cpp toplevel.h helpwidget.h moduleIface.cpp kcdialog.cpp KControl.desktop cr48-app-kcontrol.png moduletreeview.cpp proxywidget.cpp modules.h version.h cr16-app-kcontrol.png quickhelp.cpp moduleiconview.h KControl_NoDisplay.desktop moduleinfo.h global.h kcmshell.h helpwidget.cpp modulemenu.cpp modloader.h d323 1 a323 1 @@@@ -884,7 +944,6 @@@@ install-strip: d331 1 a331 1 @@@@ -981,84 +1040,81 @@@@ install-data-local: KControl_NoDisplay.d d450 1 a450 1 @@@@ -1074,7 +1130,7 @@@@ moduleIface_skel.cpp: moduleIface.kidl d459 1 a459 1 @@@@ -1125,45 +1181,57 @@@@ kcminit_la.all_cpp.cpp: $(srcdir)/Makefi d538 1 a538 1 @@@@ -1173,39 +1241,39 @@@@ 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 --- kcontrol/kcontrol/Makefile.in.orig Fri Dec 27 18:19:11 2002 d5 1 a5 1 @@@@ -310,52 +310,65 @@@@ INCLUDES = $(all_includes) d97 2 a98 2 rcdir = $(kde_datadir)/kcontrol @@@@ -372,7 +385,7 @@@@ CONFIG_HEADER = $(top_builddir)/config.h d107 1 a107 1 @@@@ -380,50 +393,68 @@@@ kcminit_la_final_OBJECTS = kcminit_la.al d199 1 a199 2 @@@@ -432,40 +463,49 @@@@ LDFLAGS = @@LDFLAGS@@ LIBS = @@LIBS@@ d201 63 a263 71 #>- @@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/aboutwidget.Plo \ -#>- @@AMDEP_TRUE@@ $(DEPDIR)/dockcontainer.Plo $(DEPDIR)/dummy.Po \ -#>- @@AMDEP_TRUE@@ $(DEPDIR)/global.Plo $(DEPDIR)/helpwidget.Plo \ -#>- @@AMDEP_TRUE@@ $(DEPDIR)/indexwidget.Plo $(DEPDIR)/kcdialog.Plo \ -#>- @@AMDEP_TRUE@@ $(DEPDIR)/kcminit.Plo $(DEPDIR)/kcmshell.Plo \ -#>- @@AMDEP_TRUE@@ $(DEPDIR)/kcrootonly.Plo $(DEPDIR)/kecdialog.Plo \ -#>- @@AMDEP_TRUE@@ $(DEPDIR)/main.Plo $(DEPDIR)/modloader.Plo \ -#>- @@AMDEP_TRUE@@ $(DEPDIR)/moduleIface.Plo \ +#>- @@AMDEP_TRUE@@ $(DEPDIR)/dockcontainer.Plo $(DEPDIR)/global.Plo \ +#>- @@AMDEP_TRUE@@ $(DEPDIR)/helpwidget.Plo $(DEPDIR)/indexwidget.Plo \ +#>- @@AMDEP_TRUE@@ $(DEPDIR)/kcdialog.Plo $(DEPDIR)/kcminit.Plo \ +#>- @@AMDEP_TRUE@@ $(DEPDIR)/kcminit_main.Po $(DEPDIR)/kcmshell.Plo \ +#>- @@AMDEP_TRUE@@ $(DEPDIR)/kcmshell_main.Plo \ +#>- @@AMDEP_TRUE@@ $(DEPDIR)/kcmshell_main.Po \ +#>- @@AMDEP_TRUE@@ $(DEPDIR)/kcontrol_main.Plo \ +#>- @@AMDEP_TRUE@@ $(DEPDIR)/kcontrol_main.Po $(DEPDIR)/kcrootonly.Plo \ +#>- @@AMDEP_TRUE@@ $(DEPDIR)/kecdialog.Plo $(DEPDIR)/main.Plo \ +#>- @@AMDEP_TRUE@@ $(DEPDIR)/modloader.Plo $(DEPDIR)/moduleIface.Plo \ #>- @@AMDEP_TRUE@@ $(DEPDIR)/moduleiconview.Plo \ #>- @@AMDEP_TRUE@@ $(DEPDIR)/moduleinfo.Plo $(DEPDIR)/modules.Plo \ #>- @@AMDEP_TRUE@@ $(DEPDIR)/moduletreeview.Plo \ #>- @@AMDEP_TRUE@@ $(DEPDIR)/proxywidget.Plo $(DEPDIR)/quickhelp.Plo \ #>- @@AMDEP_TRUE@@ $(DEPDIR)/searchwidget.Plo $(DEPDIR)/toplevel.Plo -#>+ 27 -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@DEP_FILES = $(DEPDIR)/kcdialog_skel.P $(DEPDIR)/moduleIface_skel.P $(DEPDIR)/kcminit_la.all_cpp.P $(DEPDIR)/kcmshell_la.all_cpp.P $(DEPDIR)/kcontrol_la.all_cpp.P $(DEPDIR)/aboutwidget.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/dockcontainer.Plo $(DEPDIR)/dummy.Po \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/global.Plo $(DEPDIR)/helpwidget.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/indexwidget.Plo $(DEPDIR)/kcdialog.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kcminit.Plo $(DEPDIR)/kcmshell.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kcrootonly.Plo $(DEPDIR)/kecdialog.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/main.Plo $(DEPDIR)/modloader.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/moduleIface.Plo \ +#>+ 33 +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@DEP_FILES = $(DEPDIR)/kcdialog_skel.P $(DEPDIR)/moduleIface_skel.P $(DEPDIR)/kcminit_la.all_cpp.P $(DEPDIR)/libkcminit_main_la.all_cpp.P $(DEPDIR)/libkcmshell_main_la.all_cpp.P $(DEPDIR)/libkcontrol_main_la.all_cpp.P $(DEPDIR)/aboutwidget.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/dockcontainer.Plo $(DEPDIR)/global.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/helpwidget.Plo $(DEPDIR)/indexwidget.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kcdialog.Plo $(DEPDIR)/kcminit.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kcminit_main.Po $(DEPDIR)/kcmshell.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kcmshell_main.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kcmshell_main.Po \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kcontrol_main.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kcontrol_main.Po $(DEPDIR)/kcrootonly.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kecdialog.Plo $(DEPDIR)/main.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/modloader.Plo $(DEPDIR)/moduleIface.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/moduleiconview.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/moduleinfo.Plo $(DEPDIR)/modules.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/moduletreeview.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/proxywidget.Plo $(DEPDIR)/quickhelp.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/searchwidget.Plo $(DEPDIR)/toplevel.Plo @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@DEP_FILES = $(DEPDIR)/kcdialog_skel.P $(DEPDIR)/moduleIface_skel.P $(DEPDIR)/aboutwidget.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/dockcontainer.Plo $(DEPDIR)/dummy.Po \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/global.Plo $(DEPDIR)/helpwidget.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/indexwidget.Plo $(DEPDIR)/kcdialog.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kcminit.Plo $(DEPDIR)/kcmshell.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kcrootonly.Plo $(DEPDIR)/kecdialog.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/main.Plo $(DEPDIR)/modloader.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/moduleIface.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/dockcontainer.Plo $(DEPDIR)/global.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/helpwidget.Plo $(DEPDIR)/indexwidget.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kcdialog.Plo $(DEPDIR)/kcminit.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kcminit_main.Po $(DEPDIR)/kcmshell.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kcmshell_main.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kcmshell_main.Po \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kcontrol_main.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kcontrol_main.Po $(DEPDIR)/kcrootonly.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kecdialog.Plo $(DEPDIR)/main.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/modloader.Plo $(DEPDIR)/moduleIface.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/moduleiconview.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/moduleinfo.Plo $(DEPDIR)/modules.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/moduletreeview.Plo \ @@@@ -492,8 +532,9 @@@@ CXXLINK = $(LIBTOOL) --mode=link --tag=C d272 1 a272 1 DATA = $(data_DATA) $(rc_DATA) d275 1 a275 1 @@@@ -503,7 +544,7 @@@@ RECURSIVE_TARGETS = info-recursive dvi-r d284 1 a284 1 @@@@ -556,6 +597,12 @@@@ kcmshell.la: $(kcmshell_la_OBJECTS) $(kc d294 1 d297 1 a297 21 $(mkinstalldirs) $(DESTDIR)$(bindir) @@@@ -598,13 +645,17 @@@@ distclean-compile: @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/aboutwidget.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/dockcontainer.Plo@@am__quote@@ -@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/dummy.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/global.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/helpwidget.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/indexwidget.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kcdialog.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kcminit.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kcminit_main.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kcmshell.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kcmshell_main.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kcmshell_main.Po@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kcontrol_main.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kcontrol_main.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kcrootonly.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kecdialog.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/main.Plo@@am__quote@@ @@@@ -770,7 +821,7 @@@@ distclean-tags: d299 19 d320 2 a321 2 -KDE_DIST=quickhelp.cpp moduletreeview.cpp aboutwidget.h toplevel.h hi48-app-kcontrol.png modules.cpp kcontrolui.rc helpwidget.h main.h searchwidget.h proxywidget.cpp moduleIface.cpp hi16-app-kcontrol.png dockcontainer.h kcdialog.cpp kecdialog.h KControl.desktop modules.h modloader.h moduleiconview.cpp hi32-app-kcontrol.png kcdialog.h proxywidget.h quickhelp.h helpwidget.cpp global.h modulemenu.h kcrootonly.cpp modulemenu.cpp kcmshell.h moduleinfo.h moduletreeview.h moduleiconview.h dockcontainer.cpp aboutwidget.cpp version.h indexwidget.h moduleIface.h kcrootonly.h +KDE_DIST=kcontrolui.rc indexwidget.h hi32-app-kcontrol.png proxywidget.h dockcontainer.h modulemenu.h aboutwidget.cpp quickhelp.h searchwidget.h modules.cpp main.h kecdialog.cpp moduletreeview.h moduleiconview.cpp kcdialog.h kecdialog.h moduleIface.h searchwidget.cpp aboutwidget.h hi48-app-kcontrol.png hi16-app-kcontrol.png kcrootonly.cpp kcrootonly.h dockcontainer.cpp toplevel.h helpwidget.h moduleIface.cpp kcdialog.cpp KControl.desktop moduletreeview.cpp proxywidget.cpp modules.h version.h quickhelp.cpp moduleiconview.h moduleinfo.h global.h kcmshell.h helpwidget.cpp modulemenu.cpp modloader.h d325 1 a325 1 @@@@ -832,7 +883,6 @@@@ install-strip: d332 2 a333 2 -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* @@@@ -915,84 +965,81 @@@@ uninstall-info: uninstall-info-recursive d452 1 a452 1 @@@@ -1008,7 +1055,7 @@@@ moduleIface_skel.cpp: moduleIface.kidl d461 1 a461 1 @@@@ -1053,45 +1100,57 @@@@ kcminit_la.all_cpp.cpp: $(srcdir)/Makefi d540 1 a540 1 @@@@ -1101,39 +1160,39 @@@@ 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-ao,v 1.1.2.1 2002/06/23 19:05:19 jlam Exp $ d3 1 a3 1 --- kcontrol/kcontrol/Makefile.in.orig Mon May 13 23:57:39 2002 d5 1 a5 1 @@@@ -311,52 +311,65 @@@@ d19 3 a21 3 -#>- helpwidget.cpp moduleinfo.cpp modules.cpp proxywidget.cpp \ -#>- modloader.cpp dockcontainer.cpp aboutwidget.cpp global.cpp \ -#>- quickhelp.cpp moduletreeview.cpp moduleiconview.cpp \ d23 4 a26 4 +#>- searchwidget.cpp helpwidget.cpp moduleinfo.cpp modules.cpp \ +#>- proxywidget.cpp modloader.cpp dockcontainer.cpp aboutwidget.cpp \ +#>- global.cpp quickhelp.cpp moduletreeview.cpp moduleiconview.cpp \ #>- kecdialog.cpp kcrootonly.cpp moduleIface.cpp moduleIface.skel d48 6 a53 1 -#>- proxywidget.cpp kcdialog.cpp global.cpp \ d55 3 a57 5 +#>- kecdialog.cpp proxywidget.cpp kcdialog.cpp global.cpp \ #>- kcdialog.skel #>+ 3 -kcmshell_la_SOURCES=kcmshell.cpp moduleinfo.cpp modloader.cpp kecdialog.cpp \ - proxywidget.cpp kcdialog.cpp global.cpp \ d60 1 a60 1 kcdialog_skel.cpp d98 1 a98 1 @@@@ -373,7 +386,7 @@@@ d107 1 a107 1 @@@@ -381,52 +394,70 @@@@ d136 1 a136 1 #>+ 6 d141 1 a141 2 kecdialog.lo proxywidget.lo kcdialog.lo global.lo kcdialog_skel.lo \ - kcmshell_la_meta_unload.lo a145 1 + libkcmshell_main_la_meta_unload.lo d156 1 a156 1 #>+ 9 d164 1 a164 2 kecdialog.lo kcrootonly.lo moduleIface.lo moduleIface_skel.lo \ - kcontrol_la_meta_unload.lo a166 1 + libkcontrol_main_la_meta_unload.lo d199 1 a199 1 @@@@ -435,13 +466,16 @@@@ d202 71 a272 22 @@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/aboutwidget.Plo \ - @@AMDEP_TRUE@@ $(DEPDIR)/dockcontainer.Plo $(DEPDIR)/dummy.Po \ - @@AMDEP_TRUE@@ $(DEPDIR)/global.Plo $(DEPDIR)/helpwidget.Plo \ - @@AMDEP_TRUE@@ $(DEPDIR)/indexwidget.Plo $(DEPDIR)/kcdialog.Plo \ - @@AMDEP_TRUE@@ $(DEPDIR)/kcminit.Plo $(DEPDIR)/kcmshell.Plo \ - @@AMDEP_TRUE@@ $(DEPDIR)/kcrootonly.Plo $(DEPDIR)/kecdialog.Plo \ - @@AMDEP_TRUE@@ $(DEPDIR)/main.Plo $(DEPDIR)/modloader.Plo \ - @@AMDEP_TRUE@@ $(DEPDIR)/moduleIface.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/dockcontainer.Plo $(DEPDIR)/global.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/helpwidget.Plo $(DEPDIR)/indexwidget.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/kcdialog.Plo $(DEPDIR)/kcminit.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/kcminit_main.Po $(DEPDIR)/kcmshell.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/kcmshell_main.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/kcmshell_main.Po \ + @@AMDEP_TRUE@@ $(DEPDIR)/kcontrol_main.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/kcontrol_main.Po $(DEPDIR)/kcrootonly.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/kecdialog.Plo $(DEPDIR)/main.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/modloader.Plo $(DEPDIR)/moduleIface.Plo \ @@AMDEP_TRUE@@ $(DEPDIR)/moduleiconview.Plo \ @@AMDEP_TRUE@@ $(DEPDIR)/moduleinfo.Plo $(DEPDIR)/modules.Plo \ @@AMDEP_TRUE@@ $(DEPDIR)/moduletreeview.Plo \ @@@@ -467,8 +501,9 @@@@ d284 1 a284 1 @@@@ -478,7 +513,7 @@@@ d293 1 a293 1 @@@@ -531,6 +566,12 @@@@ d306 1 a306 1 @@@@ -573,13 +614,17 @@@@ d325 1 a325 1 @@@@ -745,7 +790,7 @@@@ d329 1 a329 1 -KDE_DIST=kcontrolui.rc indexwidget.h proxywidget.h dockcontainer.h aboutwidget.cpp modules.cpp main.h moduletreeview.h kecdialog.h moduleIface.h aboutwidget.h kcrootonly.cpp hi16-app-kcontrol.png toplevel.h kcdialog.cpp proxywidget.cpp modules.h moduleinfo.h kcmshell.h modulemenu.cpp modloader.h hi32-app-kcontrol.png modulemenu.h quickhelp.h searchwidget.h moduleiconview.cpp kcdialog.h hi48-app-kcontrol.png kcrootonly.h dockcontainer.cpp helpwidget.h moduleIface.cpp KControl.desktop moduletreeview.cpp version.h quickhelp.cpp moduleiconview.h global.h helpwidget.cpp d334 1 a334 1 @@@@ -807,7 +852,6 @@@@ d342 1 a342 1 @@@@ -890,9 +934,6 @@@@ a351 1 @@@@ -1016,34 +1057,34 @@@@ d353 87 d441 5 a445 42 #>+ 12 -kcmshell_la_meta_unload.cpp: kcmshell.moc moduleinfo.moc kecdialog.moc kcdialog.moc proxywidget.moc - @@echo 'creating kcmshell_la_meta_unload.cpp' - @@-rm -f kcmshell_la_meta_unload.cpp +libkcmshell_main_la_meta_unload.cpp: kcmshell.moc moduleinfo.moc kecdialog.moc kcdialog.moc proxywidget.moc + @@echo 'creating libkcmshell_main_la_meta_unload.cpp' + @@-rm -f libkcmshell_main_la_meta_unload.cpp @@if test ${kde_qtver} = 2; then \ - echo 'static const char * _metalist_kcmshell_la[] = {' > kcmshell_la_meta_unload.cpp ;\ - cat kcmshell.moc moduleinfo.moc kecdialog.moc kcdialog.moc proxywidget.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kcmshell_la_meta_unload.cpp ;\ - echo '0};' >> kcmshell_la_meta_unload.cpp ;\ - echo '#include ' >> kcmshell_la_meta_unload.cpp ;\ - echo '_UNLOAD(kcmshell_la)' >> kcmshell_la_meta_unload.cpp ;\ - else echo > kcmshell_la_meta_unload.cpp; fi + echo 'static const char * _metalist_libkcmshell_main_la[] = {' > libkcmshell_main_la_meta_unload.cpp ;\ + cat kcmshell.moc moduleinfo.moc kecdialog.moc kcdialog.moc proxywidget.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkcmshell_main_la_meta_unload.cpp ;\ + echo '0};' >> libkcmshell_main_la_meta_unload.cpp ;\ + echo '#include ' >> libkcmshell_main_la_meta_unload.cpp ;\ + echo '_UNLOAD(libkcmshell_main_la)' >> libkcmshell_main_la_meta_unload.cpp ;\ + else echo > libkcmshell_main_la_meta_unload.cpp; fi #>+ 12 -kcontrol_la_meta_unload.cpp: indexwidget.moc main.moc moduleinfo.moc helpwidget.moc toplevel.moc moduletreeview.moc kecdialog.moc modules.moc moduleiconview.moc searchwidget.moc moduleIface.moc aboutwidget.moc proxywidget.moc quickhelp.moc dockcontainer.moc - @@echo 'creating kcontrol_la_meta_unload.cpp' - @@-rm -f kcontrol_la_meta_unload.cpp +libkcontrol_main_la_meta_unload.cpp: indexwidget.moc main.moc moduleinfo.moc helpwidget.moc toplevel.moc moduletreeview.moc kecdialog.moc modules.moc moduleiconview.moc searchwidget.moc moduleIface.moc aboutwidget.moc proxywidget.moc quickhelp.moc dockcontainer.moc + @@echo 'creating libkcontrol_main_la_meta_unload.cpp' + @@-rm -f libkcontrol_main_la_meta_unload.cpp @@if test ${kde_qtver} = 2; then \ - echo 'static const char * _metalist_kcontrol_la[] = {' > kcontrol_la_meta_unload.cpp ;\ - cat indexwidget.moc main.moc moduleinfo.moc helpwidget.moc toplevel.moc moduletreeview.moc kecdialog.moc modules.moc moduleiconview.moc searchwidget.moc moduleIface.moc aboutwidget.moc proxywidget.moc quickhelp.moc dockcontainer.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kcontrol_la_meta_unload.cpp ;\ - echo '0};' >> kcontrol_la_meta_unload.cpp ;\ - echo '#include ' >> kcontrol_la_meta_unload.cpp ;\ - echo '_UNLOAD(kcontrol_la)' >> kcontrol_la_meta_unload.cpp ;\ - else echo > kcontrol_la_meta_unload.cpp; fi + echo 'static const char * _metalist_libkcontrol_main_la[] = {' > libkcontrol_main_la_meta_unload.cpp ;\ + cat indexwidget.moc main.moc moduleinfo.moc helpwidget.moc toplevel.moc moduletreeview.moc kecdialog.moc modules.moc moduleiconview.moc searchwidget.moc moduleIface.moc aboutwidget.moc proxywidget.moc quickhelp.moc dockcontainer.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkcontrol_main_la_meta_unload.cpp ;\ + echo '0};' >> libkcontrol_main_la_meta_unload.cpp ;\ + echo '#include ' >> libkcontrol_main_la_meta_unload.cpp ;\ + echo '_UNLOAD(libkcontrol_main_la)' >> libkcontrol_main_la_meta_unload.cpp ;\ + else echo > libkcontrol_main_la_meta_unload.cpp; fi d447 5 d454 4 a457 3 clean-moc-classes: - -rm -f kcmshell_la_meta_unload.cpp kcontrol_la_meta_unload.cpp + -rm -f libkcmshell_main_la_meta_unload.cpp libkcontrol_main_la_meta_unload.cpp d459 3 a461 4 #>+ 11 kcminit_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcminit.cpp $(srcdir)/global.cpp indexwidget.moc main.moc moduleinfo.moc kcmshell.moc helpwidget.moc toplevel.moc moduletreeview.moc kecdialog.moc modulemenu.moc modules.moc moduleiconview.moc kcdialog.moc searchwidget.moc moduleIface.moc aboutwidget.moc proxywidget.moc dockcontainer.moc quickhelp.moc @@@@ -1058,11 +1099,11 @@@@ rm -f kcminit_la.all_cpp.final kcminit_la.all_cpp.files d463 4 a466 13 #>+ 11 -kcmshell_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcmshell.cpp $(srcdir)/moduleinfo.cpp $(srcdir)/modloader.cpp $(srcdir)/kecdialog.cpp $(srcdir)/proxywidget.cpp $(srcdir)/kcdialog.cpp $(srcdir)/global.cpp kcdialog_skel.cpp kcmshell_la_meta_unload.cpp +kcmshell_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcmshell_main.cpp @@echo 'creating kcmshell_la.all_cpp.cpp ...'; \ rm -f kcmshell_la.all_cpp.files kcmshell_la.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kcmshell_la.all_cpp.final; \ - for file in kcmshell.cpp moduleinfo.cpp modloader.cpp kecdialog.cpp proxywidget.cpp kcdialog.cpp global.cpp kcdialog_skel.cpp kcmshell_la_meta_unload.cpp ; do \ + for file in kcmshell_main.cpp ; do \ echo "#include \"$$file\"" >> kcmshell_la.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcmshell_la.all_cpp.final; \ done; \ @@@@ -1070,11 +1111,11 @@@@ rm -f kcmshell_la.all_cpp.final kcmshell_la.all_cpp.files d468 4 a471 13 #>+ 11 -kcontrol_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/indexwidget.cpp $(srcdir)/searchwidget.cpp $(srcdir)/helpwidget.cpp $(srcdir)/moduleinfo.cpp $(srcdir)/modules.cpp $(srcdir)/proxywidget.cpp $(srcdir)/modloader.cpp $(srcdir)/dockcontainer.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/global.cpp $(srcdir)/quickhelp.cpp $(srcdir)/moduletreeview.cpp $(srcdir)/moduleiconview.cpp $(srcdir)/kecdialog.cpp $(srcdir)/kcrootonly.cpp $(srcdir)/moduleIface.cpp moduleIface_skel.cpp kcontrol_la_meta_unload.cpp +kcontrol_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcontrol_main.cpp @@echo 'creating kcontrol_la.all_cpp.cpp ...'; \ rm -f kcontrol_la.all_cpp.files kcontrol_la.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kcontrol_la.all_cpp.final; \ - for file in main.cpp toplevel.cpp indexwidget.cpp searchwidget.cpp helpwidget.cpp moduleinfo.cpp modules.cpp proxywidget.cpp modloader.cpp dockcontainer.cpp aboutwidget.cpp global.cpp quickhelp.cpp moduletreeview.cpp moduleiconview.cpp kecdialog.cpp kcrootonly.cpp moduleIface.cpp moduleIface_skel.cpp kcontrol_la_meta_unload.cpp ; do \ + for file in kcontrol_main.cpp ; do \ echo "#include \"$$file\"" >> kcontrol_la.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcontrol_la.all_cpp.final; \ done; \ @@@@ -1082,11 +1123,47 @@@@ rm -f kcontrol_la.all_cpp.final kcontrol_la.all_cpp.files d474 5 a478 2 -kcminit.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp +libkcminit_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcminit.cpp $(srcdir)/global.cpp d486 1 a486 1 + cat libkcminit_main_la.all_cpp.final libkcminit_main_la.all_cpp.files > libkcminit_main_la.all_cpp.cpp; \ d490 1 a490 1 +libkcmshell_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcmshell.cpp $(srcdir)/moduleinfo.cpp $(srcdir)/modloader.cpp $(srcdir)/kecdialog.cpp $(srcdir)/proxywidget.cpp $(srcdir)/kcdialog.cpp $(srcdir)/global.cpp kcdialog_skel.cpp libkcmshell_main_la_meta_unload.cpp d494 3 a496 1 + for file in kcmshell.cpp moduleinfo.cpp modloader.cpp kecdialog.cpp proxywidget.cpp kcdialog.cpp global.cpp kcdialog_skel.cpp libkcmshell_main_la_meta_unload.cpp ; do \ d499 4 a502 2 + done; \ + cat libkcmshell_main_la.all_cpp.final libkcmshell_main_la.all_cpp.files > libkcmshell_main_la.all_cpp.cpp; \ d504 7 a510 3 + +#>+ 11 +libkcontrol_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/indexwidget.cpp $(srcdir)/searchwidget.cpp $(srcdir)/helpwidget.cpp $(srcdir)/moduleinfo.cpp $(srcdir)/modules.cpp $(srcdir)/proxywidget.cpp $(srcdir)/modloader.cpp $(srcdir)/dockcontainer.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/global.cpp $(srcdir)/quickhelp.cpp $(srcdir)/moduletreeview.cpp $(srcdir)/moduleiconview.cpp $(srcdir)/kecdialog.cpp $(srcdir)/kcrootonly.cpp $(srcdir)/moduleIface.cpp moduleIface_skel.cpp libkcontrol_main_la_meta_unload.cpp d514 3 a516 1 + for file in main.cpp toplevel.cpp indexwidget.cpp searchwidget.cpp helpwidget.cpp moduleinfo.cpp modules.cpp proxywidget.cpp modloader.cpp dockcontainer.cpp aboutwidget.cpp global.cpp quickhelp.cpp moduletreeview.cpp moduleiconview.cpp kecdialog.cpp kcrootonly.cpp moduleIface.cpp moduleIface_skel.cpp libkcontrol_main_la_meta_unload.cpp ; do \ d519 4 a522 2 + done; \ + cat libkcontrol_main_la.all_cpp.final libkcontrol_main_la.all_cpp.files > libkcontrol_main_la.all_cpp.cpp; \ a523 40 + +#>+ 11 +kcminit.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcminit_main.cpp @@echo 'creating kcminit.all_cpp.cpp ...'; \ rm -f kcminit.all_cpp.files kcminit.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kcminit.all_cpp.final; \ - for file in dummy.cpp ; do \ + for file in kcminit_main.cpp ; do \ echo "#include \"$$file\"" >> kcminit.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcminit.all_cpp.final; \ done; \ @@@@ -1094,11 +1171,11 @@@@ rm -f kcminit.all_cpp.final kcminit.all_cpp.files #>+ 11 -kcmshell.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp +kcmshell.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcmshell_main.cpp @@echo 'creating kcmshell.all_cpp.cpp ...'; \ rm -f kcmshell.all_cpp.files kcmshell.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kcmshell.all_cpp.final; \ - for file in dummy.cpp ; do \ + for file in kcmshell_main.cpp ; do \ echo "#include \"$$file\"" >> kcmshell.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcmshell.all_cpp.final; \ done; \ @@@@ -1106,11 +1183,11 @@@@ rm -f kcmshell.all_cpp.final kcmshell.all_cpp.files #>+ 11 -kcontrol.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp +kcontrol.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcontrol_main.cpp @@echo 'creating kcontrol.all_cpp.cpp ...'; \ rm -f kcontrol.all_cpp.files kcontrol.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kcontrol.all_cpp.final; \ - for file in dummy.cpp ; do \ + for file in kcontrol_main.cpp ; do \ echo "#include \"$$file\"" >> kcontrol.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcontrol.all_cpp.final; \ done; \ @@@@ -1119,20 +1196,20 @@@@ d527 2 a528 2 - -rm -f kcminit_la.all_cpp.cpp kcmshell_la.all_cpp.cpp kcontrol_la.all_cpp.cpp kcminit.all_cpp.cpp kcmshell.all_cpp.cpp kcontrol.all_cpp.cpp + -rm -f kcminit_la.all_cpp.cpp kcmshell_la.all_cpp.cpp kcontrol_la.all_cpp.cpp libkcminit_main_la.all_cpp.cpp libkcmshell_main_la.all_cpp.cpp libkcontrol_main_la.all_cpp.cpp kcminit.all_cpp.cpp kcmshell.all_cpp.cpp kcontrol.all_cpp.cpp d548 69 a616 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-ao was added on branch buildlink2 on 2002-06-23 19:05:19 +0000 @ text @d1 489 @ 1.1.1.1.2.2 log @Merge from pkgsrc-current to buildlink2 branch. @ text @a0 489 $NetBSD: patch-ao,v 1.1.1.1.2.1 2002/06/23 19:05:19 jlam Exp $ --- kcontrol/kcontrol/Makefile.in.orig Mon May 13 23:57:39 2002 +++ kcontrol/kcontrol/Makefile.in @@@@ -311,52 +311,65 @@@@ SUBDIRS = . pics -CLEANFILES = dummy.cpp - bin_PROGRAMS = kcontrol kcmshell kcminit -lib_LTLIBRARIES = kcontrol.la kcmshell.la kcminit.la +lib_LTLIBRARIES = libkcontrol_main.la kcontrol.la \ + libkcmshell_main.la kcmshell.la \ + libkcminit_main.la kcminit.la + -#>- kcontrol_la_SOURCES = main.cpp toplevel.cpp indexwidget.cpp searchwidget.cpp \ -#>- helpwidget.cpp moduleinfo.cpp modules.cpp proxywidget.cpp \ -#>- modloader.cpp dockcontainer.cpp aboutwidget.cpp global.cpp \ -#>- quickhelp.cpp moduletreeview.cpp moduleiconview.cpp \ +#>- libkcontrol_main_la_SOURCES = main.cpp toplevel.cpp indexwidget.cpp \ +#>- searchwidget.cpp helpwidget.cpp moduleinfo.cpp modules.cpp \ +#>- proxywidget.cpp modloader.cpp dockcontainer.cpp aboutwidget.cpp \ +#>- global.cpp quickhelp.cpp moduletreeview.cpp moduleiconview.cpp \ #>- kecdialog.cpp kcrootonly.cpp moduleIface.cpp moduleIface.skel #>+ 5 -kcontrol_la_SOURCES=main.cpp toplevel.cpp indexwidget.cpp searchwidget.cpp \ - helpwidget.cpp moduleinfo.cpp modules.cpp proxywidget.cpp \ - modloader.cpp dockcontainer.cpp aboutwidget.cpp global.cpp \ - quickhelp.cpp moduletreeview.cpp moduleiconview.cpp \ +libkcontrol_main_la_SOURCES=main.cpp toplevel.cpp indexwidget.cpp \ + searchwidget.cpp helpwidget.cpp moduleinfo.cpp modules.cpp \ + proxywidget.cpp modloader.cpp dockcontainer.cpp aboutwidget.cpp \ + global.cpp quickhelp.cpp moduletreeview.cpp moduleiconview.cpp \ kecdialog.cpp kcrootonly.cpp moduleIface.cpp moduleIface_skel.cpp -kcontrol_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) +libkcontrol_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) +libkcontrol_main_la_LDFLAGS = $(all_libraries) + +kcontrol_la_SOURCES = kcontrol_main.cpp +kcontrol_la_LIBADD = libkcontrol_main.la kcontrol_la_LDFLAGS = $(all_libraries) -module -avoid-version -#>- kcmshell_la_SOURCES = kcmshell.cpp moduleinfo.cpp modloader.cpp kecdialog.cpp \ -#>- proxywidget.cpp kcdialog.cpp global.cpp \ +#>- libkcmshell_main_la_SOURCES = kcmshell.cpp moduleinfo.cpp modloader.cpp \ +#>- kecdialog.cpp proxywidget.cpp kcdialog.cpp global.cpp \ #>- kcdialog.skel #>+ 3 -kcmshell_la_SOURCES=kcmshell.cpp moduleinfo.cpp modloader.cpp kecdialog.cpp \ - proxywidget.cpp kcdialog.cpp global.cpp \ +libkcmshell_main_la_SOURCES=kcmshell.cpp moduleinfo.cpp modloader.cpp \ + kecdialog.cpp proxywidget.cpp kcdialog.cpp global.cpp \ kcdialog_skel.cpp -kcmshell_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) +libkcmshell_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) +libkcmshell_main_la_LDFLAGS = $(all_libraries) + +kcmshell_la_SOURCES = kcmshell_main.cpp +kcmshell_la_LIBADD = libkcmshell_main.la kcmshell_la_LDFLAGS = $(all_libraries) -module -avoid-version +libkcminit_main_la_SOURCES = kcminit.cpp global.cpp +libkcminit_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) +libkcminit_main_la_LDFLAGS = $(all_libraries) + kcminit_la_SOURCES = kcminit.cpp global.cpp -kcminit_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) +kcminit_la_LIBADD = libkcminit_main.la kcminit_la_LDFLAGS = $(all_libraries) -module -avoid-version -kcontrol_SOURCES = dummy.cpp -kcontrol_LDADD = kcontrol.la +kcontrol_SOURCES = kcontrol_main.cpp +kcontrol_LDADD = libkcontrol_main.la kcontrol_LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic -kcmshell_SOURCES = dummy.cpp -kcmshell_LDADD = kcmshell.la +kcmshell_SOURCES = kcmshell_main.cpp +kcmshell_LDADD = libkcmshell_main.la kcmshell_LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic -kcminit_SOURCES = dummy.cpp -kcminit_LDADD = kcminit.la +kcminit_SOURCES = kcminit_main.cpp +kcminit_LDADD = libkcminit_main.la kcminit_LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic rcdir = $(kde_datadir)/kcontrol @@@@ -373,7 +386,7 @@@@ CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) -kcminit_la_DEPENDENCIES = +kcminit_la_DEPENDENCIES = libkcminit_main.la am_kcminit_la_OBJECTS = kcminit.lo global.lo #>- kcminit_la_OBJECTS = $(am_kcminit_la_OBJECTS) #>+ 4 @@@@ -381,52 +394,70 @@@@ kcminit_la_nofinal_OBJECTS = kcminit.lo global.lo @@KDE_USE_FINAL_FALSE@@kcminit_la_OBJECTS = $(kcminit_la_nofinal_OBJECTS) @@KDE_USE_FINAL_TRUE@@kcminit_la_OBJECTS = $(kcminit_la_final_OBJECTS) -kcmshell_la_DEPENDENCIES = -am_kcmshell_la_OBJECTS = kcmshell.lo moduleinfo.lo modloader.lo \ - kecdialog.lo proxywidget.lo kcdialog.lo global.lo +kcmshell_la_DEPENDENCIES = libkcmshell_main.la +am_kcmshell_la_OBJECTS = kcmshell_main.lo #>- kcmshell_la_OBJECTS = $(am_kcmshell_la_OBJECTS) +#>+ 1 +kcmshell_la_OBJECTS = kcmshell_main.lo +kcontrol_la_DEPENDENCIES = libkcontrol_main.la +am_kcontrol_la_OBJECTS = kcontrol_main.lo +#>- kcontrol_la_OBJECTS = $(am_kcontrol_la_OBJECTS) +#>+ 1 +kcontrol_la_OBJECTS = kcontrol_main.lo +libkcminit_main_la_DEPENDENCIES = +am_libkcminit_main_la_OBJECTS = kcminit.lo global.lo +#>- libkcminit_main_la_OBJECTS = $(am_libkcminit_main_la_OBJECTS) +#>+ 4 +libkcminit_main_la_final_OBJECTS = libkcminit_main_la.all_cpp.lo +libkcminit_main_la_nofinal_OBJECTS = kcminit.lo global.lo +@@KDE_USE_FINAL_FALSE@@libkcminit_main_la_OBJECTS = $(libkcminit_main_la_nofinal_OBJECTS) +@@KDE_USE_FINAL_TRUE@@libkcminit_main_la_OBJECTS = $(libkcminit_main_la_final_OBJECTS) +libkcmshell_main_la_DEPENDENCIES = +am_libkcmshell_main_la_OBJECTS = kcmshell.lo moduleinfo.lo modloader.lo \ + kecdialog.lo proxywidget.lo kcdialog.lo global.lo +#>- libkcmshell_main_la_OBJECTS = $(am_libkcmshell_main_la_OBJECTS) #>+ 6 -kcmshell_la_final_OBJECTS = kcmshell_la.all_cpp.lo -kcmshell_la_nofinal_OBJECTS = kcmshell.lo moduleinfo.lo modloader.lo \ +libkcmshell_main_la_final_OBJECTS = libkcmshell_main_la.all_cpp.lo +libkcmshell_main_la_nofinal_OBJECTS = kcmshell.lo moduleinfo.lo modloader.lo \ kecdialog.lo proxywidget.lo kcdialog.lo global.lo kcdialog_skel.lo \ - kcmshell_la_meta_unload.lo -@@KDE_USE_FINAL_FALSE@@kcmshell_la_OBJECTS = $(kcmshell_la_nofinal_OBJECTS) -@@KDE_USE_FINAL_TRUE@@kcmshell_la_OBJECTS = $(kcmshell_la_final_OBJECTS) -kcontrol_la_DEPENDENCIES = -am_kcontrol_la_OBJECTS = main.lo toplevel.lo indexwidget.lo \ + libkcmshell_main_la_meta_unload.lo +@@KDE_USE_FINAL_FALSE@@libkcmshell_main_la_OBJECTS = $(libkcmshell_main_la_nofinal_OBJECTS) +@@KDE_USE_FINAL_TRUE@@libkcmshell_main_la_OBJECTS = $(libkcmshell_main_la_final_OBJECTS) +libkcontrol_main_la_DEPENDENCIES = +am_libkcontrol_main_la_OBJECTS = main.lo toplevel.lo indexwidget.lo \ searchwidget.lo helpwidget.lo moduleinfo.lo modules.lo \ proxywidget.lo modloader.lo dockcontainer.lo aboutwidget.lo \ global.lo quickhelp.lo moduletreeview.lo moduleiconview.lo \ kecdialog.lo kcrootonly.lo moduleIface.lo -#>- kcontrol_la_OBJECTS = $(am_kcontrol_la_OBJECTS) +#>- libkcontrol_main_la_OBJECTS = $(am_libkcontrol_main_la_OBJECTS) #>+ 9 -kcontrol_la_final_OBJECTS = kcontrol_la.all_cpp.lo -kcontrol_la_nofinal_OBJECTS = main.lo toplevel.lo indexwidget.lo \ +libkcontrol_main_la_final_OBJECTS = libkcontrol_main_la.all_cpp.lo +libkcontrol_main_la_nofinal_OBJECTS = main.lo toplevel.lo indexwidget.lo \ searchwidget.lo helpwidget.lo moduleinfo.lo modules.lo \ proxywidget.lo modloader.lo dockcontainer.lo aboutwidget.lo \ global.lo quickhelp.lo moduletreeview.lo moduleiconview.lo \ kecdialog.lo kcrootonly.lo moduleIface.lo moduleIface_skel.lo \ - kcontrol_la_meta_unload.lo -@@KDE_USE_FINAL_FALSE@@kcontrol_la_OBJECTS = $(kcontrol_la_nofinal_OBJECTS) -@@KDE_USE_FINAL_TRUE@@kcontrol_la_OBJECTS = $(kcontrol_la_final_OBJECTS) + libkcontrol_main_la_meta_unload.lo +@@KDE_USE_FINAL_FALSE@@libkcontrol_main_la_OBJECTS = $(libkcontrol_main_la_nofinal_OBJECTS) +@@KDE_USE_FINAL_TRUE@@libkcontrol_main_la_OBJECTS = $(libkcontrol_main_la_final_OBJECTS) bin_PROGRAMS = kcontrol$(EXEEXT) kcmshell$(EXEEXT) kcminit$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) -am_kcminit_OBJECTS = dummy.$(OBJEXT) +am_kcminit_OBJECTS = kcminit_main.$(OBJEXT) #>- kcminit_OBJECTS = $(am_kcminit_OBJECTS) #>+ 1 -kcminit_OBJECTS = dummy.$(OBJEXT) -kcminit_DEPENDENCIES = kcminit.la -am_kcmshell_OBJECTS = dummy.$(OBJEXT) +kcminit_OBJECTS = kcminit_main.$(OBJEXT) +kcminit_DEPENDENCIES = libkcminit_main.la +am_kcmshell_OBJECTS = kcmshell_main.$(OBJEXT) #>- kcmshell_OBJECTS = $(am_kcmshell_OBJECTS) #>+ 1 -kcmshell_OBJECTS = dummy.$(OBJEXT) -kcmshell_DEPENDENCIES = kcmshell.la -am_kcontrol_OBJECTS = dummy.$(OBJEXT) +kcmshell_OBJECTS = kcmshell_main.$(OBJEXT) +kcmshell_DEPENDENCIES = libkcmshell_main.la +am_kcontrol_OBJECTS = kcontrol_main.$(OBJEXT) #>- kcontrol_OBJECTS = $(am_kcontrol_OBJECTS) #>+ 1 -kcontrol_OBJECTS = dummy.$(OBJEXT) -kcontrol_DEPENDENCIES = kcontrol.la +kcontrol_OBJECTS = kcontrol_main.$(OBJEXT) +kcontrol_DEPENDENCIES = libkcontrol_main.la DEFS = @@DEFS@@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) @@@@ -435,13 +466,16 @@@@ LIBS = @@LIBS@@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp @@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/aboutwidget.Plo \ - @@AMDEP_TRUE@@ $(DEPDIR)/dockcontainer.Plo $(DEPDIR)/dummy.Po \ - @@AMDEP_TRUE@@ $(DEPDIR)/global.Plo $(DEPDIR)/helpwidget.Plo \ - @@AMDEP_TRUE@@ $(DEPDIR)/indexwidget.Plo $(DEPDIR)/kcdialog.Plo \ - @@AMDEP_TRUE@@ $(DEPDIR)/kcminit.Plo $(DEPDIR)/kcmshell.Plo \ - @@AMDEP_TRUE@@ $(DEPDIR)/kcrootonly.Plo $(DEPDIR)/kecdialog.Plo \ - @@AMDEP_TRUE@@ $(DEPDIR)/main.Plo $(DEPDIR)/modloader.Plo \ - @@AMDEP_TRUE@@ $(DEPDIR)/moduleIface.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/dockcontainer.Plo $(DEPDIR)/global.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/helpwidget.Plo $(DEPDIR)/indexwidget.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/kcdialog.Plo $(DEPDIR)/kcminit.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/kcminit_main.Po $(DEPDIR)/kcmshell.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/kcmshell_main.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/kcmshell_main.Po \ + @@AMDEP_TRUE@@ $(DEPDIR)/kcontrol_main.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/kcontrol_main.Po $(DEPDIR)/kcrootonly.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/kecdialog.Plo $(DEPDIR)/main.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/modloader.Plo $(DEPDIR)/moduleIface.Plo \ @@AMDEP_TRUE@@ $(DEPDIR)/moduleiconview.Plo \ @@AMDEP_TRUE@@ $(DEPDIR)/moduleinfo.Plo $(DEPDIR)/modules.Plo \ @@AMDEP_TRUE@@ $(DEPDIR)/moduletreeview.Plo \ @@@@ -467,8 +501,9 @@@@ $(AM_LDFLAGS) $(LDFLAGS) -o $@@ CXXFLAGS = @@CXXFLAGS@@ DIST_SOURCES = $(kcminit_la_SOURCES) $(kcmshell_la_SOURCES) \ - $(kcontrol_la_SOURCES) $(kcminit_SOURCES) $(kcmshell_SOURCES) \ - $(kcontrol_SOURCES) + $(kcontrol_la_SOURCES) $(libkcminit_main_la_SOURCES) \ + $(libkcmshell_main_la_SOURCES) $(libkcontrol_main_la_SOURCES) \ + $(kcminit_SOURCES) $(kcmshell_SOURCES) $(kcontrol_SOURCES) DATA = $(data_DATA) $(rc_DATA) @@@@ -478,7 +513,7 @@@@ uninstall-recursive check-recursive installcheck-recursive DIST_COMMON = Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) -SOURCES = $(kcminit_la_SOURCES) $(kcmshell_la_SOURCES) $(kcontrol_la_SOURCES) $(kcminit_SOURCES) $(kcmshell_SOURCES) $(kcontrol_SOURCES) +SOURCES = $(kcminit_la_SOURCES) $(kcmshell_la_SOURCES) $(kcontrol_la_SOURCES) $(libkcminit_main_la_SOURCES) $(libkcmshell_main_la_SOURCES) $(libkcontrol_main_la_SOURCES) $(kcminit_SOURCES) $(kcmshell_SOURCES) $(kcontrol_SOURCES) #>- all: all-recursive #>+ 1 @@@@ -531,6 +566,12 @@@@ $(CXXLINK) -rpath $(libdir) $(kcmshell_la_LDFLAGS) $(kcmshell_la_OBJECTS) $(kcmshell_la_LIBADD) $(LIBS) kcontrol.la: $(kcontrol_la_OBJECTS) $(kcontrol_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kcontrol_la_LDFLAGS) $(kcontrol_la_OBJECTS) $(kcontrol_la_LIBADD) $(LIBS) +libkcminit_main.la: $(libkcminit_main_la_OBJECTS) $(libkcminit_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkcminit_main_la_LDFLAGS) $(libkcminit_main_la_OBJECTS) $(libkcminit_main_la_LIBADD) $(LIBS) +libkcmshell_main.la: $(libkcmshell_main_la_OBJECTS) $(libkcmshell_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkcmshell_main_la_LDFLAGS) $(libkcmshell_main_la_OBJECTS) $(libkcmshell_main_la_LIBADD) $(LIBS) +libkcontrol_main.la: $(libkcontrol_main_la_OBJECTS) $(libkcontrol_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkcontrol_main_la_LDFLAGS) $(libkcontrol_main_la_OBJECTS) $(libkcontrol_main_la_LIBADD) $(LIBS) install-binPROGRAMS: $(bin_PROGRAMS) @@$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) @@@@ -573,13 +614,17 @@@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/aboutwidget.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/dockcontainer.Plo@@am__quote@@ -@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/dummy.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/global.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/helpwidget.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/indexwidget.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kcdialog.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kcminit.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kcminit_main.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kcmshell.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kcmshell_main.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kcmshell_main.Po@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kcontrol_main.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kcontrol_main.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kcrootonly.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kecdialog.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/main.Plo@@am__quote@@ @@@@ -745,7 +790,7 @@@@ #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=kcontrolui.rc indexwidget.h proxywidget.h dockcontainer.h aboutwidget.cpp modules.cpp main.h moduletreeview.h kecdialog.h moduleIface.h aboutwidget.h kcrootonly.cpp hi16-app-kcontrol.png toplevel.h kcdialog.cpp proxywidget.cpp modules.h moduleinfo.h kcmshell.h modulemenu.cpp modloader.h hi32-app-kcontrol.png modulemenu.h quickhelp.h searchwidget.h moduleiconview.cpp kcdialog.h hi48-app-kcontrol.png kcrootonly.h dockcontainer.cpp helpwidget.h moduleIface.cpp KControl.desktop moduletreeview.cpp version.h quickhelp.cpp moduleiconview.h global.h helpwidget.cpp +KDE_DIST=kcontrolui.rc indexwidget.h hi32-app-kcontrol.png proxywidget.h dockcontainer.h modulemenu.h aboutwidget.cpp quickhelp.h searchwidget.h modules.cpp main.h kecdialog.cpp moduletreeview.h moduleiconview.cpp kcdialog.h kecdialog.h moduleIface.h searchwidget.cpp aboutwidget.h hi48-app-kcontrol.png hi16-app-kcontrol.png kcrootonly.cpp kcrootonly.h dockcontainer.cpp toplevel.h helpwidget.h moduleIface.cpp kcdialog.cpp KControl.desktop moduletreeview.cpp proxywidget.cpp modules.h version.h quickhelp.cpp moduleiconview.h moduleinfo.h global.h kcmshell.h helpwidget.cpp modulemenu.cpp modloader.h DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) @@@@ -807,7 +852,6 @@@@ mostlyclean-generic: clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* @@@@ -890,9 +934,6 @@@@ messages: rc.cpp $(XGETTEXT) *.cpp -o $(podir)/kcontrol.pot - -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: @@@@ -1016,34 +1057,34 @@@@ #>+ 12 -kcmshell_la_meta_unload.cpp: kcmshell.moc moduleinfo.moc kecdialog.moc kcdialog.moc proxywidget.moc - @@echo 'creating kcmshell_la_meta_unload.cpp' - @@-rm -f kcmshell_la_meta_unload.cpp +libkcmshell_main_la_meta_unload.cpp: kcmshell.moc moduleinfo.moc kecdialog.moc kcdialog.moc proxywidget.moc + @@echo 'creating libkcmshell_main_la_meta_unload.cpp' + @@-rm -f libkcmshell_main_la_meta_unload.cpp @@if test ${kde_qtver} = 2; then \ - echo 'static const char * _metalist_kcmshell_la[] = {' > kcmshell_la_meta_unload.cpp ;\ - cat kcmshell.moc moduleinfo.moc kecdialog.moc kcdialog.moc proxywidget.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kcmshell_la_meta_unload.cpp ;\ - echo '0};' >> kcmshell_la_meta_unload.cpp ;\ - echo '#include ' >> kcmshell_la_meta_unload.cpp ;\ - echo '_UNLOAD(kcmshell_la)' >> kcmshell_la_meta_unload.cpp ;\ - else echo > kcmshell_la_meta_unload.cpp; fi + echo 'static const char * _metalist_libkcmshell_main_la[] = {' > libkcmshell_main_la_meta_unload.cpp ;\ + cat kcmshell.moc moduleinfo.moc kecdialog.moc kcdialog.moc proxywidget.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkcmshell_main_la_meta_unload.cpp ;\ + echo '0};' >> libkcmshell_main_la_meta_unload.cpp ;\ + echo '#include ' >> libkcmshell_main_la_meta_unload.cpp ;\ + echo '_UNLOAD(libkcmshell_main_la)' >> libkcmshell_main_la_meta_unload.cpp ;\ + else echo > libkcmshell_main_la_meta_unload.cpp; fi #>+ 12 -kcontrol_la_meta_unload.cpp: indexwidget.moc main.moc moduleinfo.moc helpwidget.moc toplevel.moc moduletreeview.moc kecdialog.moc modules.moc moduleiconview.moc searchwidget.moc moduleIface.moc aboutwidget.moc proxywidget.moc quickhelp.moc dockcontainer.moc - @@echo 'creating kcontrol_la_meta_unload.cpp' - @@-rm -f kcontrol_la_meta_unload.cpp +libkcontrol_main_la_meta_unload.cpp: indexwidget.moc main.moc moduleinfo.moc helpwidget.moc toplevel.moc moduletreeview.moc kecdialog.moc modules.moc moduleiconview.moc searchwidget.moc moduleIface.moc aboutwidget.moc proxywidget.moc quickhelp.moc dockcontainer.moc + @@echo 'creating libkcontrol_main_la_meta_unload.cpp' + @@-rm -f libkcontrol_main_la_meta_unload.cpp @@if test ${kde_qtver} = 2; then \ - echo 'static const char * _metalist_kcontrol_la[] = {' > kcontrol_la_meta_unload.cpp ;\ - cat indexwidget.moc main.moc moduleinfo.moc helpwidget.moc toplevel.moc moduletreeview.moc kecdialog.moc modules.moc moduleiconview.moc searchwidget.moc moduleIface.moc aboutwidget.moc proxywidget.moc quickhelp.moc dockcontainer.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kcontrol_la_meta_unload.cpp ;\ - echo '0};' >> kcontrol_la_meta_unload.cpp ;\ - echo '#include ' >> kcontrol_la_meta_unload.cpp ;\ - echo '_UNLOAD(kcontrol_la)' >> kcontrol_la_meta_unload.cpp ;\ - else echo > kcontrol_la_meta_unload.cpp; fi + echo 'static const char * _metalist_libkcontrol_main_la[] = {' > libkcontrol_main_la_meta_unload.cpp ;\ + cat indexwidget.moc main.moc moduleinfo.moc helpwidget.moc toplevel.moc moduletreeview.moc kecdialog.moc modules.moc moduleiconview.moc searchwidget.moc moduleIface.moc aboutwidget.moc proxywidget.moc quickhelp.moc dockcontainer.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkcontrol_main_la_meta_unload.cpp ;\ + echo '0};' >> libkcontrol_main_la_meta_unload.cpp ;\ + echo '#include ' >> libkcontrol_main_la_meta_unload.cpp ;\ + echo '_UNLOAD(libkcontrol_main_la)' >> libkcontrol_main_la_meta_unload.cpp ;\ + else echo > libkcontrol_main_la_meta_unload.cpp; fi #>+ 3 clean-moc-classes: - -rm -f kcmshell_la_meta_unload.cpp kcontrol_la_meta_unload.cpp + -rm -f libkcmshell_main_la_meta_unload.cpp libkcontrol_main_la_meta_unload.cpp #>+ 11 kcminit_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcminit.cpp $(srcdir)/global.cpp indexwidget.moc main.moc moduleinfo.moc kcmshell.moc helpwidget.moc toplevel.moc moduletreeview.moc kecdialog.moc modulemenu.moc modules.moc moduleiconview.moc kcdialog.moc searchwidget.moc moduleIface.moc aboutwidget.moc proxywidget.moc dockcontainer.moc quickhelp.moc @@@@ -1058,11 +1099,11 @@@@ rm -f kcminit_la.all_cpp.final kcminit_la.all_cpp.files #>+ 11 -kcmshell_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcmshell.cpp $(srcdir)/moduleinfo.cpp $(srcdir)/modloader.cpp $(srcdir)/kecdialog.cpp $(srcdir)/proxywidget.cpp $(srcdir)/kcdialog.cpp $(srcdir)/global.cpp kcdialog_skel.cpp kcmshell_la_meta_unload.cpp +kcmshell_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcmshell_main.cpp @@echo 'creating kcmshell_la.all_cpp.cpp ...'; \ rm -f kcmshell_la.all_cpp.files kcmshell_la.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kcmshell_la.all_cpp.final; \ - for file in kcmshell.cpp moduleinfo.cpp modloader.cpp kecdialog.cpp proxywidget.cpp kcdialog.cpp global.cpp kcdialog_skel.cpp kcmshell_la_meta_unload.cpp ; do \ + for file in kcmshell_main.cpp ; do \ echo "#include \"$$file\"" >> kcmshell_la.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcmshell_la.all_cpp.final; \ done; \ @@@@ -1070,11 +1111,11 @@@@ rm -f kcmshell_la.all_cpp.final kcmshell_la.all_cpp.files #>+ 11 -kcontrol_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/indexwidget.cpp $(srcdir)/searchwidget.cpp $(srcdir)/helpwidget.cpp $(srcdir)/moduleinfo.cpp $(srcdir)/modules.cpp $(srcdir)/proxywidget.cpp $(srcdir)/modloader.cpp $(srcdir)/dockcontainer.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/global.cpp $(srcdir)/quickhelp.cpp $(srcdir)/moduletreeview.cpp $(srcdir)/moduleiconview.cpp $(srcdir)/kecdialog.cpp $(srcdir)/kcrootonly.cpp $(srcdir)/moduleIface.cpp moduleIface_skel.cpp kcontrol_la_meta_unload.cpp +kcontrol_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcontrol_main.cpp @@echo 'creating kcontrol_la.all_cpp.cpp ...'; \ rm -f kcontrol_la.all_cpp.files kcontrol_la.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kcontrol_la.all_cpp.final; \ - for file in main.cpp toplevel.cpp indexwidget.cpp searchwidget.cpp helpwidget.cpp moduleinfo.cpp modules.cpp proxywidget.cpp modloader.cpp dockcontainer.cpp aboutwidget.cpp global.cpp quickhelp.cpp moduletreeview.cpp moduleiconview.cpp kecdialog.cpp kcrootonly.cpp moduleIface.cpp moduleIface_skel.cpp kcontrol_la_meta_unload.cpp ; do \ + for file in kcontrol_main.cpp ; do \ echo "#include \"$$file\"" >> kcontrol_la.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcontrol_la.all_cpp.final; \ done; \ @@@@ -1082,11 +1123,47 @@@@ rm -f kcontrol_la.all_cpp.final kcontrol_la.all_cpp.files #>+ 11 -kcminit.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp +libkcminit_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcminit.cpp $(srcdir)/global.cpp + @@echo 'creating libkcminit_main_la.all_cpp.cpp ...'; \ + rm -f libkcminit_main_la.all_cpp.files libkcminit_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkcminit_main_la.all_cpp.final; \ + for file in kcminit.cpp global.cpp ; do \ + echo "#include \"$$file\"" >> libkcminit_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkcminit_main_la.all_cpp.final; \ + done; \ + cat libkcminit_main_la.all_cpp.final libkcminit_main_la.all_cpp.files > libkcminit_main_la.all_cpp.cpp; \ + rm -f libkcminit_main_la.all_cpp.final libkcminit_main_la.all_cpp.files + +#>+ 11 +libkcmshell_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcmshell.cpp $(srcdir)/moduleinfo.cpp $(srcdir)/modloader.cpp $(srcdir)/kecdialog.cpp $(srcdir)/proxywidget.cpp $(srcdir)/kcdialog.cpp $(srcdir)/global.cpp kcdialog_skel.cpp libkcmshell_main_la_meta_unload.cpp + @@echo 'creating libkcmshell_main_la.all_cpp.cpp ...'; \ + rm -f libkcmshell_main_la.all_cpp.files libkcmshell_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkcmshell_main_la.all_cpp.final; \ + for file in kcmshell.cpp moduleinfo.cpp modloader.cpp kecdialog.cpp proxywidget.cpp kcdialog.cpp global.cpp kcdialog_skel.cpp libkcmshell_main_la_meta_unload.cpp ; do \ + echo "#include \"$$file\"" >> libkcmshell_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkcmshell_main_la.all_cpp.final; \ + done; \ + cat libkcmshell_main_la.all_cpp.final libkcmshell_main_la.all_cpp.files > libkcmshell_main_la.all_cpp.cpp; \ + rm -f libkcmshell_main_la.all_cpp.final libkcmshell_main_la.all_cpp.files + +#>+ 11 +libkcontrol_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/indexwidget.cpp $(srcdir)/searchwidget.cpp $(srcdir)/helpwidget.cpp $(srcdir)/moduleinfo.cpp $(srcdir)/modules.cpp $(srcdir)/proxywidget.cpp $(srcdir)/modloader.cpp $(srcdir)/dockcontainer.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/global.cpp $(srcdir)/quickhelp.cpp $(srcdir)/moduletreeview.cpp $(srcdir)/moduleiconview.cpp $(srcdir)/kecdialog.cpp $(srcdir)/kcrootonly.cpp $(srcdir)/moduleIface.cpp moduleIface_skel.cpp libkcontrol_main_la_meta_unload.cpp + @@echo 'creating libkcontrol_main_la.all_cpp.cpp ...'; \ + rm -f libkcontrol_main_la.all_cpp.files libkcontrol_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkcontrol_main_la.all_cpp.final; \ + for file in main.cpp toplevel.cpp indexwidget.cpp searchwidget.cpp helpwidget.cpp moduleinfo.cpp modules.cpp proxywidget.cpp modloader.cpp dockcontainer.cpp aboutwidget.cpp global.cpp quickhelp.cpp moduletreeview.cpp moduleiconview.cpp kecdialog.cpp kcrootonly.cpp moduleIface.cpp moduleIface_skel.cpp libkcontrol_main_la_meta_unload.cpp ; do \ + echo "#include \"$$file\"" >> libkcontrol_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkcontrol_main_la.all_cpp.final; \ + done; \ + cat libkcontrol_main_la.all_cpp.final libkcontrol_main_la.all_cpp.files > libkcontrol_main_la.all_cpp.cpp; \ + rm -f libkcontrol_main_la.all_cpp.final libkcontrol_main_la.all_cpp.files + +#>+ 11 +kcminit.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcminit_main.cpp @@echo 'creating kcminit.all_cpp.cpp ...'; \ rm -f kcminit.all_cpp.files kcminit.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kcminit.all_cpp.final; \ - for file in dummy.cpp ; do \ + for file in kcminit_main.cpp ; do \ echo "#include \"$$file\"" >> kcminit.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcminit.all_cpp.final; \ done; \ @@@@ -1094,11 +1171,11 @@@@ rm -f kcminit.all_cpp.final kcminit.all_cpp.files #>+ 11 -kcmshell.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp +kcmshell.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcmshell_main.cpp @@echo 'creating kcmshell.all_cpp.cpp ...'; \ rm -f kcmshell.all_cpp.files kcmshell.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kcmshell.all_cpp.final; \ - for file in dummy.cpp ; do \ + for file in kcmshell_main.cpp ; do \ echo "#include \"$$file\"" >> kcmshell.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcmshell.all_cpp.final; \ done; \ @@@@ -1106,11 +1183,11 @@@@ rm -f kcmshell.all_cpp.final kcmshell.all_cpp.files #>+ 11 -kcontrol.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp +kcontrol.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcontrol_main.cpp @@echo 'creating kcontrol.all_cpp.cpp ...'; \ rm -f kcontrol.all_cpp.files kcontrol.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kcontrol.all_cpp.final; \ - for file in dummy.cpp ; do \ + for file in kcontrol_main.cpp ; do \ echo "#include \"$$file\"" >> kcontrol.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcontrol.all_cpp.final; \ done; \ @@@@ -1119,20 +1196,20 @@@@ #>+ 3 clean-final: - -rm -f kcminit_la.all_cpp.cpp kcmshell_la.all_cpp.cpp kcontrol_la.all_cpp.cpp kcminit.all_cpp.cpp kcmshell.all_cpp.cpp kcontrol.all_cpp.cpp + -rm -f kcminit_la.all_cpp.cpp kcmshell_la.all_cpp.cpp kcontrol_la.all_cpp.cpp libkcminit_main_la.all_cpp.cpp libkcmshell_main_la.all_cpp.cpp libkcontrol_main_la.all_cpp.cpp kcminit.all_cpp.cpp kcmshell.all_cpp.cpp kcontrol.all_cpp.cpp #>+ 2 final: - $(MAKE) kcminit_la_OBJECTS="$(kcminit_la_final_OBJECTS)" kcmshell_la_OBJECTS="$(kcmshell_la_final_OBJECTS)" kcontrol_la_OBJECTS="$(kcontrol_la_final_OBJECTS)" all-am + $(MAKE) kcminit_la_OBJECTS="$(kcminit_la_final_OBJECTS)" libkcminit_main_la_OBJECTS="$(libkcminit_main_la_final_OBJECTS)" libkcmshell_main_la_OBJECTS="$(libkcmshell_main_la_final_OBJECTS)" libkcontrol_main_la_OBJECTS="$(libkcontrol_main_la_final_OBJECTS)" all-am #>+ 2 final-install: - $(MAKE) kcminit_la_OBJECTS="$(kcminit_la_final_OBJECTS)" kcmshell_la_OBJECTS="$(kcmshell_la_final_OBJECTS)" kcontrol_la_OBJECTS="$(kcontrol_la_final_OBJECTS)" install-am + $(MAKE) kcminit_la_OBJECTS="$(kcminit_la_final_OBJECTS)" libkcminit_main_la_OBJECTS="$(libkcminit_main_la_final_OBJECTS)" libkcmshell_main_la_OBJECTS="$(libkcmshell_main_la_final_OBJECTS)" libkcontrol_main_la_OBJECTS="$(libkcontrol_main_la_final_OBJECTS)" install-am #>+ 2 no-final: - $(MAKE) kcminit_la_OBJECTS="$(kcminit_la_nofinal_OBJECTS)" kcmshell_la_OBJECTS="$(kcmshell_la_nofinal_OBJECTS)" kcontrol_la_OBJECTS="$(kcontrol_la_nofinal_OBJECTS)" all-am + $(MAKE) kcminit_la_OBJECTS="$(kcminit_la_nofinal_OBJECTS)" libkcminit_main_la_OBJECTS="$(libkcminit_main_la_nofinal_OBJECTS)" libkcmshell_main_la_OBJECTS="$(libkcmshell_main_la_nofinal_OBJECTS)" libkcontrol_main_la_OBJECTS="$(libkcontrol_main_la_nofinal_OBJECTS)" all-am #>+ 2 no-final-install: - $(MAKE) kcminit_la_OBJECTS="$(kcminit_la_nofinal_OBJECTS)" kcmshell_la_OBJECTS="$(kcmshell_la_nofinal_OBJECTS)" kcontrol_la_OBJECTS="$(kcontrol_la_nofinal_OBJECTS)" install-am + $(MAKE) kcminit_la_OBJECTS="$(kcminit_la_nofinal_OBJECTS)" libkcminit_main_la_OBJECTS="$(libkcminit_main_la_nofinal_OBJECTS)" libkcmshell_main_la_OBJECTS="$(libkcmshell_main_la_nofinal_OBJECTS)" libkcontrol_main_la_OBJECTS="$(libkcontrol_main_la_nofinal_OBJECTS)" install-am #>+ 3 cvs-clean: $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean @