head 1.13; access; symbols pkgsrc-2017Q3:1.12.0.102 pkgsrc-2017Q3-base:1.12 pkgsrc-2017Q2:1.12.0.98 pkgsrc-2017Q2-base:1.12 pkgsrc-2017Q1:1.12.0.96 pkgsrc-2017Q1-base:1.12 pkgsrc-2016Q4:1.12.0.94 pkgsrc-2016Q4-base:1.12 pkgsrc-2016Q3:1.12.0.92 pkgsrc-2016Q3-base:1.12 pkgsrc-2016Q2:1.12.0.90 pkgsrc-2016Q2-base:1.12 pkgsrc-2016Q1:1.12.0.88 pkgsrc-2016Q1-base:1.12 pkgsrc-2015Q4:1.12.0.86 pkgsrc-2015Q4-base:1.12 pkgsrc-2015Q3:1.12.0.84 pkgsrc-2015Q3-base:1.12 pkgsrc-2015Q2:1.12.0.82 pkgsrc-2015Q2-base:1.12 pkgsrc-2015Q1:1.12.0.80 pkgsrc-2015Q1-base:1.12 pkgsrc-2014Q4:1.12.0.78 pkgsrc-2014Q4-base:1.12 pkgsrc-2014Q3:1.12.0.76 pkgsrc-2014Q3-base:1.12 pkgsrc-2014Q2:1.12.0.74 pkgsrc-2014Q2-base:1.12 pkgsrc-2014Q1:1.12.0.72 pkgsrc-2014Q1-base:1.12 pkgsrc-2013Q4:1.12.0.70 pkgsrc-2013Q4-base:1.12 pkgsrc-2013Q3:1.12.0.68 pkgsrc-2013Q3-base:1.12 pkgsrc-2013Q2:1.12.0.66 pkgsrc-2013Q2-base:1.12 pkgsrc-2013Q1:1.12.0.64 pkgsrc-2013Q1-base:1.12 pkgsrc-2012Q4:1.12.0.62 pkgsrc-2012Q4-base:1.12 pkgsrc-2012Q3:1.12.0.60 pkgsrc-2012Q3-base:1.12 pkgsrc-2012Q2:1.12.0.58 pkgsrc-2012Q2-base:1.12 pkgsrc-2012Q1:1.12.0.56 pkgsrc-2012Q1-base:1.12 pkgsrc-2011Q4:1.12.0.54 pkgsrc-2011Q4-base:1.12 pkgsrc-2011Q3:1.12.0.52 pkgsrc-2011Q3-base:1.12 pkgsrc-2011Q2:1.12.0.50 pkgsrc-2011Q2-base:1.12 pkgsrc-2011Q1:1.12.0.48 pkgsrc-2011Q1-base:1.12 pkgsrc-2010Q4:1.12.0.46 pkgsrc-2010Q4-base:1.12 pkgsrc-2010Q3:1.12.0.44 pkgsrc-2010Q3-base:1.12 pkgsrc-2010Q2:1.12.0.42 pkgsrc-2010Q2-base:1.12 pkgsrc-2010Q1:1.12.0.40 pkgsrc-2010Q1-base:1.12 pkgsrc-2009Q4:1.12.0.38 pkgsrc-2009Q4-base:1.12 pkgsrc-2009Q3:1.12.0.36 pkgsrc-2009Q3-base:1.12 pkgsrc-2009Q2:1.12.0.34 pkgsrc-2009Q2-base:1.12 pkgsrc-2009Q1:1.12.0.32 pkgsrc-2009Q1-base:1.12 pkgsrc-2008Q4:1.12.0.30 pkgsrc-2008Q4-base:1.12 pkgsrc-2008Q3:1.12.0.28 pkgsrc-2008Q3-base:1.12 cube-native-xorg:1.12.0.26 cube-native-xorg-base:1.12 pkgsrc-2008Q2:1.12.0.24 pkgsrc-2008Q2-base:1.12 cwrapper:1.12.0.22 pkgsrc-2008Q1:1.12.0.20 pkgsrc-2008Q1-base:1.12 pkgsrc-2007Q4:1.12.0.18 pkgsrc-2007Q4-base:1.12 pkgsrc-2007Q3:1.12.0.16 pkgsrc-2007Q3-base:1.12 pkgsrc-2007Q2:1.12.0.14 pkgsrc-2007Q2-base:1.12 pkgsrc-2007Q1:1.12.0.12 pkgsrc-2007Q1-base:1.12 pkgsrc-2006Q4:1.12.0.10 pkgsrc-2006Q4-base:1.12 pkgsrc-2006Q3:1.12.0.8 pkgsrc-2006Q3-base:1.12 pkgsrc-2006Q2:1.12.0.6 pkgsrc-2006Q2-base:1.12 pkgsrc-2006Q1:1.12.0.4 pkgsrc-2006Q1-base:1.12 pkgsrc-2005Q4:1.12.0.2 pkgsrc-2005Q4-base:1.12 pkgsrc-2005Q3:1.11.0.4 pkgsrc-2005Q3-base:1.11 pkgsrc-2005Q2:1.11.0.2 pkgsrc-2005Q2-base:1.11 pkgsrc-2005Q1:1.10.0.4 pkgsrc-2005Q1-base:1.10 pkgsrc-2004Q4:1.10.0.2 pkgsrc-2004Q4-base:1.10 pkgsrc-2004Q3:1.9.0.2 pkgsrc-2004Q3-base:1.9 pkgsrc-2004Q2:1.7.0.4 pkgsrc-2004Q2-base:1.7 pkgsrc-2004Q1:1.7.0.2 pkgsrc-2004Q1-base:1.7 pkgsrc-2003Q4:1.5.0.2 pkgsrc-2003Q4-base:1.5 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.13 date 2017.09.26.10.27.21; author wiz; state dead; branches; next 1.12; commitid 9ARpkXTuh9Wg2H8A; 1.12 date 2005.12.11.10.53.54; author markd; state Exp; branches; next 1.11; 1.11 date 2005.03.23.21.37.48; author markd; state dead; branches; next 1.10; 1.10 date 2004.12.14.11.02.18; author markd; state Exp; branches; next 1.9; 1.9 date 2004.08.21.12.16.45; author markd; state dead; branches; next 1.8; 1.8 date 2004.08.11.13.51.14; author markd; state Exp; branches; next 1.7; 1.7 date 2004.02.04.13.58.39; author markd; state dead; branches 1.7.4.1; next 1.6; 1.6 date 2004.01.15.09.52.51; author markd; state Exp; branches; next 1.5; 1.5 date 2003.05.22.02.42.41; author markd; state Exp; branches; next 1.4; 1.4 date 2003.03.11.13.10.35; author markd; state Exp; branches; next 1.3; 1.3 date 2003.01.02.09.12.39; author skrll; state Exp; branches; next 1.2; 1.2 date 2002.08.25.19.23.52; author jlam; state Exp; branches; next 1.1; 1.1 date 2002.05.31.13.16.46; author skrll; state Exp; branches 1.1.1.1; next ; 1.7.4.1 date 2004.08.13.13.05.05; author agc; state Exp; branches; next ; 1.1.1.1 date 2002.05.31.13.16.46; author skrll; state Exp; branches 1.1.1.1.2.1; next ; 1.1.1.1.2.1 date 2002.05.31.13.16.46; author jlam; state dead; branches; next 1.1.1.1.2.2; 1.1.1.1.2.2 date 2002.06.23.19.06.18; author jlam; state Exp; branches; next ; desc @@ 1.13 log @*: remove qt3 and the packages using it, including KDE3 Announced in https://mail-index.netbsd.org/pkgsrc-users/2017/09/10/msg025556.html @ text @$NetBSD: patch-ap,v 1.12 2005/12/11 10:53:54 markd Exp $ --- kinit/kstartupconfig.cpp.orig 2005-12-01 20:47:00.000000000 +1300 +++ kinit/kstartupconfig.cpp @@@@ -28,10 +28,10 @@@@ This utility helps to have some configur without the need to launch anything linked to KDE libraries (which may need some time to load). -The configuration options are written to $KDEHOME/share/config/startupconfigkeys, +The configuration options are written to $KDEHOME/share/kde/config/startupconfigkeys, one option per line, as . It is possible to use ' for quoting multiword entries. Values of these options will be written -to $KDEHOME/share/config/startupconfig as a shell script that will set +to $KDEHOME/share/kde/config/startupconfig as a shell script that will set the values to shell variables, named __ (all spaces replaced by underscores, everything lowercase). So e.g. line "ksplashrc KSplash Theme Default" may result in "ksplashrc_ksplash_theme=Default". @@@@ -89,14 +89,14 @@@@ int main() return 1; char filename[ 1024 ]; strlcpy( filename, kdehome, 1024 ); - strlcat( filename, "/share/config/startupconfig", 1024 ); + strlcat( filename, "/share/kde/config/startupconfig", 1024 ); if( access( filename, R_OK ) != 0 ) { int ret = system( "kdostartupconfig" ); return WEXITSTATUS( ret ); } strlcpy( filename, kdehome, 1024 ); - strlcat( filename, "/share/config/startupconfigfiles", 1024 ); + strlcat( filename, "/share/kde/config/startupconfigfiles", 1024 ); struct stat st; if( stat( filename, &st ) != 0 ) { @@@@ -111,7 +111,7 @@@@ int main() return WEXITSTATUS( ret ); } strlcpy( filename, kdehome, 1024 ); - strlcat( filename, "/share/config/startupconfigkeys", 1024 ); + strlcat( filename, "/share/kde/config/startupconfigkeys", 1024 ); FILE* keys = fopen( filename, "r" ); if( keys == NULL ) { @ 1.12 log @Update to KDE 3.5 Many new features and refinements. Notable changes include: * Konqueror is the second web browser to pass the Acid2 CSS test, ahead of Firefox and Internet Explorer * Konqueror can also now free web pages from adverts with its ad-block feature * SuperKaramba is included in KDE, providing well-integrated and easy-to-install widgets for the user's desktop * Kopete has support for MSN and Yahoo! webcams * The edutainment module has three new applications (KGeography, Kanagram and blinKen), and has seen huge improvements in Kalzium @ text @d1 1 a1 1 $NetBSD$ @ 1.11 log @Update to KDE 3.4 Highlights at a glance * Text-to-speech system with support built into Konqueror, Kate, KPDF and the standalone application KSayIt * Support for text to speech synthesis is integrated with the desktop * Completely redesigned, more flexible trash system * Kicker with improved look and feel * KPDF now enables you to select, copy & paste text and images from PDFs, along with many other improvements * Kontact supports now various groupware servers, including eGroupware, GroupWise, Kolab, OpenGroupware.org and SLOX * Kopete supports Novell Groupwise and Lotus Sametime and gets integrated into Kontact * DBUS/HAL support allows to keep dynamic device icons in media:/ and on the desktop in sync with the state of all devices * KHTML has improved standard support and now close to full support for CSS 2.1 and the CSS 3 Selectors module * Better synchronization between 2 PCs * A new high contrast style and a complete monochrome icon set * An icon effect to paint all icons in two chosen colors, converting third party application icons into high contrast monochrome icons * Akregator allows you to read news from your favourite RSS-enabled websites in one application * Juk has now an album cover management via Google Image Search * KMail now stores passwords securely with KWallet * SVG files can now be used as wallpapers * KHTML plug-ins are now configurable, so the user can selectively disable ones that are not used. This does not include Netscape-style plug-ins. Netscape plug-in in CPU usage can be manually lowered, and plug-ins are more stable. * more than 6,500 bugs have been fixed * more than 1,700 wishes have been fullfilled * more than 80,000 contributions with several million lines of code and documentation added or changed @ text @d1 1 a1 1 $NetBSD: patch-ap,v 1.10 2004/12/14 11:02:18 markd Exp $ d3 5 a7 14 --- khtml/khtml_part.cpp.orig 2004-11-29 06:30:50.000000000 +1300 +++ khtml/khtml_part.cpp @@@@ -4758,7 +4758,7 @@@@ KHTMLPart * KHTMLPart::findFrameParent( KParts::ReadOnlyPart *callingPart, const QString &f, khtml::ChildFrame **childFrame ) { #ifdef DEBUG_FINDFRAME - kdDebug(6050) << "KHTMLPart::findFrameParent: this = " << this << " URL = " << m_url << " findFrameParent( " << f << " )" << endl; + kdDebug(6050) << "KHTMLPart::findFrameParent: this = " << this << " URL = " << m_url << " name = " << name() << " findFrameParent( " << f << " )" << endl; #endif // Check access KHTMLPart* const callingHtmlPart = dynamic_cast(callingPart); @@@@ -4766,6 +4766,9 @@@@ KHTMLPart::findFrameParent( KParts::Read if (!checkFrameAccess(callingHtmlPart)) return 0; d9 35 a43 6 + if (!childFrame && !parentPart() && (name() == f)) + return this; + FrameIt it = d->m_frames.find( f ); const FrameIt end = d->m_frames.end(); if ( it != end ) @ 1.10 log @Part of fix of Konqueror Window Injection Vulnerability. From http://www.kde.org/info/security/advisory-20041213-1.txt. Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD$ @ 1.9 log @Update to KDE 3.3 * Rewrite the name-resolution routines so that true asynchronous lookups are possible (multithreaded). Thiago Macieira * kconf_update has now support for updating files other than config files. Waldo Bastian * Crypto certificates import without user interaction Helge Deller * KEditToolbar: Add support for arranging actions via drag&drop. Sandro Giessl * Move KNewStuff to kdelibs, making it usable for KDE-Edu etc. Josef Spillner * Introduce KIMIface, a generic DCOP interface to instant messaging/chat clients, and support libraries for other KDE apps, enabling loosely coupled integration. Will Stephenson * Show actions icons in the configure shortcut dialog. Olivier Goffart * KKeyDialog: add widget (based on klistviewsearchline) for searching shortcuts Cristian Tibirna * User visible feedback if invocation of browser, help Center or mailer fails * KImgIO o Add EXR image plugin, supports reading high dynamic range files. Brad Hards o Add support for SGI images (a.k.a. "RGB" images). These do typically have file extensions *.rgb, *.rgba, *.sgi, or *.bw. The SGI image file format is a de-facto standard for textures, for example in 3D modeling. Melchior Franz o Add read support for DDS images (Direct Draw Surface). This format is mainly used for textures in DirectX. Ignacio Castaño * libkabc o Write support and SSL/TLS for the LDAP resource Szombathelyi György * KLocale o Try harder to find message translations if a string is not translated in the primary language of the user, but available in other languages that the user has chosen in kcontrol. Heiko Evermann * KSpell2 o Introduction of the new spellchecking library fixing all of KSpell shortcomings. Zack Rusin * KHTML part o KHTML: Merge text shifting from WebCore. Leo Savernik o KHTML: Type-ahead find Arend van Beelen jr. o Copy To->IM Contact... context menu entry. Using kimproxy, allow one to initiate a file transfer from Konqueror. Will Stephenson o Added "Open in This Window" in popup frame submenu o New context menu when text is selected which allows lookup in default search engine o Fixed and improved Access Key support: now activated by pressing and releasing the ctrl key. When activated, the accesskey mode displays all accesskeys available in tooltips Jean-Baptiste Mardelle @ text @d1 1 a1 1 $NetBSD: patch-ap,v 1.8 2004/08/11 13:51:14 markd Exp $ d3 4 a6 36 Index: dcopserver.cpp =================================================================== RCS file: /home/kde/kdelibs/dcop/dcopserver.cpp,v retrieving revision 1.160.2.3 diff -u -p -r1.160.2.3 dcopserver.cpp --- dcop/dcopserver.cpp 30 Apr 2004 15:00:08 -0000 1.160.2.3 +++ dcop/dcopserver.cpp 26 Jul 2004 09:03:06 -0000 @@@@ -443,35 +443,78 @@@@ write_iceauth (FILE *addfp, IceAuthDataE fprintf (addfp, "\n"); } +#ifndef HAVE_MKSTEMPS +#include +#include -#ifndef HAVE_MKSTEMP -static char *unique_filename (const char *path, const char *prefix) -#else -static char *unique_filename (const char *path, const char *prefix, int *pFd) -#endif +/* this is based on code taken from the GNU libc, distributed under the LGPL license */ + +/* Generate a unique temporary file name from TEMPLATE. + + TEMPLATE has the form: + + /ccXXXXXX + + SUFFIX_LEN tells us how long is (it can be zero length). + + The last six characters of TEMPLATE before must be "XXXXXX"; + they are replaced with a string that makes the filename unique. + + Returns a file descriptor open on the file for reading and writing. */ + +int mkstemps (char* _template, int suffix_len) d8 3 a10 66 -#ifndef HAVE_MKSTEMP -#ifndef X_NOT_POSIX - return ((char *) tempnam (path, prefix)); -#else - char tempFile[PATH_MAX]; - char *tmp; + static const char letters[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; + char *XXXXXX; + int len; + int count; + int value; + + len = strlen (_template); + + if ((int) len < 6 + suffix_len || strncmp (&_template[len - 6 - suffix_len], "XXXXXX", 6)) + return -1; + + XXXXXX = &_template[len - 6 - suffix_len]; + + value = rand(); + for (count = 0; count < 256; ++count) + { + int v = value; + int fd; + + /* Fill in the random bits. */ + XXXXXX[0] = letters[v % 62]; + v /= 62; + XXXXXX[1] = letters[v % 62]; + v /= 62; + XXXXXX[2] = letters[v % 62]; + v /= 62; + XXXXXX[3] = letters[v % 62]; + v /= 62; + XXXXXX[4] = letters[v % 62]; + v /= 62; + XXXXXX[5] = letters[v % 62]; + + fd = open (_template, O_RDWR|O_CREAT|O_EXCL, 0600); + if (fd >= 0) + /* The file does not exist. */ + return fd; + + /* This is a random value. It is only necessary that the next + TMP_MAX values generated by adding 7777 to VALUE are different + with (module 2^32). */ + value += 7777; + } + /* We return the null string if we can't find a unique file name. */ + _template[0] = '\0'; + return -1; +} - snprintf (tempFile, PATH_MAX, "%s/%sXXXXXX", path, prefix); - tmp = (char *) mktemp (tempFile); - if (tmp) - { - char *ptr = (char *) malloc (strlen (tmp) + 1); - if (ptr != NULL) - { - strcpy (ptr, tmp); - } - return (ptr); - } - else - return (NULL); d12 12 a23 81 -#else + +static char *unique_filename (const char *path, const char *prefix, int *pFd) +{ char tempFile[PATH_MAX]; char *ptr; @@@@ -480,43 +523,10 @@@@ static char *unique_filename (const char if (ptr != NULL) { strcpy(ptr, tempFile); - *pFd = mkstemp(ptr); + *pFd = mkstemps(ptr, 0); } return ptr; -#endif -} - -#if 0 -Status SetAuthentication_local (int count, IceListenObj *listenObjs) -{ - int i; - for (i = 0; i < count; i ++) { - char *prot = IceGetListenConnectionString(listenObjs[i]); - if (!prot) continue; - char *host = strchr(prot, '/'); - char *sock = 0; - if (host) { - *host=0; - host++; - sock = strchr(host, ':'); - if (sock) { - *sock = 0; - sock++; - } - } -#ifndef NDEBUG - qDebug("DCOPServer: SetAProc_loc: conn %d, prot=%s, file=%s", - (unsigned)i, prot, sock); -#endif - if (sock && !strcmp(prot, "local")) { - chmod(sock, 0700); - } - IceSetHostBasedAuthProc (listenObjs[i], HostBasedAuthProc); - free(prot); - } - return 1; } -#endif #define MAGIC_COOKIE_LEN 16 @@@@ -529,28 +539,19 @@@@ SetAuthentication (int count, IceListenO int original_umask; int i; QCString command; -#ifdef HAVE_MKSTEMP int fd; -#endif original_umask = umask (0077); /* disallow non-owner access */ path = getenv ("DCOP_SAVE_DIR"); if (!path) path = "/tmp"; -#ifndef HAVE_MKSTEMP - if ((addAuthFile = unique_filename (path, "dcop")) == NULL) - goto bad; - if (!(addfp = fopen (addAuthFile, "w"))) - goto bad; -#else if ((addAuthFile = unique_filename (path, "dcop", &fd)) == NULL) goto bad; if (!(addfp = fdopen(fd, "wb"))) goto bad; -#endif if ((*_authDataEntries = static_cast(malloc (count * 2 * sizeof (IceAuthDataEntry)))) == NULL) goto bad; @ 1.8 log @Fix some issues related to html frames, cookie handling and temporary filenames. From KDE cvs. Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD$ @ 1.7 log @Update to KDE-3.2.0. Changes: Libraries * Hidden methods in DCOP interfaces - DCOPIDLng Alexander Kellett * Documentation parsing (kdoc based) and inclusion in generated .dcopidl files (note: kdebindings dcopidlng only) Alexander Kellett * Kalyptus based rewrite of DCOPIDL - DCOPIDLng Alexander Kellett * Thumbnail generator for DVI files. Stefan Kebekus * Thumbnail generator for Xcursor files. Fredrik Hoeglund * KMainWindow can now maintain the statusbar and corresponding action (duplicate (99% of the time broken) code removed from countless applications in KDE). Benjamin Meyer * KMainWindow, KToolbar, and several other core classes now will only stores settings if those settings are not the default values (helping to reduce the huge size of config files). Benjamin Meyer * Add support for International Domain Names (IDN). Thiago Macieira, Waldo Bastian * KDE Password Registry and Wallet. George Staikos * SSL session ID reuse. George Staikos * KCookiejar: Support HttpOnly cookies. Waldo Bastian * KLocale: support for different calendar systems Hans Petter Bieker * KCalendarSystem: support for Hebrew calendar system Hans Petter Bieker * Support data urls. See rfc 2397. Leo Savernik * New tab widget classes KTabBar and KTabWidget in kdeui Stephan Binner * New KFile permissions panel Tim Jansen * Support for mimetype inheritance and aliases David Faure * KDialogBase: Replace setButtonOkText() & co. with setButtonOk() that takes a KGuiItem instead (deprecating the old methods) Martijn Klingens * Move KPrefs from libkdepim to kdelibs. Cornelius Schumacher * Support for "extra fields" in KIO slaves and in Konqueror / KFileDialog David Faure * Add KSplashScreen, a splash screen class based on QSplashScreen (with support for KDE's Xinerama options) Chris Howells * KPasteTextAction: enhanced action for pasting text by offering a list with the clipboard history. Andras Mantia KHTML * Non-modal find dialog David Faure KDEfx * Added KCPUInfo class which makes it possible for applications to do runtime checks for architecture specific CPU features, such MMX, 3DNow! and AltiVec. Fredrik Hoeglund * Added MMX and SSE2 optimizations to the blending functions in KImageEffect, that among other things are used to blend the translucent menus when the menu effect is set to software blend, and to tint icons when they're selected in icon views. Fredrik Hoeglund Kate Part * File type specific settings Christoph Cullmann * vi style cmd line Christoph Cullmann * Support variable lines in files Anders Lund * Color Schemes Christoph Cullmann * Indentation based code folding Christoph Cullmann * Implement more DCOP interfaces and clean up the ktexteditor dcop interfaces Christoph Cullmann KImgIO * Add PCX image plugin, supports reading and writing 1, 4, 8 and 24bpp images Nadeem Hasan * Add TGA image plugin, supports reading and writing true color TGA images (compressed and uncompressed) Dominik Seichter Interfaces * Interfaces for KBytesEdit widget part Friedrich W. H. Kossebau KSpell * Adding ability to spell check HTML, TeX and nroff documents. Zack Rusin * Completely reworking the spell checking dialog. Adding language selection combo. Zack Rusin @ text @d1 1 a1 1 $NetBSD: patch-ap,v 1.6 2004/01/15 09:52:51 markd Exp $ d3 182 a184 245 --- kded/Makefile.in.orig 2003-12-29 11:16:54.000000000 +1300 +++ kded/Makefile.in @@@@ -396,18 +396,22 @@@@ x_libraries = @@x_libraries@@ INCLUDES = -I$(srcdir)/.. -I$(top_srcdir) $(all_includes) -lib_LTLIBRARIES = kded.la kbuildsycoca.la +lib_LTLIBRARIES = libkded_main.la kded.la libkbuildsycoca_main.la kbuildsycoca.la -kded_la_LDFLAGS = $(all_libraries) -module -avoid-version -kded_la_LIBADD = $(LIB_KIO) -kded_la_SOURCES = kded.cpp kbuildservicetypefactory.cpp \ +libkded_main_la_LDFLAGS = $(all_libraries) +libkded_main_la_LIBADD = $(LIB_KIO) +libkded_main_la_SOURCES = kded.cpp kbuildservicetypefactory.cpp \ kbuildservicefactory.cpp \ kbuildservicegroupfactory.cpp kdedmodule.cpp -kbuildsycoca_la_LDFLAGS = $(all_libraries) -module -avoid-version -kbuildsycoca_la_LIBADD = $(LIB_KIO) -kbuildsycoca_la_SOURCES = kbuildsycoca.cpp kbuildservicetypefactory.cpp \ +kded_la_LDFLAGS = $(all_libraries) -module -avoid-version +kded_la_LIBADD = libkded_main.la +kded_la_SOURCES = kded_main.cpp + +libkbuildsycoca_main_la_LDFLAGS = $(all_libraries) +libkbuildsycoca_main_la_LIBADD = $(LIB_KIO) +libkbuildsycoca_main_la_SOURCES = kbuildsycoca.cpp kbuildservicetypefactory.cpp \ kbuildservicefactory.cpp \ kbuildservicegroupfactory.cpp \ kbuildimageiofactory.cpp \ @@@@ -415,15 +419,19 @@@@ kbuildsycoca_la_SOURCES = kbuildsycoca.c kctimefactory.cpp +kbuildsycoca_la_LDFLAGS = $(all_libraries) -module -avoid-version +kbuildsycoca_la_LIBADD = libkbuildsycoca_main.la +kbuildsycoca_la_SOURCES = kbuildsycoca_main.cpp + bin_PROGRAMS = kded kbuildsycoca kdontchangethehostname kded_LDFLAGS = $(all_libraries) $(KDE_RPATH) -kded_LDADD = kded.la -kded_SOURCES = dummy.cpp +kded_LDADD = libkded_main.la +kded_SOURCES = kded_main.cpp kbuildsycoca_LDFLAGS = $(all_libraries) $(KDE_RPATH) -kbuildsycoca_LDADD = kbuildsycoca.la -kbuildsycoca_SOURCES = dummy.cpp +kbuildsycoca_LDADD = libkbuildsycoca_main.la +kbuildsycoca_SOURCES = kbuildsycoca_main.cpp kdontchangethehostname_LDFLAGS = $(all_libraries) $(KDE_RPATH) kdontchangethehostname_LDADD = $(LIB_KDECORE) @@@@ -451,46 +459,56 @@@@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) -kbuildsycoca_la_DEPENDENCIES = -am_kbuildsycoca_la_OBJECTS = kbuildsycoca.lo kbuildservicetypefactory.lo \ - kbuildservicefactory.lo kbuildservicegroupfactory.lo \ - kbuildimageiofactory.lo kbuildprotocolinfofactory.lo \ - kctimefactory.lo +kbuildsycoca_la_DEPENDENCIES = libkbuildsycoca_main.la +am_kbuildsycoca_la_OBJECTS = kbuildsycoca_main.lo #>- kbuildsycoca_la_OBJECTS = $(am_kbuildsycoca_la_OBJECTS) +#>+ 1 +kbuildsycoca_la_OBJECTS = kbuildsycoca_main.lo +kded_la_DEPENDENCIES = libkded_main.la +am_kded_la_OBJECTS = kded_main.lo +#>- kded_la_OBJECTS = $(am_kded_la_OBJECTS) +#>+ 1 +kded_la_OBJECTS = kded_main.lo +libkbuildsycoca_main_la_DEPENDENCIES = +am_libkbuildsycoca_main_la_OBJECTS = kbuildsycoca.lo \ + kbuildservicetypefactory.lo kbuildservicefactory.lo \ + kbuildservicegroupfactory.lo kbuildimageiofactory.lo \ + kbuildprotocolinfofactory.lo kctimefactory.lo +#>- libkbuildsycoca_main_la_OBJECTS = $(am_libkbuildsycoca_main_la_OBJECTS) #>+ 7 -kbuildsycoca_la_final_OBJECTS = kbuildsycoca_la.all_cpp.lo -kbuildsycoca_la_nofinal_OBJECTS = kbuildsycoca.lo kbuildservicetypefactory.lo \ - kbuildservicefactory.lo kbuildservicegroupfactory.lo \ - kbuildimageiofactory.lo kbuildprotocolinfofactory.lo \ - kctimefactory.lo -@@KDE_USE_FINAL_FALSE@@kbuildsycoca_la_OBJECTS = $(kbuildsycoca_la_nofinal_OBJECTS) -@@KDE_USE_FINAL_TRUE@@kbuildsycoca_la_OBJECTS = $(kbuildsycoca_la_final_OBJECTS) -kded_la_DEPENDENCIES = -am_kded_la_OBJECTS = kded.lo kbuildservicetypefactory.lo \ +libkbuildsycoca_main_la_final_OBJECTS = libkbuildsycoca_main_la.all_cpp.lo +libkbuildsycoca_main_la_nofinal_OBJECTS = kbuildsycoca.lo \ + kbuildservicetypefactory.lo kbuildservicefactory.lo \ + kbuildservicegroupfactory.lo kbuildimageiofactory.lo \ + kbuildprotocolinfofactory.lo kctimefactory.lo +@@KDE_USE_FINAL_FALSE@@libkbuildsycoca_main_la_OBJECTS = $(libkbuildsycoca_main_la_nofinal_OBJECTS) +@@KDE_USE_FINAL_TRUE@@libkbuildsycoca_main_la_OBJECTS = $(libkbuildsycoca_main_la_final_OBJECTS) +libkded_main_la_DEPENDENCIES = +am_libkded_main_la_OBJECTS = kded.lo kbuildservicetypefactory.lo \ kbuildservicefactory.lo kbuildservicegroupfactory.lo \ kdedmodule.lo -#>- kded_la_OBJECTS = $(am_kded_la_OBJECTS) +#>- libkded_main_la_OBJECTS = $(am_libkded_main_la_OBJECTS) #>+ 6 -kded_la_final_OBJECTS = kded_la.all_cpp.lo -kded_la_nofinal_OBJECTS = kded.lo kbuildservicetypefactory.lo \ +libkded_main_la_final_OBJECTS = libkded_main_la.all_cpp.lo +libkded_main_la_nofinal_OBJECTS = kded.lo kbuildservicetypefactory.lo \ kbuildservicefactory.lo kbuildservicegroupfactory.lo \ kdedmodule.lo -@@KDE_USE_FINAL_FALSE@@kded_la_OBJECTS = $(kded_la_nofinal_OBJECTS) -@@KDE_USE_FINAL_TRUE@@kded_la_OBJECTS = $(kded_la_final_OBJECTS) +@@KDE_USE_FINAL_FALSE@@libkded_main_la_OBJECTS = $(libkded_main_la_nofinal_OBJECTS) +@@KDE_USE_FINAL_TRUE@@libkded_main_la_OBJECTS = $(libkded_main_la_final_OBJECTS) bin_PROGRAMS = kded$(EXEEXT) kbuildsycoca$(EXEEXT) \ kdontchangethehostname$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) -am_kbuildsycoca_OBJECTS = dummy.$(OBJEXT) +am_kbuildsycoca_OBJECTS = kbuildsycoca_main.$(OBJEXT) #>- kbuildsycoca_OBJECTS = $(am_kbuildsycoca_OBJECTS) #>+ 1 -kbuildsycoca_OBJECTS = dummy.$(OBJEXT) -kbuildsycoca_DEPENDENCIES = kbuildsycoca.la -am_kded_OBJECTS = dummy.$(OBJEXT) +kbuildsycoca_OBJECTS = kbuildsycoca_main.$(OBJEXT) +kbuildsycoca_DEPENDENCIES = libkbuildsycoca_main.la +am_kded_OBJECTS = kded_main.$(OBJEXT) #>- kded_OBJECTS = $(am_kded_OBJECTS) #>+ 1 -kded_OBJECTS = dummy.$(OBJEXT) -kded_DEPENDENCIES = kded.la +kded_OBJECTS = kded_main.$(OBJEXT) +kded_DEPENDENCIES = libkded_main.la am_kdontchangethehostname_OBJECTS = khostname.$(OBJEXT) #>- kdontchangethehostname_OBJECTS = $(am_kdontchangethehostname_OBJECTS) #>+ 1 @@@@ -500,33 +518,39 @@@@ kdontchangethehostname_DEPENDENCIES = DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles -#>- @@AMDEP_TRUE@@DEP_FILES = ./$(DEPDIR)/dummy.Po \ -#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/kbuildimageiofactory.Plo \ +#>- @@AMDEP_TRUE@@DEP_FILES = ./$(DEPDIR)/kbuildimageiofactory.Plo \ #>- @@AMDEP_TRUE@@ ./$(DEPDIR)/kbuildprotocolinfofactory.Plo \ #>- @@AMDEP_TRUE@@ ./$(DEPDIR)/kbuildservicefactory.Plo \ #>- @@AMDEP_TRUE@@ ./$(DEPDIR)/kbuildservicegroupfactory.Plo \ #>- @@AMDEP_TRUE@@ ./$(DEPDIR)/kbuildservicetypefactory.Plo \ #>- @@AMDEP_TRUE@@ ./$(DEPDIR)/kbuildsycoca.Plo \ +#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/kbuildsycoca_main.Plo \ +#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/kbuildsycoca_main.Po \ #>- @@AMDEP_TRUE@@ ./$(DEPDIR)/kctimefactory.Plo ./$(DEPDIR)/kded.Plo \ +#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/kded_main.Plo ./$(DEPDIR)/kded_main.Po \ #>- @@AMDEP_TRUE@@ ./$(DEPDIR)/kdedmodule.Plo ./$(DEPDIR)/khostname.Po -#>+ 19 -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@DEP_FILES = $(DEPDIR)/kbuildsycoca_la.all_cpp.P $(DEPDIR)/kded_la.all_cpp.P ./$(DEPDIR)/dummy.Po \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kbuildimageiofactory.Plo \ +#>+ 23 +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@DEP_FILES = $(DEPDIR)/libkbuildsycoca_main_la.all_cpp.P $(DEPDIR)/libkded_main_la.all_cpp.P ./$(DEPDIR)/kbuildimageiofactory.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kbuildprotocolinfofactory.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kbuildservicefactory.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kbuildservicegroupfactory.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kbuildservicetypefactory.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kbuildsycoca.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kbuildsycoca_main.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kbuildsycoca_main.Po \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kctimefactory.Plo ./$(DEPDIR)/kded.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kded_main.Plo ./$(DEPDIR)/kded_main.Po \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kdedmodule.Plo ./$(DEPDIR)/khostname.Po -@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@DEP_FILES = ./$(DEPDIR)/dummy.Po \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kbuildimageiofactory.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@DEP_FILES = ./$(DEPDIR)/kbuildimageiofactory.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kbuildprotocolinfofactory.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kbuildservicefactory.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kbuildservicegroupfactory.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kbuildservicetypefactory.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kbuildsycoca.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kbuildsycoca_main.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kbuildsycoca_main.Po \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kctimefactory.Plo ./$(DEPDIR)/kded.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kded_main.Plo ./$(DEPDIR)/kded_main.Po \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kdedmodule.Plo ./$(DEPDIR)/khostname.Po #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@@@ -548,6 +572,7 @@@@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@@ DIST_SOURCES = $(kbuildsycoca_la_SOURCES) $(kded_la_SOURCES) \ + $(libkbuildsycoca_main_la_SOURCES) $(libkded_main_la_SOURCES) \ $(kbuildsycoca_SOURCES) $(kded_SOURCES) \ $(kdontchangethehostname_SOURCES) DATA = $(servicetype_DATA) $(update_DATA) @@@@ -556,7 +581,7 @@@@ HEADERS = $(include_HEADERS) $(noinst_HE DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) Makefile.am \ Makefile.in -SOURCES = $(kbuildsycoca_la_SOURCES) $(kded_la_SOURCES) $(kbuildsycoca_SOURCES) $(kded_SOURCES) $(kdontchangethehostname_SOURCES) +SOURCES = $(kbuildsycoca_la_SOURCES) $(kded_la_SOURCES) $(libkbuildsycoca_main_la_SOURCES) $(libkded_main_la_SOURCES) $(kbuildsycoca_SOURCES) $(kded_SOURCES) $(kdontchangethehostname_SOURCES) #>- all: all-am #>+ 1 @@@@ -605,6 +630,10 @@@@ kbuildsycoca.la: $(kbuildsycoca_la_OBJEC $(CXXLINK) -rpath $(libdir) $(kbuildsycoca_la_LDFLAGS) $(kbuildsycoca_la_OBJECTS) $(kbuildsycoca_la_LIBADD) $(LIBS) kded.la: $(kded_la_OBJECTS) $(kded_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kded_la_LDFLAGS) $(kded_la_OBJECTS) $(kded_la_LIBADD) $(LIBS) +libkbuildsycoca_main.la: $(libkbuildsycoca_main_la_OBJECTS) $(libkbuildsycoca_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkbuildsycoca_main_la_LDFLAGS) $(libkbuildsycoca_main_la_OBJECTS) $(libkbuildsycoca_main_la_LIBADD) $(LIBS) +libkded_main.la: $(libkded_main_la_OBJECTS) $(libkded_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkded_main_la_LDFLAGS) $(libkded_main_la_OBJECTS) $(libkded_main_la_LIBADD) $(LIBS) binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @@$(NORMAL_INSTALL) @@@@ -650,15 +679,18 @@@@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/dummy.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/kbuildimageiofactory.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/kbuildprotocolinfofactory.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/kbuildservicefactory.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/kbuildservicegroupfactory.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/kbuildservicetypefactory.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/kbuildsycoca.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/kbuildsycoca_main.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/kbuildsycoca_main.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/kctimefactory.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/kded.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/kded_main.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/kded_main.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/kdedmodule.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/khostname.Po@@am__quote@@ @@@@ -817,7 +849,7 @@@@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=kdedmodule.desktop README.kded kded.h HOWTO DESIGN kctimefactory.h kded.upd +KDE_DIST=README.kded DESIGN kdedmodule.desktop kded.h HOWTO Makefile.in.rej kded.upd kctimefactory.h DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) @@@@ -955,19 +987,16 @@@@ uninstall-am: uninstall-binPROGRAMS unin uninstall-info-am uninstall-libLTLIBRARIES \ uninstall-servicetypeDATA uninstall-updateDATA d186 2 a187 118 - -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 -kbuildsycoca.moc: $(srcdir)/kbuildsycoca.h - $(MOC) $(srcdir)/kbuildsycoca.h -o kbuildsycoca.moc +kded.moc: $(srcdir)/kded.h + $(MOC) $(srcdir)/kded.h -o kded.moc #>+ 1 -mocs: kbuildsycoca.moc +mocs: kded.moc #>+ 3 kdedmodule.moc: $(srcdir)/kdedmodule.h $(MOC) $(srcdir)/kdedmodule.h -o kdedmodule.moc @@@@ -975,14 +1004,14 @@@@ kdedmodule.moc: $(srcdir)/kdedmodule.h #>+ 1 mocs: kdedmodule.moc #>+ 3 -kded.moc: $(srcdir)/kded.h - $(MOC) $(srcdir)/kded.h -o kded.moc +kbuildsycoca.moc: $(srcdir)/kbuildsycoca.h + $(MOC) $(srcdir)/kbuildsycoca.h -o kbuildsycoca.moc #>+ 1 -mocs: kded.moc +mocs: kbuildsycoca.moc #>+ 3 clean-metasources: - -rm -f kbuildsycoca.moc kdedmodule.moc kded.moc + -rm -f kded.moc kdedmodule.moc kbuildsycoca.moc #>+ 2 docs-am: @@@@ -995,45 +1024,45 @@@@ force-reedit: #>+ 11 -kbuildsycoca_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kbuildsycoca.cpp $(srcdir)/kbuildservicetypefactory.cpp $(srcdir)/kbuildservicefactory.cpp $(srcdir)/kbuildservicegroupfactory.cpp $(srcdir)/kbuildimageiofactory.cpp $(srcdir)/kbuildprotocolinfofactory.cpp $(srcdir)/kctimefactory.cpp kbuildsycoca.moc - @@echo 'creating kbuildsycoca_la.all_cpp.cpp ...'; \ - rm -f kbuildsycoca_la.all_cpp.files kbuildsycoca_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kbuildsycoca_la.all_cpp.final; \ +libkbuildsycoca_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kbuildsycoca.cpp $(srcdir)/kbuildservicetypefactory.cpp $(srcdir)/kbuildservicefactory.cpp $(srcdir)/kbuildservicegroupfactory.cpp $(srcdir)/kbuildimageiofactory.cpp $(srcdir)/kbuildprotocolinfofactory.cpp $(srcdir)/kctimefactory.cpp kbuildsycoca.moc + @@echo 'creating libkbuildsycoca_main_la.all_cpp.cpp ...'; \ + rm -f libkbuildsycoca_main_la.all_cpp.files libkbuildsycoca_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkbuildsycoca_main_la.all_cpp.final; \ for file in kbuildsycoca.cpp kbuildservicetypefactory.cpp kbuildservicefactory.cpp kbuildservicegroupfactory.cpp kbuildimageiofactory.cpp kbuildprotocolinfofactory.cpp kctimefactory.cpp ; do \ - echo "#include \"$$file\"" >> kbuildsycoca_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kbuildsycoca_la.all_cpp.final; \ + echo "#include \"$$file\"" >> libkbuildsycoca_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkbuildsycoca_main_la.all_cpp.final; \ done; \ - cat kbuildsycoca_la.all_cpp.final kbuildsycoca_la.all_cpp.files > kbuildsycoca_la.all_cpp.cpp; \ - rm -f kbuildsycoca_la.all_cpp.final kbuildsycoca_la.all_cpp.files + cat libkbuildsycoca_main_la.all_cpp.final libkbuildsycoca_main_la.all_cpp.files > libkbuildsycoca_main_la.all_cpp.cpp; \ + rm -f libkbuildsycoca_main_la.all_cpp.final libkbuildsycoca_main_la.all_cpp.files #>+ 11 -kded_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kded.cpp $(srcdir)/kbuildservicetypefactory.cpp $(srcdir)/kbuildservicefactory.cpp $(srcdir)/kbuildservicegroupfactory.cpp $(srcdir)/kdedmodule.cpp kdedmodule.moc kded.moc - @@echo 'creating kded_la.all_cpp.cpp ...'; \ - rm -f kded_la.all_cpp.files kded_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kded_la.all_cpp.final; \ +libkded_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kded.cpp $(srcdir)/kbuildservicetypefactory.cpp $(srcdir)/kbuildservicefactory.cpp $(srcdir)/kbuildservicegroupfactory.cpp $(srcdir)/kdedmodule.cpp kded.moc kdedmodule.moc + @@echo 'creating libkded_main_la.all_cpp.cpp ...'; \ + rm -f libkded_main_la.all_cpp.files libkded_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkded_main_la.all_cpp.final; \ for file in kded.cpp kbuildservicetypefactory.cpp kbuildservicefactory.cpp kbuildservicegroupfactory.cpp kdedmodule.cpp ; do \ - echo "#include \"$$file\"" >> kded_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kded_la.all_cpp.final; \ + echo "#include \"$$file\"" >> libkded_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkded_main_la.all_cpp.final; \ done; \ - cat kded_la.all_cpp.final kded_la.all_cpp.files > kded_la.all_cpp.cpp; \ - rm -f kded_la.all_cpp.final kded_la.all_cpp.files + cat libkded_main_la.all_cpp.final libkded_main_la.all_cpp.files > libkded_main_la.all_cpp.cpp; \ + rm -f libkded_main_la.all_cpp.final libkded_main_la.all_cpp.files #>+ 3 clean-final: - -rm -f kbuildsycoca_la.all_cpp.cpp kded_la.all_cpp.cpp + -rm -f libkbuildsycoca_main_la.all_cpp.cpp libkded_main_la.all_cpp.cpp #>+ 2 final: - $(MAKE) kbuildsycoca_la_OBJECTS="$(kbuildsycoca_la_final_OBJECTS)" kded_la_OBJECTS="$(kded_la_final_OBJECTS)" all-am + $(MAKE) libkbuildsycoca_main_la_OBJECTS="$(libkbuildsycoca_main_la_final_OBJECTS)" libkded_main_la_OBJECTS="$(libkded_main_la_final_OBJECTS)" all-am #>+ 2 final-install: - $(MAKE) kbuildsycoca_la_OBJECTS="$(kbuildsycoca_la_final_OBJECTS)" kded_la_OBJECTS="$(kded_la_final_OBJECTS)" install-am + $(MAKE) libkbuildsycoca_main_la_OBJECTS="$(libkbuildsycoca_main_la_final_OBJECTS)" libkded_main_la_OBJECTS="$(libkded_main_la_final_OBJECTS)" install-am #>+ 2 no-final: - $(MAKE) kbuildsycoca_la_OBJECTS="$(kbuildsycoca_la_nofinal_OBJECTS)" kded_la_OBJECTS="$(kded_la_nofinal_OBJECTS)" all-am + $(MAKE) libkbuildsycoca_main_la_OBJECTS="$(libkbuildsycoca_main_la_nofinal_OBJECTS)" libkded_main_la_OBJECTS="$(libkded_main_la_nofinal_OBJECTS)" all-am #>+ 2 no-final-install: - $(MAKE) kbuildsycoca_la_OBJECTS="$(kbuildsycoca_la_nofinal_OBJECTS)" kded_la_OBJECTS="$(kded_la_nofinal_OBJECTS)" install-am + $(MAKE) libkbuildsycoca_main_la_OBJECTS="$(libkbuildsycoca_main_la_nofinal_OBJECTS)" libkded_main_la_OBJECTS="$(libkded_main_la_nofinal_OBJECTS)" install-am #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean @@@@ -1043,9 +1072,9 @@@@ kde-rpo-clean: -rm -f *.rpo #>+ 7 -kded.o: kded.moc -kdedmodule.o: kdedmodule.moc -kdedmodule.lo: kdedmodule.moc kbuildsycoca.lo: kbuildsycoca.moc +kded.o: kded.moc kded.lo: kded.moc +kdedmodule.o: kdedmodule.moc kbuildsycoca.o: kbuildsycoca.moc +kdedmodule.lo: kdedmodule.moc @ 1.7.4.1 log @Pullup ticket 102 to the pkgsrc-2004Q2 branch, requested by Mark Davies Security fix for kdelibs3 Module Name: pkgsrc Committed By: markd Date: Wed Aug 11 13:51:14 UTC 2004 Modified Files: pkgsrc/x11/kdelibs3: Makefile distinfo pkgsrc/x11/kdelibs3/patches: patch-an Added Files: pkgsrc/x11/kdelibs3/patches: patch-ap patch-aq patch-ar patch-as patch-at patch-au patch-av patch-aw patch-ax patch-ay Log Message: Fix some issues related to html frames, cookie handling and temporary filenames. From KDE cvs. Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD$ d3 246 a248 121 Index: dcopserver.cpp =================================================================== RCS file: /home/kde/kdelibs/dcop/dcopserver.cpp,v retrieving revision 1.160.2.3 diff -u -p -r1.160.2.3 dcopserver.cpp --- dcop/dcopserver.cpp 30 Apr 2004 15:00:08 -0000 1.160.2.3 +++ dcop/dcopserver.cpp 26 Jul 2004 09:03:06 -0000 @@@@ -443,35 +443,78 @@@@ write_iceauth (FILE *addfp, IceAuthDataE fprintf (addfp, "\n"); } +#ifndef HAVE_MKSTEMPS +#include +#include -#ifndef HAVE_MKSTEMP -static char *unique_filename (const char *path, const char *prefix) -#else -static char *unique_filename (const char *path, const char *prefix, int *pFd) -#endif +/* this is based on code taken from the GNU libc, distributed under the LGPL license */ + +/* Generate a unique temporary file name from TEMPLATE. + + TEMPLATE has the form: + + /ccXXXXXX + + SUFFIX_LEN tells us how long is (it can be zero length). + + The last six characters of TEMPLATE before must be "XXXXXX"; + they are replaced with a string that makes the filename unique. + + Returns a file descriptor open on the file for reading and writing. */ + +int mkstemps (char* _template, int suffix_len) { -#ifndef HAVE_MKSTEMP -#ifndef X_NOT_POSIX - return ((char *) tempnam (path, prefix)); -#else - char tempFile[PATH_MAX]; - char *tmp; + static const char letters[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; + char *XXXXXX; + int len; + int count; + int value; + + len = strlen (_template); + + if ((int) len < 6 + suffix_len || strncmp (&_template[len - 6 - suffix_len], "XXXXXX", 6)) + return -1; + + XXXXXX = &_template[len - 6 - suffix_len]; + + value = rand(); + for (count = 0; count < 256; ++count) + { + int v = value; + int fd; + + /* Fill in the random bits. */ + XXXXXX[0] = letters[v % 62]; + v /= 62; + XXXXXX[1] = letters[v % 62]; + v /= 62; + XXXXXX[2] = letters[v % 62]; + v /= 62; + XXXXXX[3] = letters[v % 62]; + v /= 62; + XXXXXX[4] = letters[v % 62]; + v /= 62; + XXXXXX[5] = letters[v % 62]; + + fd = open (_template, O_RDWR|O_CREAT|O_EXCL, 0600); + if (fd >= 0) + /* The file does not exist. */ + return fd; + + /* This is a random value. It is only necessary that the next + TMP_MAX values generated by adding 7777 to VALUE are different + with (module 2^32). */ + value += 7777; + } + /* We return the null string if we can't find a unique file name. */ + _template[0] = '\0'; + return -1; +} - snprintf (tempFile, PATH_MAX, "%s/%sXXXXXX", path, prefix); - tmp = (char *) mktemp (tempFile); - if (tmp) - { - char *ptr = (char *) malloc (strlen (tmp) + 1); - if (ptr != NULL) - { - strcpy (ptr, tmp); - } - return (ptr); - } - else - return (NULL); #endif -#else + +static char *unique_filename (const char *path, const char *prefix, int *pFd) +{ char tempFile[PATH_MAX]; char *ptr; @@@@ -480,43 +523,10 @@@@ static char *unique_filename (const char if (ptr != NULL) { strcpy(ptr, tempFile); - *pFd = mkstemp(ptr); + *pFd = mkstemps(ptr, 0); } return ptr; -#endif -} d250 117 a366 63 -#if 0 -Status SetAuthentication_local (int count, IceListenObj *listenObjs) -{ - int i; - for (i = 0; i < count; i ++) { - char *prot = IceGetListenConnectionString(listenObjs[i]); - if (!prot) continue; - char *host = strchr(prot, '/'); - char *sock = 0; - if (host) { - *host=0; - host++; - sock = strchr(host, ':'); - if (sock) { - *sock = 0; - sock++; - } - } -#ifndef NDEBUG - qDebug("DCOPServer: SetAProc_loc: conn %d, prot=%s, file=%s", - (unsigned)i, prot, sock); -#endif - if (sock && !strcmp(prot, "local")) { - chmod(sock, 0700); - } - IceSetHostBasedAuthProc (listenObjs[i], HostBasedAuthProc); - free(prot); - } - return 1; } -#endif #define MAGIC_COOKIE_LEN 16 @@@@ -529,28 +539,19 @@@@ SetAuthentication (int count, IceListenO int original_umask; int i; QCString command; -#ifdef HAVE_MKSTEMP int fd; -#endif original_umask = umask (0077); /* disallow non-owner access */ path = getenv ("DCOP_SAVE_DIR"); if (!path) path = "/tmp"; -#ifndef HAVE_MKSTEMP - if ((addAuthFile = unique_filename (path, "dcop")) == NULL) - goto bad; - if (!(addfp = fopen (addAuthFile, "w"))) - goto bad; -#else if ((addAuthFile = unique_filename (path, "dcop", &fd)) == NULL) goto bad; if (!(addfp = fdopen(fd, "wb"))) goto bad; -#endif if ((*_authDataEntries = static_cast(malloc (count * 2 * sizeof (IceAuthDataEntry)))) == NULL) goto bad; @ 1.6 log @Update to KDE-3.1.5 Changes: * networking: Fix crash related to SOCKS * kate: C syntax highlighting * konqueror: Improved handling of long filenames in icon view. * khtml: Minor rendering fixes * khtml: Improved loading of large images * java: Crash fix * webdav: Fixed renaming of files via secure connection @ text @d1 1 a1 1 $NetBSD$ @ 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 --- kded/Makefile.in.orig Thu May 8 05:24:05 2003 d5 1 a5 1 @@@@ -394,18 +394,22 @@@@ x_libraries = @@x_libraries@@ d35 1 a35 1 @@@@ -413,15 +417,19 @@@@ kbuildsycoca_la_SOURCES = kbuildsycoca.c d59 1 a59 1 @@@@ -448,46 +456,56 @@@@ CONFIG_HEADER = $(top_builddir)/config.h d141 1 a141 1 @@@@ -497,33 +515,39 @@@@ kdontchangethehostname_DEPENDENCIES = d188 1 a188 1 @@@@ -545,6 +569,7 @@@@ CXXLD = $(CXX) d196 1 a196 1 @@@@ -553,7 +578,7 @@@@ HEADERS = $(include_HEADERS) $(noinst_HE d205 1 a205 1 @@@@ -602,6 +627,10 @@@@ kbuildsycoca.la: $(kbuildsycoca_la_OBJEC d216 1 a216 1 @@@@ -647,15 +676,18 @@@@ mostlyclean-compile: d236 1 a236 1 @@@@ -814,7 +846,7 @@@@ distclean-tags: d240 2 a241 2 -KDE_DIST=DESIGN kded.upd kded.h kdedmodule.desktop README.kded HOWTO kctimefactory.h +KDE_DIST=README.kded DESIGN kdedmodule.desktop kded.h HOWTO kded.upd kctimefactory.h d245 1 a245 1 @@@@ -953,9 +985,6 @@@@ uninstall-am: uninstall-binPROGRAMS unin d255 33 a287 1 @@@@ -987,45 +1016,45 @@@@ force-reedit: d311 1 a311 1 -kded_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kded.cpp $(srcdir)/kbuildservicetypefactory.cpp $(srcdir)/kbuildservicefactory.cpp $(srcdir)/kbuildservicegroupfactory.cpp $(srcdir)/kdedmodule.cpp kded.moc kdedmodule.moc d354 2 a355 1 @@@@ -1036,8 +1065,8 @@@@ kde-rpo-clean: d358 3 d362 4 a365 7 -kbuildsycoca.o: kbuildsycoca.moc -kded.lo: kded.moc -kdedmodule.lo: kdedmodule.moc kded.o: kded.moc +kded.lo: kded.moc kdedmodule.o: kdedmodule.moc +kbuildsycoca.o: kbuildsycoca.moc @ 1.4 log @Update KDE to 3.1. Many bugfixes and functionality enhancements including: General New default widget style: Keramik New default icon theme: Crystal Created and enhanced framework to effectively disable certain features of the GUI, like for example shell access, disallowing to select custom wall papers. "Kiosk mode" Usability improvements: Kicker: Context menu, applet menus, wording and panel feature consistency improved Kicker: Redesigned control module. KCalc: Usability Improvements. KSnapshot: Usability Improvements. KsCD: User Interface Improvements in configuration and information dialogs kdelibs Extended the DCOP commandline client to enable nonGUI applications (such as shell scripts) to use DCOP send DCOP messages to multiple users and/or sessions concurrently Added to notification dialog to allow applications to configure their notifications with a common GUI. Added "Open File", "Open Destination" and "Keep window open" to download progress dialog. KDatePicker has now week number display and selection. Added KLocale support for setting/retrieving the first day of a week Support for "Multimedia keys" on your keyboard. Added on-demand icon loading support to improve startup performance of applications. KHTML: Improvements to printing support. Page Info and Frame info dialog. Auto-Scroll support of webpages using Shift combined with arrow keys. Many, many Bugfixes and improvements. Small codebase merges with Safari. The main merge is planned for a future release however, as it requires more testing. KIO: Modified thumbnail ioslave that can extract a thumbnail from the file directly if it contains one, rather than generating one itself. Added fish:// protocol slave, which can access remote filesystems via SSH and SCP Cleanups and Corrections in smtp:// protocol slave. Activated rtsp:// protocol slave. Added support for Public Key Authentication and interopability with newer versions of OpenSSH to sftp:// protocol slave. KSSL: SSL certificate policies can now be configured based on the host name @ text @d3 1 a3 1 --- kded/Makefile.in.orig Thu Jan 23 12:30:35 2003 d5 1 a5 1 @@@@ -303,18 +303,22 @@@@ d35 1 a35 1 @@@@ -322,15 +326,19 @@@@ d59 1 a59 1 @@@@ -357,46 +365,56 @@@@ d141 2 a142 2 @@@@ -410,33 +428,39 @@@@ LIBS = @@LIBS@@ d188 2 a189 1 @@@@ -459,6 +483,7 @@@@ a190 1 CXXFLAGS = @@CXXFLAGS@@ d196 1 a196 1 @@@@ -467,7 +492,7 @@@@ d205 1 a205 1 @@@@ -516,6 +541,10 @@@@ d216 1 a216 1 @@@@ -561,15 +590,18 @@@@ d236 2 a237 2 @@@@ -696,7 +728,7 @@@@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH d245 1 a245 1 @@@@ -821,9 +853,6 @@@@ d255 1 a255 1 @@@@ -855,45 +884,45 @@@@ d322 1 a322 1 @@@@ -904,8 +933,8 @@@@ @ 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 --- kded/Makefile.in.orig Tue Nov 26 08:57:39 2002 d5 1 a5 1 @@@@ -283,18 +283,22 @@@@ x_libraries = @@x_libraries@@ d13 1 a13 1 -kded_la_LIBADD = $(LIB_KSYCOCA) d16 1 a16 1 +libkded_main_la_LIBADD = $(LIB_KSYCOCA) d23 1 a23 1 -kbuildsycoca_la_LIBADD = $(LIB_KSYCOCA) d30 1 a30 1 +libkbuildsycoca_main_la_LIBADD = $(LIB_KSYCOCA) d35 1 a35 1 @@@@ -302,15 +306,19 @@@@ kbuildsycoca_la_SOURCES = kbuildsycoca.c d46 1 a46 1 -kded_LDADD = $(LIB_KSYCOCA) kded.la d48 1 a48 1 +kded_LDADD = $(LIB_KSYCOCA) libkded_main.la d52 1 a52 1 -kbuildsycoca_LDADD = $(LIB_KSYCOCA) kbuildsycoca.la d54 1 a54 1 +kbuildsycoca_LDADD = $(LIB_KSYCOCA) libkbuildsycoca_main.la d58 2 a59 2 kdontchangethehostname_LDADD = $(LIB_KDECORE) @@@@ -337,46 +345,56 @@@@ CONFIG_HEADER = $(top_builddir)/config.h d141 1 a141 2 @@@@ -389,33 +407,39 @@@@ CPPFLAGS = @@CPPFLAGS@@ LDFLAGS = @@LDFLAGS@@ d144 14 a157 13 -#>- @@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/dummy.Po \ -#>- @@AMDEP_TRUE@@ $(DEPDIR)/kbuildimageiofactory.Plo \ +#>- @@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/kbuildimageiofactory.Plo \ #>- @@AMDEP_TRUE@@ $(DEPDIR)/kbuildprotocolinfofactory.Plo \ #>- @@AMDEP_TRUE@@ $(DEPDIR)/kbuildservicefactory.Plo \ #>- @@AMDEP_TRUE@@ $(DEPDIR)/kbuildservicegroupfactory.Plo \ #>- @@AMDEP_TRUE@@ $(DEPDIR)/kbuildservicetypefactory.Plo \ #>- @@AMDEP_TRUE@@ $(DEPDIR)/kbuildsycoca.Plo \ +#>- @@AMDEP_TRUE@@ $(DEPDIR)/kbuildsycoca_main.Plo \ +#>- @@AMDEP_TRUE@@ $(DEPDIR)/kbuildsycoca_main.Po \ #>- @@AMDEP_TRUE@@ $(DEPDIR)/kctimefactory.Plo $(DEPDIR)/kded.Plo \ +#>- @@AMDEP_TRUE@@ $(DEPDIR)/kded_main.Plo $(DEPDIR)/kded_main.Po \ #>- @@AMDEP_TRUE@@ $(DEPDIR)/kdedmodule.Plo $(DEPDIR)/khostname.Po d159 2 a160 2 -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@DEP_FILES = $(DEPDIR)/kbuildsycoca_la.all_cpp.P $(DEPDIR)/kded_la.all_cpp.P $(DEPDIR)/dummy.Po \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kbuildimageiofactory.Plo \ d162 24 a185 24 +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@DEP_FILES = $(DEPDIR)/libkbuildsycoca_main_la.all_cpp.P $(DEPDIR)/libkded_main_la.all_cpp.P $(DEPDIR)/kbuildimageiofactory.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kbuildprotocolinfofactory.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kbuildservicefactory.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kbuildservicegroupfactory.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kbuildservicetypefactory.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kbuildsycoca.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kbuildsycoca_main.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kbuildsycoca_main.Po \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kctimefactory.Plo $(DEPDIR)/kded.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kded_main.Plo $(DEPDIR)/kded_main.Po \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kdedmodule.Plo $(DEPDIR)/khostname.Po -@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@DEP_FILES = $(DEPDIR)/dummy.Po \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kbuildimageiofactory.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@DEP_FILES = $(DEPDIR)/kbuildimageiofactory.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kbuildprotocolinfofactory.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kbuildservicefactory.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kbuildservicegroupfactory.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kbuildservicetypefactory.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kbuildsycoca.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kbuildsycoca_main.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kbuildsycoca_main.Po \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kctimefactory.Plo $(DEPDIR)/kded.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kded_main.Plo $(DEPDIR)/kded_main.Po \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kdedmodule.Plo $(DEPDIR)/khostname.Po d188 1 a188 1 @@@@ -438,6 +462,7 @@@@ CXXLINK = $(LIBTOOL) --mode=link --tag=C d196 1 a196 1 @@@@ -446,7 +471,7 @@@@ HEADERS = $(include_HEADERS) $(noinst_HE d205 1 a205 1 @@@@ -497,6 +522,10 @@@@ kbuildsycoca.la: $(kbuildsycoca_la_OBJEC d213 1 d216 1 a216 2 $(mkinstalldirs) $(DESTDIR)$(bindir) @@@@ -537,15 +566,18 @@@@ mostlyclean-compile: d220 15 a234 17 -@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/dummy.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kbuildimageiofactory.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kbuildprotocolinfofactory.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kbuildservicefactory.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kbuildservicegroupfactory.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kbuildservicetypefactory.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kbuildsycoca.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kbuildsycoca_main.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kbuildsycoca_main.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kctimefactory.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kded.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kded_main.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kded_main.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kdedmodule.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/khostname.Po@@am__quote@@ @@@@ -657,7 +689,7 @@@@ distclean-tags: d236 2 d245 1 a245 1 @@@@ -776,9 +808,6 @@@@ uninstall-am: uninstall-binPROGRAMS unin d255 1 a255 1 @@@@ -810,45 +839,45 @@@@ force-reedit: d322 1 a322 1 @@@@ -859,8 +888,8 @@@@ 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-ap,v 1.1.2.1 2002/06/23 19:06:18 jlam Exp $ d3 1 a3 1 --- kded/Makefile.in.orig Tue May 21 15:42:06 2002 d5 1 a5 1 @@@@ -283,18 +283,22 @@@@ d18 2 a19 2 kbuildservicefactory.cpp \ kbuildservicegroupfactory.cpp kdedmodule.cpp d32 5 a36 5 kbuildservicefactory.cpp \ kbuildservicegroupfactory.cpp \ kbuildimageiofactory.cpp \ @@@@ -302,15 +306,19 @@@@ kctimefactory.cpp d59 1 a59 1 @@@@ -337,48 +345,58 @@@@ d84 1 a84 1 #>+ 8 d89 1 a89 2 - kctimefactory.lo \ - kbuildsycoca_la_meta_unload.lo d98 1 a98 2 + kbuildprotocolinfofactory.lo kctimefactory.lo \ + libkbuildsycoca_main_la_meta_unload.lo d107 1 a107 1 #>+ 7 d113 1 a113 2 kdedmodule.lo \ - kded_la_meta_unload.lo a115 1 + libkded_main_la_meta_unload.lo d141 1 a141 1 @@@@ -391,14 +409,16 @@@@ d145 42 a186 13 -@@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/dummy.Po \ - @@AMDEP_TRUE@@ $(DEPDIR)/kbuildimageiofactory.Plo \ +@@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/kbuildimageiofactory.Plo \ @@AMDEP_TRUE@@ $(DEPDIR)/kbuildprotocolinfofactory.Plo \ @@AMDEP_TRUE@@ $(DEPDIR)/kbuildservicefactory.Plo \ @@AMDEP_TRUE@@ $(DEPDIR)/kbuildservicegroupfactory.Plo \ @@AMDEP_TRUE@@ $(DEPDIR)/kbuildservicetypefactory.Plo \ @@AMDEP_TRUE@@ $(DEPDIR)/kbuildsycoca.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/kbuildsycoca_main.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/kbuildsycoca_main.Po \ @@AMDEP_TRUE@@ $(DEPDIR)/kctimefactory.Plo $(DEPDIR)/kded.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/kded_main.Plo $(DEPDIR)/kded_main.Po \ @@AMDEP_TRUE@@ $(DEPDIR)/kdedmodule.Plo $(DEPDIR)/khostname.Po d188 1 a188 2 #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) @@@@ -420,6 +440,7 @@@@ d196 1 a196 1 @@@@ -428,7 +449,7 @@@@ d205 1 a205 1 @@@@ -479,6 +500,10 @@@@ d216 1 a216 1 @@@@ -519,15 +544,18 @@@@ d236 1 a236 1 @@@@ -639,7 +667,7 @@@@ d240 1 a240 1 -KDE_DIST=HOWTO README.kded DESIGN kdedmodule.desktop kded.upd kded.h kctimefactory.h d245 1 a245 1 @@@@ -758,9 +786,6 @@@@ d255 1 a255 65 @@@@ -792,41 +817,41 @@@@ #>+ 12 -kbuildsycoca_la_meta_unload.cpp: kbuildsycoca.moc - @@echo 'creating kbuildsycoca_la_meta_unload.cpp' - @@-rm -f kbuildsycoca_la_meta_unload.cpp +libkbuildsycoca_main_la_meta_unload.cpp: kbuildsycoca.moc + @@echo 'creating libkbuildsycoca_main_la_meta_unload.cpp' + @@-rm -f libkbuildsycoca_main_la_meta_unload.cpp @@if test ${kde_qtver} = 2; then \ - echo 'static const char * _metalist_kbuildsycoca_la[] = {' > kbuildsycoca_la_meta_unload.cpp ;\ - cat kbuildsycoca.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kbuildsycoca_la_meta_unload.cpp ;\ - echo '0};' >> kbuildsycoca_la_meta_unload.cpp ;\ - echo '#include ' >> kbuildsycoca_la_meta_unload.cpp ;\ - echo '_UNLOAD(kbuildsycoca_la)' >> kbuildsycoca_la_meta_unload.cpp ;\ - else echo > kbuildsycoca_la_meta_unload.cpp; fi + echo 'static const char * _metalist_libkbuildsycoca_main_la[] = {' > libkbuildsycoca_main_la_meta_unload.cpp ;\ + cat kbuildsycoca.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkbuildsycoca_main_la_meta_unload.cpp ;\ + echo '0};' >> libkbuildsycoca_main_la_meta_unload.cpp ;\ + echo '#include ' >> libkbuildsycoca_main_la_meta_unload.cpp ;\ + echo '_UNLOAD(libkbuildsycoca_main_la)' >> libkbuildsycoca_main_la_meta_unload.cpp ;\ + else echo > libkbuildsycoca_main_la_meta_unload.cpp; fi #>+ 12 -kded_la_meta_unload.cpp: kded.moc kdedmodule.moc - @@echo 'creating kded_la_meta_unload.cpp' - @@-rm -f kded_la_meta_unload.cpp +libkded_main_la_meta_unload.cpp: kded.moc kdedmodule.moc + @@echo 'creating libkded_main_la_meta_unload.cpp' + @@-rm -f libkded_main_la_meta_unload.cpp @@if test ${kde_qtver} = 2; then \ - echo 'static const char * _metalist_kded_la[] = {' > kded_la_meta_unload.cpp ;\ - cat kded.moc kdedmodule.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kded_la_meta_unload.cpp ;\ - echo '0};' >> kded_la_meta_unload.cpp ;\ - echo '#include ' >> kded_la_meta_unload.cpp ;\ - echo '_UNLOAD(kded_la)' >> kded_la_meta_unload.cpp ;\ - else echo > kded_la_meta_unload.cpp; fi + echo 'static const char * _metalist_libkded_main_la[] = {' > libkded_main_la_meta_unload.cpp ;\ + cat kded.moc kdedmodule.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkded_main_la_meta_unload.cpp ;\ + echo '0};' >> libkded_main_la_meta_unload.cpp ;\ + echo '#include ' >> libkded_main_la_meta_unload.cpp ;\ + echo '_UNLOAD(libkded_main_la)' >> libkded_main_la_meta_unload.cpp ;\ + else echo > libkded_main_la_meta_unload.cpp; fi #>+ 3 clean-moc-classes: - -rm -f kbuildsycoca_la_meta_unload.cpp kded_la_meta_unload.cpp + -rm -f libkbuildsycoca_main_la_meta_unload.cpp libkded_main_la_meta_unload.cpp #>+ 11 -kbuildsycoca_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kbuildsycoca.cpp $(srcdir)/kbuildservicetypefactory.cpp $(srcdir)/kbuildservicefactory.cpp $(srcdir)/kbuildservicegroupfactory.cpp $(srcdir)/kbuildimageiofactory.cpp $(srcdir)/kbuildprotocolinfofactory.cpp $(srcdir)/kctimefactory.cpp kbuildsycoca_la_meta_unload.cpp kded.moc kdedmodule.moc kbuildsycoca.moc +kbuildsycoca_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kbuildsycoca_main.cpp kded.moc kdedmodule.moc kbuildsycoca.moc @@echo 'creating kbuildsycoca_la.all_cpp.cpp ...'; \ rm -f kbuildsycoca_la.all_cpp.files kbuildsycoca_la.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kbuildsycoca_la.all_cpp.final; \ - for file in kbuildsycoca.cpp kbuildservicetypefactory.cpp kbuildservicefactory.cpp kbuildservicegroupfactory.cpp kbuildimageiofactory.cpp kbuildprotocolinfofactory.cpp kctimefactory.cpp kbuildsycoca_la_meta_unload.cpp ; do \ + for file in kbuildsycoca_main.cpp ; do \ echo "#include \"$$file\"" >> kbuildsycoca_la.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kbuildsycoca_la.all_cpp.final; \ done; \ @@@@ -834,11 +859,11 @@@@ rm -f kbuildsycoca_la.all_cpp.final kbuildsycoca_la.all_cpp.files a256 13 #>+ 11 -kded_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kded.cpp $(srcdir)/kbuildservicetypefactory.cpp $(srcdir)/kbuildservicefactory.cpp $(srcdir)/kbuildservicegroupfactory.cpp $(srcdir)/kdedmodule.cpp kded_la_meta_unload.cpp +kded_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kded_main.cpp @@echo 'creating kded_la.all_cpp.cpp ...'; \ rm -f kded_la.all_cpp.files kded_la.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kded_la.all_cpp.final; \ - for file in kded.cpp kbuildservicetypefactory.cpp kbuildservicefactory.cpp kbuildservicegroupfactory.cpp kdedmodule.cpp kded_la_meta_unload.cpp ; do \ + for file in kded_main.cpp ; do \ echo "#include \"$$file\"" >> kded_la.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kded_la.all_cpp.final; \ done; \ @@@@ -846,11 +871,35 @@@@ rm -f kded_la.all_cpp.final kded_la.all_cpp.files d259 5 a263 2 -kbuildsycoca.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp +libkbuildsycoca_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kbuildsycoca.cpp $(srcdir)/kbuildservicetypefactory.cpp $(srcdir)/kbuildservicefactory.cpp $(srcdir)/kbuildservicegroupfactory.cpp $(srcdir)/kbuildimageiofactory.cpp $(srcdir)/kbuildprotocolinfofactory.cpp $(srcdir)/kctimefactory.cpp libkbuildsycoca_main_la_meta_unload.cpp d267 3 a269 1 + for file in kbuildsycoca.cpp kbuildservicetypefactory.cpp kbuildservicefactory.cpp kbuildservicegroupfactory.cpp kbuildimageiofactory.cpp kbuildprotocolinfofactory.cpp kctimefactory.cpp libkbuildsycoca_main_la_meta_unload.cpp ; do \ d272 4 a275 2 + done; \ + cat libkbuildsycoca_main_la.all_cpp.final libkbuildsycoca_main_la.all_cpp.files > libkbuildsycoca_main_la.all_cpp.cpp; \ d277 7 a283 3 + +#>+ 11 +libkded_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kded.cpp $(srcdir)/kbuildservicetypefactory.cpp $(srcdir)/kbuildservicefactory.cpp $(srcdir)/kbuildservicegroupfactory.cpp $(srcdir)/kdedmodule.cpp libkded_main_la_meta_unload.cpp d287 3 a289 1 + for file in kded.cpp kbuildservicetypefactory.cpp kbuildservicefactory.cpp kbuildservicegroupfactory.cpp kdedmodule.cpp libkded_main_la_meta_unload.cpp ; do \ d292 4 a295 2 + done; \ + cat libkded_main_la.all_cpp.final libkded_main_la.all_cpp.files > libkded_main_la.all_cpp.cpp; \ a296 26 + +#>+ 11 +kbuildsycoca.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kbuildsycoca_main.cpp @@echo 'creating kbuildsycoca.all_cpp.cpp ...'; \ rm -f kbuildsycoca.all_cpp.files kbuildsycoca.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kbuildsycoca.all_cpp.final; \ - for file in dummy.cpp ; do \ + for file in kbuildsycoca_main.cpp ; do \ echo "#include \"$$file\"" >> kbuildsycoca.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kbuildsycoca.all_cpp.final; \ done; \ @@@@ -858,11 +907,11 @@@@ rm -f kbuildsycoca.all_cpp.final kbuildsycoca.all_cpp.files #>+ 11 -kded.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp +kded.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kded_main.cpp @@echo 'creating kded.all_cpp.cpp ...'; \ rm -f kded.all_cpp.files kded.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kded.all_cpp.final; \ - for file in dummy.cpp ; do \ + for file in kded_main.cpp ; do \ echo "#include \"$$file\"" >> kded.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kded.all_cpp.final; \ done; \ @@@@ -883,20 +932,20 @@@@ d300 2 a301 2 - -rm -f kbuildsycoca_la.all_cpp.cpp kded_la.all_cpp.cpp kbuildsycoca.all_cpp.cpp kded.all_cpp.cpp kdontchangethehostname.all_cpp.cpp + -rm -f kbuildsycoca_la.all_cpp.cpp kded_la.all_cpp.cpp libkbuildsycoca_main_la.all_cpp.cpp libkded_main_la.all_cpp.cpp kbuildsycoca.all_cpp.cpp kded.all_cpp.cpp kdontchangethehostname.all_cpp.cpp d321 13 a333 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 kdelibs3 pkg. @ text @@ 1.1.1.1.2.1 log @file patch-ap was added on branch buildlink2 on 2002-06-23 19:06:18 +0000 @ text @d1 385 @ 1.1.1.1.2.2 log @Merge from pkgsrc-current to buildlink2 branch. @ text @a0 385 $NetBSD: patch-ap,v 1.1.1.1.2.1 2002/06/23 19:06:18 jlam Exp $ --- kded/Makefile.in.orig Tue May 21 15:42:06 2002 +++ kded/Makefile.in @@@@ -283,18 +283,22 @@@@ INCLUDES = -I$(srcdir)/.. -I$(top_srcdir) $(all_includes) -lib_LTLIBRARIES = kded.la kbuildsycoca.la +lib_LTLIBRARIES = libkded_main.la kded.la libkbuildsycoca_main.la kbuildsycoca.la -kded_la_LDFLAGS = $(all_libraries) -module -avoid-version -kded_la_LIBADD = $(LIB_KSYCOCA) -kded_la_SOURCES = kded.cpp kbuildservicetypefactory.cpp \ +libkded_main_la_LDFLAGS = $(all_libraries) +libkded_main_la_LIBADD = $(LIB_KSYCOCA) +libkded_main_la_SOURCES = kded.cpp kbuildservicetypefactory.cpp \ kbuildservicefactory.cpp \ kbuildservicegroupfactory.cpp kdedmodule.cpp -kbuildsycoca_la_LDFLAGS = $(all_libraries) -module -avoid-version -kbuildsycoca_la_LIBADD = $(LIB_KSYCOCA) -kbuildsycoca_la_SOURCES = kbuildsycoca.cpp kbuildservicetypefactory.cpp \ +kded_la_LDFLAGS = $(all_libraries) -module -avoid-version +kded_la_LIBADD = libkded_main.la +kded_la_SOURCES = kded_main.cpp + +libkbuildsycoca_main_la_LDFLAGS = $(all_libraries) +libkbuildsycoca_main_la_LIBADD = $(LIB_KSYCOCA) +libkbuildsycoca_main_la_SOURCES = kbuildsycoca.cpp kbuildservicetypefactory.cpp \ kbuildservicefactory.cpp \ kbuildservicegroupfactory.cpp \ kbuildimageiofactory.cpp \ @@@@ -302,15 +306,19 @@@@ kctimefactory.cpp +kbuildsycoca_la_LDFLAGS = $(all_libraries) -module -avoid-version +kbuildsycoca_la_LIBADD = libkbuildsycoca_main.la +kbuildsycoca_la_SOURCES = kbuildsycoca_main.cpp + bin_PROGRAMS = kded kbuildsycoca kdontchangethehostname kded_LDFLAGS = $(all_libraries) $(KDE_RPATH) -kded_LDADD = $(LIB_KSYCOCA) kded.la -kded_SOURCES = dummy.cpp +kded_LDADD = $(LIB_KSYCOCA) libkded_main.la +kded_SOURCES = kded_main.cpp kbuildsycoca_LDFLAGS = $(all_libraries) $(KDE_RPATH) -kbuildsycoca_LDADD = $(LIB_KSYCOCA) kbuildsycoca.la -kbuildsycoca_SOURCES = dummy.cpp +kbuildsycoca_LDADD = $(LIB_KSYCOCA) libkbuildsycoca_main.la +kbuildsycoca_SOURCES = kbuildsycoca_main.cpp kdontchangethehostname_LDFLAGS = $(all_libraries) $(KDE_RPATH) kdontchangethehostname_LDADD = $(LIB_KDECORE) @@@@ -337,48 +345,58 @@@@ CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) -kbuildsycoca_la_DEPENDENCIES = -am_kbuildsycoca_la_OBJECTS = kbuildsycoca.lo kbuildservicetypefactory.lo \ - kbuildservicefactory.lo kbuildservicegroupfactory.lo \ - kbuildimageiofactory.lo kbuildprotocolinfofactory.lo \ - kctimefactory.lo +kbuildsycoca_la_DEPENDENCIES = libkbuildsycoca_main.la +am_kbuildsycoca_la_OBJECTS = kbuildsycoca_main.lo #>- kbuildsycoca_la_OBJECTS = $(am_kbuildsycoca_la_OBJECTS) +#>+ 1 +kbuildsycoca_la_OBJECTS = kbuildsycoca_main.lo +kded_la_DEPENDENCIES = libkded_main.la +am_kded_la_OBJECTS = kded_main.lo +#>- kded_la_OBJECTS = $(am_kded_la_OBJECTS) +#>+ 1 +kded_la_OBJECTS = kded_main.lo +libkbuildsycoca_main_la_DEPENDENCIES = +am_libkbuildsycoca_main_la_OBJECTS = kbuildsycoca.lo \ + kbuildservicetypefactory.lo kbuildservicefactory.lo \ + kbuildservicegroupfactory.lo kbuildimageiofactory.lo \ + kbuildprotocolinfofactory.lo kctimefactory.lo +#>- libkbuildsycoca_main_la_OBJECTS = $(am_libkbuildsycoca_main_la_OBJECTS) #>+ 8 -kbuildsycoca_la_final_OBJECTS = kbuildsycoca_la.all_cpp.lo -kbuildsycoca_la_nofinal_OBJECTS = kbuildsycoca.lo kbuildservicetypefactory.lo \ - kbuildservicefactory.lo kbuildservicegroupfactory.lo \ - kbuildimageiofactory.lo kbuildprotocolinfofactory.lo \ - kctimefactory.lo \ - kbuildsycoca_la_meta_unload.lo -@@KDE_USE_FINAL_FALSE@@kbuildsycoca_la_OBJECTS = $(kbuildsycoca_la_nofinal_OBJECTS) -@@KDE_USE_FINAL_TRUE@@kbuildsycoca_la_OBJECTS = $(kbuildsycoca_la_final_OBJECTS) -kded_la_DEPENDENCIES = -am_kded_la_OBJECTS = kded.lo kbuildservicetypefactory.lo \ +libkbuildsycoca_main_la_final_OBJECTS = libkbuildsycoca_main_la.all_cpp.lo +libkbuildsycoca_main_la_nofinal_OBJECTS = kbuildsycoca.lo \ + kbuildservicetypefactory.lo kbuildservicefactory.lo \ + kbuildservicegroupfactory.lo kbuildimageiofactory.lo \ + kbuildprotocolinfofactory.lo kctimefactory.lo \ + libkbuildsycoca_main_la_meta_unload.lo +@@KDE_USE_FINAL_FALSE@@libkbuildsycoca_main_la_OBJECTS = $(libkbuildsycoca_main_la_nofinal_OBJECTS) +@@KDE_USE_FINAL_TRUE@@libkbuildsycoca_main_la_OBJECTS = $(libkbuildsycoca_main_la_final_OBJECTS) +libkded_main_la_DEPENDENCIES = +am_libkded_main_la_OBJECTS = kded.lo kbuildservicetypefactory.lo \ kbuildservicefactory.lo kbuildservicegroupfactory.lo \ kdedmodule.lo -#>- kded_la_OBJECTS = $(am_kded_la_OBJECTS) +#>- libkded_main_la_OBJECTS = $(am_libkded_main_la_OBJECTS) #>+ 7 -kded_la_final_OBJECTS = kded_la.all_cpp.lo -kded_la_nofinal_OBJECTS = kded.lo kbuildservicetypefactory.lo \ +libkded_main_la_final_OBJECTS = libkded_main_la.all_cpp.lo +libkded_main_la_nofinal_OBJECTS = kded.lo kbuildservicetypefactory.lo \ kbuildservicefactory.lo kbuildservicegroupfactory.lo \ kdedmodule.lo \ - kded_la_meta_unload.lo -@@KDE_USE_FINAL_FALSE@@kded_la_OBJECTS = $(kded_la_nofinal_OBJECTS) -@@KDE_USE_FINAL_TRUE@@kded_la_OBJECTS = $(kded_la_final_OBJECTS) + libkded_main_la_meta_unload.lo +@@KDE_USE_FINAL_FALSE@@libkded_main_la_OBJECTS = $(libkded_main_la_nofinal_OBJECTS) +@@KDE_USE_FINAL_TRUE@@libkded_main_la_OBJECTS = $(libkded_main_la_final_OBJECTS) bin_PROGRAMS = kded$(EXEEXT) kbuildsycoca$(EXEEXT) \ kdontchangethehostname$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) -am_kbuildsycoca_OBJECTS = dummy.$(OBJEXT) +am_kbuildsycoca_OBJECTS = kbuildsycoca_main.$(OBJEXT) #>- kbuildsycoca_OBJECTS = $(am_kbuildsycoca_OBJECTS) #>+ 1 -kbuildsycoca_OBJECTS = dummy.$(OBJEXT) -kbuildsycoca_DEPENDENCIES = kbuildsycoca.la -am_kded_OBJECTS = dummy.$(OBJEXT) +kbuildsycoca_OBJECTS = kbuildsycoca_main.$(OBJEXT) +kbuildsycoca_DEPENDENCIES = libkbuildsycoca_main.la +am_kded_OBJECTS = kded_main.$(OBJEXT) #>- kded_OBJECTS = $(am_kded_OBJECTS) #>+ 1 -kded_OBJECTS = dummy.$(OBJEXT) -kded_DEPENDENCIES = kded.la +kded_OBJECTS = kded_main.$(OBJEXT) +kded_DEPENDENCIES = libkded_main.la am_kdontchangethehostname_OBJECTS = khostname.$(OBJEXT) #>- kdontchangethehostname_OBJECTS = $(am_kdontchangethehostname_OBJECTS) #>+ 1 @@@@ -391,14 +409,16 @@@@ LDFLAGS = @@LDFLAGS@@ LIBS = @@LIBS@@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp -@@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/dummy.Po \ - @@AMDEP_TRUE@@ $(DEPDIR)/kbuildimageiofactory.Plo \ +@@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/kbuildimageiofactory.Plo \ @@AMDEP_TRUE@@ $(DEPDIR)/kbuildprotocolinfofactory.Plo \ @@AMDEP_TRUE@@ $(DEPDIR)/kbuildservicefactory.Plo \ @@AMDEP_TRUE@@ $(DEPDIR)/kbuildservicegroupfactory.Plo \ @@AMDEP_TRUE@@ $(DEPDIR)/kbuildservicetypefactory.Plo \ @@AMDEP_TRUE@@ $(DEPDIR)/kbuildsycoca.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/kbuildsycoca_main.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/kbuildsycoca_main.Po \ @@AMDEP_TRUE@@ $(DEPDIR)/kctimefactory.Plo $(DEPDIR)/kded.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/kded_main.Plo $(DEPDIR)/kded_main.Po \ @@AMDEP_TRUE@@ $(DEPDIR)/kdedmodule.Plo $(DEPDIR)/khostname.Po #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) @@@@ -420,6 +440,7 @@@@ $(AM_LDFLAGS) $(LDFLAGS) -o $@@ CXXFLAGS = @@CXXFLAGS@@ DIST_SOURCES = $(kbuildsycoca_la_SOURCES) $(kded_la_SOURCES) \ + $(libkbuildsycoca_main_la_SOURCES) $(libkded_main_la_SOURCES) \ $(kbuildsycoca_SOURCES) $(kded_SOURCES) \ $(kdontchangethehostname_SOURCES) DATA = $(servicetype_DATA) $(update_DATA) @@@@ -428,7 +449,7 @@@@ DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) Makefile.am \ Makefile.in -SOURCES = $(kbuildsycoca_la_SOURCES) $(kded_la_SOURCES) $(kbuildsycoca_SOURCES) $(kded_SOURCES) $(kdontchangethehostname_SOURCES) +SOURCES = $(kbuildsycoca_la_SOURCES) $(kded_la_SOURCES) $(libkbuildsycoca_main_la_SOURCES) $(libkded_main_la_SOURCES) $(kbuildsycoca_SOURCES) $(kded_SOURCES) $(kdontchangethehostname_SOURCES) #>- all: all-am #>+ 1 @@@@ -479,6 +500,10 @@@@ $(CXXLINK) -rpath $(libdir) $(kbuildsycoca_la_LDFLAGS) $(kbuildsycoca_la_OBJECTS) $(kbuildsycoca_la_LIBADD) $(LIBS) kded.la: $(kded_la_OBJECTS) $(kded_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kded_la_LDFLAGS) $(kded_la_OBJECTS) $(kded_la_LIBADD) $(LIBS) +libkbuildsycoca_main.la: $(libkbuildsycoca_main_la_OBJECTS) $(libkbuildsycoca_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkbuildsycoca_main_la_LDFLAGS) $(libkbuildsycoca_main_la_OBJECTS) $(libkbuildsycoca_main_la_LIBADD) $(LIBS) +libkded_main.la: $(libkded_main_la_OBJECTS) $(libkded_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkded_main_la_LDFLAGS) $(libkded_main_la_OBJECTS) $(libkded_main_la_LIBADD) $(LIBS) install-binPROGRAMS: $(bin_PROGRAMS) @@$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) @@@@ -519,15 +544,18 @@@@ distclean-compile: -rm -f *.tab.c -@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/dummy.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kbuildimageiofactory.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kbuildprotocolinfofactory.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kbuildservicefactory.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kbuildservicegroupfactory.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kbuildservicetypefactory.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kbuildsycoca.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kbuildsycoca_main.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kbuildsycoca_main.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kctimefactory.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kded.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kded_main.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kded_main.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kdedmodule.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/khostname.Po@@am__quote@@ @@@@ -639,7 +667,7 @@@@ #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=HOWTO README.kded DESIGN kdedmodule.desktop kded.upd kded.h kctimefactory.h +KDE_DIST=README.kded DESIGN kdedmodule.desktop kded.h HOWTO kded.upd kctimefactory.h DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) @@@@ -758,9 +786,6 @@@@ uninstall-info-am uninstall-libLTLIBRARIES \ uninstall-servicetypeDATA uninstall-updateDATA - -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: @@@@ -792,41 +817,41 @@@@ #>+ 12 -kbuildsycoca_la_meta_unload.cpp: kbuildsycoca.moc - @@echo 'creating kbuildsycoca_la_meta_unload.cpp' - @@-rm -f kbuildsycoca_la_meta_unload.cpp +libkbuildsycoca_main_la_meta_unload.cpp: kbuildsycoca.moc + @@echo 'creating libkbuildsycoca_main_la_meta_unload.cpp' + @@-rm -f libkbuildsycoca_main_la_meta_unload.cpp @@if test ${kde_qtver} = 2; then \ - echo 'static const char * _metalist_kbuildsycoca_la[] = {' > kbuildsycoca_la_meta_unload.cpp ;\ - cat kbuildsycoca.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kbuildsycoca_la_meta_unload.cpp ;\ - echo '0};' >> kbuildsycoca_la_meta_unload.cpp ;\ - echo '#include ' >> kbuildsycoca_la_meta_unload.cpp ;\ - echo '_UNLOAD(kbuildsycoca_la)' >> kbuildsycoca_la_meta_unload.cpp ;\ - else echo > kbuildsycoca_la_meta_unload.cpp; fi + echo 'static const char * _metalist_libkbuildsycoca_main_la[] = {' > libkbuildsycoca_main_la_meta_unload.cpp ;\ + cat kbuildsycoca.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkbuildsycoca_main_la_meta_unload.cpp ;\ + echo '0};' >> libkbuildsycoca_main_la_meta_unload.cpp ;\ + echo '#include ' >> libkbuildsycoca_main_la_meta_unload.cpp ;\ + echo '_UNLOAD(libkbuildsycoca_main_la)' >> libkbuildsycoca_main_la_meta_unload.cpp ;\ + else echo > libkbuildsycoca_main_la_meta_unload.cpp; fi #>+ 12 -kded_la_meta_unload.cpp: kded.moc kdedmodule.moc - @@echo 'creating kded_la_meta_unload.cpp' - @@-rm -f kded_la_meta_unload.cpp +libkded_main_la_meta_unload.cpp: kded.moc kdedmodule.moc + @@echo 'creating libkded_main_la_meta_unload.cpp' + @@-rm -f libkded_main_la_meta_unload.cpp @@if test ${kde_qtver} = 2; then \ - echo 'static const char * _metalist_kded_la[] = {' > kded_la_meta_unload.cpp ;\ - cat kded.moc kdedmodule.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kded_la_meta_unload.cpp ;\ - echo '0};' >> kded_la_meta_unload.cpp ;\ - echo '#include ' >> kded_la_meta_unload.cpp ;\ - echo '_UNLOAD(kded_la)' >> kded_la_meta_unload.cpp ;\ - else echo > kded_la_meta_unload.cpp; fi + echo 'static const char * _metalist_libkded_main_la[] = {' > libkded_main_la_meta_unload.cpp ;\ + cat kded.moc kdedmodule.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkded_main_la_meta_unload.cpp ;\ + echo '0};' >> libkded_main_la_meta_unload.cpp ;\ + echo '#include ' >> libkded_main_la_meta_unload.cpp ;\ + echo '_UNLOAD(libkded_main_la)' >> libkded_main_la_meta_unload.cpp ;\ + else echo > libkded_main_la_meta_unload.cpp; fi #>+ 3 clean-moc-classes: - -rm -f kbuildsycoca_la_meta_unload.cpp kded_la_meta_unload.cpp + -rm -f libkbuildsycoca_main_la_meta_unload.cpp libkded_main_la_meta_unload.cpp #>+ 11 -kbuildsycoca_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kbuildsycoca.cpp $(srcdir)/kbuildservicetypefactory.cpp $(srcdir)/kbuildservicefactory.cpp $(srcdir)/kbuildservicegroupfactory.cpp $(srcdir)/kbuildimageiofactory.cpp $(srcdir)/kbuildprotocolinfofactory.cpp $(srcdir)/kctimefactory.cpp kbuildsycoca_la_meta_unload.cpp kded.moc kdedmodule.moc kbuildsycoca.moc +kbuildsycoca_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kbuildsycoca_main.cpp kded.moc kdedmodule.moc kbuildsycoca.moc @@echo 'creating kbuildsycoca_la.all_cpp.cpp ...'; \ rm -f kbuildsycoca_la.all_cpp.files kbuildsycoca_la.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kbuildsycoca_la.all_cpp.final; \ - for file in kbuildsycoca.cpp kbuildservicetypefactory.cpp kbuildservicefactory.cpp kbuildservicegroupfactory.cpp kbuildimageiofactory.cpp kbuildprotocolinfofactory.cpp kctimefactory.cpp kbuildsycoca_la_meta_unload.cpp ; do \ + for file in kbuildsycoca_main.cpp ; do \ echo "#include \"$$file\"" >> kbuildsycoca_la.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kbuildsycoca_la.all_cpp.final; \ done; \ @@@@ -834,11 +859,11 @@@@ rm -f kbuildsycoca_la.all_cpp.final kbuildsycoca_la.all_cpp.files #>+ 11 -kded_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kded.cpp $(srcdir)/kbuildservicetypefactory.cpp $(srcdir)/kbuildservicefactory.cpp $(srcdir)/kbuildservicegroupfactory.cpp $(srcdir)/kdedmodule.cpp kded_la_meta_unload.cpp +kded_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kded_main.cpp @@echo 'creating kded_la.all_cpp.cpp ...'; \ rm -f kded_la.all_cpp.files kded_la.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kded_la.all_cpp.final; \ - for file in kded.cpp kbuildservicetypefactory.cpp kbuildservicefactory.cpp kbuildservicegroupfactory.cpp kdedmodule.cpp kded_la_meta_unload.cpp ; do \ + for file in kded_main.cpp ; do \ echo "#include \"$$file\"" >> kded_la.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kded_la.all_cpp.final; \ done; \ @@@@ -846,11 +871,35 @@@@ rm -f kded_la.all_cpp.final kded_la.all_cpp.files #>+ 11 -kbuildsycoca.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp +libkbuildsycoca_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kbuildsycoca.cpp $(srcdir)/kbuildservicetypefactory.cpp $(srcdir)/kbuildservicefactory.cpp $(srcdir)/kbuildservicegroupfactory.cpp $(srcdir)/kbuildimageiofactory.cpp $(srcdir)/kbuildprotocolinfofactory.cpp $(srcdir)/kctimefactory.cpp libkbuildsycoca_main_la_meta_unload.cpp + @@echo 'creating libkbuildsycoca_main_la.all_cpp.cpp ...'; \ + rm -f libkbuildsycoca_main_la.all_cpp.files libkbuildsycoca_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkbuildsycoca_main_la.all_cpp.final; \ + for file in kbuildsycoca.cpp kbuildservicetypefactory.cpp kbuildservicefactory.cpp kbuildservicegroupfactory.cpp kbuildimageiofactory.cpp kbuildprotocolinfofactory.cpp kctimefactory.cpp libkbuildsycoca_main_la_meta_unload.cpp ; do \ + echo "#include \"$$file\"" >> libkbuildsycoca_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkbuildsycoca_main_la.all_cpp.final; \ + done; \ + cat libkbuildsycoca_main_la.all_cpp.final libkbuildsycoca_main_la.all_cpp.files > libkbuildsycoca_main_la.all_cpp.cpp; \ + rm -f libkbuildsycoca_main_la.all_cpp.final libkbuildsycoca_main_la.all_cpp.files + +#>+ 11 +libkded_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kded.cpp $(srcdir)/kbuildservicetypefactory.cpp $(srcdir)/kbuildservicefactory.cpp $(srcdir)/kbuildservicegroupfactory.cpp $(srcdir)/kdedmodule.cpp libkded_main_la_meta_unload.cpp + @@echo 'creating libkded_main_la.all_cpp.cpp ...'; \ + rm -f libkded_main_la.all_cpp.files libkded_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkded_main_la.all_cpp.final; \ + for file in kded.cpp kbuildservicetypefactory.cpp kbuildservicefactory.cpp kbuildservicegroupfactory.cpp kdedmodule.cpp libkded_main_la_meta_unload.cpp ; do \ + echo "#include \"$$file\"" >> libkded_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkded_main_la.all_cpp.final; \ + done; \ + cat libkded_main_la.all_cpp.final libkded_main_la.all_cpp.files > libkded_main_la.all_cpp.cpp; \ + rm -f libkded_main_la.all_cpp.final libkded_main_la.all_cpp.files + +#>+ 11 +kbuildsycoca.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kbuildsycoca_main.cpp @@echo 'creating kbuildsycoca.all_cpp.cpp ...'; \ rm -f kbuildsycoca.all_cpp.files kbuildsycoca.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kbuildsycoca.all_cpp.final; \ - for file in dummy.cpp ; do \ + for file in kbuildsycoca_main.cpp ; do \ echo "#include \"$$file\"" >> kbuildsycoca.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kbuildsycoca.all_cpp.final; \ done; \ @@@@ -858,11 +907,11 @@@@ rm -f kbuildsycoca.all_cpp.final kbuildsycoca.all_cpp.files #>+ 11 -kded.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp +kded.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kded_main.cpp @@echo 'creating kded.all_cpp.cpp ...'; \ rm -f kded.all_cpp.files kded.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kded.all_cpp.final; \ - for file in dummy.cpp ; do \ + for file in kded_main.cpp ; do \ echo "#include \"$$file\"" >> kded.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kded.all_cpp.final; \ done; \ @@@@ -883,20 +932,20 @@@@ #>+ 3 clean-final: - -rm -f kbuildsycoca_la.all_cpp.cpp kded_la.all_cpp.cpp kbuildsycoca.all_cpp.cpp kded.all_cpp.cpp kdontchangethehostname.all_cpp.cpp + -rm -f kbuildsycoca_la.all_cpp.cpp kded_la.all_cpp.cpp libkbuildsycoca_main_la.all_cpp.cpp libkded_main_la.all_cpp.cpp kbuildsycoca.all_cpp.cpp kded.all_cpp.cpp kdontchangethehostname.all_cpp.cpp #>+ 2 final: - $(MAKE) kbuildsycoca_la_OBJECTS="$(kbuildsycoca_la_final_OBJECTS)" kded_la_OBJECTS="$(kded_la_final_OBJECTS)" all-am + $(MAKE) libkbuildsycoca_main_la_OBJECTS="$(libkbuildsycoca_main_la_final_OBJECTS)" libkded_main_la_OBJECTS="$(libkded_main_la_final_OBJECTS)" all-am #>+ 2 final-install: - $(MAKE) kbuildsycoca_la_OBJECTS="$(kbuildsycoca_la_final_OBJECTS)" kded_la_OBJECTS="$(kded_la_final_OBJECTS)" install-am + $(MAKE) libkbuildsycoca_main_la_OBJECTS="$(libkbuildsycoca_main_la_final_OBJECTS)" libkded_main_la_OBJECTS="$(libkded_main_la_final_OBJECTS)" install-am #>+ 2 no-final: - $(MAKE) kbuildsycoca_la_OBJECTS="$(kbuildsycoca_la_nofinal_OBJECTS)" kded_la_OBJECTS="$(kded_la_nofinal_OBJECTS)" all-am + $(MAKE) libkbuildsycoca_main_la_OBJECTS="$(libkbuildsycoca_main_la_nofinal_OBJECTS)" libkded_main_la_OBJECTS="$(libkded_main_la_nofinal_OBJECTS)" all-am #>+ 2 no-final-install: - $(MAKE) kbuildsycoca_la_OBJECTS="$(kbuildsycoca_la_nofinal_OBJECTS)" kded_la_OBJECTS="$(kded_la_nofinal_OBJECTS)" install-am + $(MAKE) libkbuildsycoca_main_la_OBJECTS="$(libkbuildsycoca_main_la_nofinal_OBJECTS)" libkded_main_la_OBJECTS="$(libkded_main_la_nofinal_OBJECTS)" install-am #>+ 3 cvs-clean: $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean @