head 1.8; access; symbols pkgsrc-2013Q2:1.8.0.52 pkgsrc-2013Q2-base:1.8 pkgsrc-2012Q4:1.8.0.50 pkgsrc-2012Q4-base:1.8 pkgsrc-2011Q4:1.8.0.48 pkgsrc-2011Q4-base:1.8 pkgsrc-2011Q2:1.8.0.46 pkgsrc-2011Q2-base:1.8 pkgsrc-2009Q4:1.8.0.44 pkgsrc-2009Q4-base:1.8 pkgsrc-2008Q4:1.8.0.42 pkgsrc-2008Q4-base:1.8 pkgsrc-2008Q3:1.8.0.40 pkgsrc-2008Q3-base:1.8 cube-native-xorg:1.8.0.38 cube-native-xorg-base:1.8 pkgsrc-2008Q2:1.8.0.36 pkgsrc-2008Q2-base:1.8 pkgsrc-2008Q1:1.8.0.34 pkgsrc-2008Q1-base:1.8 pkgsrc-2007Q4:1.8.0.32 pkgsrc-2007Q4-base:1.8 pkgsrc-2007Q3:1.8.0.30 pkgsrc-2007Q3-base:1.8 pkgsrc-2007Q2:1.8.0.28 pkgsrc-2007Q2-base:1.8 pkgsrc-2007Q1:1.8.0.26 pkgsrc-2007Q1-base:1.8 pkgsrc-2006Q4:1.8.0.24 pkgsrc-2006Q4-base:1.8 pkgsrc-2006Q3:1.8.0.22 pkgsrc-2006Q3-base:1.8 pkgsrc-2006Q2:1.8.0.20 pkgsrc-2006Q2-base:1.8 pkgsrc-2006Q1:1.8.0.18 pkgsrc-2006Q1-base:1.8 pkgsrc-2005Q4:1.8.0.16 pkgsrc-2005Q4-base:1.8 pkgsrc-2005Q3:1.8.0.14 pkgsrc-2005Q3-base:1.8 pkgsrc-2005Q2:1.8.0.12 pkgsrc-2005Q2-base:1.8 pkgsrc-2005Q1:1.8.0.10 pkgsrc-2005Q1-base:1.8 pkgsrc-2004Q4:1.8.0.8 pkgsrc-2004Q4-base:1.8 pkgsrc-2004Q3:1.8.0.6 pkgsrc-2004Q3-base:1.8 pkgsrc-2004Q2:1.8.0.4 pkgsrc-2004Q2-base:1.8 pkgsrc-2004Q1:1.8.0.2 pkgsrc-2004Q1-base:1.8 pkgsrc-2003Q4:1.6.0.2 pkgsrc-2003Q4-base:1.6 netbsd-1-6-1:1.3.0.2 netbsd-1-6-1-base:1.3 netbsd-1-6:1.1.1.1.0.4 netbsd-1-6-RELEASE-base:1.1 pkgviews:1.1.1.1.0.6 pkgviews-base:1.1 buildlink2-base:1.1 buildlink2:1.1.1.1.0.2 pkg-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.8 date 2004.02.04.14.25.59; author markd; state dead; branches; next 1.7; 1.7 date 2004.01.15.10.15.14; author markd; state Exp; branches; next 1.6; 1.6 date 2003.07.30.13.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.21; author markd; state Exp; branches; next 1.3; 1.3 date 2003.01.02.09.12.34; author skrll; state Exp; branches; next 1.2; 1.2 date 2002.08.25.19.23.38; 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.26; author jlam; state Exp; branches; next ; desc @@ 1.8 log @Update to KDE-3.2 Changes: Base Kate * Moving KATE view management over to KMDI Joseph Wenninger * Basic project managment Christoph Cullmann KControl * Xinerama KControl module, enhanced KDE Xinerama and dual-head support George Staikos * add/update control module for configuring per-domain settings. See Bug 49145. Leo Savernik * Support for per-style configuration settings in the style control center module, a module for Keramik Maksim Orlovich * Add support for installing/removing- and switching Xcursor themes to the mouse KControl module Fredrik Hoeglund * Font installer - create fonts:/ ioslave, and modify KControl module to use this. See http://members.lycos.co.uk/cpdrummond for (old) screenshots/download Craig Drummond KHotKeys * Update to version 2.0, which includes more features like mouse gestures. Lubos Lunak KWin * Full support for latest NETWM spec version in KWin, and seamless usage of other compliant window managers with KDE. Lubos Lunak * New API for window decoration plugins. Lubos Lunak * Focus stealing prevention. Lubos Lunak * Add an option to allow wide borders to some of the window decoration styles Gunnar Schmi DT Kicker * Make addition of non-KDE applications to Kicker easier Alexander Kellett * Enable backgrounds for child panels and all applets, allow for colorization of background pixmaps Aaron J. Seigo * Allow applets to export a menu to the handle Aaron J. Seigo * User defined plain colors for tiles Aaron J. Seigo * Make the panel transparent. Zack Rusin * Add an option to the RMB-menu and to the "Advanced Options" in kcontrol to enable/disable the panel handle when "Custom" size is selected. KDM * More sophisticated session definitions, common with GDM Oswald Buddenhagen * Pluggable greeter input methods; better architectural compliance with PAM's input model. Oswald Buddenhagen Various (kwin, kdesktop, kcontrol, ksmserver) * Optimally support the X Resize and Rotate extension. Hamish Rodda All KDE applications (kdebase/kdenetwork/kdepim/kdegraphics,...) * No absolute paths to user home directories in KDE config files. This allows to support roaming users. Helge Deller Konsole * Add a better interface to konsolepart for other apps. Dominique Devriese * Added "Set Selection End" to right mouse button menu. * Column text selecting when Ctrl and Alt are pressed * Uses now KTabWidget, allows tab context menus and more Stephan Binner * Utilize KNotify (e.g. passive popup) for "Activity", "Bell", "Shell Exit" and "Silence" events * ZModem up- and download (requires rzsz) Waldo Bastian * Make bidi rendering (for RTL languages) configurable. Meni Livne KEditBookmarks * Export to HTML and printing of bookmark collection. Alexander Kellett * Recursive favicon updates in bookmark editor. Alexander Kellett * Field for incremental searching on titles. Alexander Kellett * Opera and Internet Explorer bookmark collection exporting. Alexander Kellett * Bookmark editor now includes an extra pane to allow title/url editing without use of context menu / keyboard shortcuts. Alexander Kellett * More detailed bookmark access information (last viewed, first seen, view counts). Alexander Kellett * Recursive - entire collection, per folder - alphabetical sorting Alexander Kellett Konqueror * Enhanced Konqueror statusbar and kpart statusbar extension. Statusbar notifications for secure connections, wallet, js errors. David Faure, George Staikos * Bookmarklets support in the form of a "Mini-tools" konq-plugin Alexander Kellett * Addition of an advanced Add Bookmark dialog. Alexander Kellett * Read-only bookmark menu includes. Alexander Kellett * Ability to select which items should be shown in the bookmark bar. Alexander Kellett * Servicemenu improvements: placed in a common Actions submenu, allow grouping into submenus, allow for separators, allow simple mimetype globbing Aaron J. Seigo * Bookmarking of all loaded tabs as a folder. Alexander Kellett * Lightweight bookmark editing from within bookmarks menu via context menu. Alexander Kellett * New sidebar module: Web. Implements sidebar modules similar to those introduced in Netscape 6/Mozilla. George Staikos * Konqueror "preloading", often reducing Konqueror startup time. Lubos Lunak * Spellchecking in text forms and spelling highlighting Scott Wheeler, Don Sanders Tabbed Browsing * "New Tab" and "Close Tab" buttons besides the tab bar Stephan Binner * Loading/read state indication by tab color Stephan Binner * Drag and drop support from/to tabs and to empty tab bar space Stephan Binner * Allow to reorder tabs with pressed middle mouse button Stephan Binner * Middle mouse button on tabs or empty tab bar space opens clipboard content Stephan Binner * Support for opening external URLs and popups in new tabs Stephan Binner * Optional permanent close buttons within tabs and permanent shown tab bar Stephan Binner KHTML part * KHTML: Implement caret mode. This is a prerequisite for designmode. See Bug 48302. Leo Savernik * KHTML: add infrastructure for per-domain settings. See Bug 49145. Leo Savernik * better support for samba shares through libsmbclient of samba 3.0 Stephan Kulow KIO Slaves * kio_smtp: SMTP pipelining support for faster submission, esp. over high-latency links. Marc Mutz KDesktop * Added GUI for "Mouse wheel over desktop switches desktop" option. * Make screen savers capable of being DPMS aware, so they can be disabled when watching a movie or TV if the app sets up X DPMS appropriately. Gregor Jasny * Screen locker: pluggable greeter input methods; better architectural compliance with PAM's input model. Oswald Buddenhagen * Shadow behind the text of the desktop icons, for more readability Laur Ivan * E-mail addresses entered in "Run Command..." (Alt-F2) will start mailer. Waldo Bastian * Numeric expression in "Run Command..." (Alt-F2) is evaluated. Waldo Bastian @ text @$NetBSD: patch-ba,v 1.7 2004/01/15 10:15:14 markd Exp $ --- kdesktop/Makefile.in.orig 2004-01-02 14:05:57.000000000 +1300 +++ kdesktop/Makefile.in @@@@ -424,10 +424,17 @@@@ x_includes = @@x_includes@@ x_libraries = @@x_libraries@@ INCLUDES = -I$(top_srcdir)/kcontrol/background -I$(top_srcdir)/libkonq $(all_includes) + +libkdesktop_main_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) +libkdesktop_main_la_LIBADD = $(top_builddir)/libkonq/libkonq.la \ + $(top_builddir)/kcontrol/background/libbgnd.la + + kdesktop_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -module -avoid-version -kdesktop_la_LIBADD = $(top_builddir)/libkonq/libkonq.la $(top_builddir)/kcontrol/background/libbgnd.la +kdesktop_la_LIBADD = libkdesktop_main.la + kdesktop_LDFLAGS = $(all_libraries) $(KDE_RPATH) -kdesktop_LDADD = kdesktop.la +kdesktop_LDADD = libkdesktop_main.la SUBDIRS = . lock pics patterns programs init kwebdesktop @@@@ -435,22 +442,24 @@@@ SUBDIRS = . lock pics patterns programs ####### Files bin_PROGRAMS = kdesktop bin_SCRIPTS = kdeeject -lib_LTLIBRARIES = kdesktop.la +lib_LTLIBRARIES = libkdesktop_main.la kdesktop.la -#>- kdesktop_la_SOURCES = main.cc krootwm.cc xautolock.cc kdiconview.cc desktop.cc \ +#>- libkdesktop_main_la_SOURCES = main.cc krootwm.cc xautolock.cc kdiconview.cc desktop.cc \ #>- lockeng.cc KDesktopIface.skel \ #>- bgmanager.cc init.cc KScreensaverIface.skel \ #>- minicli.cpp KBackgroundIface.skel pixmapserver.cc kcustommenu.cc \ #>- startupid.cpp #>+ 5 -kdesktop_la_SOURCES=main.cc krootwm.cc xautolock.cc kdiconview.cc desktop.cc \ +libkdesktop_main_la_SOURCES=main.cc krootwm.cc xautolock.cc kdiconview.cc desktop.cc \ lockeng.cc \ bgmanager.cc init.cc \ minicli.cpp pixmapserver.cc kcustommenu.cc \ startupid.cpp KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc -kdesktop_SOURCES = dummy.cc +kdesktop_la_SOURCES = kdesktop_main.cc + +kdesktop_SOURCES = kdesktop_main.cc include_HEADERS = KDesktopIface.h KScreensaverIface.h KBackgroundIface.h @@@@ -473,27 +482,32 @@@@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) -kdesktop_la_DEPENDENCIES = $(top_builddir)/libkonq/libkonq.la \ - $(top_builddir)/kcontrol/background/libbgnd.la -am_kdesktop_la_OBJECTS = main.lo krootwm.lo xautolock.lo kdiconview.lo \ - desktop.lo lockeng.lo bgmanager.lo init.lo minicli.lo \ - pixmapserver.lo kcustommenu.lo startupid.lo +kdesktop_la_DEPENDENCIES = libkdesktop_main.la +am_kdesktop_la_OBJECTS = kdesktop_main.lo #>- kdesktop_la_OBJECTS = $(am_kdesktop_la_OBJECTS) +#>+ 1 +kdesktop_la_OBJECTS = kdesktop_main.lo +libkdesktop_main_la_DEPENDENCIES = $(top_builddir)/libkonq/libkonq.la \ + $(top_builddir)/kcontrol/background/libbgnd.la +am_libkdesktop_main_la_OBJECTS = main.lo krootwm.lo xautolock.lo \ + kdiconview.lo desktop.lo lockeng.lo bgmanager.lo init.lo \ + minicli.lo pixmapserver.lo kcustommenu.lo startupid.lo +#>- libkdesktop_main_la_OBJECTS = $(am_libkdesktop_main_la_OBJECTS) #>+ 6 -kdesktop_la_final_OBJECTS = kdesktop_la.all_cpp.lo kdesktop_la.all_cc.lo -kdesktop_la_nofinal_OBJECTS = main.lo krootwm.lo xautolock.lo kdiconview.lo \ - desktop.lo lockeng.lo bgmanager.lo init.lo minicli.lo \ - pixmapserver.lo kcustommenu.lo startupid.lo KDesktopIface_skel.lo KScreensaverIface_skel.lo KBackgroundIface_skel.lo -@@KDE_USE_FINAL_FALSE@@kdesktop_la_OBJECTS = $(kdesktop_la_nofinal_OBJECTS) -@@KDE_USE_FINAL_TRUE@@kdesktop_la_OBJECTS = $(kdesktop_la_final_OBJECTS) +libkdesktop_main_la_final_OBJECTS = libkdesktop_main_la.all_cpp.lo libkdesktop_main_la.all_cc.lo +libkdesktop_main_la_nofinal_OBJECTS = main.lo krootwm.lo xautolock.lo \ + kdiconview.lo desktop.lo lockeng.lo bgmanager.lo init.lo \ + minicli.lo pixmapserver.lo kcustommenu.lo startupid.lo KDesktopIface_skel.lo KScreensaverIface_skel.lo KBackgroundIface_skel.lo +@@KDE_USE_FINAL_FALSE@@libkdesktop_main_la_OBJECTS = $(libkdesktop_main_la_nofinal_OBJECTS) +@@KDE_USE_FINAL_TRUE@@libkdesktop_main_la_OBJECTS = $(libkdesktop_main_la_final_OBJECTS) bin_PROGRAMS = kdesktop$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) -am_kdesktop_OBJECTS = dummy.$(OBJEXT) +am_kdesktop_OBJECTS = kdesktop_main.$(OBJEXT) #>- kdesktop_OBJECTS = $(am_kdesktop_OBJECTS) #>+ 1 -kdesktop_OBJECTS = dummy.$(OBJEXT) -kdesktop_DEPENDENCIES = kdesktop.la +kdesktop_OBJECTS = kdesktop_main.$(OBJEXT) +kdesktop_DEPENDENCIES = libkdesktop_main.la SCRIPTS = $(bin_SCRIPTS) @@@@ -501,25 +515,31 @@@@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$( depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles #>- @@AMDEP_TRUE@@DEP_FILES = ./$(DEPDIR)/bgmanager.Plo \ -#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/desktop.Plo ./$(DEPDIR)/dummy.Po \ -#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/init.Plo ./$(DEPDIR)/kcustommenu.Plo \ +#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/desktop.Plo ./$(DEPDIR)/init.Plo \ +#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/kcustommenu.Plo \ +#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/kdesktop_main.Plo \ +#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/kdesktop_main.Po \ #>- @@AMDEP_TRUE@@ ./$(DEPDIR)/kdiconview.Plo ./$(DEPDIR)/krootwm.Plo \ #>- @@AMDEP_TRUE@@ ./$(DEPDIR)/lockeng.Plo ./$(DEPDIR)/main.Plo \ #>- @@AMDEP_TRUE@@ ./$(DEPDIR)/minicli.Plo \ #>- @@AMDEP_TRUE@@ ./$(DEPDIR)/pixmapserver.Plo \ #>- @@AMDEP_TRUE@@ ./$(DEPDIR)/startupid.Plo ./$(DEPDIR)/xautolock.Plo -#>+ 17 -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@DEP_FILES = $(DEPDIR)/KDesktopIface_skel.P $(DEPDIR)/KScreensaverIface_skel.P $(DEPDIR)/KBackgroundIface_skel.P $(DEPDIR)/kdesktop_la.all_cpp.P $(DEPDIR)/kdesktop_la.all_cc.P ./$(DEPDIR)/bgmanager.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/desktop.Plo ./$(DEPDIR)/dummy.Po \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/init.Plo ./$(DEPDIR)/kcustommenu.Plo \ +#>+ 21 +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@DEP_FILES = $(DEPDIR)/KDesktopIface_skel.P $(DEPDIR)/KScreensaverIface_skel.P $(DEPDIR)/KBackgroundIface_skel.P $(DEPDIR)/libkdesktop_main_la.all_cpp.P $(DEPDIR)/libkdesktop_main_la.all_cc.P ./$(DEPDIR)/bgmanager.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/desktop.Plo ./$(DEPDIR)/init.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kcustommenu.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kdesktop_main.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kdesktop_main.Po \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kdiconview.Plo ./$(DEPDIR)/krootwm.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/lockeng.Plo ./$(DEPDIR)/main.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/minicli.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/pixmapserver.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/startupid.Plo ./$(DEPDIR)/xautolock.Plo @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@DEP_FILES = $(DEPDIR)/KDesktopIface_skel.P $(DEPDIR)/KScreensaverIface_skel.P $(DEPDIR)/KBackgroundIface_skel.P ./$(DEPDIR)/bgmanager.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/desktop.Plo ./$(DEPDIR)/dummy.Po \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/init.Plo ./$(DEPDIR)/kcustommenu.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/desktop.Plo ./$(DEPDIR)/init.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kcustommenu.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kdesktop_main.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kdesktop_main.Po \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kdiconview.Plo ./$(DEPDIR)/krootwm.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/lockeng.Plo ./$(DEPDIR)/main.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/minicli.Plo \ @@@@ -544,7 +564,8 @@@@ CXXLD = $(CXX) #>+ 2 CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@@ -DIST_SOURCES = $(kdesktop_la_SOURCES) $(kdesktop_SOURCES) +DIST_SOURCES = $(kdesktop_la_SOURCES) $(libkdesktop_main_la_SOURCES) \ + $(kdesktop_SOURCES) DATA = $(autostart_DATA) $(menu_DATA) HEADERS = $(include_HEADERS) $(noinst_HEADERS) @@@@ -558,7 +579,7 @@@@ RECURSIVE_TARGETS = info-recursive dvi-r DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) AUTHORS Makefile.am \ Makefile.in DIST_SUBDIRS = $(SUBDIRS) -SOURCES = $(kdesktop_la_SOURCES) $(kdesktop_SOURCES) +SOURCES = $(kdesktop_la_SOURCES) $(libkdesktop_main_la_SOURCES) $(kdesktop_SOURCES) #>- all: all-recursive #>+ 1 @@@@ -605,6 +626,8 @@@@ clean-libLTLIBRARIES: done kdesktop.la: $(kdesktop_la_OBJECTS) $(kdesktop_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kdesktop_la_LDFLAGS) $(kdesktop_la_OBJECTS) $(kdesktop_la_LIBADD) $(LIBS) +libkdesktop_main.la: $(libkdesktop_main_la_OBJECTS) $(libkdesktop_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkdesktop_main_la_LDFLAGS) $(libkdesktop_main_la_OBJECTS) $(libkdesktop_main_la_LIBADD) $(LIBS) binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @@$(NORMAL_INSTALL) @@@@ -666,9 +689,10 @@@@ distclean-compile: @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/bgmanager.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/desktop.Plo@@am__quote@@ -@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/dummy.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/init.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/kcustommenu.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/kdesktop_main.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/kdesktop_main.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/kdiconview.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/krootwm.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/lockeng.Plo@@am__quote@@ @@@@ -936,7 +960,7 @@@@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=kdesktopbindings.cpp kdiconview.h kdesktop_custom_menu2 DESIGN kdesktop.desktop kdesktop_custom_menu1 kcustommenu.h kdeeject +KDE_DIST=DESIGN kdesktop.desktop kdesktop_custom_menu1 kdesktop_custom_menu2 kcustommenu.h kdiconview.h Makefile.in.rej kdesktopbindings.cpp kdeeject DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) @@@@ -1111,32 +1135,6 @@@@ dummy.cc: # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: -#>+ 13 -KDesktopIface.kidl: $(srcdir)/KDesktopIface.h $(DCOP_DEPENDENCIES) - $(DCOPIDL) $(srcdir)/KDesktopIface.h > KDesktopIface.kidl || ( rm -f KDesktopIface.kidl ; false ) -KDesktopIface_skel.cc: KDesktopIface.kidl - $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KDesktopIface.kidl -KScreensaverIface.kidl: $(srcdir)/KScreensaverIface.h $(DCOP_DEPENDENCIES) - $(DCOPIDL) $(srcdir)/KScreensaverIface.h > KScreensaverIface.kidl || ( rm -f KScreensaverIface.kidl ; false ) -KScreensaverIface_skel.cc: KScreensaverIface.kidl - $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KScreensaverIface.kidl -KBackgroundIface.kidl: $(srcdir)/KBackgroundIface.h $(DCOP_DEPENDENCIES) - $(DCOPIDL) $(srcdir)/KBackgroundIface.h > KBackgroundIface.kidl || ( rm -f KBackgroundIface.kidl ; false ) -KBackgroundIface_skel.cc: KBackgroundIface.kidl - $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KBackgroundIface.kidl - -#>+ 3 -lockeng.moc: $(srcdir)/lockeng.h - $(MOC) $(srcdir)/lockeng.h -o lockeng.moc - -#>+ 1 -mocs: lockeng.moc -#>+ 3 -krootwm.moc: $(srcdir)/krootwm.h - $(MOC) $(srcdir)/krootwm.h -o krootwm.moc - -#>+ 1 -mocs: krootwm.moc #>+ 3 xautolock.moc: $(srcdir)/xautolock.h $(MOC) $(srcdir)/xautolock.h -o xautolock.moc @@@@ -1144,11 +1142,11 @@@@ xautolock.moc: $(srcdir)/xautolock.h #>+ 1 mocs: xautolock.moc #>+ 3 -pixmapserver.moc: $(srcdir)/pixmapserver.h - $(MOC) $(srcdir)/pixmapserver.h -o pixmapserver.moc +lockeng.moc: $(srcdir)/lockeng.h + $(MOC) $(srcdir)/lockeng.h -o lockeng.moc #>+ 1 -mocs: pixmapserver.moc +mocs: lockeng.moc #>+ 3 bgmanager.moc: $(srcdir)/bgmanager.h $(MOC) $(srcdir)/bgmanager.h -o bgmanager.moc @@@@ -1156,11 +1154,11 @@@@ bgmanager.moc: $(srcdir)/bgmanager.h #>+ 1 mocs: bgmanager.moc #>+ 3 -minicli.moc: $(srcdir)/minicli.h - $(MOC) $(srcdir)/minicli.h -o minicli.moc +kdiconview.moc: $(srcdir)/kdiconview.h + $(MOC) $(srcdir)/kdiconview.h -o kdiconview.moc #>+ 1 -mocs: minicli.moc +mocs: kdiconview.moc #>+ 3 desktop.moc: $(srcdir)/desktop.h $(MOC) $(srcdir)/desktop.h -o desktop.moc @@@@ -1168,11 +1166,11 @@@@ desktop.moc: $(srcdir)/desktop.h #>+ 1 mocs: desktop.moc #>+ 3 -kcustommenu.moc: $(srcdir)/kcustommenu.h - $(MOC) $(srcdir)/kcustommenu.h -o kcustommenu.moc +pixmapserver.moc: $(srcdir)/pixmapserver.h + $(MOC) $(srcdir)/pixmapserver.h -o pixmapserver.moc #>+ 1 -mocs: kcustommenu.moc +mocs: pixmapserver.moc #>+ 3 startupid.moc: $(srcdir)/startupid.h $(MOC) $(srcdir)/startupid.h -o startupid.moc @@@@ -1180,14 +1178,40 @@@@ startupid.moc: $(srcdir)/startupid.h #>+ 1 mocs: startupid.moc #>+ 3 -kdiconview.moc: $(srcdir)/kdiconview.h - $(MOC) $(srcdir)/kdiconview.h -o kdiconview.moc +kcustommenu.moc: $(srcdir)/kcustommenu.h + $(MOC) $(srcdir)/kcustommenu.h -o kcustommenu.moc #>+ 1 -mocs: kdiconview.moc +mocs: kcustommenu.moc +#>+ 3 +minicli.moc: $(srcdir)/minicli.h + $(MOC) $(srcdir)/minicli.h -o minicli.moc + +#>+ 1 +mocs: minicli.moc +#>+ 3 +krootwm.moc: $(srcdir)/krootwm.h + $(MOC) $(srcdir)/krootwm.h -o krootwm.moc + +#>+ 1 +mocs: krootwm.moc +#>+ 13 +KDesktopIface.kidl: $(srcdir)/KDesktopIface.h $(DCOP_DEPENDENCIES) + $(DCOPIDL) $(srcdir)/KDesktopIface.h > KDesktopIface.kidl || ( rm -f KDesktopIface.kidl ; false ) +KDesktopIface_skel.cc: KDesktopIface.kidl + $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KDesktopIface.kidl +KScreensaverIface.kidl: $(srcdir)/KScreensaverIface.h $(DCOP_DEPENDENCIES) + $(DCOPIDL) $(srcdir)/KScreensaverIface.h > KScreensaverIface.kidl || ( rm -f KScreensaverIface.kidl ; false ) +KScreensaverIface_skel.cc: KScreensaverIface.kidl + $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KScreensaverIface.kidl +KBackgroundIface.kidl: $(srcdir)/KBackgroundIface.h $(DCOP_DEPENDENCIES) + $(DCOPIDL) $(srcdir)/KBackgroundIface.h > KBackgroundIface.kidl || ( rm -f KBackgroundIface.kidl ; false ) +KBackgroundIface_skel.cc: KBackgroundIface.kidl + $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KBackgroundIface.kidl + #>+ 3 clean-metasources: - -rm -f lockeng.moc krootwm.moc xautolock.moc pixmapserver.moc bgmanager.moc minicli.moc desktop.moc kcustommenu.moc startupid.moc kdiconview.moc + -rm -f xautolock.moc lockeng.moc bgmanager.moc kdiconview.moc desktop.moc pixmapserver.moc startupid.moc kcustommenu.moc minicli.moc krootwm.moc #>+ 6 clean-idl: @@@@ -1207,45 +1231,45 @@@@ force-reedit: #>+ 11 -kdesktop_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/minicli.cpp $(srcdir)/startupid.cpp desktop.moc minicli.moc lockeng.moc kcustommenu.moc krootwm.moc kdiconview.moc startupid.moc xautolock.moc bgmanager.moc pixmapserver.moc - @@echo 'creating kdesktop_la.all_cpp.cpp ...'; \ - rm -f kdesktop_la.all_cpp.files kdesktop_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kdesktop_la.all_cpp.final; \ +libkdesktop_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/minicli.cpp $(srcdir)/startupid.cpp lockeng.moc xautolock.moc bgmanager.moc kdiconview.moc desktop.moc pixmapserver.moc startupid.moc kcustommenu.moc minicli.moc krootwm.moc + @@echo 'creating libkdesktop_main_la.all_cpp.cpp ...'; \ + rm -f libkdesktop_main_la.all_cpp.files libkdesktop_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkdesktop_main_la.all_cpp.final; \ for file in minicli.cpp startupid.cpp ; do \ - echo "#include \"$$file\"" >> kdesktop_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kdesktop_la.all_cpp.final; \ + echo "#include \"$$file\"" >> libkdesktop_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkdesktop_main_la.all_cpp.final; \ done; \ - cat kdesktop_la.all_cpp.final kdesktop_la.all_cpp.files > kdesktop_la.all_cpp.cpp; \ - rm -f kdesktop_la.all_cpp.final kdesktop_la.all_cpp.files + cat libkdesktop_main_la.all_cpp.final libkdesktop_main_la.all_cpp.files > libkdesktop_main_la.all_cpp.cpp; \ + rm -f libkdesktop_main_la.all_cpp.final libkdesktop_main_la.all_cpp.files #>+ 11 -kdesktop_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/main.cc $(srcdir)/krootwm.cc $(srcdir)/xautolock.cc $(srcdir)/kdiconview.cc $(srcdir)/desktop.cc $(srcdir)/lockeng.cc $(srcdir)/bgmanager.cc $(srcdir)/init.cc $(srcdir)/pixmapserver.cc $(srcdir)/kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc desktop.moc minicli.moc lockeng.moc kcustommenu.moc krootwm.moc kdiconview.moc startupid.moc xautolock.moc bgmanager.moc pixmapserver.moc - @@echo 'creating kdesktop_la.all_cc.cc ...'; \ - rm -f kdesktop_la.all_cc.files kdesktop_la.all_cc.final; \ - echo "#define KDE_USE_FINAL 1" >> kdesktop_la.all_cc.final; \ +libkdesktop_main_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/main.cc $(srcdir)/krootwm.cc $(srcdir)/xautolock.cc $(srcdir)/kdiconview.cc $(srcdir)/desktop.cc $(srcdir)/lockeng.cc $(srcdir)/bgmanager.cc $(srcdir)/init.cc $(srcdir)/pixmapserver.cc $(srcdir)/kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc lockeng.moc xautolock.moc bgmanager.moc kdiconview.moc desktop.moc pixmapserver.moc startupid.moc kcustommenu.moc minicli.moc krootwm.moc + @@echo 'creating libkdesktop_main_la.all_cc.cc ...'; \ + rm -f libkdesktop_main_la.all_cc.files libkdesktop_main_la.all_cc.final; \ + echo "#define KDE_USE_FINAL 1" >> libkdesktop_main_la.all_cc.final; \ for file in main.cc krootwm.cc xautolock.cc kdiconview.cc desktop.cc lockeng.cc bgmanager.cc init.cc pixmapserver.cc kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc ; do \ - echo "#include \"$$file\"" >> kdesktop_la.all_cc.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kdesktop_la.all_cc.final; \ + echo "#include \"$$file\"" >> libkdesktop_main_la.all_cc.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkdesktop_main_la.all_cc.final; \ done; \ - cat kdesktop_la.all_cc.final kdesktop_la.all_cc.files > kdesktop_la.all_cc.cc; \ - rm -f kdesktop_la.all_cc.final kdesktop_la.all_cc.files + cat libkdesktop_main_la.all_cc.final libkdesktop_main_la.all_cc.files > libkdesktop_main_la.all_cc.cc; \ + rm -f libkdesktop_main_la.all_cc.final libkdesktop_main_la.all_cc.files #>+ 3 clean-final: - -rm -f kdesktop_la.all_cpp.cpp kdesktop_la.all_cc.cc + -rm -f libkdesktop_main_la.all_cpp.cpp libkdesktop_main_la.all_cc.cc #>+ 2 final: - $(MAKE) kdesktop_la_OBJECTS="$(kdesktop_la_final_OBJECTS)" all-am + $(MAKE) libkdesktop_main_la_OBJECTS="$(libkdesktop_main_la_final_OBJECTS)" all-am #>+ 2 final-install: - $(MAKE) kdesktop_la_OBJECTS="$(kdesktop_la_final_OBJECTS)" install-am + $(MAKE) libkdesktop_main_la_OBJECTS="$(libkdesktop_main_la_final_OBJECTS)" install-am #>+ 2 no-final: - $(MAKE) kdesktop_la_OBJECTS="$(kdesktop_la_nofinal_OBJECTS)" all-am + $(MAKE) libkdesktop_main_la_OBJECTS="$(libkdesktop_main_la_nofinal_OBJECTS)" all-am #>+ 2 no-final-install: - $(MAKE) kdesktop_la_OBJECTS="$(kdesktop_la_nofinal_OBJECTS)" install-am + $(MAKE) libkdesktop_main_la_OBJECTS="$(libkdesktop_main_la_nofinal_OBJECTS)" install-am #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean @@@@ -1255,23 +1279,23 @@@@ kde-rpo-clean: -rm -f *.rpo #>+ 21 -kcustommenu.lo: kcustommenu.moc -lockeng.lo: lockeng.moc -minicli.o: minicli.moc -kdiconview.lo: kdiconview.moc -desktop.lo: desktop.moc -xautolock.o: xautolock.moc -pixmapserver.o: pixmapserver.moc -desktop.o: desktop.moc +krootwm.lo: krootwm.moc minicli.lo: minicli.moc -bgmanager.o: bgmanager.moc krootwm.o: krootwm.moc -xautolock.lo: xautolock.moc -bgmanager.lo: bgmanager.moc -krootwm.lo: krootwm.moc +pixmapserver.lo: pixmapserver.moc +xautolock.o: xautolock.moc lockeng.o: lockeng.moc -kcustommenu.o: kcustommenu.moc +bgmanager.lo: bgmanager.moc startupid.o: startupid.moc +xautolock.lo: xautolock.moc +desktop.o: desktop.moc +desktop.lo: desktop.moc +kcustommenu.o: kcustommenu.moc +lockeng.lo: lockeng.moc startupid.lo: startupid.moc +minicli.o: minicli.moc +kdiconview.lo: kdiconview.moc +pixmapserver.o: pixmapserver.moc +kcustommenu.lo: kcustommenu.moc kdiconview.o: kdiconview.moc -pixmapserver.lo: pixmapserver.moc +bgmanager.o: bgmanager.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 --- kdesktop/Makefile.in.orig 2003-07-15 22:03:30.000000000 +1200 d5 1 a5 1 @@@@ -423,10 +423,17 @@@@ x_includes = @@x_includes@@ d25 1 a25 1 @@@@ -434,22 +441,24 @@@@ SUBDIRS = . lock pics patterns programs d54 1 a54 1 @@@@ -471,27 +480,32 @@@@ CONFIG_HEADER = $(top_builddir)/config.h d75 1 a75 1 -kdesktop_la_final_OBJECTS = kdesktop_la.all_cc.lo kdesktop_la.all_cpp.lo d101 1 a101 1 @@@@ -499,25 +513,31 @@@@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$( d117 1 a117 1 -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@DEP_FILES = $(DEPDIR)/KDesktopIface_skel.P $(DEPDIR)/KScreensaverIface_skel.P $(DEPDIR)/KBackgroundIface_skel.P $(DEPDIR)/kdesktop_la.all_cc.P $(DEPDIR)/kdesktop_la.all_cpp.P ./$(DEPDIR)/bgmanager.Plo \ d141 1 a141 1 @@@@ -542,7 +562,8 @@@@ CXXLD = $(CXX) d151 1 a151 1 @@@@ -556,7 +577,7 @@@@ RECURSIVE_TARGETS = info-recursive dvi-r d160 1 a160 1 @@@@ -603,6 +624,8 @@@@ clean-libLTLIBRARIES: d169 1 a169 1 @@@@ -664,9 +687,10 @@@@ distclean-compile: d181 1 a181 1 @@@@ -928,7 +952,7 @@@@ distclean-tags: d185 1 a185 1 -KDE_DIST=kcustommenu.h kdesktopbindings.cpp DESIGN kdesktop.desktop kdesktop_custom_menu1 kdiconview.h kdeeject kdesktop_custom_menu2 d190 1 a190 1 @@@@ -1103,44 +1127,30 @@@@ dummy.cc: d208 7 a214 1 #>+ 3 d217 7 a223 3 +xautolock.moc: $(srcdir)/xautolock.h + $(MOC) $(srcdir)/xautolock.h -o xautolock.moc d225 1 a225 2 -mocs: krootwm.moc +mocs: xautolock.moc d227 2 a228 2 -minicli.moc: $(srcdir)/minicli.h - $(MOC) $(srcdir)/minicli.h -o minicli.moc d233 1 a233 1 -mocs: minicli.moc d236 3 a238 5 -startupid.moc: $(srcdir)/startupid.h - $(MOC) $(srcdir)/startupid.h -o startupid.moc +bgmanager.moc: $(srcdir)/bgmanager.h + $(MOC) $(srcdir)/bgmanager.h -o bgmanager.moc d240 1 a240 2 -mocs: startupid.moc +mocs: bgmanager.moc d242 2 a243 2 -lockeng.moc: $(srcdir)/lockeng.h - $(MOC) $(srcdir)/lockeng.h -o lockeng.moc d248 1 a248 1 -mocs: lockeng.moc d253 1 a253 1 @@@@ -1154,32 +1164,46 @@@@ pixmapserver.moc: $(srcdir)/pixmapserver d255 1 a255 1 mocs: pixmapserver.moc d257 4 a260 8 +startupid.moc: $(srcdir)/startupid.h + $(MOC) $(srcdir)/startupid.h -o startupid.moc + +#>+ 1 +mocs: startupid.moc +#>+ 3 kcustommenu.moc: $(srcdir)/kcustommenu.h $(MOC) $(srcdir)/kcustommenu.h -o kcustommenu.moc d263 8 a270 1 mocs: kcustommenu.moc d274 2 a275 2 +minicli.moc: $(srcdir)/minicli.h + $(MOC) $(srcdir)/minicli.h -o minicli.moc d279 6 d286 1 a286 3 #>+ 3 -xautolock.moc: $(srcdir)/xautolock.h - $(MOC) $(srcdir)/xautolock.h -o xautolock.moc d289 2 a290 6 #>+ 1 -mocs: xautolock.moc -#>+ 3 -bgmanager.moc: $(srcdir)/bgmanager.h - $(MOC) $(srcdir)/bgmanager.h -o bgmanager.moc d305 1 a305 3 -#>+ 1 -mocs: bgmanager.moc d308 1 a308 1 - -rm -f krootwm.moc minicli.moc startupid.moc lockeng.moc desktop.moc pixmapserver.moc kcustommenu.moc kdiconview.moc xautolock.moc bgmanager.moc d313 1 a313 1 @@@@ -1199,45 +1223,45 @@@@ force-reedit: d317 4 a320 7 -kdesktop_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/main.cc $(srcdir)/krootwm.cc $(srcdir)/xautolock.cc $(srcdir)/kdiconview.cc $(srcdir)/desktop.cc $(srcdir)/lockeng.cc $(srcdir)/bgmanager.cc $(srcdir)/init.cc $(srcdir)/pixmapserver.cc $(srcdir)/kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc minicli.moc krootwm.moc kdiconview.moc kcustommenu.moc pixmapserver.moc startupid.moc lockeng.moc bgmanager.moc xautolock.moc desktop.moc - @@echo 'creating kdesktop_la.all_cc.cc ...'; \ - rm -f kdesktop_la.all_cc.files kdesktop_la.all_cc.final; \ - echo "#define KDE_USE_FINAL 1" >> kdesktop_la.all_cc.final; \ - for file in main.cc krootwm.cc xautolock.cc kdiconview.cc desktop.cc lockeng.cc bgmanager.cc init.cc pixmapserver.cc kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc ; do \ - echo "#include \"$$file\"" >> kdesktop_la.all_cc.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kdesktop_la.all_cc.final; \ d325 3 a327 1 + for file in minicli.cpp startupid.cpp ; do \ d331 2 a332 2 - cat kdesktop_la.all_cc.final kdesktop_la.all_cc.files > kdesktop_la.all_cc.cc; \ - rm -f kdesktop_la.all_cc.final kdesktop_la.all_cc.files d337 4 a340 7 -kdesktop_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/minicli.cpp $(srcdir)/startupid.cpp minicli.moc krootwm.moc kdiconview.moc kcustommenu.moc pixmapserver.moc startupid.moc lockeng.moc bgmanager.moc xautolock.moc desktop.moc - @@echo 'creating kdesktop_la.all_cpp.cpp ...'; \ - rm -f kdesktop_la.all_cpp.files kdesktop_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kdesktop_la.all_cpp.final; \ - for file in minicli.cpp startupid.cpp ; do \ - echo "#include \"$$file\"" >> kdesktop_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kdesktop_la.all_cpp.final; \ d345 3 a347 1 + for file in main.cc krootwm.cc xautolock.cc kdiconview.cc desktop.cc lockeng.cc bgmanager.cc init.cc pixmapserver.cc kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc ; do \ d351 2 a352 2 - cat kdesktop_la.all_cpp.final kdesktop_la.all_cpp.files > kdesktop_la.all_cpp.cpp; \ - rm -f kdesktop_la.all_cpp.final kdesktop_la.all_cpp.files d358 1 a358 1 - -rm -f kdesktop_la.all_cc.cc kdesktop_la.all_cpp.cpp d380 1 a380 1 @@@@ -1247,23 +1271,23 @@@@ kde-rpo-clean: d384 10 a393 4 -kdiconview.o: kdiconview.moc -lockeng.o: lockeng.moc krootwm.lo: krootwm.moc -pixmapserver.lo: pixmapserver.moc a394 1 +minicli.lo: minicli.moc d396 3 d400 2 a401 3 xautolock.o: xautolock.moc -minicli.o: minicli.moc -pixmapserver.o: pixmapserver.moc a402 2 -desktop.lo: desktop.moc +lockeng.o: lockeng.moc d404 3 a406 8 +startupid.o: startupid.moc xautolock.lo: xautolock.moc -startupid.lo: startupid.moc -lockeng.lo: lockeng.moc desktop.o: desktop.moc -minicli.lo: minicli.moc -startupid.o: startupid.moc -bgmanager.lo: bgmanager.moc d410 1 a410 1 +startupid.lo: startupid.moc d412 1 a412 1 kdiconview.lo: kdiconview.moc d414 3 a416 2 kcustommenu.lo: kcustommenu.moc +kdiconview.o: kdiconview.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 --- kdesktop/Makefile.in.orig Tue May 13 23:07:56 2003 d5 1 a5 1 @@@@ -422,10 +422,17 @@@@ x_includes = @@x_includes@@ d25 1 a25 1 @@@@ -433,22 +440,24 @@@@ SUBDIRS = . lock pics patterns programs d181 1 a181 1 @@@@ -934,7 +958,7 @@@@ distclean-tags: d186 1 a186 1 +KDE_DIST=DESIGN kdesktop.desktop kdesktop_custom_menu1 kdesktop_custom_menu2 kcustommenu.h kdiconview.h kdesktopbindings.cpp kdeeject d190 1 a190 1 @@@@ -1109,35 +1133,21 @@@@ dummy.cc: d196 1 a196 1 - $(DCOPIDL) $(srcdir)/KDesktopIface.h > KDesktopIface.kidl || ( rm -f KDesktopIface.kidl ; /bin/false ) d200 1 a200 1 - $(DCOPIDL) $(srcdir)/KScreensaverIface.h > KScreensaverIface.kidl || ( rm -f KScreensaverIface.kidl ; /bin/false ) d204 1 a204 1 - $(DCOPIDL) $(srcdir)/KBackgroundIface.h > KBackgroundIface.kidl || ( rm -f KBackgroundIface.kidl ; /bin/false ) d214 3 d223 3 d232 3 d241 3 d246 4 a249 3 @@@@ -1148,24 +1158,38 @@@@ pixmapserver.moc: $(srcdir)/pixmapserver $(MOC) $(srcdir)/pixmapserver.h -o pixmapserver.moc d254 2 d260 2 d268 3 d277 2 d282 1 d285 1 a285 1 + $(DCOPIDL) $(srcdir)/KDesktopIface.h > KDesktopIface.kidl || ( rm -f KDesktopIface.kidl ; /bin/false ) d289 1 a289 1 + $(DCOPIDL) $(srcdir)/KScreensaverIface.h > KScreensaverIface.kidl || ( rm -f KScreensaverIface.kidl ; /bin/false ) d293 1 a293 1 + $(DCOPIDL) $(srcdir)/KBackgroundIface.h > KBackgroundIface.kidl || ( rm -f KBackgroundIface.kidl ; /bin/false ) d297 2 d306 1 a306 1 @@@@ -1185,45 +1209,45 @@@@ force-reedit: d375 1 a375 1 @@@@ -1233,23 +1257,23 @@@@ 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 --- kdesktop/Makefile.in.orig Fri Jan 17 09:03:06 2003 d5 1 a5 1 @@@@ -286,10 +286,17 @@@@ x_includes = @@x_includes@@ d25 1 a25 1 @@@@ -297,22 +304,24 @@@@ SUBDIRS = . lock pics patterns programs d54 1 a54 1 @@@@ -334,27 +343,32 @@@@ CONFIG_HEADER = $(top_builddir)/config.h d101 1 a101 1 @@@@ -366,25 +380,31 @@@@ LIBS = @@LIBS@@ d141 3 a143 3 @@@@ -418,7 +438,8 @@@@ LTCOMPILE = $(LIBTOOL) --mode=compile $( CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ d151 1 a151 1 @@@@ -431,7 +452,7 @@@@ RECURSIVE_TARGETS = info-recursive dvi-r d160 1 a160 1 @@@@ -478,6 +499,8 @@@@ clean-libLTLIBRARIES: d169 1 a169 1 @@@@ -539,9 +562,10 @@@@ distclean-compile: d181 2 a182 2 @@@@ -752,7 +776,7 @@@@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH d185 2 a186 2 -KDE_DIST=kcustommenu.h kdesktopbindings.cpp pixmapserver.cc DESIGN lockeng.cc kdesktop.desktop kdesktop_custom_menu1 minicli.cpp startupid.cpp kdiconview.h kcustommenu.cc bgmanager.cc kdeeject kdesktop_custom_menu2 init.cc +KDE_DIST=DESIGN kdesktop.desktop kdesktop_custom_menu1 kdesktop_custom_menu2 kcustommenu.h minicli.cpp kdiconview.h startupid.cpp init.cc pixmapserver.cc bgmanager.cc kdesktopbindings.cpp kdeeject lockeng.cc kcustommenu.cc d190 1 a190 1 @@@@ -912,35 +936,21 @@@@ dummy.cc: d234 1 a234 1 @@@@ -951,24 +961,38 @@@@ pixmapserver.moc: $(srcdir)/pixmapserver d281 1 a281 1 @@@@ -988,45 +1012,45 @@@@ force-reedit: d350 1 a350 1 @@@@ -1036,23 +1060,23 @@@@ 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 --- kdesktop/Makefile.in.orig Fri Dec 27 18:19:11 2002 d5 1 a5 1 @@@@ -287,10 +287,17 @@@@ x_includes = @@x_includes@@ d25 1 a25 1 @@@@ -298,22 +305,24 @@@@ SUBDIRS = . lock pics patterns programs d27 1 a27 1 bin_PROGRAMS = kdesktop kdmdesktop d32 3 a34 4 -#>- kdesktop_la_SOURCES = krootwm.cc xautolock.cc kdiconview.cc desktop.cc main.cc \ -#>- lockeng.cc KDesktopIface.skel \ +#>- libkdesktop_main_la_SOURCES = krootwm.cc xautolock.cc kdiconview.cc \ +#>- desktop.cc main.cc lockeng.cc KDesktopIface.skel \ d39 3 a41 4 -kdesktop_la_SOURCES=krootwm.cc xautolock.cc kdiconview.cc desktop.cc main.cc \ - lockeng.cc \ +libkdesktop_main_la_SOURCES=krootwm.cc xautolock.cc kdiconview.cc \ + desktop.cc main.cc lockeng.cc \ d54 1 a54 1 @@@@ -339,27 +348,32 @@@@ CONFIG_HEADER = $(top_builddir)/config.h d59 4 d65 1 a65 1 +#>- kdesktop_la_OBJECTS = $(am_kdesktop_la_OBJECTS) d69 4 a72 6 $(top_builddir)/kcontrol/background/libbgnd.la -am_kdesktop_la_OBJECTS = krootwm.lo xautolock.lo kdiconview.lo \ +am_libkdesktop_main_la_OBJECTS = krootwm.lo xautolock.lo kdiconview.lo \ desktop.lo main.lo lockeng.lo bgmanager.lo init.lo minicli.lo \ pixmapserver.lo kcustommenu.lo startupid.lo -#>- kdesktop_la_OBJECTS = $(am_kdesktop_la_OBJECTS) d76 3 a78 5 -kdesktop_la_nofinal_OBJECTS = krootwm.lo xautolock.lo kdiconview.lo \ +libkdesktop_main_la_final_OBJECTS = libkdesktop_main_la.all_cpp.lo libkdesktop_main_la.all_cc.lo +libkdesktop_main_la_nofinal_OBJECTS = krootwm.lo xautolock.lo kdiconview.lo \ desktop.lo main.lo lockeng.lo bgmanager.lo init.lo minicli.lo \ pixmapserver.lo kcustommenu.lo startupid.lo KDesktopIface_skel.lo KScreensaverIface_skel.lo KBackgroundIface_skel.lo d81 4 d87 1 a87 1 bin_PROGRAMS = kdesktop$(EXEEXT) kdmdesktop$(EXEEXT) d98 4 a101 5 am_kdmdesktop_OBJECTS = kdmdesktop.$(OBJEXT) #>- kdmdesktop_OBJECTS = $(am_kdmdesktop_OBJECTS) #>+ 1 @@@@ -375,23 +389,26 @@@@ LDFLAGS = @@LDFLAGS@@ LIBS = @@LIBS@@ d103 39 a141 33 #>- @@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/bgmanager.Plo $(DEPDIR)/desktop.Plo \ -#>- @@AMDEP_TRUE@@ $(DEPDIR)/dummy.Po $(DEPDIR)/init.Plo \ -#>- @@AMDEP_TRUE@@ $(DEPDIR)/kcustommenu.Plo $(DEPDIR)/kdiconview.Plo \ +#>- @@AMDEP_TRUE@@ $(DEPDIR)/init.Plo $(DEPDIR)/kcustommenu.Plo \ +#>- @@AMDEP_TRUE@@ $(DEPDIR)/kdesktop_main.Plo \ +#>- @@AMDEP_TRUE@@ $(DEPDIR)/kdesktop_main.Po $(DEPDIR)/kdiconview.Plo \ #>- @@AMDEP_TRUE@@ $(DEPDIR)/kdmdesktop.Po $(DEPDIR)/krootwm.Plo \ #>- @@AMDEP_TRUE@@ $(DEPDIR)/lockeng.Plo $(DEPDIR)/main.Plo \ #>- @@AMDEP_TRUE@@ $(DEPDIR)/minicli.Plo $(DEPDIR)/pixmapserver.Plo \ #>- @@AMDEP_TRUE@@ $(DEPDIR)/startupid.Plo $(DEPDIR)/xautolock.Plo -#>+ 15 -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@DEP_FILES = $(DEPDIR)/KDesktopIface_skel.P $(DEPDIR)/KScreensaverIface_skel.P $(DEPDIR)/KBackgroundIface_skel.P $(DEPDIR)/kdesktop_la.all_cc.P $(DEPDIR)/kdesktop_la.all_cpp.P $(DEPDIR)/bgmanager.Plo $(DEPDIR)/desktop.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/dummy.Po $(DEPDIR)/init.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kcustommenu.Plo $(DEPDIR)/kdiconview.Plo \ +#>+ 17 +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@DEP_FILES = $(DEPDIR)/KDesktopIface_skel.P $(DEPDIR)/KScreensaverIface_skel.P $(DEPDIR)/KBackgroundIface_skel.P $(DEPDIR)/libkdesktop_main_la.all_cpp.P $(DEPDIR)/libkdesktop_main_la.all_cc.P $(DEPDIR)/bgmanager.Plo $(DEPDIR)/desktop.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/init.Plo $(DEPDIR)/kcustommenu.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kdesktop_main.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kdesktop_main.Po $(DEPDIR)/kdiconview.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kdmdesktop.Po $(DEPDIR)/krootwm.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/lockeng.Plo $(DEPDIR)/main.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/minicli.Plo $(DEPDIR)/pixmapserver.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/startupid.Plo $(DEPDIR)/xautolock.Plo @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@DEP_FILES = $(DEPDIR)/KDesktopIface_skel.P $(DEPDIR)/KScreensaverIface_skel.P $(DEPDIR)/KBackgroundIface_skel.P $(DEPDIR)/bgmanager.Plo $(DEPDIR)/desktop.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/dummy.Po $(DEPDIR)/init.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kcustommenu.Plo $(DEPDIR)/kdiconview.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/init.Plo $(DEPDIR)/kcustommenu.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kdesktop_main.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kdesktop_main.Po $(DEPDIR)/kdiconview.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kdmdesktop.Po $(DEPDIR)/krootwm.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/lockeng.Plo $(DEPDIR)/main.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/minicli.Plo $(DEPDIR)/pixmapserver.Plo \ @@@@ -424,8 +441,8 @@@@ LTCOMPILE = $(LIBTOOL) --mode=compile $( d145 1 a145 2 -DIST_SOURCES = $(kdesktop_la_SOURCES) $(kdesktop_SOURCES) \ - $(kdmdesktop_SOURCES) d147 1 a147 1 + $(kdesktop_SOURCES) $(kdmdesktop_SOURCES) d151 1 a151 1 @@@@ -438,7 +455,7 @@@@ RECURSIVE_TARGETS = info-recursive dvi-r d155 2 a156 2 -SOURCES = $(kdesktop_la_SOURCES) $(kdesktop_SOURCES) $(kdmdesktop_SOURCES) +SOURCES = $(kdesktop_la_SOURCES) $(libkdesktop_main_la_SOURCES) $(kdesktop_SOURCES) $(kdmdesktop_SOURCES) d160 2 a161 2 @@@@ -487,6 +504,8 @@@@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) d166 1 d169 1 a169 14 $(mkinstalldirs) $(DESTDIR)$(bindir) @@@@ -547,9 +566,10 @@@@ distclean-compile: @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/bgmanager.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/desktop.Plo@@am__quote@@ -@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/dummy.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/init.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kcustommenu.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kdesktop_main.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kdesktop_main.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kdiconview.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kdmdesktop.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/krootwm.Plo@@am__quote@@ @@@@ -746,7 +766,7 @@@@ distclean-tags: d171 12 d185 2 a186 2 -KDE_DIST=kcustommenu.h kdesktopbindings.cpp pixmapserver.cc DESIGN lockeng.cc kdesktop.desktop kdesktop_custom_menu1 minicli.cpp startupid.cpp kdiconview.h kcustommenu.cc bgmanager.cc kdeeject kdesktop_custom_menu2 init.cc kdmdesktop.h +KDE_DIST=DESIGN kdesktop.desktop kdesktop_custom_menu1 kdesktop_custom_menu2 kcustommenu.h minicli.cpp kdiconview.h startupid.cpp init.cc pixmapserver.cc bgmanager.cc main.cc desktop.cc kdesktopbindings.cpp kdeeject lockeng.cc kcustommenu.cc kdmdesktop.h d190 1 a190 1 @@@@ -900,67 +920,67 @@@@ dummy.cc: d208 1 a208 1 -#>+ 3 a210 4 - #>+ 3 -minicli.moc: $(srcdir)/minicli.h - $(MOC) $(srcdir)/minicli.h -o minicli.moc d215 2 a216 2 -startupid.moc: $(srcdir)/startupid.h - $(MOC) $(srcdir)/startupid.h -o startupid.moc d221 2 a222 2 -kdmdesktop.moc: $(srcdir)/kdmdesktop.h - $(MOC) $(srcdir)/kdmdesktop.h -o kdmdesktop.moc d234 1 a234 8 $(MOC) $(srcdir)/desktop.h -o desktop.moc #>+ 3 +kdmdesktop.moc: $(srcdir)/kdmdesktop.h + $(MOC) $(srcdir)/kdmdesktop.h -o kdmdesktop.moc + +#>+ 3 pixmapserver.moc: $(srcdir)/pixmapserver.h d276 2 a277 2 - -rm -f krootwm.moc minicli.moc startupid.moc kdmdesktop.moc lockeng.moc desktop.moc pixmapserver.moc kcustommenu.moc kdiconview.moc xautolock.moc bgmanager.moc + -rm -f xautolock.moc lockeng.moc bgmanager.moc kdiconview.moc desktop.moc kdmdesktop.moc pixmapserver.moc startupid.moc kcustommenu.moc minicli.moc krootwm.moc d281 1 a281 1 @@@@ -980,45 +1000,45 @@@@ force-reedit: d285 1 a285 1 -kdesktop_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/krootwm.cc $(srcdir)/xautolock.cc $(srcdir)/kdiconview.cc $(srcdir)/desktop.cc $(srcdir)/main.cc $(srcdir)/lockeng.cc $(srcdir)/bgmanager.cc $(srcdir)/init.cc $(srcdir)/pixmapserver.cc $(srcdir)/kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc minicli.moc krootwm.moc kdiconview.moc kcustommenu.moc pixmapserver.moc startupid.moc lockeng.moc bgmanager.moc xautolock.moc desktop.moc d289 1 a289 1 - for file in krootwm.cc xautolock.cc kdiconview.cc desktop.cc main.cc lockeng.cc bgmanager.cc init.cc pixmapserver.cc kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc ; do \ d313 1 a313 1 +libkdesktop_main_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/krootwm.cc $(srcdir)/xautolock.cc $(srcdir)/kdiconview.cc $(srcdir)/desktop.cc $(srcdir)/main.cc $(srcdir)/lockeng.cc $(srcdir)/bgmanager.cc $(srcdir)/init.cc $(srcdir)/pixmapserver.cc $(srcdir)/kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc lockeng.moc xautolock.moc bgmanager.moc kdiconview.moc desktop.moc pixmapserver.moc startupid.moc kcustommenu.moc minicli.moc krootwm.moc d317 1 a317 1 + for file in krootwm.cc xautolock.cc kdiconview.cc desktop.cc main.cc lockeng.cc bgmanager.cc init.cc pixmapserver.cc kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc ; do \ d350 1 a350 1 @@@@ -1028,25 +1048,25 @@@@ kde-rpo-clean: d353 1 a353 1 #>+ 23 d357 2 d360 2 a361 5 +krootwm.o: krootwm.moc pixmapserver.lo: pixmapserver.moc -bgmanager.o: bgmanager.moc +kdmdesktop.lo: kdmdesktop.moc +kdmdesktop.o: kdmdesktop.moc d363 2 a364 1 -krootwm.o: krootwm.moc a365 2 -pixmapserver.o: pixmapserver.moc -minicli.o: minicli.moc a371 1 -kdmdesktop.o: kdmdesktop.moc d373 1 a374 1 desktop.o: desktop.moc a375 1 -kdmdesktop.lo: kdmdesktop.moc @ 1.2 log @Merge changes in packages from the buildlink2 branch that have buildlink2.mk files back into the main trunk. @ text @d1 1 a1 1 $NetBSD: patch-ba,v 1.1.2.1 2002/06/23 19:05:26 jlam Exp $ d3 1 a3 1 --- kdesktop/Makefile.in.orig Mon May 13 23:57:43 2002 d5 1 a5 1 @@@@ -288,10 +288,17 @@@@ d25 1 a25 1 @@@@ -299,22 +306,24 @@@@ d33 1 a33 1 -#>- lockeng.cc KDesktopIface.skel \ d35 4 a38 4 +#>- desktop.cc main.cc lockeng.cc KDesktopIface.skel \ #>- bgmanager.cc init.cc KScreensaverIface.skel \ #>- minicli.cpp KBackgroundIface.skel pixmapserver.cc kcustommenu.cc \ #>- startupid.cpp d56 1 a56 1 @@@@ -340,28 +349,33 @@@@ d74 2 a75 2 #>+ 7 -kdesktop_la_final_OBJECTS = kdesktop_la.all_cpp.lo kdesktop_la.all_cc.lo d80 1 a80 2 pixmapserver.lo kcustommenu.lo startupid.lo KDesktopIface_skel.lo KScreensaverIface_skel.lo KBackgroundIface_skel.lo \ - kdesktop_la_meta_unload.lo a82 1 + libkdesktop_main_la_meta_unload.lo d98 2 a99 2 #>+ 5 @@@@ -381,8 +395,9 @@@@ d102 33 a134 10 @@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/bgmanager.Plo $(DEPDIR)/desktop.Plo \ - @@AMDEP_TRUE@@ $(DEPDIR)/dummy.Po $(DEPDIR)/init.Plo \ - @@AMDEP_TRUE@@ $(DEPDIR)/kcustommenu.Plo $(DEPDIR)/kdiconview.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/init.Plo $(DEPDIR)/kcustommenu.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/kdesktop_main.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/kdesktop_main.Po $(DEPDIR)/kdiconview.Plo \ @@AMDEP_TRUE@@ $(DEPDIR)/kdmdesktop.Po $(DEPDIR)/krootwm.Plo \ @@AMDEP_TRUE@@ $(DEPDIR)/lockeng.Plo $(DEPDIR)/main.Plo \ @@AMDEP_TRUE@@ $(DEPDIR)/minicli.Plo $(DEPDIR)/pixmapserver.Plo \ @@@@ -414,8 +429,8 @@@@ d145 1 a145 1 @@@@ -428,7 +443,7 @@@@ d154 1 a154 1 @@@@ -477,6 +492,8 @@@@ d163 1 a163 1 @@@@ -537,9 +554,10 @@@@ d175 1 a175 1 @@@@ -736,7 +754,7 @@@@ d179 1 a179 1 -KDE_DIST=kdesktop.desktop kdesktop_custom_menu1 kdesktop_custom_menu2 pixmapserver.cc bgmanager.cc lockeng.cc DESIGN kcustommenu.h minicli.cpp kdiconview.h kdesktopbindings.cpp kcustommenu.cc kdmdesktop.h startupid.cpp init.cc kdeeject d184 1 a184 1 @@@@ -890,20 +908,6 @@@@ d189 1 a189 1 -KDesktopIface.kidl: $(srcdir)/KDesktopIface.h $(DCOPIDL_DEPENDENCIES) d193 1 a193 1 -KScreensaverIface.kidl: $(srcdir)/KScreensaverIface.h $(DCOPIDL_DEPENDENCIES) d197 1 a197 1 -KBackgroundIface.kidl: $(srcdir)/KBackgroundIface.h $(DCOPIDL_DEPENDENCIES) d202 48 d251 4 a254 5 xautolock.moc: $(srcdir)/xautolock.h $(MOC) $(srcdir)/xautolock.h -o xautolock.moc @@@@ -948,6 +952,20 @@@@ krootwm.moc: $(srcdir)/krootwm.h $(MOC) $(srcdir)/krootwm.h -o krootwm.moc d256 9 d266 1 a266 1 +KDesktopIface.kidl: $(srcdir)/KDesktopIface.h $(DCOPIDL_DEPENDENCIES) d270 1 a270 1 +KScreensaverIface.kidl: $(srcdir)/KScreensaverIface.h $(DCOPIDL_DEPENDENCIES) d274 1 a274 1 +KBackgroundIface.kidl: $(srcdir)/KBackgroundIface.h $(DCOPIDL_DEPENDENCIES) d278 1 a278 1 + d281 2 a282 2 -rm -f xautolock.moc lockeng.moc bgmanager.moc kdiconview.moc desktop.moc kdmdesktop.moc pixmapserver.moc startupid.moc kcustommenu.moc minicli.moc krootwm.moc @@@@ -970,16 +988,16 @@@@ d284 3 a287 29 #>+ 12 -kdesktop_la_meta_unload.cc: lockeng.moc xautolock.moc bgmanager.moc kdiconview.moc desktop.moc pixmapserver.moc startupid.moc kcustommenu.moc minicli.moc krootwm.moc - @@echo 'creating kdesktop_la_meta_unload.cc' - @@-rm -f kdesktop_la_meta_unload.cc +libkdesktop_main_la_meta_unload.cc: lockeng.moc xautolock.moc bgmanager.moc kdiconview.moc desktop.moc pixmapserver.moc startupid.moc kcustommenu.moc minicli.moc krootwm.moc + @@echo 'creating libkdesktop_main_la_meta_unload.cc' + @@-rm -f libkdesktop_main_la_meta_unload.cc @@if test ${kde_qtver} = 2; then \ - echo 'static const char * _metalist_kdesktop_la[] = {' > kdesktop_la_meta_unload.cc ;\ - cat lockeng.moc xautolock.moc bgmanager.moc kdiconview.moc desktop.moc pixmapserver.moc startupid.moc kcustommenu.moc minicli.moc krootwm.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kdesktop_la_meta_unload.cc ;\ - echo '0};' >> kdesktop_la_meta_unload.cc ;\ - echo '#include ' >> kdesktop_la_meta_unload.cc ;\ - echo '_UNLOAD(kdesktop_la)' >> kdesktop_la_meta_unload.cc ;\ - else echo > kdesktop_la_meta_unload.cc; fi + echo 'static const char * _metalist_libkdesktop_main_la[] = {' > libkdesktop_main_la_meta_unload.cc ;\ + cat lockeng.moc xautolock.moc bgmanager.moc kdiconview.moc desktop.moc pixmapserver.moc startupid.moc kcustommenu.moc minicli.moc krootwm.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkdesktop_main_la_meta_unload.cc ;\ + echo '0};' >> libkdesktop_main_la_meta_unload.cc ;\ + echo '#include ' >> libkdesktop_main_la_meta_unload.cc ;\ + echo '_UNLOAD(libkdesktop_main_la)' >> libkdesktop_main_la_meta_unload.cc ;\ + else echo > libkdesktop_main_la_meta_unload.cc; fi #>+ 12 @@@@ -997,26 +1015,14 @@@@ #>+ 3 clean-moc-classes: - -rm -f kdesktop_la_meta_unload.cc kdmdesktop_meta_unload.cc + -rm -f libkdesktop_main_la_meta_unload.cc kdmdesktop_meta_unload.cc d290 8 a297 28 -kdesktop_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/minicli.cpp $(srcdir)/startupid.cpp xautolock.moc lockeng.moc bgmanager.moc kdiconview.moc desktop.moc kdmdesktop.moc pixmapserver.moc startupid.moc kcustommenu.moc minicli.moc krootwm.moc - @@echo 'creating kdesktop_la.all_cpp.cpp ...'; \ - rm -f kdesktop_la.all_cpp.files kdesktop_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kdesktop_la.all_cpp.final; \ - for file in minicli.cpp startupid.cpp ; do \ - echo "#include \"$$file\"" >> kdesktop_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kdesktop_la.all_cpp.final; \ - done; \ - cat kdesktop_la.all_cpp.final kdesktop_la.all_cpp.files > kdesktop_la.all_cpp.cpp; \ - rm -f kdesktop_la.all_cpp.final kdesktop_la.all_cpp.files - -#>+ 11 -kdesktop_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/krootwm.cc $(srcdir)/xautolock.cc $(srcdir)/kdiconview.cc $(srcdir)/desktop.cc $(srcdir)/main.cc $(srcdir)/lockeng.cc $(srcdir)/bgmanager.cc $(srcdir)/init.cc $(srcdir)/pixmapserver.cc $(srcdir)/kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc kdesktop_la_meta_unload.cc xautolock.moc lockeng.moc bgmanager.moc kdiconview.moc desktop.moc kdmdesktop.moc pixmapserver.moc startupid.moc kcustommenu.moc minicli.moc krootwm.moc +kdesktop_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/kdesktop_main.cc xautolock.moc lockeng.moc bgmanager.moc kdiconview.moc desktop.moc kdmdesktop.moc pixmapserver.moc startupid.moc kcustommenu.moc minicli.moc krootwm.moc @@echo 'creating kdesktop_la.all_cc.cc ...'; \ rm -f kdesktop_la.all_cc.files kdesktop_la.all_cc.final; \ echo "#define KDE_USE_FINAL 1" >> kdesktop_la.all_cc.final; \ - for file in krootwm.cc xautolock.cc kdiconview.cc desktop.cc main.cc lockeng.cc bgmanager.cc init.cc pixmapserver.cc kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc kdesktop_la_meta_unload.cc ; do \ + for file in kdesktop_main.cc ; do \ echo "#include \"$$file\"" >> kdesktop_la.all_cc.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kdesktop_la.all_cc.final; \ done; \ @@@@ -1024,11 +1030,35 @@@@ rm -f kdesktop_la.all_cc.final kdesktop_la.all_cc.files #>+ 11 -kdesktop.all_cc.cc: $(srcdir)/Makefile.in dummy.cc +libkdesktop_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/minicli.cpp $(srcdir)/startupid.cpp d304 4 a307 2 + done; \ + cat libkdesktop_main_la.all_cpp.final libkdesktop_main_la.all_cpp.files > libkdesktop_main_la.all_cpp.cpp; \ d309 10 a318 3 + +#>+ 11 +libkdesktop_main_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/krootwm.cc $(srcdir)/xautolock.cc $(srcdir)/kdiconview.cc $(srcdir)/desktop.cc $(srcdir)/main.cc $(srcdir)/lockeng.cc $(srcdir)/bgmanager.cc $(srcdir)/init.cc $(srcdir)/pixmapserver.cc $(srcdir)/kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc libkdesktop_main_la_meta_unload.cc d322 1 a322 1 + for file in krootwm.cc xautolock.cc kdiconview.cc desktop.cc main.cc lockeng.cc bgmanager.cc init.cc pixmapserver.cc kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc libkdesktop_main_la_meta_unload.cc ; do \ d325 4 a328 2 + done; \ + cat libkdesktop_main_la.all_cc.final libkdesktop_main_la.all_cc.files > libkdesktop_main_la.all_cc.cc; \ a329 12 + +#>+ 11 +kdesktop.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/kdesktop_main.cc @@echo 'creating kdesktop.all_cc.cc ...'; \ rm -f kdesktop.all_cc.files kdesktop.all_cc.final; \ echo "#define KDE_USE_FINAL 1" >> kdesktop.all_cc.final; \ - for file in dummy.cc ; do \ + for file in kdesktop_main.cc ; do \ echo "#include \"$$file\"" >> kdesktop.all_cc.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kdesktop.all_cc.final; \ done; \ @@@@ -1061,20 +1091,20 @@@@ d333 2 a334 2 - -rm -f kdesktop_la.all_cpp.cpp kdesktop_la.all_cc.cc kdesktop.all_cc.cc kdmdesktop.all_cpp.cpp kdmdesktop.all_cc.cc + -rm -f kdesktop_la.all_cc.cc libkdesktop_main_la.all_cpp.cpp libkdesktop_main_la.all_cc.cc kdesktop.all_cc.cc kdmdesktop.all_cpp.cpp kdmdesktop.all_cc.cc d338 2 a339 2 - $(MAKE) kdesktop_la_OBJECTS="$(kdesktop_la_final_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_final_OBJECTS)" all-am + $(MAKE) libkdesktop_main_la_OBJECTS="$(libkdesktop_main_la_final_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_final_OBJECTS)" all-am d342 2 a343 2 - $(MAKE) kdesktop_la_OBJECTS="$(kdesktop_la_final_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_final_OBJECTS)" install-am + $(MAKE) libkdesktop_main_la_OBJECTS="$(libkdesktop_main_la_final_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_final_OBJECTS)" install-am d346 2 a347 2 - $(MAKE) kdesktop_la_OBJECTS="$(kdesktop_la_nofinal_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_nofinal_OBJECTS)" all-am + $(MAKE) libkdesktop_main_la_OBJECTS="$(libkdesktop_main_la_nofinal_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_nofinal_OBJECTS)" all-am d350 2 a351 2 - $(MAKE) kdesktop_la_OBJECTS="$(kdesktop_la_nofinal_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_nofinal_OBJECTS)" install-am + $(MAKE) libkdesktop_main_la_OBJECTS="$(libkdesktop_main_la_nofinal_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_nofinal_OBJECTS)" install-am d354 42 a395 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-ba was added on branch buildlink2 on 2002-06-23 19:05:26 +0000 @ text @d1 324 @ 1.1.1.1.2.2 log @Merge from pkgsrc-current to buildlink2 branch. @ text @a0 324 $NetBSD: patch-ba,v 1.1.1.1.2.1 2002/06/23 19:05:26 jlam Exp $ --- kdesktop/Makefile.in.orig Mon May 13 23:57:43 2002 +++ kdesktop/Makefile.in @@@@ -288,10 +288,17 @@@@ x_libraries = @@x_libraries@@ INCLUDES = -I$(top_srcdir)/kcontrol/background -I$(top_srcdir)/libkonq $(all_includes) + +libkdesktop_main_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) +libkdesktop_main_la_LIBADD = $(top_builddir)/libkonq/libkonq.la \ + $(top_builddir)/kcontrol/background/libbgnd.la + + kdesktop_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -module -avoid-version -kdesktop_la_LIBADD = $(top_builddir)/libkonq/libkonq.la $(top_builddir)/kcontrol/background/libbgnd.la +kdesktop_la_LIBADD = libkdesktop_main.la + kdesktop_LDFLAGS = $(all_libraries) $(KDE_RPATH) -kdesktop_LDADD = kdesktop.la +kdesktop_LDADD = libkdesktop_main.la SUBDIRS = . lock pics patterns programs init kwebdesktop @@@@ -299,22 +306,24 @@@@ ####### Files bin_PROGRAMS = kdesktop kdmdesktop bin_SCRIPTS = kdeeject -lib_LTLIBRARIES = kdesktop.la +lib_LTLIBRARIES = libkdesktop_main.la kdesktop.la -#>- kdesktop_la_SOURCES = krootwm.cc xautolock.cc kdiconview.cc desktop.cc main.cc \ -#>- lockeng.cc KDesktopIface.skel \ +#>- libkdesktop_main_la_SOURCES = krootwm.cc xautolock.cc kdiconview.cc \ +#>- desktop.cc main.cc lockeng.cc KDesktopIface.skel \ #>- bgmanager.cc init.cc KScreensaverIface.skel \ #>- minicli.cpp KBackgroundIface.skel pixmapserver.cc kcustommenu.cc \ #>- startupid.cpp #>+ 5 -kdesktop_la_SOURCES=krootwm.cc xautolock.cc kdiconview.cc desktop.cc main.cc \ - lockeng.cc \ +libkdesktop_main_la_SOURCES=krootwm.cc xautolock.cc kdiconview.cc \ + desktop.cc main.cc lockeng.cc \ bgmanager.cc init.cc \ minicli.cpp pixmapserver.cc kcustommenu.cc \ startupid.cpp KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc -kdesktop_SOURCES = dummy.cc +kdesktop_la_SOURCES = kdesktop_main.cc + +kdesktop_SOURCES = kdesktop_main.cc include_HEADERS = KDesktopIface.h KScreensaverIface.h KBackgroundIface.h @@@@ -340,28 +349,33 @@@@ CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) -kdesktop_la_DEPENDENCIES = $(top_builddir)/libkonq/libkonq.la \ +kdesktop_la_DEPENDENCIES = libkdesktop_main.la +am_kdesktop_la_OBJECTS = kdesktop_main.lo +#>- kdesktop_la_OBJECTS = $(am_kdesktop_la_OBJECTS) +#>+ 1 +kdesktop_la_OBJECTS = kdesktop_main.lo +libkdesktop_main_la_DEPENDENCIES = $(top_builddir)/libkonq/libkonq.la \ $(top_builddir)/kcontrol/background/libbgnd.la -am_kdesktop_la_OBJECTS = krootwm.lo xautolock.lo kdiconview.lo \ +am_libkdesktop_main_la_OBJECTS = krootwm.lo xautolock.lo kdiconview.lo \ desktop.lo main.lo lockeng.lo bgmanager.lo init.lo minicli.lo \ pixmapserver.lo kcustommenu.lo startupid.lo -#>- kdesktop_la_OBJECTS = $(am_kdesktop_la_OBJECTS) +#>- libkdesktop_main_la_OBJECTS = $(am_libkdesktop_main_la_OBJECTS) #>+ 7 -kdesktop_la_final_OBJECTS = kdesktop_la.all_cpp.lo kdesktop_la.all_cc.lo -kdesktop_la_nofinal_OBJECTS = krootwm.lo xautolock.lo kdiconview.lo \ +libkdesktop_main_la_final_OBJECTS = libkdesktop_main_la.all_cpp.lo libkdesktop_main_la.all_cc.lo +libkdesktop_main_la_nofinal_OBJECTS = krootwm.lo xautolock.lo kdiconview.lo \ desktop.lo main.lo lockeng.lo bgmanager.lo init.lo minicli.lo \ pixmapserver.lo kcustommenu.lo startupid.lo KDesktopIface_skel.lo KScreensaverIface_skel.lo KBackgroundIface_skel.lo \ - kdesktop_la_meta_unload.lo -@@KDE_USE_FINAL_FALSE@@kdesktop_la_OBJECTS = $(kdesktop_la_nofinal_OBJECTS) -@@KDE_USE_FINAL_TRUE@@kdesktop_la_OBJECTS = $(kdesktop_la_final_OBJECTS) + libkdesktop_main_la_meta_unload.lo +@@KDE_USE_FINAL_FALSE@@libkdesktop_main_la_OBJECTS = $(libkdesktop_main_la_nofinal_OBJECTS) +@@KDE_USE_FINAL_TRUE@@libkdesktop_main_la_OBJECTS = $(libkdesktop_main_la_final_OBJECTS) bin_PROGRAMS = kdesktop$(EXEEXT) kdmdesktop$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) -am_kdesktop_OBJECTS = dummy.$(OBJEXT) +am_kdesktop_OBJECTS = kdesktop_main.$(OBJEXT) #>- kdesktop_OBJECTS = $(am_kdesktop_OBJECTS) #>+ 1 -kdesktop_OBJECTS = dummy.$(OBJEXT) -kdesktop_DEPENDENCIES = kdesktop.la +kdesktop_OBJECTS = kdesktop_main.$(OBJEXT) +kdesktop_DEPENDENCIES = libkdesktop_main.la am_kdmdesktop_OBJECTS = kdmdesktop.$(OBJEXT) #>- kdmdesktop_OBJECTS = $(am_kdmdesktop_OBJECTS) #>+ 5 @@@@ -381,8 +395,9 @@@@ LIBS = @@LIBS@@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp @@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/bgmanager.Plo $(DEPDIR)/desktop.Plo \ - @@AMDEP_TRUE@@ $(DEPDIR)/dummy.Po $(DEPDIR)/init.Plo \ - @@AMDEP_TRUE@@ $(DEPDIR)/kcustommenu.Plo $(DEPDIR)/kdiconview.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/init.Plo $(DEPDIR)/kcustommenu.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/kdesktop_main.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/kdesktop_main.Po $(DEPDIR)/kdiconview.Plo \ @@AMDEP_TRUE@@ $(DEPDIR)/kdmdesktop.Po $(DEPDIR)/krootwm.Plo \ @@AMDEP_TRUE@@ $(DEPDIR)/lockeng.Plo $(DEPDIR)/main.Plo \ @@AMDEP_TRUE@@ $(DEPDIR)/minicli.Plo $(DEPDIR)/pixmapserver.Plo \ @@@@ -414,8 +429,8 @@@@ CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@@ -DIST_SOURCES = $(kdesktop_la_SOURCES) $(kdesktop_SOURCES) \ - $(kdmdesktop_SOURCES) +DIST_SOURCES = $(kdesktop_la_SOURCES) $(libkdesktop_main_la_SOURCES) \ + $(kdesktop_SOURCES) $(kdmdesktop_SOURCES) DATA = $(autostart_DATA) $(menu_DATA) HEADERS = $(include_HEADERS) $(noinst_HEADERS) @@@@ -428,7 +443,7 @@@@ DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) AUTHORS Makefile.am \ Makefile.in DIST_SUBDIRS = $(SUBDIRS) -SOURCES = $(kdesktop_la_SOURCES) $(kdesktop_SOURCES) $(kdmdesktop_SOURCES) +SOURCES = $(kdesktop_la_SOURCES) $(libkdesktop_main_la_SOURCES) $(kdesktop_SOURCES) $(kdmdesktop_SOURCES) #>- all: all-recursive #>+ 1 @@@@ -477,6 +492,8 @@@@ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) kdesktop.la: $(kdesktop_la_OBJECTS) $(kdesktop_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kdesktop_la_LDFLAGS) $(kdesktop_la_OBJECTS) $(kdesktop_la_LIBADD) $(LIBS) +libkdesktop_main.la: $(libkdesktop_main_la_OBJECTS) $(libkdesktop_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkdesktop_main_la_LDFLAGS) $(libkdesktop_main_la_OBJECTS) $(libkdesktop_main_la_LIBADD) $(LIBS) install-binPROGRAMS: $(bin_PROGRAMS) @@$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) @@@@ -537,9 +554,10 @@@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/bgmanager.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/desktop.Plo@@am__quote@@ -@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/dummy.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/init.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kcustommenu.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kdesktop_main.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kdesktop_main.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kdiconview.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kdmdesktop.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/krootwm.Plo@@am__quote@@ @@@@ -736,7 +754,7 @@@@ #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=kdesktop.desktop kdesktop_custom_menu1 kdesktop_custom_menu2 pixmapserver.cc bgmanager.cc lockeng.cc DESIGN kcustommenu.h minicli.cpp kdiconview.h kdesktopbindings.cpp kcustommenu.cc kdmdesktop.h startupid.cpp init.cc kdeeject +KDE_DIST=DESIGN kdesktop.desktop kdesktop_custom_menu1 kdesktop_custom_menu2 kcustommenu.h minicli.cpp kdiconview.h startupid.cpp init.cc pixmapserver.cc bgmanager.cc main.cc desktop.cc kdesktopbindings.cpp kdeeject lockeng.cc kcustommenu.cc kdmdesktop.h DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) @@@@ -890,20 +908,6 @@@@ # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: -#>+ 13 -KDesktopIface.kidl: $(srcdir)/KDesktopIface.h $(DCOPIDL_DEPENDENCIES) - $(DCOPIDL) $(srcdir)/KDesktopIface.h > KDesktopIface.kidl || ( rm -f KDesktopIface.kidl ; /bin/false ) -KDesktopIface_skel.cc: KDesktopIface.kidl - $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KDesktopIface.kidl -KScreensaverIface.kidl: $(srcdir)/KScreensaverIface.h $(DCOPIDL_DEPENDENCIES) - $(DCOPIDL) $(srcdir)/KScreensaverIface.h > KScreensaverIface.kidl || ( rm -f KScreensaverIface.kidl ; /bin/false ) -KScreensaverIface_skel.cc: KScreensaverIface.kidl - $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KScreensaverIface.kidl -KBackgroundIface.kidl: $(srcdir)/KBackgroundIface.h $(DCOPIDL_DEPENDENCIES) - $(DCOPIDL) $(srcdir)/KBackgroundIface.h > KBackgroundIface.kidl || ( rm -f KBackgroundIface.kidl ; /bin/false ) -KBackgroundIface_skel.cc: KBackgroundIface.kidl - $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KBackgroundIface.kidl - #>+ 3 xautolock.moc: $(srcdir)/xautolock.h $(MOC) $(srcdir)/xautolock.h -o xautolock.moc @@@@ -948,6 +952,20 @@@@ krootwm.moc: $(srcdir)/krootwm.h $(MOC) $(srcdir)/krootwm.h -o krootwm.moc +#>+ 13 +KDesktopIface.kidl: $(srcdir)/KDesktopIface.h $(DCOPIDL_DEPENDENCIES) + $(DCOPIDL) $(srcdir)/KDesktopIface.h > KDesktopIface.kidl || ( rm -f KDesktopIface.kidl ; /bin/false ) +KDesktopIface_skel.cc: KDesktopIface.kidl + $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KDesktopIface.kidl +KScreensaverIface.kidl: $(srcdir)/KScreensaverIface.h $(DCOPIDL_DEPENDENCIES) + $(DCOPIDL) $(srcdir)/KScreensaverIface.h > KScreensaverIface.kidl || ( rm -f KScreensaverIface.kidl ; /bin/false ) +KScreensaverIface_skel.cc: KScreensaverIface.kidl + $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KScreensaverIface.kidl +KBackgroundIface.kidl: $(srcdir)/KBackgroundIface.h $(DCOPIDL_DEPENDENCIES) + $(DCOPIDL) $(srcdir)/KBackgroundIface.h > KBackgroundIface.kidl || ( rm -f KBackgroundIface.kidl ; /bin/false ) +KBackgroundIface_skel.cc: KBackgroundIface.kidl + $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KBackgroundIface.kidl + #>+ 3 clean-metasources: -rm -f xautolock.moc lockeng.moc bgmanager.moc kdiconview.moc desktop.moc kdmdesktop.moc pixmapserver.moc startupid.moc kcustommenu.moc minicli.moc krootwm.moc @@@@ -970,16 +988,16 @@@@ #>+ 12 -kdesktop_la_meta_unload.cc: lockeng.moc xautolock.moc bgmanager.moc kdiconview.moc desktop.moc pixmapserver.moc startupid.moc kcustommenu.moc minicli.moc krootwm.moc - @@echo 'creating kdesktop_la_meta_unload.cc' - @@-rm -f kdesktop_la_meta_unload.cc +libkdesktop_main_la_meta_unload.cc: lockeng.moc xautolock.moc bgmanager.moc kdiconview.moc desktop.moc pixmapserver.moc startupid.moc kcustommenu.moc minicli.moc krootwm.moc + @@echo 'creating libkdesktop_main_la_meta_unload.cc' + @@-rm -f libkdesktop_main_la_meta_unload.cc @@if test ${kde_qtver} = 2; then \ - echo 'static const char * _metalist_kdesktop_la[] = {' > kdesktop_la_meta_unload.cc ;\ - cat lockeng.moc xautolock.moc bgmanager.moc kdiconview.moc desktop.moc pixmapserver.moc startupid.moc kcustommenu.moc minicli.moc krootwm.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kdesktop_la_meta_unload.cc ;\ - echo '0};' >> kdesktop_la_meta_unload.cc ;\ - echo '#include ' >> kdesktop_la_meta_unload.cc ;\ - echo '_UNLOAD(kdesktop_la)' >> kdesktop_la_meta_unload.cc ;\ - else echo > kdesktop_la_meta_unload.cc; fi + echo 'static const char * _metalist_libkdesktop_main_la[] = {' > libkdesktop_main_la_meta_unload.cc ;\ + cat lockeng.moc xautolock.moc bgmanager.moc kdiconview.moc desktop.moc pixmapserver.moc startupid.moc kcustommenu.moc minicli.moc krootwm.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkdesktop_main_la_meta_unload.cc ;\ + echo '0};' >> libkdesktop_main_la_meta_unload.cc ;\ + echo '#include ' >> libkdesktop_main_la_meta_unload.cc ;\ + echo '_UNLOAD(libkdesktop_main_la)' >> libkdesktop_main_la_meta_unload.cc ;\ + else echo > libkdesktop_main_la_meta_unload.cc; fi #>+ 12 @@@@ -997,26 +1015,14 @@@@ #>+ 3 clean-moc-classes: - -rm -f kdesktop_la_meta_unload.cc kdmdesktop_meta_unload.cc + -rm -f libkdesktop_main_la_meta_unload.cc kdmdesktop_meta_unload.cc #>+ 11 -kdesktop_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/minicli.cpp $(srcdir)/startupid.cpp xautolock.moc lockeng.moc bgmanager.moc kdiconview.moc desktop.moc kdmdesktop.moc pixmapserver.moc startupid.moc kcustommenu.moc minicli.moc krootwm.moc - @@echo 'creating kdesktop_la.all_cpp.cpp ...'; \ - rm -f kdesktop_la.all_cpp.files kdesktop_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kdesktop_la.all_cpp.final; \ - for file in minicli.cpp startupid.cpp ; do \ - echo "#include \"$$file\"" >> kdesktop_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kdesktop_la.all_cpp.final; \ - done; \ - cat kdesktop_la.all_cpp.final kdesktop_la.all_cpp.files > kdesktop_la.all_cpp.cpp; \ - rm -f kdesktop_la.all_cpp.final kdesktop_la.all_cpp.files - -#>+ 11 -kdesktop_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/krootwm.cc $(srcdir)/xautolock.cc $(srcdir)/kdiconview.cc $(srcdir)/desktop.cc $(srcdir)/main.cc $(srcdir)/lockeng.cc $(srcdir)/bgmanager.cc $(srcdir)/init.cc $(srcdir)/pixmapserver.cc $(srcdir)/kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc kdesktop_la_meta_unload.cc xautolock.moc lockeng.moc bgmanager.moc kdiconview.moc desktop.moc kdmdesktop.moc pixmapserver.moc startupid.moc kcustommenu.moc minicli.moc krootwm.moc +kdesktop_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/kdesktop_main.cc xautolock.moc lockeng.moc bgmanager.moc kdiconview.moc desktop.moc kdmdesktop.moc pixmapserver.moc startupid.moc kcustommenu.moc minicli.moc krootwm.moc @@echo 'creating kdesktop_la.all_cc.cc ...'; \ rm -f kdesktop_la.all_cc.files kdesktop_la.all_cc.final; \ echo "#define KDE_USE_FINAL 1" >> kdesktop_la.all_cc.final; \ - for file in krootwm.cc xautolock.cc kdiconview.cc desktop.cc main.cc lockeng.cc bgmanager.cc init.cc pixmapserver.cc kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc kdesktop_la_meta_unload.cc ; do \ + for file in kdesktop_main.cc ; do \ echo "#include \"$$file\"" >> kdesktop_la.all_cc.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kdesktop_la.all_cc.final; \ done; \ @@@@ -1024,11 +1030,35 @@@@ rm -f kdesktop_la.all_cc.final kdesktop_la.all_cc.files #>+ 11 -kdesktop.all_cc.cc: $(srcdir)/Makefile.in dummy.cc +libkdesktop_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/minicli.cpp $(srcdir)/startupid.cpp + @@echo 'creating libkdesktop_main_la.all_cpp.cpp ...'; \ + rm -f libkdesktop_main_la.all_cpp.files libkdesktop_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkdesktop_main_la.all_cpp.final; \ + for file in minicli.cpp startupid.cpp ; do \ + echo "#include \"$$file\"" >> libkdesktop_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkdesktop_main_la.all_cpp.final; \ + done; \ + cat libkdesktop_main_la.all_cpp.final libkdesktop_main_la.all_cpp.files > libkdesktop_main_la.all_cpp.cpp; \ + rm -f libkdesktop_main_la.all_cpp.final libkdesktop_main_la.all_cpp.files + +#>+ 11 +libkdesktop_main_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/krootwm.cc $(srcdir)/xautolock.cc $(srcdir)/kdiconview.cc $(srcdir)/desktop.cc $(srcdir)/main.cc $(srcdir)/lockeng.cc $(srcdir)/bgmanager.cc $(srcdir)/init.cc $(srcdir)/pixmapserver.cc $(srcdir)/kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc libkdesktop_main_la_meta_unload.cc + @@echo 'creating libkdesktop_main_la.all_cc.cc ...'; \ + rm -f libkdesktop_main_la.all_cc.files libkdesktop_main_la.all_cc.final; \ + echo "#define KDE_USE_FINAL 1" >> libkdesktop_main_la.all_cc.final; \ + for file in krootwm.cc xautolock.cc kdiconview.cc desktop.cc main.cc lockeng.cc bgmanager.cc init.cc pixmapserver.cc kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc libkdesktop_main_la_meta_unload.cc ; do \ + echo "#include \"$$file\"" >> libkdesktop_main_la.all_cc.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkdesktop_main_la.all_cc.final; \ + done; \ + cat libkdesktop_main_la.all_cc.final libkdesktop_main_la.all_cc.files > libkdesktop_main_la.all_cc.cc; \ + rm -f libkdesktop_main_la.all_cc.final libkdesktop_main_la.all_cc.files + +#>+ 11 +kdesktop.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/kdesktop_main.cc @@echo 'creating kdesktop.all_cc.cc ...'; \ rm -f kdesktop.all_cc.files kdesktop.all_cc.final; \ echo "#define KDE_USE_FINAL 1" >> kdesktop.all_cc.final; \ - for file in dummy.cc ; do \ + for file in kdesktop_main.cc ; do \ echo "#include \"$$file\"" >> kdesktop.all_cc.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kdesktop.all_cc.final; \ done; \ @@@@ -1061,20 +1091,20 @@@@ #>+ 3 clean-final: - -rm -f kdesktop_la.all_cpp.cpp kdesktop_la.all_cc.cc kdesktop.all_cc.cc kdmdesktop.all_cpp.cpp kdmdesktop.all_cc.cc + -rm -f kdesktop_la.all_cc.cc libkdesktop_main_la.all_cpp.cpp libkdesktop_main_la.all_cc.cc kdesktop.all_cc.cc kdmdesktop.all_cpp.cpp kdmdesktop.all_cc.cc #>+ 2 final: - $(MAKE) kdesktop_la_OBJECTS="$(kdesktop_la_final_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_final_OBJECTS)" all-am + $(MAKE) libkdesktop_main_la_OBJECTS="$(libkdesktop_main_la_final_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_final_OBJECTS)" all-am #>+ 2 final-install: - $(MAKE) kdesktop_la_OBJECTS="$(kdesktop_la_final_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_final_OBJECTS)" install-am + $(MAKE) libkdesktop_main_la_OBJECTS="$(libkdesktop_main_la_final_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_final_OBJECTS)" install-am #>+ 2 no-final: - $(MAKE) kdesktop_la_OBJECTS="$(kdesktop_la_nofinal_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_nofinal_OBJECTS)" all-am + $(MAKE) libkdesktop_main_la_OBJECTS="$(libkdesktop_main_la_nofinal_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_nofinal_OBJECTS)" all-am #>+ 2 no-final-install: - $(MAKE) kdesktop_la_OBJECTS="$(kdesktop_la_nofinal_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_nofinal_OBJECTS)" install-am + $(MAKE) libkdesktop_main_la_OBJECTS="$(libkdesktop_main_la_nofinal_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_nofinal_OBJECTS)" install-am #>+ 3 cvs-clean: $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean @