head 1.11; access; symbols pkgsrc-2013Q2:1.11.0.26 pkgsrc-2013Q2-base:1.11 pkgsrc-2012Q4:1.11.0.24 pkgsrc-2012Q4-base:1.11 pkgsrc-2011Q4:1.11.0.22 pkgsrc-2011Q4-base:1.11 pkgsrc-2011Q2:1.11.0.20 pkgsrc-2011Q2-base:1.11 pkgsrc-2009Q4:1.11.0.18 pkgsrc-2009Q4-base:1.11 pkgsrc-2008Q4:1.11.0.16 pkgsrc-2008Q4-base:1.11 pkgsrc-2008Q3:1.11.0.14 pkgsrc-2008Q3-base:1.11 cube-native-xorg:1.11.0.12 cube-native-xorg-base:1.11 pkgsrc-2008Q2:1.11.0.10 pkgsrc-2008Q2-base:1.11 pkgsrc-2008Q1:1.11.0.8 pkgsrc-2008Q1-base:1.11 pkgsrc-2007Q4:1.11.0.6 pkgsrc-2007Q4-base:1.11 pkgsrc-2007Q3:1.11.0.4 pkgsrc-2007Q3-base:1.11 pkgsrc-2007Q2:1.11.0.2 pkgsrc-2007Q2-base:1.11 pkgsrc-2007Q1:1.10.0.2 pkgsrc-2007Q1-base:1.10 pkgsrc-2006Q4:1.9.0.6 pkgsrc-2006Q4-base:1.9 pkgsrc-2006Q3:1.9.0.4 pkgsrc-2006Q3-base:1.9 pkgsrc-2006Q2:1.9.0.2 pkgsrc-2006Q2-base:1.9 pkgsrc-2006Q1:1.8.0.16 pkgsrc-2006Q1-base:1.8 pkgsrc-2005Q4:1.8.0.14 pkgsrc-2005Q4-base:1.8 pkgsrc-2005Q3:1.8.0.12 pkgsrc-2005Q3-base:1.8 pkgsrc-2005Q2:1.8.0.10 pkgsrc-2005Q2-base:1.8 pkgsrc-2005Q1:1.8.0.8 pkgsrc-2005Q1-base:1.8 pkgsrc-2004Q4:1.8.0.6 pkgsrc-2004Q4-base:1.8 pkgsrc-2004Q3:1.8.0.4 pkgsrc-2004Q3-base:1.8 pkgsrc-2004Q2:1.8.0.2 pkgsrc-2004Q2-base:1.8 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.11 date 2007.05.23.12.57.46; author markd; state dead; branches; next 1.10; 1.10 date 2007.04.06.12.59.18; author markd; state Exp; branches; next 1.9; 1.9 date 2006.06.01.13.39.10; author markd; state dead; branches; next 1.8; 1.8 date 2004.04.26.11.24.15; author markd; state Exp; branches; next 1.7; 1.7 date 2004.02.04.13.58.39; author markd; state dead; branches; 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.51; author jlam; state Exp; branches; next 1.1; 1.1 date 2002.05.31.13.16.44; author skrll; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2002.05.31.13.16.44; author skrll; state Exp; branches 1.1.1.1.2.1; next ; 1.1.1.1.2.1 date 2002.05.31.13.16.44; author jlam; state dead; branches; next 1.1.1.1.2.2; 1.1.1.1.2.2 date 2002.06.23.19.06.13; author jlam; state Exp; branches; next ; desc @@ 1.11 log @Update to KDE 3.5.7 KHTML * Implement heuristic cyr encoding detection. * Implement support for textContent(). * Indicate near mouse pointer if a link wants to open a new browser window. * Harmonize document.href and .pathname of about:blank windows with other browsers. * Fix jumping to the top right before loading a new page. * Make frame name lookup locale-independant. * Make valueOf() and toString() accessible across sites. * Make setValue() work on radio button and checkboxes. * overrideMimeType() implementation. * Fix various crashes and bugs. KJS * Support named function expressions. * Support for localeCompare() function. * Caller property implementation. * Improvements: * Unreserve class keyword as it's often used as an identifier by JS programmers. * Disable UTF-8 validation in libPCRE, since it's incredibly slow. * Support unicode escape sequences in identifier names. * Parse null characters. * toExponential() fix for negative numbers. * Fixed off-by-one digit error in toFixed(). Kate * Update cmake highlighter. * Fix bug in search and replace, placeholder did not work correctly. * Make cursor in inactive views behave correctly. * Update selection after paste. * Multiple views are usable again. Kimgio * Fix buffer overflow during writing xview files. @ text @$NetBSD: patch-ag,v 1.10 2007/04/06 12:59:18 markd Exp $ ------------------------------------------------------------------------ r645387 | porten | 2007-03-22 15:01:13 +0100 (Thu, 22 Mar 2007) | 4 lines substitute some of the invalid sequences with the standard replacement char. this matches Mozilla but not IE which leaves them unchanged (or throws an exception) ------------------------------------------------------------------------ --- kjs/function.cpp +++ kjs/function.cpp @@@@ -244,11 +244,15 @@@@ UString decodeURI(ExecState *exec, UStri } // UTF-8 transform + const unsigned long replacementChar = 0xFFFD; unsigned long V; if (n == 2) { unsigned long yyyyy = octets[0] & 0x1F; unsigned long zzzzzz = octets[1] & 0x3F; V = (yyyyy << 6) | zzzzzz; + // 2-byte sequence overlong for this value? + if (V < 0xFF) + V = replacementChar; C = UChar((unsigned short)V); } else if (n == 3) { @@@@ -256,6 +260,11 @@@@ UString decodeURI(ExecState *exec, UStri unsigned long yyyyyy = octets[1] & 0x3F; unsigned long zzzzzz = octets[2] & 0x3F; V = (xxxx << 12) | (yyyyyy << 6) | zzzzzz; + // 3-byte sequence overlong for this value, + // an invalid value or UTF-16 surrogate? + if (V < 0x800 || V == 0xFFFE || V == 0xFFFF || + (V >= 0xD800 && V <= 0xDFFF)) + V = replacementChar; C = UChar((unsigned short)V); } else { @ 1.10 log @ioslave PASV port scanning vulnerability (CVE-2007-1564) fix. plus fix against KJS for similar issue to the Qt UTF-8 overlong sequence decoding vulnerability. Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD$ @ 1.9 log @Update to KDE 3.5.3 Changes: * KHTML o Don't crash when triple-clicking on a line that has :after or :before content, or anything that isn't in the DOM o Implement nondeterministic CSS matching o Do not crash if an old target got destroyed. o Fix static Y position of positioned objects in initial whitespace (3.5 regression). o Fontrendering: A few percent speedup by caching font scalability info o Konqueror will crash if a floated link uses :hover:before or :hover:after to create a positioned element. o Text selection misbehaves for devanagari. o Fix crash when hovering a HTML menu item o Don't crash when null pointer passed to removeEventListener o Prevent an infinite loop in parseToken() when dealing with broken HTML. o If we saved creating a renderer at attach. Create it if we later need it. o Don't allow to find text in password fields. o Improve XHTML CSS styling o Handle CSS restyling for all types of dynamic DOM changes and user interaction o Only repaint the expossed background when scrolling. Optimizes a few slow pages with unoptimized X11 drivers. o Speed-up painting and selections on pages with large tables. o Match better the error-handling capabilities of Firefox with respect to DL/DT/DD elements. o Added missing sanity check which caused crashes in caret mode on pgup/pgdn when there was no valid caret. o Make sure copyBlt doesn't fail because of different depth. o No other property depends on background-image, and applying it before the rest of the background short-hand breaks it under inheritance. * KIO o Add media kioslave support to KFileDialog o KPropertiesDialog first renames the file, then allows all plugins to save their changes. o Make KDirSelectDialog work with media:/ and similar. Fixes JuK. * KDEPrint o Fix usage of private methods in CUPS which broke KDEPrint with CUPS 1.2 o Allow adding multiple file to the to-be-printed list. o No fax sent when special characters are included in the sender information o Kdeprintfax ignores paper size setting when using Hylafax * KDE-UI o Use KConfigGroup to reset the config group automatically. o Give a possibility to disable spellchecking. * KIO-Slaves o KIO-HTTP o Keep the fragment when doing redirections. (the HTTP requests and redirections don't include fragments; it's a browser thing). @ text @d1 1 a1 1 $NetBSD: patch-ag,v 1.8 2004/04/26 11:24:15 markd Exp $ d3 38 a40 26 --- kio/kio/global.cpp.orig 2004-04-04 21:08:52.000000000 +1200 +++ kio/kio/global.cpp @@@@ -1390,7 +1390,11 @@@@ QString KIO::findDeviceMountPoint( const #ifdef HAVE_GETMNTINFO +#ifdef ST_RDONLY + struct statvfs *mounted; +#else struct statfs *mounted; +#endif int num_fs = getmntinfo(&mounted, MNT_NOWAIT); @@@@ -1656,7 +1660,11 @@@@ static QString get_mount_info(const QStr #ifdef HAVE_GETMNTINFO +#ifdef ST_RDONLY + struct statvfs *mounted; +#else struct statfs *mounted; +#endif char realpath_buffer[MAXPATHLEN]; int num_fs = getmntinfo(&mounted, MNT_NOWAIT); @ 1.8 log @statfs -> statvfs in current. Patch from John R. Shannon in PR 25324 with suggestion from Christos Zoulas @ 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-ag,v 1.6 2004/01/15 09:52:51 markd Exp $ d3 3 a5 5 --- dcop/Makefile.in.orig 2003-12-29 11:16:52.000000000 +1300 +++ dcop/Makefile.in @@@@ -406,7 +406,7 @@@@ INCLUDES = $(all_includes) bin_PROGRAMS = dcopserver dcopserver_shutdown check_PROGRAMS = testdcop testdcopc d7 1 a7 4 -lib_LTLIBRARIES = libDCOP.la dcopserver.la +lib_LTLIBRARIES = libDCOP.la libdcopserver_main.la dcopserver.la libDCOP_la_LIBADD = KDE-ICE/libkICE.la $(LIB_QT) libDCOP_la_LDFLAGS = $(KDE_RPATH) -version-info 5:0:1 -no-undefined $(all_libraries) d9 5 a13 3 @@@@ -418,13 +418,17 @@@@ noinst_HEADERS = version.h dcopglobal.h # dcopstub needs to go first for --enable-final to work libDCOP_la_SOURCES = dcopstub.cpp dcopref.cpp dcopobject.cpp dcopclient.cpp d15 1 a15 9 +libdcopserver_main_la_LDFLAGS = $(all_libraries) +libdcopserver_main_la_SOURCES = dcopserver.cpp dcopsignals.cpp +libdcopserver_main_la_LIBADD = libDCOP.la + dcopserver_la_LDFLAGS = -module -avoid-version $(all_libraries) -dcopserver_la_SOURCES = dcopserver.cpp dcopsignals.cpp -dcopserver_la_LIBADD = libDCOP.la +dcopserver_la_SOURCES = dcopserver_main.cpp +dcopserver_la_LIBADD = libdcopserver_main.la d17 1 a17 5 dcopserver_LDFLAGS = $(KDE_RPATH) $(all_libraries) -dcopserver_SOURCES = dummy.cpp -dcopserver_LDADD = dcopserver.la +dcopserver_SOURCES = dcopserver_main.cpp +dcopserver_LDADD = libdcopserver_main.la d19 1 a19 1 dcopserver_shutdown_SOURCES = dcopserver_shutdown.c d21 6 a26 3 @@@@ -447,14 +451,11 @@@@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = dcop-path.h LTLIBRARIES = $(lib_LTLIBRARIES) d28 1 a28 248 -dcopserver_la_DEPENDENCIES = libDCOP.la -am_dcopserver_la_OBJECTS = dcopserver.lo dcopsignals.lo +dcopserver_la_DEPENDENCIES = libdcopserver_main.la +am_dcopserver_la_OBJECTS = dcopserver_main.lo #>- dcopserver_la_OBJECTS = $(am_dcopserver_la_OBJECTS) -#>+ 4 -dcopserver_la_final_OBJECTS = dcopserver_la.all_cpp.lo -dcopserver_la_nofinal_OBJECTS = dcopserver.lo dcopsignals.lo -@@KDE_USE_FINAL_FALSE@@dcopserver_la_OBJECTS = $(dcopserver_la_nofinal_OBJECTS) -@@KDE_USE_FINAL_TRUE@@dcopserver_la_OBJECTS = $(dcopserver_la_final_OBJECTS) +#>+ 1 +dcopserver_la_OBJECTS = dcopserver_main.lo libDCOP_la_DEPENDENCIES = KDE-ICE/libkICE.la am_libDCOP_la_OBJECTS = dcopstub.lo dcopref.lo dcopobject.lo \ dcopclient.lo @@@@ -465,15 +466,23 @@@@ libDCOP_la_nofinal_OBJECTS = dcopstub.lo dcopclient.lo @@KDE_USE_FINAL_FALSE@@libDCOP_la_OBJECTS = $(libDCOP_la_nofinal_OBJECTS) @@KDE_USE_FINAL_TRUE@@libDCOP_la_OBJECTS = $(libDCOP_la_final_OBJECTS) +libdcopserver_main_la_DEPENDENCIES = libDCOP.la +am_libdcopserver_main_la_OBJECTS = dcopserver.lo dcopsignals.lo +#>- libdcopserver_main_la_OBJECTS = $(am_libdcopserver_main_la_OBJECTS) +#>+ 4 +libdcopserver_main_la_final_OBJECTS = libdcopserver_main_la.all_cpp.lo +libdcopserver_main_la_nofinal_OBJECTS = dcopserver.lo dcopsignals.lo +@@KDE_USE_FINAL_FALSE@@libdcopserver_main_la_OBJECTS = $(libdcopserver_main_la_nofinal_OBJECTS) +@@KDE_USE_FINAL_TRUE@@libdcopserver_main_la_OBJECTS = $(libdcopserver_main_la_final_OBJECTS) bin_PROGRAMS = dcopserver$(EXEEXT) dcopserver_shutdown$(EXEEXT) check_PROGRAMS = testdcop$(EXEEXT) testdcopc$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) -am_dcopserver_OBJECTS = dummy.$(OBJEXT) +am_dcopserver_OBJECTS = dcopserver_main.$(OBJEXT) #>- dcopserver_OBJECTS = $(am_dcopserver_OBJECTS) #>+ 1 -dcopserver_OBJECTS = dummy.$(OBJEXT) -dcopserver_DEPENDENCIES = dcopserver.la +dcopserver_OBJECTS = dcopserver_main.$(OBJEXT) +dcopserver_DEPENDENCIES = libdcopserver_main.la am_dcopserver_shutdown_OBJECTS = dcopserver_shutdown.$(OBJEXT) #>- dcopserver_shutdown_OBJECTS = $(am_dcopserver_shutdown_OBJECTS) #>+ 1 @@@@ -501,25 +510,31 @@@@ am__depfiles_maybe = depfiles #>- @@AMDEP_TRUE@@DEP_FILES = ./$(DEPDIR)/dcopc.Po ./$(DEPDIR)/dcopclient.Plo \ #>- @@AMDEP_TRUE@@ ./$(DEPDIR)/dcopobject.Plo ./$(DEPDIR)/dcopref.Plo \ #>- @@AMDEP_TRUE@@ ./$(DEPDIR)/dcopserver.Plo \ +#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/dcopserver_main.Plo \ +#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/dcopserver_main.Po \ #>- @@AMDEP_TRUE@@ ./$(DEPDIR)/dcopserver_shutdown.Po \ #>- @@AMDEP_TRUE@@ ./$(DEPDIR)/dcopsignals.Plo \ -#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/dcopstub.Plo ./$(DEPDIR)/dummy.Po \ -#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/testdcop.Po ./$(DEPDIR)/testdcopc.Po -#>+ 15 -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@DEP_FILES = $(DEPDIR)/dcopserver_la.all_cpp.P $(DEPDIR)/libDCOP_la.all_cpp.P ./$(DEPDIR)/dcopc.Po ./$(DEPDIR)/dcopclient.Plo \ +#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/dcopstub.Plo ./$(DEPDIR)/testdcop.Po \ +#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/testdcopc.Po +#>+ 19 +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@DEP_FILES = $(DEPDIR)/libDCOP_la.all_cpp.P $(DEPDIR)/libdcopserver_main_la.all_cpp.P ./$(DEPDIR)/dcopc.Po ./$(DEPDIR)/dcopclient.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/dcopobject.Plo ./$(DEPDIR)/dcopref.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/dcopserver.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/dcopserver_main.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/dcopserver_main.Po \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/dcopserver_shutdown.Po \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/dcopsignals.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/dcopstub.Plo ./$(DEPDIR)/dummy.Po \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/testdcop.Po ./$(DEPDIR)/testdcopc.Po +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/dcopstub.Plo ./$(DEPDIR)/testdcop.Po \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/testdcopc.Po @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@DEP_FILES = ./$(DEPDIR)/dcopc.Po ./$(DEPDIR)/dcopclient.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/dcopobject.Plo ./$(DEPDIR)/dcopref.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/dcopserver.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/dcopserver_main.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/dcopserver_main.Po \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/dcopserver_shutdown.Po \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/dcopsignals.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/dcopstub.Plo ./$(DEPDIR)/dummy.Po \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/testdcop.Po ./$(DEPDIR)/testdcopc.Po +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/dcopstub.Plo ./$(DEPDIR)/testdcop.Po \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/testdcopc.Po COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@@@ -547,8 +562,9 @@@@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@@ DIST_SOURCES = $(dcopserver_la_SOURCES) $(libDCOP_la_SOURCES) \ - $(dcopserver_SOURCES) $(dcopserver_shutdown_SOURCES) \ - $(testdcop_SOURCES) $(testdcopc_SOURCES) + $(libdcopserver_main_la_SOURCES) $(dcopserver_SOURCES) \ + $(dcopserver_shutdown_SOURCES) $(testdcop_SOURCES) \ + $(testdcopc_SOURCES) HEADERS = $(include_HEADERS) $(noinst_HEADERS) @@@@ -561,7 +577,7 @@@@ DIST_COMMON = $(include_HEADERS) $(noins $(srcdir)/../admin/Doxyfile.am Makefile.am Makefile.in \ dcop-path.h.in DIST_SUBDIRS = $(SUBDIRS) -SOURCES = $(dcopserver_la_SOURCES) $(libDCOP_la_SOURCES) $(dcopserver_SOURCES) $(dcopserver_shutdown_SOURCES) $(testdcop_SOURCES) $(testdcopc_SOURCES) +SOURCES = $(dcopserver_la_SOURCES) $(libDCOP_la_SOURCES) $(libdcopserver_main_la_SOURCES) $(dcopserver_SOURCES) $(dcopserver_shutdown_SOURCES) $(testdcop_SOURCES) $(testdcopc_SOURCES) #>- all: all-recursive #>+ 1 @@@@ -615,6 +631,8 @@@@ dcopserver.la: $(dcopserver_la_OBJECTS) @@KDE_USE_CLOSURE_TRUE@@libDCOP.la: libDCOP.la.closure $(libDCOP_la_OBJECTS) $(libDCOP_la_DEPENDENCIES) @@KDE_USE_CLOSURE_FALSE@@libDCOP.la: $(libDCOP_la_OBJECTS) $(libDCOP_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(libDCOP_la_LDFLAGS) $(libDCOP_la_OBJECTS) $(libDCOP_la_LIBADD) $(LIBS) +libdcopserver_main.la: $(libdcopserver_main_la_OBJECTS) $(libdcopserver_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libdcopserver_main_la_LDFLAGS) $(libdcopserver_main_la_OBJECTS) $(libdcopserver_main_la_LIBADD) $(LIBS) binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @@$(NORMAL_INSTALL) @@@@ -675,10 +693,11 @@@@ distclean-compile: @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/dcopobject.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/dcopref.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/dcopserver.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/dcopserver_main.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/dcopserver_main.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/dcopserver_shutdown.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/dcopsignals.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/dcopstub.Plo@@am__quote@@ -@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/dummy.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/testdcop.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/testdcopc.Po@@am__quote@@ @@@@ -904,7 +923,7 @@@@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=dcopc.h configure.in.in +KDE_DIST=configure.in.in Makefile.in.rej dcopc.h DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) @@@@ -1064,9 +1083,6 @@@@ uninstall-info: uninstall-info-recursive uninstall-info-recursive uninstall-libLTLIBRARIES \ uninstall-local uninstall-recursive - -dummy.cpp: - echo > dummy.cpp apidox-am-yes: @@if test "$(subdir)" != "."; then \ $(mkinstalldirs) $(top_builddir)/apidocs/$(subdir) ;\ @@@@ -1250,17 +1266,17 @@@@ testdcop.moc: $(srcdir)/testdcop.h #>+ 1 mocs: testdcop.moc #>+ 3 -dcopserver.moc: $(srcdir)/dcopserver.h - $(MOC) $(srcdir)/dcopserver.h -o dcopserver.moc - -#>+ 1 -mocs: dcopserver.moc -#>+ 3 dcopclient.moc: $(srcdir)/dcopclient.h $(MOC) $(srcdir)/dcopclient.h -o dcopclient.moc #>+ 1 mocs: dcopclient.moc +#>+ 3 +dcopserver.moc: $(srcdir)/dcopserver.h + $(MOC) $(srcdir)/dcopserver.h -o dcopserver.moc + +#>+ 1 +mocs: dcopserver.moc #>+ 8 libDCOP.la.closure: $(libDCOP_la_OBJECTS) $(libDCOP_la_DEPENDENCIES) @@echo "int main() {return 0;}" > libDCOP_la_closure.cpp @@@@ -1272,7 +1288,7 @@@@ libDCOP.la.closure: $(libDCOP_la_OBJECTS #>+ 3 clean-metasources: - -rm -f testdcop.moc dcopserver.moc dcopclient.moc + -rm -f testdcop.moc dcopclient.moc dcopserver.moc #>+ 3 clean-closures: @@@@ -1289,18 +1305,6 @@@@ force-reedit: #>+ 11 -dcopserver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dcopserver.cpp $(srcdir)/dcopsignals.cpp dcopserver.moc - @@echo 'creating dcopserver_la.all_cpp.cpp ...'; \ - rm -f dcopserver_la.all_cpp.files dcopserver_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> dcopserver_la.all_cpp.final; \ - for file in dcopserver.cpp dcopsignals.cpp ; do \ - echo "#include \"$$file\"" >> dcopserver_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> dcopserver_la.all_cpp.final; \ - done; \ - cat dcopserver_la.all_cpp.final dcopserver_la.all_cpp.files > dcopserver_la.all_cpp.cpp; \ - rm -f dcopserver_la.all_cpp.final dcopserver_la.all_cpp.files - -#>+ 11 libDCOP_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dcopstub.cpp $(srcdir)/dcopref.cpp $(srcdir)/dcopobject.cpp $(srcdir)/dcopclient.cpp dcopclient.moc @@echo 'creating libDCOP_la.all_cpp.cpp ...'; \ rm -f libDCOP_la.all_cpp.files libDCOP_la.all_cpp.final; \ @@@@ -1312,22 +1316,34 @@@@ libDCOP_la.all_cpp.cpp: $(srcdir)/Makefi cat libDCOP_la.all_cpp.final libDCOP_la.all_cpp.files > libDCOP_la.all_cpp.cpp; \ rm -f libDCOP_la.all_cpp.final libDCOP_la.all_cpp.files +#>+ 11 +libdcopserver_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dcopserver.cpp $(srcdir)/dcopsignals.cpp dcopserver.moc + @@echo 'creating libdcopserver_main_la.all_cpp.cpp ...'; \ + rm -f libdcopserver_main_la.all_cpp.files libdcopserver_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libdcopserver_main_la.all_cpp.final; \ + for file in dcopserver.cpp dcopsignals.cpp ; do \ + echo "#include \"$$file\"" >> libdcopserver_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libdcopserver_main_la.all_cpp.final; \ + done; \ + cat libdcopserver_main_la.all_cpp.final libdcopserver_main_la.all_cpp.files > libdcopserver_main_la.all_cpp.cpp; \ + rm -f libdcopserver_main_la.all_cpp.final libdcopserver_main_la.all_cpp.files + #>+ 3 clean-final: - -rm -f dcopserver_la.all_cpp.cpp libDCOP_la.all_cpp.cpp + -rm -f libDCOP_la.all_cpp.cpp libdcopserver_main_la.all_cpp.cpp #>+ 2 final: - $(MAKE) dcopserver_la_OBJECTS="$(dcopserver_la_final_OBJECTS)" libDCOP_la_OBJECTS="$(libDCOP_la_final_OBJECTS)" testdcopc_OBJECTS="$(testdcopc_final_OBJECTS)" all-am + $(MAKE) libDCOP_la_OBJECTS="$(libDCOP_la_final_OBJECTS)" libdcopserver_main_la_OBJECTS="$(libdcopserver_main_la_final_OBJECTS)" testdcopc_OBJECTS="$(testdcopc_final_OBJECTS)" all-am #>+ 2 final-install: - $(MAKE) dcopserver_la_OBJECTS="$(dcopserver_la_final_OBJECTS)" libDCOP_la_OBJECTS="$(libDCOP_la_final_OBJECTS)" testdcopc_OBJECTS="$(testdcopc_final_OBJECTS)" install-am + $(MAKE) libDCOP_la_OBJECTS="$(libDCOP_la_final_OBJECTS)" libdcopserver_main_la_OBJECTS="$(libdcopserver_main_la_final_OBJECTS)" testdcopc_OBJECTS="$(testdcopc_final_OBJECTS)" install-am #>+ 2 no-final: - $(MAKE) dcopserver_la_OBJECTS="$(dcopserver_la_nofinal_OBJECTS)" libDCOP_la_OBJECTS="$(libDCOP_la_nofinal_OBJECTS)" testdcopc_OBJECTS="$(testdcopc_nofinal_OBJECTS)" all-am + $(MAKE) libDCOP_la_OBJECTS="$(libDCOP_la_nofinal_OBJECTS)" libdcopserver_main_la_OBJECTS="$(libdcopserver_main_la_nofinal_OBJECTS)" testdcopc_OBJECTS="$(testdcopc_nofinal_OBJECTS)" all-am #>+ 2 no-final-install: - $(MAKE) dcopserver_la_OBJECTS="$(dcopserver_la_nofinal_OBJECTS)" libDCOP_la_OBJECTS="$(libDCOP_la_nofinal_OBJECTS)" testdcopc_OBJECTS="$(testdcopc_nofinal_OBJECTS)" install-am + $(MAKE) libDCOP_la_OBJECTS="$(libDCOP_la_nofinal_OBJECTS)" libdcopserver_main_la_OBJECTS="$(libdcopserver_main_la_nofinal_OBJECTS)" testdcopc_OBJECTS="$(testdcopc_nofinal_OBJECTS)" install-am #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean @@@@ -1337,9 +1353,9 @@@@ kde-rpo-clean: -rm -f *.rpo #>+ 7 -dcopclient.o: dcopclient.moc dcopclient.lo: dcopclient.moc testdcop.lo: testdcop.moc dcopserver.o: dcopserver.moc -dcopserver.lo: dcopserver.moc +dcopclient.o: dcopclient.moc testdcop.o: testdcop.moc +dcopserver.lo: dcopserver.moc @ 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 --- dcop/Makefile.in.orig Thu May 8 05:24:03 2003 d5 1 a5 1 @@@@ -404,7 +404,7 @@@@ INCLUDES = $(all_includes) d14 1 a14 1 @@@@ -420,13 +420,17 @@@@ noinst_HEADERS = version.h dcopglobal.h d36 1 a36 1 @@@@ -448,14 +452,11 @@@@ CONFIG_HEADER = $(top_builddir)/config.h d55 1 a55 1 @@@@ -466,15 +467,23 @@@@ libDCOP_la_nofinal_OBJECTS = dcopstub.lo d82 1 a82 1 @@@@ -502,25 +511,31 @@@@ am__depfiles_maybe = depfiles d122 1 a122 1 @@@@ -548,8 +563,9 @@@@ CXXLD = $(CXX) d134 1 a134 1 @@@@ -562,7 +578,7 @@@@ DIST_COMMON = $(include_HEADERS) $(noins d143 1 a143 1 @@@@ -616,6 +632,8 @@@@ dcopserver.la: $(dcopserver_la_OBJECTS) d152 1 a152 1 @@@@ -676,10 +694,11 @@@@ distclean-compile: d165 10 a174 1 @@@@ -1059,9 +1078,6 @@@@ uninstall-info: uninstall-info-recursive d184 34 a217 1 @@@@ -1266,18 +1282,6 @@@@ force-reedit: d236 1 a236 1 @@@@ -1289,22 +1293,34 @@@@ libDCOP_la.all_cpp.cpp: $(srcdir)/Makefi d276 1 a276 1 @@@@ -1314,9 +1330,9 @@@@ kde-rpo-clean: d280 2 a281 1 +dcopclient.lo: dcopclient.moc d283 3 d287 1 a287 5 -dcopclient.lo: dcopclient.moc -dcopserver.o: dcopserver.moc dcopclient.o: dcopclient.moc +dcopserver.o: dcopserver.moc dcopserver.lo: dcopserver.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 --- dcop/Makefile.in.orig Thu Jan 23 12:30:33 2003 d5 1 a5 1 @@@@ -313,7 +313,7 @@@@ d14 1 a14 1 @@@@ -329,13 +329,17 @@@@ d36 1 a36 1 @@@@ -357,14 +361,11 @@@@ d55 1 a55 1 @@@@ -375,15 +376,23 @@@@ d82 1 a82 1 @@@@ -415,25 +424,31 @@@@ d122 2 a123 1 @@@@ -463,8 +478,9 @@@@ a124 1 CXXFLAGS = @@CXXFLAGS@@ d134 3 a136 3 @@@@ -475,7 +491,7 @@@@ DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) Makefile.am \ Makefile.in dcop-path.h.in d143 1 a143 1 @@@@ -529,6 +545,8 @@@@ d152 1 a152 1 @@@@ -589,10 +607,11 @@@@ d165 3 a167 3 @@@@ -905,9 +924,6 @@@@ uninstall-info-am uninstall-info-recursive \ uninstall-libLTLIBRARIES uninstall-local uninstall-recursive d175 1 a175 1 @@@@ -1112,18 +1128,6 @@@@ d194 1 a194 1 @@@@ -1135,22 +1139,34 @@@@ d234 1 a234 1 @@@@ -1160,9 +1176,9 @@@@ @ 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 --- dcop/Makefile.in.orig Tue Nov 26 08:57:39 2002 d5 1 a5 1 @@@@ -293,7 +293,7 @@@@ INCLUDES = $(all_includes) d12 1 a12 1 libDCOP_la_LDFLAGS = $(KDE_RPATH) -version-info 4:0 -no-undefined $(all_libraries) d14 1 a14 1 @@@@ -307,13 +307,17 @@@@ noinst_HEADERS = version.h dcopglobal.h d16 1 a16 1 libDCOP_la_SOURCES = dcopstub.cpp dcopclient.cpp dcopobject.cpp dcopref.cpp d36 2 a37 2 @@@@ -332,14 +336,11 @@@@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = d53 4 a56 4 am_libDCOP_la_OBJECTS = dcopstub.lo dcopclient.lo dcopobject.lo \ dcopref.lo @@@@ -350,15 +351,23 @@@@ libDCOP_la_nofinal_OBJECTS = dcopstub.lo dcopref.lo d82 10 a91 10 @@@@ -389,25 +398,28 @@@@ depcomp = $(SHELL) $(top_srcdir)/admin/d #>- @@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/dcopc.Po $(DEPDIR)/dcopclient.Plo \ #>- @@AMDEP_TRUE@@ $(DEPDIR)/dcopobject.Plo $(DEPDIR)/dcopref.Plo \ #>- @@AMDEP_TRUE@@ $(DEPDIR)/dcopserver.Plo \ +#>- @@AMDEP_TRUE@@ $(DEPDIR)/dcopserver_main.Plo \ +#>- @@AMDEP_TRUE@@ $(DEPDIR)/dcopserver_main.Po \ #>- @@AMDEP_TRUE@@ $(DEPDIR)/dcopserver_shutdown.Po \ #>- @@AMDEP_TRUE@@ $(DEPDIR)/dcopsignals.Plo $(DEPDIR)/dcopstub.Plo \ -#>- @@AMDEP_TRUE@@ $(DEPDIR)/dummy.Po $(DEPDIR)/testdcop.Po \ -#>- @@AMDEP_TRUE@@ $(DEPDIR)/testdcopc.Po d93 26 a118 23 -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@DEP_FILES = $(DEPDIR)/dcopserver_la.all_cpp.P $(DEPDIR)/libDCOP_la.all_cpp.P $(DEPDIR)/dcopc.Po $(DEPDIR)/dcopclient.Plo \ +#>- @@AMDEP_TRUE@@ $(DEPDIR)/testdcop.Po $(DEPDIR)/testdcopc.Po +#>+ 17 +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@DEP_FILES = $(DEPDIR)/libDCOP_la.all_cpp.P $(DEPDIR)/libdcopserver_main_la.all_cpp.P $(DEPDIR)/dcopc.Po $(DEPDIR)/dcopclient.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/dcopobject.Plo $(DEPDIR)/dcopref.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/dcopserver.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/dcopserver_main.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/dcopserver_main.Po \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/dcopserver_shutdown.Po \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/dcopsignals.Plo $(DEPDIR)/dcopstub.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/dummy.Po $(DEPDIR)/testdcop.Po \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/testdcopc.Po +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/testdcop.Po $(DEPDIR)/testdcopc.Po @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@DEP_FILES = $(DEPDIR)/dcopc.Po $(DEPDIR)/dcopclient.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/dcopobject.Plo $(DEPDIR)/dcopref.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/dcopserver.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/dcopserver_main.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/dcopserver_main.Po \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/dcopserver_shutdown.Po \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/dcopsignals.Plo $(DEPDIR)/dcopstub.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/dummy.Po $(DEPDIR)/testdcop.Po \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/testdcopc.Po +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/testdcop.Po $(DEPDIR)/testdcopc.Po d122 1 a122 1 @@@@ -437,8 +449,9 @@@@ CXXLINK = $(LIBTOOL) --mode=link --tag=C d134 1 a134 1 @@@@ -449,7 +462,7 @@@@ RECURSIVE_TARGETS = info-recursive dvi-r d136 1 a136 1 Makefile.in d143 1 a143 1 @@@@ -503,6 +516,8 @@@@ dcopserver.la: $(dcopserver_la_OBJECTS) d149 1 d152 12 a163 13 $(mkinstalldirs) $(DESTDIR)$(bindir) @@@@ -554,10 +569,11 @@@@ distclean-compile: @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/dcopobject.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/dcopref.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/dcopserver.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/dcopserver_main.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/dcopserver_main.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/dcopserver_shutdown.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/dcopsignals.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/dcopstub.Plo@@am__quote@@ -@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/dummy.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/testdcop.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/testdcopc.Po@@am__quote@@ d165 1 a165 1 @@@@ -851,22 +867,19 @@@@ uninstall-info: uninstall-info-recursive d167 1 a167 1 uninstall-libLTLIBRARIES uninstall-recursive d172 4 a175 30 # 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 -dcopclient.moc: $(srcdir)/dcopclient.h - $(MOC) $(srcdir)/dcopclient.h -o dcopclient.moc - -#>+ 3 testdcop.moc: $(srcdir)/testdcop.h $(MOC) $(srcdir)/testdcop.h -o testdcop.moc #>+ 3 +dcopclient.moc: $(srcdir)/dcopclient.h + $(MOC) $(srcdir)/dcopclient.h -o dcopclient.moc + +#>+ 3 dcopserver.moc: $(srcdir)/dcopserver.h $(MOC) $(srcdir)/dcopserver.h -o dcopserver.moc @@@@ -881,7 +894,7 @@@@ libDCOP.la.closure: $(libDCOP_la_OBJECTS #>+ 3 clean-metasources: - -rm -f dcopclient.moc testdcop.moc dcopserver.moc + -rm -f testdcop.moc dcopclient.moc dcopserver.moc #>+ 3 clean-closures: @@@@ -898,18 +911,6 @@@@ force-reedit: d191 1 a191 1 libDCOP_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dcopstub.cpp $(srcdir)/dcopclient.cpp $(srcdir)/dcopobject.cpp $(srcdir)/dcopref.cpp dcopclient.moc d194 1 a194 1 @@@@ -921,22 +922,34 @@@@ libDCOP_la.all_cpp.cpp: $(srcdir)/Makefi d234 1 a234 1 @@@@ -946,9 +959,9 @@@@ kde-rpo-clean: d238 4 d243 1 a243 4 -testdcop.lo: testdcop.moc -testdcop.o: testdcop.moc dcopclient.lo: dcopclient.moc +testdcop.lo: testdcop.moc a244 2 dcopclient.o: dcopclient.moc +testdcop.o: testdcop.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-ag,v 1.1.2.1 2002/06/23 19:06:13 jlam Exp $ d3 1 a3 1 --- dcop/Makefile.in.orig Tue May 21 15:42:04 2002 d5 1 a5 1 @@@@ -293,7 +293,7 @@@@ d14 1 a14 1 @@@@ -307,13 +307,17 @@@@ d36 1 a36 1 @@@@ -332,14 +336,11 @@@@ d55 1 a55 1 @@@@ -350,15 +351,23 @@@@ d82 35 a116 11 @@@@ -389,10 +398,11 @@@@ @@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/dcopc.Po $(DEPDIR)/dcopclient.Plo \ @@AMDEP_TRUE@@ $(DEPDIR)/dcopobject.Plo $(DEPDIR)/dcopref.Plo \ @@AMDEP_TRUE@@ $(DEPDIR)/dcopserver.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/dcopserver_main.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/dcopserver_main.Po \ @@AMDEP_TRUE@@ $(DEPDIR)/dcopserver_shutdown.Po \ @@AMDEP_TRUE@@ $(DEPDIR)/dcopsignals.Plo $(DEPDIR)/dcopstub.Plo \ - @@AMDEP_TRUE@@ $(DEPDIR)/dummy.Po $(DEPDIR)/testdcop.Po \ - @@AMDEP_TRUE@@ $(DEPDIR)/testdcopc.Po + @@AMDEP_TRUE@@ $(DEPDIR)/testdcop.Po $(DEPDIR)/testdcopc.Po d119 1 a119 2 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ @@@@ -421,8 +431,9 @@@@ d131 1 a131 1 @@@@ -433,7 +444,7 @@@@ d140 1 a140 1 @@@@ -487,6 +498,8 @@@@ d149 1 a149 1 @@@@ -538,10 +551,11 @@@@ d162 1 a162 1 @@@@ -835,9 +849,6 @@@@ d172 27 a198 1 @@@@ -882,11 +893,11 @@@@ d202 4 a205 5 -dcopserver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dcopserver.cpp $(srcdir)/dcopsignals.cpp testdcop.moc dcopclient.moc dcopserver.moc +dcopserver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dcopserver_main.cpp testdcop.moc dcopclient.moc dcopserver.moc @@echo 'creating dcopserver_la.all_cpp.cpp ...'; \ rm -f dcopserver_la.all_cpp.files dcopserver_la.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> dcopserver_la.all_cpp.final; \ d207 12 a218 5 + for file in dcopserver_main.cpp ; do \ echo "#include \"$$file\"" >> dcopserver_la.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> dcopserver_la.all_cpp.final; \ done; \ @@@@ -906,11 +917,23 @@@@ d221 2 a222 3 #>+ 11 -dcopserver.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp +libdcopserver_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dcopserver.cpp $(srcdir)/dcopsignals.cpp d230 1 a230 1 + cat libdcopserver_main_la.all_cpp.final libdcopserver_main_la.all_cpp.files > libdcopserver_main_la.all_cpp.cpp; \ a232 12 +#>+ 11 +dcopserver.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dcopserver_main.cpp @@echo 'creating dcopserver.all_cpp.cpp ...'; \ rm -f dcopserver.all_cpp.files dcopserver.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> dcopserver.all_cpp.final; \ - for file in dummy.cpp ; do \ + for file in dcopserver_main.cpp ; do \ echo "#include \"$$file\"" >> dcopserver.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> dcopserver.all_cpp.final; \ done; \ @@@@ -931,20 +954,20 @@@@ d235 2 a236 2 - -rm -f dcopserver_la.all_cpp.cpp libDCOP_la.all_cpp.cpp dcopserver.all_cpp.cpp testdcop.all_cpp.cpp + -rm -f dcopserver_la.all_cpp.cpp libDCOP_la.all_cpp.cpp libdcopserver_main_la.all_cpp.cpp dcopserver.all_cpp.cpp testdcop.all_cpp.cpp d256 14 a269 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-ag was added on branch buildlink2 on 2002-06-23 19:06:13 +0000 @ text @d1 214 @ 1.1.1.1.2.2 log @Merge from pkgsrc-current to buildlink2 branch. @ text @a0 214 $NetBSD: patch-ag,v 1.1.1.1.2.1 2002/06/23 19:06:13 jlam Exp $ --- dcop/Makefile.in.orig Tue May 21 15:42:04 2002 +++ dcop/Makefile.in @@@@ -293,7 +293,7 @@@@ bin_PROGRAMS = dcopserver dcopserver_shutdown check_PROGRAMS = testdcop testdcopc -lib_LTLIBRARIES = libDCOP.la dcopserver.la +lib_LTLIBRARIES = libDCOP.la libdcopserver_main.la dcopserver.la libDCOP_la_LIBADD = KDE-ICE/libkICE.la $(LIB_QT) libDCOP_la_LDFLAGS = $(KDE_RPATH) -version-info 4:0 -no-undefined $(all_libraries) @@@@ -307,13 +307,17 @@@@ # dcopstub needs to go first for --enable-final to work libDCOP_la_SOURCES = dcopstub.cpp dcopclient.cpp dcopobject.cpp dcopref.cpp +libdcopserver_main_la_LDFLAGS = $(all_libraries) +libdcopserver_main_la_SOURCES = dcopserver.cpp dcopsignals.cpp +libdcopserver_main_la_LIBADD = libDCOP.la + dcopserver_la_LDFLAGS = -module -avoid-version $(all_libraries) -dcopserver_la_SOURCES = dcopserver.cpp dcopsignals.cpp -dcopserver_la_LIBADD = libDCOP.la +dcopserver_la_SOURCES = dcopserver_main.cpp +dcopserver_la_LIBADD = libdcopserver_main.la dcopserver_LDFLAGS = $(KDE_RPATH) $(all_libraries) -dcopserver_SOURCES = dummy.cpp -dcopserver_LDADD = dcopserver.la +dcopserver_SOURCES = dcopserver_main.cpp +dcopserver_LDADD = libdcopserver_main.la dcopserver_shutdown_SOURCES = dcopserver_shutdown.c @@@@ -332,14 +336,11 @@@@ CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) -dcopserver_la_DEPENDENCIES = libDCOP.la -am_dcopserver_la_OBJECTS = dcopserver.lo dcopsignals.lo +dcopserver_la_DEPENDENCIES = libdcopserver_main.la +am_dcopserver_la_OBJECTS = dcopserver_main.lo #>- dcopserver_la_OBJECTS = $(am_dcopserver_la_OBJECTS) -#>+ 4 -dcopserver_la_final_OBJECTS = dcopserver_la.all_cpp.lo -dcopserver_la_nofinal_OBJECTS = dcopserver.lo dcopsignals.lo -@@KDE_USE_FINAL_FALSE@@dcopserver_la_OBJECTS = $(dcopserver_la_nofinal_OBJECTS) -@@KDE_USE_FINAL_TRUE@@dcopserver_la_OBJECTS = $(dcopserver_la_final_OBJECTS) +#>+ 1 +dcopserver_la_OBJECTS = dcopserver_main.lo libDCOP_la_DEPENDENCIES = KDE-ICE/libkICE.la am_libDCOP_la_OBJECTS = dcopstub.lo dcopclient.lo dcopobject.lo \ dcopref.lo @@@@ -350,15 +351,23 @@@@ dcopref.lo @@KDE_USE_FINAL_FALSE@@libDCOP_la_OBJECTS = $(libDCOP_la_nofinal_OBJECTS) @@KDE_USE_FINAL_TRUE@@libDCOP_la_OBJECTS = $(libDCOP_la_final_OBJECTS) +libdcopserver_main_la_DEPENDENCIES = libDCOP.la +am_libdcopserver_main_la_OBJECTS = dcopserver.lo dcopsignals.lo +#>- libdcopserver_main_la_OBJECTS = $(am_libdcopserver_main_la_OBJECTS) +#>+ 4 +libdcopserver_main_la_final_OBJECTS = libdcopserver_main_la.all_cpp.lo +libdcopserver_main_la_nofinal_OBJECTS = dcopserver.lo dcopsignals.lo +@@KDE_USE_FINAL_FALSE@@libdcopserver_main_la_OBJECTS = $(libdcopserver_main_la_nofinal_OBJECTS) +@@KDE_USE_FINAL_TRUE@@libdcopserver_main_la_OBJECTS = $(libdcopserver_main_la_final_OBJECTS) bin_PROGRAMS = dcopserver$(EXEEXT) dcopserver_shutdown$(EXEEXT) check_PROGRAMS = testdcop$(EXEEXT) testdcopc$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) -am_dcopserver_OBJECTS = dummy.$(OBJEXT) +am_dcopserver_OBJECTS = dcopserver_main.$(OBJEXT) #>- dcopserver_OBJECTS = $(am_dcopserver_OBJECTS) #>+ 1 -dcopserver_OBJECTS = dummy.$(OBJEXT) -dcopserver_DEPENDENCIES = dcopserver.la +dcopserver_OBJECTS = dcopserver_main.$(OBJEXT) +dcopserver_DEPENDENCIES = libdcopserver_main.la am_dcopserver_shutdown_OBJECTS = dcopserver_shutdown.$(OBJEXT) #>- dcopserver_shutdown_OBJECTS = $(am_dcopserver_shutdown_OBJECTS) #>+ 1 @@@@ -389,10 +398,11 @@@@ @@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/dcopc.Po $(DEPDIR)/dcopclient.Plo \ @@AMDEP_TRUE@@ $(DEPDIR)/dcopobject.Plo $(DEPDIR)/dcopref.Plo \ @@AMDEP_TRUE@@ $(DEPDIR)/dcopserver.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/dcopserver_main.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/dcopserver_main.Po \ @@AMDEP_TRUE@@ $(DEPDIR)/dcopserver_shutdown.Po \ @@AMDEP_TRUE@@ $(DEPDIR)/dcopsignals.Plo $(DEPDIR)/dcopstub.Plo \ - @@AMDEP_TRUE@@ $(DEPDIR)/dummy.Po $(DEPDIR)/testdcop.Po \ - @@AMDEP_TRUE@@ $(DEPDIR)/testdcopc.Po + @@AMDEP_TRUE@@ $(DEPDIR)/testdcop.Po $(DEPDIR)/testdcopc.Po COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ @@@@ -421,8 +431,9 @@@@ $(AM_LDFLAGS) $(LDFLAGS) -o $@@ CXXFLAGS = @@CXXFLAGS@@ DIST_SOURCES = $(dcopserver_la_SOURCES) $(libDCOP_la_SOURCES) \ - $(dcopserver_SOURCES) $(dcopserver_shutdown_SOURCES) \ - $(testdcop_SOURCES) $(testdcopc_SOURCES) + $(libdcopserver_main_la_SOURCES) $(dcopserver_SOURCES) \ + $(dcopserver_shutdown_SOURCES) $(testdcop_SOURCES) \ + $(testdcopc_SOURCES) HEADERS = $(include_HEADERS) $(noinst_HEADERS) @@@@ -433,7 +444,7 @@@@ DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) Makefile.am \ Makefile.in DIST_SUBDIRS = $(SUBDIRS) -SOURCES = $(dcopserver_la_SOURCES) $(libDCOP_la_SOURCES) $(dcopserver_SOURCES) $(dcopserver_shutdown_SOURCES) $(testdcop_SOURCES) $(testdcopc_SOURCES) +SOURCES = $(dcopserver_la_SOURCES) $(libDCOP_la_SOURCES) $(libdcopserver_main_la_SOURCES) $(dcopserver_SOURCES) $(dcopserver_shutdown_SOURCES) $(testdcop_SOURCES) $(testdcopc_SOURCES) #>- all: all-recursive #>+ 1 @@@@ -487,6 +498,8 @@@@ @@KDE_USE_CLOSURE_TRUE@@libDCOP.la: libDCOP.la.closure $(libDCOP_la_OBJECTS) $(libDCOP_la_DEPENDENCIES) @@KDE_USE_CLOSURE_FALSE@@libDCOP.la: $(libDCOP_la_OBJECTS) $(libDCOP_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(libDCOP_la_LDFLAGS) $(libDCOP_la_OBJECTS) $(libDCOP_la_LIBADD) $(LIBS) +libdcopserver_main.la: $(libdcopserver_main_la_OBJECTS) $(libdcopserver_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libdcopserver_main_la_LDFLAGS) $(libdcopserver_main_la_OBJECTS) $(libdcopserver_main_la_LIBADD) $(LIBS) install-binPROGRAMS: $(bin_PROGRAMS) @@$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) @@@@ -538,10 +551,11 @@@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/dcopobject.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/dcopref.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/dcopserver.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/dcopserver_main.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/dcopserver_main.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/dcopserver_shutdown.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/dcopsignals.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/dcopstub.Plo@@am__quote@@ -@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/dummy.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/testdcop.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/testdcopc.Po@@am__quote@@ @@@@ -835,9 +849,6 @@@@ uninstall-info-am uninstall-info-recursive \ uninstall-libLTLIBRARIES uninstall-recursive - -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: @@@@ -882,11 +893,11 @@@@ #>+ 11 -dcopserver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dcopserver.cpp $(srcdir)/dcopsignals.cpp testdcop.moc dcopclient.moc dcopserver.moc +dcopserver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dcopserver_main.cpp testdcop.moc dcopclient.moc dcopserver.moc @@echo 'creating dcopserver_la.all_cpp.cpp ...'; \ rm -f dcopserver_la.all_cpp.files dcopserver_la.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> dcopserver_la.all_cpp.final; \ - for file in dcopserver.cpp dcopsignals.cpp ; do \ + for file in dcopserver_main.cpp ; do \ echo "#include \"$$file\"" >> dcopserver_la.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> dcopserver_la.all_cpp.final; \ done; \ @@@@ -906,11 +917,23 @@@@ rm -f libDCOP_la.all_cpp.final libDCOP_la.all_cpp.files #>+ 11 -dcopserver.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp +libdcopserver_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dcopserver.cpp $(srcdir)/dcopsignals.cpp + @@echo 'creating libdcopserver_main_la.all_cpp.cpp ...'; \ + rm -f libdcopserver_main_la.all_cpp.files libdcopserver_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libdcopserver_main_la.all_cpp.final; \ + for file in dcopserver.cpp dcopsignals.cpp ; do \ + echo "#include \"$$file\"" >> libdcopserver_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libdcopserver_main_la.all_cpp.final; \ + done; \ + cat libdcopserver_main_la.all_cpp.final libdcopserver_main_la.all_cpp.files > libdcopserver_main_la.all_cpp.cpp; \ + rm -f libdcopserver_main_la.all_cpp.final libdcopserver_main_la.all_cpp.files + +#>+ 11 +dcopserver.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dcopserver_main.cpp @@echo 'creating dcopserver.all_cpp.cpp ...'; \ rm -f dcopserver.all_cpp.files dcopserver.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> dcopserver.all_cpp.final; \ - for file in dummy.cpp ; do \ + for file in dcopserver_main.cpp ; do \ echo "#include \"$$file\"" >> dcopserver.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> dcopserver.all_cpp.final; \ done; \ @@@@ -931,20 +954,20 @@@@ #>+ 3 clean-final: - -rm -f dcopserver_la.all_cpp.cpp libDCOP_la.all_cpp.cpp dcopserver.all_cpp.cpp testdcop.all_cpp.cpp + -rm -f dcopserver_la.all_cpp.cpp libDCOP_la.all_cpp.cpp libdcopserver_main_la.all_cpp.cpp dcopserver.all_cpp.cpp testdcop.all_cpp.cpp #>+ 2 final: - $(MAKE) dcopserver_la_OBJECTS="$(dcopserver_la_final_OBJECTS)" libDCOP_la_OBJECTS="$(libDCOP_la_final_OBJECTS)" testdcopc_OBJECTS="$(testdcopc_final_OBJECTS)" all-am + $(MAKE) libDCOP_la_OBJECTS="$(libDCOP_la_final_OBJECTS)" libdcopserver_main_la_OBJECTS="$(libdcopserver_main_la_final_OBJECTS)" testdcopc_OBJECTS="$(testdcopc_final_OBJECTS)" all-am #>+ 2 final-install: - $(MAKE) dcopserver_la_OBJECTS="$(dcopserver_la_final_OBJECTS)" libDCOP_la_OBJECTS="$(libDCOP_la_final_OBJECTS)" testdcopc_OBJECTS="$(testdcopc_final_OBJECTS)" install-am + $(MAKE) libDCOP_la_OBJECTS="$(libDCOP_la_final_OBJECTS)" libdcopserver_main_la_OBJECTS="$(libdcopserver_main_la_final_OBJECTS)" testdcopc_OBJECTS="$(testdcopc_final_OBJECTS)" install-am #>+ 2 no-final: - $(MAKE) dcopserver_la_OBJECTS="$(dcopserver_la_nofinal_OBJECTS)" libDCOP_la_OBJECTS="$(libDCOP_la_nofinal_OBJECTS)" testdcopc_OBJECTS="$(testdcopc_nofinal_OBJECTS)" all-am + $(MAKE) libDCOP_la_OBJECTS="$(libDCOP_la_nofinal_OBJECTS)" libdcopserver_main_la_OBJECTS="$(libdcopserver_main_la_nofinal_OBJECTS)" testdcopc_OBJECTS="$(testdcopc_nofinal_OBJECTS)" all-am #>+ 2 no-final-install: - $(MAKE) dcopserver_la_OBJECTS="$(dcopserver_la_nofinal_OBJECTS)" libDCOP_la_OBJECTS="$(libDCOP_la_nofinal_OBJECTS)" testdcopc_OBJECTS="$(testdcopc_nofinal_OBJECTS)" install-am + $(MAKE) libDCOP_la_OBJECTS="$(libDCOP_la_nofinal_OBJECTS)" libdcopserver_main_la_OBJECTS="$(libdcopserver_main_la_nofinal_OBJECTS)" testdcopc_OBJECTS="$(testdcopc_nofinal_OBJECTS)" install-am #>+ 3 cvs-clean: $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean @