head 1.8; access; symbols pkgsrc-2013Q2:1.8.0.52 pkgsrc-2013Q2-base:1.8 pkgsrc-2012Q4:1.8.0.50 pkgsrc-2012Q4-base:1.8 pkgsrc-2011Q4:1.8.0.48 pkgsrc-2011Q4-base:1.8 pkgsrc-2011Q2:1.8.0.46 pkgsrc-2011Q2-base:1.8 pkgsrc-2009Q4:1.8.0.44 pkgsrc-2009Q4-base:1.8 pkgsrc-2008Q4:1.8.0.42 pkgsrc-2008Q4-base:1.8 pkgsrc-2008Q3:1.8.0.40 pkgsrc-2008Q3-base:1.8 cube-native-xorg:1.8.0.38 cube-native-xorg-base:1.8 pkgsrc-2008Q2:1.8.0.36 pkgsrc-2008Q2-base:1.8 pkgsrc-2008Q1:1.8.0.34 pkgsrc-2008Q1-base:1.8 pkgsrc-2007Q4:1.8.0.32 pkgsrc-2007Q4-base:1.8 pkgsrc-2007Q3:1.8.0.30 pkgsrc-2007Q3-base:1.8 pkgsrc-2007Q2:1.8.0.28 pkgsrc-2007Q2-base:1.8 pkgsrc-2007Q1:1.8.0.26 pkgsrc-2007Q1-base:1.8 pkgsrc-2006Q4:1.8.0.24 pkgsrc-2006Q4-base:1.8 pkgsrc-2006Q3:1.8.0.22 pkgsrc-2006Q3-base:1.8 pkgsrc-2006Q2:1.8.0.20 pkgsrc-2006Q2-base:1.8 pkgsrc-2006Q1:1.8.0.18 pkgsrc-2006Q1-base:1.8 pkgsrc-2005Q4:1.8.0.16 pkgsrc-2005Q4-base:1.8 pkgsrc-2005Q3:1.8.0.14 pkgsrc-2005Q3-base:1.8 pkgsrc-2005Q2:1.8.0.12 pkgsrc-2005Q2-base:1.8 pkgsrc-2005Q1:1.8.0.10 pkgsrc-2005Q1-base:1.8 pkgsrc-2004Q4:1.8.0.8 pkgsrc-2004Q4-base:1.8 pkgsrc-2004Q3:1.8.0.6 pkgsrc-2004Q3-base:1.8 pkgsrc-2004Q2:1.8.0.4 pkgsrc-2004Q2-base:1.8 pkgsrc-2004Q1:1.8.0.2 pkgsrc-2004Q1-base:1.8 pkgsrc-2003Q4:1.6.0.2 pkgsrc-2003Q4-base:1.6 netbsd-1-6-1:1.3.0.2 netbsd-1-6-1-base:1.3 netbsd-1-6:1.1.1.1.0.4 netbsd-1-6-RELEASE-base:1.1 pkgviews:1.1.1.1.0.6 pkgviews-base:1.1 buildlink2-base:1.1 buildlink2:1.1.1.1.0.2 pkg-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.8 date 2004.02.04.13.58.39; author markd; state dead; branches; next 1.7; 1.7 date 2004.01.15.09.52.51; author markd; state Exp; branches; next 1.6; 1.6 date 2003.07.30.13.16.57; author markd; state Exp; branches; next 1.5; 1.5 date 2003.05.22.02.42.42; author markd; state Exp; branches; next 1.4; 1.4 date 2003.03.11.13.10.37; 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.54; author jlam; state Exp; branches; next 1.1; 1.1 date 2002.05.31.13.16.47; author skrll; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2002.05.31.13.16.47; author skrll; state Exp; branches 1.1.1.1.2.1; next ; 1.1.1.1.2.1 date 2002.05.31.13.16.47; author jlam; state dead; branches; next 1.1.1.1.2.2; 1.1.1.1.2.2 date 2002.06.23.19.06.32; author jlam; state Exp; branches; next ; desc @@ 1.8 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 @$NetBSD: patch-bh,v 1.7 2004/01/15 09:52:51 markd Exp $ --- kio/misc/Makefile.in.orig 2003-12-29 11:17:00.000000000 +1300 +++ kio/misc/Makefile.in @@@@ -399,17 +399,21 @@@@ INCLUDES = -I$(srcdir)/.. -I$(top_srcdir SUBDIRS = . ksendbugmail kpac kdesasl kssld kfile -lib_LTLIBRARIES = kio_uiserver.la +lib_LTLIBRARIES = libkio_uiserver_main.la kio_uiserver.la bin_PROGRAMS = kio_uiserver kmailservice ktelnetservice -kio_uiserver_SOURCES = dummy.cpp -kio_uiserver_LDADD = kio_uiserver.la +kio_uiserver_SOURCES = kio_uiserver_main.cpp +kio_uiserver_LDADD = libkio_uiserver_main.la kio_uiserver_LDFLAGS = $(KDE_RPATH) $(all_libraries) -#>- kio_uiserver_la_SOURCES = uiserver.cpp uiserver.skel observer.stub +#>- libkio_uiserver_main_la_SOURCES = uiserver.cpp uiserver.skel observer.stub #>+ 1 -kio_uiserver_la_SOURCES=uiserver.cpp uiserver_skel.cpp observer_stub.cpp -kio_uiserver_la_LIBADD = $(LIB_KIO) +libkio_uiserver_main_la_SOURCES=uiserver.cpp uiserver_skel.cpp observer_stub.cpp +libkio_uiserver_main_la_LIBADD = $(LIB_KIO) +libkio_uiserver_main_la_LDFLAGS = $(all_libraries) + +kio_uiserver_la_SOURCES = kio_uiserver_main.cpp +kio_uiserver_la_LIBADD = libkio_uiserver_main.la kio_uiserver_la_LDFLAGS = $(all_libraries) -module -avoid-version observer_DIR = $(top_srcdir)/kio/kio @@@@ -438,23 +442,28 @@@@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) -kio_uiserver_la_DEPENDENCIES = -am_kio_uiserver_la_OBJECTS = uiserver.lo +kio_uiserver_la_DEPENDENCIES = libkio_uiserver_main.la +am_kio_uiserver_la_OBJECTS = kio_uiserver_main.lo #>- kio_uiserver_la_OBJECTS = $(am_kio_uiserver_la_OBJECTS) +#>+ 1 +kio_uiserver_la_OBJECTS = kio_uiserver_main.lo +libkio_uiserver_main_la_DEPENDENCIES = +am_libkio_uiserver_main_la_OBJECTS = uiserver.lo +#>- libkio_uiserver_main_la_OBJECTS = $(am_libkio_uiserver_main_la_OBJECTS) #>+ 4 -kio_uiserver_la_final_OBJECTS = kio_uiserver_la.all_cpp.lo -kio_uiserver_la_nofinal_OBJECTS = uiserver.lo uiserver_skel.lo observer_stub.lo -@@KDE_USE_FINAL_FALSE@@kio_uiserver_la_OBJECTS = $(kio_uiserver_la_nofinal_OBJECTS) -@@KDE_USE_FINAL_TRUE@@kio_uiserver_la_OBJECTS = $(kio_uiserver_la_final_OBJECTS) +libkio_uiserver_main_la_final_OBJECTS = libkio_uiserver_main_la.all_cpp.lo +libkio_uiserver_main_la_nofinal_OBJECTS = uiserver.lo uiserver_skel.lo observer_stub.lo +@@KDE_USE_FINAL_FALSE@@libkio_uiserver_main_la_OBJECTS = $(libkio_uiserver_main_la_nofinal_OBJECTS) +@@KDE_USE_FINAL_TRUE@@libkio_uiserver_main_la_OBJECTS = $(libkio_uiserver_main_la_final_OBJECTS) bin_PROGRAMS = kio_uiserver$(EXEEXT) kmailservice$(EXEEXT) \ ktelnetservice$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) -am_kio_uiserver_OBJECTS = dummy.$(OBJEXT) +am_kio_uiserver_OBJECTS = kio_uiserver_main.$(OBJEXT) #>- kio_uiserver_OBJECTS = $(am_kio_uiserver_OBJECTS) #>+ 1 -kio_uiserver_OBJECTS = dummy.$(OBJEXT) -kio_uiserver_DEPENDENCIES = kio_uiserver.la +kio_uiserver_OBJECTS = kio_uiserver_main.$(OBJEXT) +kio_uiserver_DEPENDENCIES = libkio_uiserver_main.la am_kmailservice_OBJECTS = kmailservice.$(OBJEXT) #>- kmailservice_OBJECTS = $(am_kmailservice_OBJECTS) #>+ 1 @@@@ -469,14 +478,20 @@@@ ktelnetservice_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 ./$(DEPDIR)/kmailservice.Po \ +#>- @@AMDEP_TRUE@@DEP_FILES = ./$(DEPDIR)/kio_uiserver_main.Plo \ +#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/kio_uiserver_main.Po \ +#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/kmailservice.Po \ #>- @@AMDEP_TRUE@@ ./$(DEPDIR)/ktelnetservice.Po \ #>- @@AMDEP_TRUE@@ ./$(DEPDIR)/uiserver.Plo -#>+ 7 -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@DEP_FILES = $(DEPDIR)/uiserver_skel.P $(DEPDIR)/observer_stub.P $(DEPDIR)/kio_uiserver_la.all_cpp.P ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/kmailservice.Po \ +#>+ 11 +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@DEP_FILES = $(DEPDIR)/uiserver_skel.P $(DEPDIR)/observer_stub.P $(DEPDIR)/libkio_uiserver_main_la.all_cpp.P ./$(DEPDIR)/kio_uiserver_main.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kio_uiserver_main.Po \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kmailservice.Po \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/ktelnetservice.Po \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/uiserver.Plo -@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@DEP_FILES = $(DEPDIR)/uiserver_skel.P $(DEPDIR)/observer_stub.P ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/kmailservice.Po \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@DEP_FILES = $(DEPDIR)/uiserver_skel.P $(DEPDIR)/observer_stub.P ./$(DEPDIR)/kio_uiserver_main.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kio_uiserver_main.Po \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kmailservice.Po \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/ktelnetservice.Po \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/uiserver.Plo @@@@ -498,7 +513,8 @@@@ CXXLD = $(CXX) #>+ 2 CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@@ -DIST_SOURCES = $(kio_uiserver_la_SOURCES) $(kio_uiserver_SOURCES) \ +DIST_SOURCES = $(kio_uiserver_la_SOURCES) \ + $(libkio_uiserver_main_la_SOURCES) $(kio_uiserver_SOURCES) \ $(kmailservice_SOURCES) $(ktelnetservice_SOURCES) DATA = $(kde_services_DATA) $(protocol_DATA) @@@@ -512,7 +528,7 @@@@ RECURSIVE_TARGETS = info-recursive dvi-r check-recursive installcheck-recursive DIST_COMMON = $(kiomisc_HEADERS) Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) -SOURCES = $(kio_uiserver_la_SOURCES) $(kio_uiserver_SOURCES) $(kmailservice_SOURCES) $(ktelnetservice_SOURCES) +SOURCES = $(kio_uiserver_la_SOURCES) $(libkio_uiserver_main_la_SOURCES) $(kio_uiserver_SOURCES) $(kmailservice_SOURCES) $(ktelnetservice_SOURCES) #>- all: all-recursive #>+ 1 @@@@ -559,6 +575,8 @@@@ clean-libLTLIBRARIES: done kio_uiserver.la: $(kio_uiserver_la_OBJECTS) $(kio_uiserver_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kio_uiserver_la_LDFLAGS) $(kio_uiserver_la_OBJECTS) $(kio_uiserver_la_LIBADD) $(LIBS) +libkio_uiserver_main.la: $(libkio_uiserver_main_la_OBJECTS) $(libkio_uiserver_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkio_uiserver_main_la_LDFLAGS) $(libkio_uiserver_main_la_OBJECTS) $(libkio_uiserver_main_la_LIBADD) $(LIBS) binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @@$(NORMAL_INSTALL) @@@@ -604,7 +622,8 @@@@ 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)/kio_uiserver_main.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/kio_uiserver_main.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/kmailservice.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/ktelnetservice.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/uiserver.Plo@@am__quote@@ @@@@ -834,7 +853,7 @@@@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=rlogin.protocol kio_uiserver.desktop kmailservice.protocol rtsp.protocol telnet.protocol +KDE_DIST=kio_uiserver.desktop rlogin.protocol Makefile.in.rej kmailservice.protocol telnet.protocol rtsp.protocol DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) @@@@ -1002,6 +1021,12 @@@@ dummy.cpp: uiserver.kidl # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: +#>+ 3 +uiserver.moc: $(srcdir)/uiserver.h + $(MOC) $(srcdir)/uiserver.h -o uiserver.moc + +#>+ 1 +mocs: uiserver.moc #>+ 9 uiserver.kidl: $(srcdir)/uiserver.h $(DCOP_DEPENDENCIES) $(DCOPIDL) $(srcdir)/uiserver.h > uiserver.kidl || ( rm -f uiserver.kidl ; false ) @@@@ -1013,12 +1038,6 @@@@ observer_stub.h: observer.kidl $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-skel observer.kidl #>+ 3 -uiserver.moc: $(srcdir)/uiserver.h - $(MOC) $(srcdir)/uiserver.h -o uiserver.moc - -#>+ 1 -mocs: uiserver.moc -#>+ 3 clean-metasources: -rm -f uiserver.moc @@@@ -1039,33 +1058,33 @@@@ force-reedit: #>+ 11 -kio_uiserver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/uiserver.cpp uiserver_skel.cpp observer_stub.cpp uiserver.moc - @@echo 'creating kio_uiserver_la.all_cpp.cpp ...'; \ - rm -f kio_uiserver_la.all_cpp.files kio_uiserver_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kio_uiserver_la.all_cpp.final; \ +libkio_uiserver_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/uiserver.cpp uiserver_skel.cpp observer_stub.cpp uiserver.moc + @@echo 'creating libkio_uiserver_main_la.all_cpp.cpp ...'; \ + rm -f libkio_uiserver_main_la.all_cpp.files libkio_uiserver_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkio_uiserver_main_la.all_cpp.final; \ for file in uiserver.cpp uiserver_skel.cpp observer_stub.cpp ; do \ - echo "#include \"$$file\"" >> kio_uiserver_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kio_uiserver_la.all_cpp.final; \ + echo "#include \"$$file\"" >> libkio_uiserver_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkio_uiserver_main_la.all_cpp.final; \ done; \ - cat kio_uiserver_la.all_cpp.final kio_uiserver_la.all_cpp.files > kio_uiserver_la.all_cpp.cpp; \ - rm -f kio_uiserver_la.all_cpp.final kio_uiserver_la.all_cpp.files + cat libkio_uiserver_main_la.all_cpp.final libkio_uiserver_main_la.all_cpp.files > libkio_uiserver_main_la.all_cpp.cpp; \ + rm -f libkio_uiserver_main_la.all_cpp.final libkio_uiserver_main_la.all_cpp.files #>+ 3 clean-final: - -rm -f kio_uiserver_la.all_cpp.cpp + -rm -f libkio_uiserver_main_la.all_cpp.cpp #>+ 2 final: - $(MAKE) kio_uiserver_la_OBJECTS="$(kio_uiserver_la_final_OBJECTS)" all-am + $(MAKE) libkio_uiserver_main_la_OBJECTS="$(libkio_uiserver_main_la_final_OBJECTS)" all-am #>+ 2 final-install: - $(MAKE) kio_uiserver_la_OBJECTS="$(kio_uiserver_la_final_OBJECTS)" install-am + $(MAKE) libkio_uiserver_main_la_OBJECTS="$(libkio_uiserver_main_la_final_OBJECTS)" install-am #>+ 2 no-final: - $(MAKE) kio_uiserver_la_OBJECTS="$(kio_uiserver_la_nofinal_OBJECTS)" all-am + $(MAKE) libkio_uiserver_main_la_OBJECTS="$(libkio_uiserver_main_la_nofinal_OBJECTS)" all-am #>+ 2 no-final-install: - $(MAKE) kio_uiserver_la_OBJECTS="$(kio_uiserver_la_nofinal_OBJECTS)" install-am + $(MAKE) libkio_uiserver_main_la_OBJECTS="$(libkio_uiserver_main_la_nofinal_OBJECTS)" install-am #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean @@@@ -1075,7 +1094,7 @@@@ kde-rpo-clean: -rm -f *.rpo #>+ 5 +$(srcdir)/uiserver.cpp: observer_stub.h observer_stub.cpp: observer_stub.h uiserver.lo: uiserver.moc uiserver.o: uiserver.moc -$(srcdir)/uiserver.cpp: observer_stub.h @ 1.7 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.6 log @Update kdelibs to 3.1.3. Changes: * build system updates, gcc 3.4+ compilation fixes (Dirk Mueller) * ensure that each installed header file can be compiled on its own (has all necessary includes/forward declarations) * SECURITY: kio/khtml: Improve referer handling, always strip out username and password. * Roaming user support (Helge Deller) * kabc: add quotes around names from LDAP which contain non-alphanumeric characters * kabc: unterminated string handling fixes * kbugreport: only refer to http://bugs.kde.org if the bug-address is submit@@bugs.kde.org * kcookiejar: don't deliver cookies when the url is "strange" * kcookiejar: unbreak cookies for https sites once again * kcookiejar: make kcookiejar --remove work * kdecore: never unload dante socks library, it crashes when doing so * kdecore: Adding KMacroExpander, class for shell-safe expansion of filenames in shellcode * kdeinit: Handle X errors instead of just crashing when they occur. * kdeprint: improvements to handling of cups network printers * kdeprint/smbview: use nmblookup -M -- to make it work with samba 3.0 * kdeui: dragging from the "konqueror wheel" button no longer duplicates the window * kdeui: rewritten mouse cursor-autohide code (hopefully much more stable now) * kdeui/kfontdialog: Try very hard to match the font name that was passed with one that actually exists * kdeui/kmainwindow: fix for saving statusbar state when autosave is enabled * kdewidgets: Add some new widgets * keramik: Major fixes to toolbar gradient alignment, as well as some miscellaneous fixes. * khtml: avoid endless-relayout-loop * khtml: several backports of fixes from 3.2 development branch * khtml: several fixes to bugs exposed by DOM2 testsuite * khtml jpeg loader: use memmove in places where memory regions overlap (valgrind we love you) * kio: crash/memory leak fixes * kio: added ability to add host:port to the no-proxy list * kio: speedup handling local files * kio: improvements to the layout of the HTTP Authentication password dialog * kio: allow rtsp:// protocol redirecting to mms:// * kio: KIOSK restriction fixes * kio: signal handling fixes (SIGPIPE etc) * kio_http: text/html mimetype in Accept: gets preference over other text/* types * kio_http: improvements in HTTP referer handling * kiconloader: memory leak fix * kjava: thread handling fixes * kjava: don't send text to the console window if its not visible (saves huge amount of memory on some pages) * kjava: catch exceptions thrown inside Applet.destroy * klocale: Support Macedonian plural forms @ text @d3 1 a3 1 --- kio/misc/Makefile.in.orig 2003-07-16 12:59:59.000000000 +1200 d5 1 a5 1 @@@@ -398,17 +398,21 @@@@ INCLUDES = -I$(srcdir)/.. -I$(top_srcdir d33 1 a33 1 @@@@ -436,23 +440,28 @@@@ CONFIG_HEADER = $(top_builddir)/config.h d71 1 a71 1 @@@@ -467,14 +476,20 @@@@ ktelnetservice_DEPENDENCIES = d96 1 a96 1 @@@@ -496,7 +511,8 @@@@ CXXLD = $(CXX) d106 1 a106 1 @@@@ -510,7 +526,7 @@@@ RECURSIVE_TARGETS = info-recursive dvi-r d115 1 a115 1 @@@@ -557,6 +573,8 @@@@ clean-libLTLIBRARIES: d124 1 a124 1 @@@@ -602,7 +620,8 @@@@ mostlyclean-compile: d134 1 a134 1 @@@@ -826,7 +845,7 @@@@ distclean-tags: d138 1 a138 1 -KDE_DIST=rlogin.protocol telnet.protocol rtsp.protocol kmailservice.protocol kio_uiserver.desktop d143 1 a143 1 @@@@ -994,6 +1013,12 @@@@ dummy.cpp: uiserver.kidl d156 1 a156 1 @@@@ -1005,12 +1030,6 @@@@ observer_stub.h: observer.kidl d169 1 a169 1 @@@@ -1031,33 +1050,33 @@@@ force-reedit: d216 1 a216 1 @@@@ -1067,7 +1086,7 @@@@ kde-rpo-clean: d220 5 a224 7 -uiserver.o: uiserver.moc -uiserver.lo: uiserver.moc -observer_stub.cpp: observer_stub.h $(srcdir)/uiserver.cpp: observer_stub.h +observer_stub.cpp: observer_stub.h +uiserver.lo: uiserver.moc +uiserver.o: uiserver.moc @ 1.5 log @Update KDE to 3.1.2. Changes: kdelibs: * https authentication through proxy fixed. * KZip failed for some .zip archives. * Fixed a bug in socket code that made KDEPrint crash. * kspell: Support for Hebrew spell checking using hspell (requires hspell 0.5). kdebase: * kwin: Alt+Tab works while drag'n'drop (unless the application also grabs keyboard). * kio_smtp: Doesn't eat 100% CPU when connection breaks and fixed a confusing error message when AUTH failed ("Unknown Command" vs. "Authorization failed") * kscreensaver: Fixed issue where kdesktop_lock would stay running indefinitely in the background if it could not grab the keyboard/mouse, preventing the screen from being locked manually. * kscreensaver: Screensavers are now stopped when asking for the password [#56803] * kio_smb: Several bugfixes for the smbro-ioslave. * kdesktop: fixed minicli layout problem with Qt 3.1.2 * kdm: fixed incorrect user window width with Qt 3.1.2 * Konqueror: Create DCOP interface for mainwindow when object begins to exist. * Konqueror: Fixed tab open delays when it can't reach website. * Konsole: Don't flicker when selecting entire lines. * Konsole: Crash, selection and sort fixes in schema and session editors. * Konsole: Fixed mouse-wheel in mouse mode. * Konsole: Allow programs to resize windows if enabled. * Konsole: Keep output steady when triple-click selecting. * Konsole: Added "Print" menu command. * kicker: Fixed kasbar only drawing last icon from a group. @ text @d3 1 a3 1 --- kio/misc/Makefile.in.orig Thu May 8 05:24:11 2003 d5 1 a5 1 @@@@ -397,17 +397,21 @@@@ INCLUDES = -I$(srcdir)/.. -I$(top_srcdir d33 1 a33 1 @@@@ -435,23 +439,28 @@@@ CONFIG_HEADER = $(top_builddir)/config.h d71 1 a71 1 @@@@ -466,14 +475,20 @@@@ ktelnetservice_DEPENDENCIES = d96 1 a96 1 @@@@ -495,7 +510,8 @@@@ CXXLD = $(CXX) d106 1 a106 1 @@@@ -509,7 +525,7 @@@@ RECURSIVE_TARGETS = info-recursive dvi-r d115 1 a115 1 @@@@ -556,6 +572,8 @@@@ clean-libLTLIBRARIES: d124 1 a124 1 @@@@ -601,7 +619,8 @@@@ mostlyclean-compile: d134 1 a134 1 @@@@ -825,7 +844,7 @@@@ distclean-tags: d139 1 a139 1 +KDE_DIST=kio_uiserver.desktop rlogin.protocol kmailservice.protocol telnet.protocol rtsp.protocol d143 1 a143 1 @@@@ -993,6 +1012,10 @@@@ dummy.cpp: uiserver.kidl d151 2 d155 2 a156 2 $(DCOPIDL) $(srcdir)/uiserver.h > uiserver.kidl || ( rm -f uiserver.kidl ; /bin/false ) @@@@ -1004,10 +1027,6 @@@@ observer_stub.h: observer.kidl d163 2 d169 1 a169 1 @@@@ -1028,33 +1047,33 @@@@ force-reedit: d216 1 a216 1 @@@@ -1064,7 +1083,7 @@@@ kde-rpo-clean: @ 1.4 log @Update KDE to 3.1. Many bugfixes and functionality enhancements including: General New default widget style: Keramik New default icon theme: Crystal Created and enhanced framework to effectively disable certain features of the GUI, like for example shell access, disallowing to select custom wall papers. "Kiosk mode" Usability improvements: Kicker: Context menu, applet menus, wording and panel feature consistency improved Kicker: Redesigned control module. KCalc: Usability Improvements. KSnapshot: Usability Improvements. KsCD: User Interface Improvements in configuration and information dialogs kdelibs Extended the DCOP commandline client to enable nonGUI applications (such as shell scripts) to use DCOP send DCOP messages to multiple users and/or sessions concurrently Added to notification dialog to allow applications to configure their notifications with a common GUI. Added "Open File", "Open Destination" and "Keep window open" to download progress dialog. KDatePicker has now week number display and selection. Added KLocale support for setting/retrieving the first day of a week Support for "Multimedia keys" on your keyboard. Added on-demand icon loading support to improve startup performance of applications. KHTML: Improvements to printing support. Page Info and Frame info dialog. Auto-Scroll support of webpages using Shift combined with arrow keys. Many, many Bugfixes and improvements. Small codebase merges with Safari. The main merge is planned for a future release however, as it requires more testing. KIO: Modified thumbnail ioslave that can extract a thumbnail from the file directly if it contains one, rather than generating one itself. Added fish:// protocol slave, which can access remote filesystems via SSH and SCP Cleanups and Corrections in smtp:// protocol slave. Activated rtsp:// protocol slave. Added support for Public Key Authentication and interopability with newer versions of OpenSSH to sftp:// protocol slave. KSSL: SSL certificate policies can now be configured based on the host name @ text @d3 1 a3 1 --- kio/misc/Makefile.in.orig Thu Jan 23 12:30:39 2003 d5 1 a5 1 @@@@ -306,17 +306,21 @@@@ d33 1 a33 1 @@@@ -344,23 +348,28 @@@@ d71 2 a72 2 @@@@ -379,14 +388,20 @@@@ LIBS = @@LIBS@@ d96 2 a97 1 @@@@ -409,7 +424,8 @@@@ a99 1 CXXFLAGS = @@CXXFLAGS@@ d106 2 a107 2 @@@@ -422,7 +438,7 @@@@ uninstall-recursive check-recursive installcheck-recursive d115 1 a115 1 @@@@ -469,6 +485,8 @@@@ d124 1 a124 1 @@@@ -514,7 +532,8 @@@@ d134 2 a135 2 @@@@ -702,7 +721,7 @@@@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH d143 1 a143 1 @@@@ -855,6 +874,10 @@@@ d154 1 a154 1 @@@@ -866,10 +889,6 @@@@ d165 1 a165 1 @@@@ -890,33 +909,33 @@@@ d212 1 a212 1 @@@@ -926,7 +945,7 @@@@ @ 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 --- kio/misc/Makefile.in.orig Tue Nov 26 08:57:39 2002 d5 1 a5 1 @@@@ -286,20 +286,24 @@@@ INCLUDES = -I$(srcdir)/.. -I$(top_srcdir d7 1 a7 1 SUBDIRS = . ksendbugmail kpac kdesasl kssld d19 4 a22 8 -#>- kio_uiserver_la_SOURCES = uiserver.cpp uiserver.skel observer.stub \ +#>- libkio_uiserver_main_la_SOURCES = uiserver.cpp uiserver.skel observer.stub \ #>- renamedlg.cpp skipdlg.cpp #>+ 2 -kio_uiserver_la_SOURCES=uiserver.cpp \ +libkio_uiserver_main_la_SOURCES=uiserver.cpp \ renamedlg.cpp skipdlg.cpp uiserver_skel.cpp observer_stub.cpp d24 1 d33 1 a33 1 @@@@ -327,23 +331,28 @@@@ CONFIG_HEADER = $(top_builddir)/config.h d38 1 a38 1 -am_kio_uiserver_la_OBJECTS = uiserver.lo renamedlg.lo skipdlg.lo d45 1 a45 1 +am_libkio_uiserver_main_la_OBJECTS = uiserver.lo renamedlg.lo skipdlg.lo d49 1 a49 1 -kio_uiserver_la_nofinal_OBJECTS = uiserver.lo renamedlg.lo skipdlg.lo uiserver_skel.lo observer_stub.lo d53 1 a53 1 +libkio_uiserver_main_la_nofinal_OBJECTS = uiserver.lo renamedlg.lo skipdlg.lo uiserver_skel.lo observer_stub.lo d71 1 a71 2 @@@@ -361,14 +370,20 @@@@ CPPFLAGS = @@CPPFLAGS@@ LDFLAGS = @@LDFLAGS@@ d74 7 a80 6 -#>- @@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kmailservice.Po \ +#>- @@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/kio_uiserver_main.Plo \ +#>- @@AMDEP_TRUE@@ $(DEPDIR)/kio_uiserver_main.Po \ +#>- @@AMDEP_TRUE@@ $(DEPDIR)/kmailservice.Po \ #>- @@AMDEP_TRUE@@ $(DEPDIR)/ktelnetservice.Po $(DEPDIR)/renamedlg.Plo \ #>- @@AMDEP_TRUE@@ $(DEPDIR)/skipdlg.Plo $(DEPDIR)/uiserver.Plo d82 1 a82 1 -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@DEP_FILES = $(DEPDIR)/uiserver_skel.P $(DEPDIR)/observer_stub.P $(DEPDIR)/kio_uiserver_la.all_cpp.P $(DEPDIR)/dummy.Po $(DEPDIR)/kmailservice.Po \ d84 11 a94 11 +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@DEP_FILES = $(DEPDIR)/uiserver_skel.P $(DEPDIR)/observer_stub.P $(DEPDIR)/libkio_uiserver_main_la.all_cpp.P $(DEPDIR)/kio_uiserver_main.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kio_uiserver_main.Po \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kmailservice.Po \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/ktelnetservice.Po $(DEPDIR)/renamedlg.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/skipdlg.Plo $(DEPDIR)/uiserver.Plo -@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@DEP_FILES = $(DEPDIR)/uiserver_skel.P $(DEPDIR)/observer_stub.P $(DEPDIR)/dummy.Po $(DEPDIR)/kmailservice.Po \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@DEP_FILES = $(DEPDIR)/uiserver_skel.P $(DEPDIR)/observer_stub.P $(DEPDIR)/kio_uiserver_main.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kio_uiserver_main.Po \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kmailservice.Po \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/ktelnetservice.Po $(DEPDIR)/renamedlg.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/skipdlg.Plo $(DEPDIR)/uiserver.Plo d96 1 a96 1 @@@@ -391,7 +406,8 @@@@ CXXLD = $(CXX) d106 1 a106 1 @@@@ -404,7 +420,7 @@@@ RECURSIVE_TARGETS = info-recursive dvi-r d115 2 a116 2 @@@@ -453,6 +469,8 @@@@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) d121 1 d124 1 a124 2 $(mkinstalldirs) $(DESTDIR)$(bindir) @@@@ -493,7 +511,8 @@@@ mostlyclean-compile: d128 8 a135 8 -@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/dummy.Po@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kio_uiserver_main.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kio_uiserver_main.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kmailservice.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/ktelnetservice.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/renamedlg.Plo@@am__quote@@ @@@@ -668,7 +687,7 @@@@ distclean-tags: d138 2 a139 2 -KDE_DIST=rlogin.protocol renamedlg.cpp telnet.protocol rtsp.protocol skipdlg.cpp kmailservice.protocol kio_uiserver.desktop +KDE_DIST=kio_uiserver.desktop renamedlg.cpp skipdlg.cpp kmailservice.protocol telnet.protocol rlogin.protocol rtsp.protocol d143 1 a143 1 @@@@ -815,6 +834,18 @@@@ dummy.cpp: uiserver.kidl a150 8 +#>+ 3 +skipdlg.moc: $(srcdir)/skipdlg.h + $(MOC) $(srcdir)/skipdlg.h -o skipdlg.moc + +#>+ 3 +renamedlg.moc: $(srcdir)/renamedlg.h + $(MOC) $(srcdir)/renamedlg.h -o renamedlg.moc + d154 1 a154 1 @@@@ -826,20 +857,8 @@@@ observer_stub.h: observer.kidl a161 8 -renamedlg.moc: $(srcdir)/renamedlg.h - $(MOC) $(srcdir)/renamedlg.h -o renamedlg.moc - -#>+ 3 -skipdlg.moc: $(srcdir)/skipdlg.h - $(MOC) $(srcdir)/skipdlg.h -o skipdlg.moc - -#>+ 3 d163 1 a163 2 - -rm -f uiserver.moc renamedlg.moc skipdlg.moc + -rm -f uiserver.moc skipdlg.moc renamedlg.moc d165 1 a165 3 #>+ 5 clean-idl: @@@@ -858,33 +877,33 @@@@ force-reedit: d169 1 a169 1 -kio_uiserver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/uiserver.cpp $(srcdir)/renamedlg.cpp $(srcdir)/skipdlg.cpp uiserver_skel.cpp observer_stub.cpp uiserver.moc skipdlg.moc renamedlg.moc d173 1 a173 1 +libkio_uiserver_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/uiserver.cpp $(srcdir)/renamedlg.cpp $(srcdir)/skipdlg.cpp uiserver_skel.cpp observer_stub.cpp uiserver.moc skipdlg.moc renamedlg.moc d177 1 a177 1 for file in uiserver.cpp renamedlg.cpp skipdlg.cpp uiserver_skel.cpp observer_stub.cpp ; do \ d212 1 a212 1 @@@@ -894,13 +913,13 @@@@ kde-rpo-clean: d215 1 a215 1 #>+ 11 d217 1 a217 4 +skipdlg.o: skipdlg.moc $(srcdir)/skipdlg.cpp: observer_stub.h renamedlg.lo: renamedlg.moc -skipdlg.o: skipdlg.moc d219 1 a219 4 -uiserver.lo: uiserver.moc $(srcdir)/renamedlg.cpp: observer_stub.h +$(srcdir)/uiserver.cpp: observer_stub.h skipdlg.lo: skipdlg.moc a222 2 renamedlg.o: renamedlg.moc -$(srcdir)/uiserver.cpp: observer_stub.h @ 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-bh,v 1.1.2.1 2002/06/23 19:06:32 jlam Exp $ d3 1 a3 1 --- kio/misc/Makefile.in.orig Tue May 21 15:42:15 2002 d5 1 a5 1 @@@@ -286,20 +286,24 @@@@ d21 1 a21 1 #>- renamedlg.cpp skipdlg.cpp d36 1 a36 1 @@@@ -327,24 +331,29 @@@@ d50 1 a50 1 #>+ 5 d52 1 a52 2 -kio_uiserver_la_nofinal_OBJECTS = uiserver.lo renamedlg.lo skipdlg.lo uiserver_skel.lo observer_stub.lo \ - kio_uiserver_la_meta_unload.lo d56 1 a56 2 +libkio_uiserver_main_la_nofinal_OBJECTS = uiserver.lo renamedlg.lo skipdlg.lo uiserver_skel.lo observer_stub.lo \ + libkio_uiserver_main_la_meta_unload.lo d74 1 a74 1 @@@@ -362,7 +371,9 @@@@ d78 22 a99 8 -@@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kmailservice.Po \ +@@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/kio_uiserver_main.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/kio_uiserver_main.Po \ + @@AMDEP_TRUE@@ $(DEPDIR)/kmailservice.Po \ @@AMDEP_TRUE@@ $(DEPDIR)/ktelnetservice.Po $(DEPDIR)/renamedlg.Plo \ @@AMDEP_TRUE@@ $(DEPDIR)/skipdlg.Plo $(DEPDIR)/uiserver.Plo #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@@@ -384,7 +395,8 @@@@ d109 1 a109 1 @@@@ -397,7 +409,7 @@@@ d118 1 a118 1 @@@@ -446,6 +458,8 @@@@ d127 1 a127 1 @@@@ -486,7 +500,8 @@@@ d137 1 a137 1 @@@@ -661,7 +676,7 @@@@ d141 1 a141 1 -KDE_DIST=skipdlg.cpp rlogin.protocol kio_uiserver.desktop kmailservice.protocol renamedlg.cpp telnet.protocol rtsp.protocol d146 1 a146 1 @@@@ -808,16 +823,6 @@@@ d150 11 a160 26 -#>+ 9 -uiserver.kidl: $(srcdir)/uiserver.h $(DCOPIDL_DEPENDENCIES) - $(DCOPIDL) $(srcdir)/uiserver.h > uiserver.kidl || ( rm -f uiserver.kidl ; /bin/false ) -uiserver_skel.cpp: uiserver.kidl - $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub uiserver.kidl -observer.kidl: $(top_srcdir)/kio/kio/observer.h $(DCOPIDL_DEPENDENCIES) - $(DCOPIDL) $(top_srcdir)/kio/kio/observer.h > observer.kidl || ( rm -f observer.kidl ; /bin/false ) -observer_stub.h: observer.kidl - $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-skel observer.kidl - #>+ 3 uiserver.moc: $(srcdir)/uiserver.h $(MOC) $(srcdir)/uiserver.h -o uiserver.moc @@@@ -830,6 +835,16 @@@@ renamedlg.moc: $(srcdir)/renamedlg.h $(MOC) $(srcdir)/renamedlg.h -o renamedlg.moc +#>+ 9 +uiserver.kidl: $(srcdir)/uiserver.h $(DCOPIDL_DEPENDENCIES) + $(DCOPIDL) $(srcdir)/uiserver.h > uiserver.kidl || ( rm -f uiserver.kidl ; /bin/false ) +uiserver_skel.cpp: uiserver.kidl + $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub uiserver.kidl +observer.kidl: $(top_srcdir)/kio/kio/observer.h $(DCOPIDL_DEPENDENCIES) + $(DCOPIDL) $(top_srcdir)/kio/kio/observer.h > observer.kidl || ( rm -f observer.kidl ; /bin/false ) +observer_stub.h: observer.kidl + $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-skel observer.kidl d162 6 d169 12 d182 2 a183 2 -rm -f uiserver.moc skipdlg.moc renamedlg.moc @@@@ -851,28 +866,28 @@@@ d185 3 a188 40 #>+ 12 -kio_uiserver_la_meta_unload.cpp: uiserver.moc skipdlg.moc renamedlg.moc - @@echo 'creating kio_uiserver_la_meta_unload.cpp' - @@-rm -f kio_uiserver_la_meta_unload.cpp +libkio_uiserver_main_la_meta_unload.cpp: uiserver.moc skipdlg.moc renamedlg.moc + @@echo 'creating libkio_uiserver_main_la_meta_unload.cpp' + @@-rm -f libkio_uiserver_main_la_meta_unload.cpp @@if test ${kde_qtver} = 2; then \ - echo 'static const char * _metalist_kio_uiserver_la[] = {' > kio_uiserver_la_meta_unload.cpp ;\ - cat uiserver.moc skipdlg.moc renamedlg.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kio_uiserver_la_meta_unload.cpp ;\ - echo '0};' >> kio_uiserver_la_meta_unload.cpp ;\ - echo '#include ' >> kio_uiserver_la_meta_unload.cpp ;\ - echo '_UNLOAD(kio_uiserver_la)' >> kio_uiserver_la_meta_unload.cpp ;\ - else echo > kio_uiserver_la_meta_unload.cpp; fi + echo 'static const char * _metalist_libkio_uiserver_main_la[] = {' > libkio_uiserver_main_la_meta_unload.cpp ;\ + cat uiserver.moc skipdlg.moc renamedlg.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkio_uiserver_main_la_meta_unload.cpp ;\ + echo '0};' >> libkio_uiserver_main_la_meta_unload.cpp ;\ + echo '#include ' >> libkio_uiserver_main_la_meta_unload.cpp ;\ + echo '_UNLOAD(libkio_uiserver_main_la)' >> libkio_uiserver_main_la_meta_unload.cpp ;\ + else echo > libkio_uiserver_main_la_meta_unload.cpp; fi #>+ 3 clean-moc-classes: - -rm -f kio_uiserver_la_meta_unload.cpp + -rm -f libkio_uiserver_main_la_meta_unload.cpp #>+ 11 -kio_uiserver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/uiserver.cpp $(srcdir)/renamedlg.cpp $(srcdir)/skipdlg.cpp uiserver_skel.cpp observer_stub.cpp kio_uiserver_la_meta_unload.cpp uiserver.moc skipdlg.moc renamedlg.moc +kio_uiserver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kio_uiserver_main.cpp uiserver.moc skipdlg.moc renamedlg.moc @@echo 'creating kio_uiserver_la.all_cpp.cpp ...'; \ rm -f kio_uiserver_la.all_cpp.files kio_uiserver_la.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kio_uiserver_la.all_cpp.final; \ - for file in uiserver.cpp renamedlg.cpp skipdlg.cpp uiserver_skel.cpp observer_stub.cpp kio_uiserver_la_meta_unload.cpp ; do \ + for file in kio_uiserver_main.cpp ; do \ echo "#include \"$$file\"" >> kio_uiserver_la.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kio_uiserver_la.all_cpp.final; \ done; \ @@@@ -880,11 +895,23 @@@@ rm -f kio_uiserver_la.all_cpp.final kio_uiserver_la.all_cpp.files d191 5 a195 2 -kio_uiserver.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp +libkio_uiserver_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/uiserver.cpp $(srcdir)/renamedlg.cpp $(srcdir)/skipdlg.cpp uiserver_skel.cpp observer_stub.cpp libkio_uiserver_main_la_meta_unload.cpp d199 3 a201 1 + for file in uiserver.cpp renamedlg.cpp skipdlg.cpp uiserver_skel.cpp observer_stub.cpp libkio_uiserver_main_la_meta_unload.cpp ; do \ d204 4 a207 2 + done; \ + cat libkio_uiserver_main_la.all_cpp.final libkio_uiserver_main_la.all_cpp.files > libkio_uiserver_main_la.all_cpp.cpp; \ a208 12 + +#>+ 11 +kio_uiserver.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kio_uiserver_main.cpp @@echo 'creating kio_uiserver.all_cpp.cpp ...'; \ rm -f kio_uiserver.all_cpp.files kio_uiserver.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kio_uiserver.all_cpp.final; \ - for file in dummy.cpp ; do \ + for file in kio_uiserver_main.cpp ; do \ echo "#include \"$$file\"" >> kio_uiserver.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kio_uiserver.all_cpp.final; \ done; \ @@@@ -917,20 +944,20 @@@@ d212 2 a213 2 - -rm -f kio_uiserver_la.all_cpp.cpp kio_uiserver.all_cpp.cpp kmailservice.all_cpp.cpp ktelnetservice.all_cpp.cpp + -rm -f kio_uiserver_la.all_cpp.cpp libkio_uiserver_main_la.all_cpp.cpp kio_uiserver.all_cpp.cpp kmailservice.all_cpp.cpp ktelnetservice.all_cpp.cpp d233 20 a252 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-bh was added on branch buildlink2 on 2002-06-23 19:06:32 +0000 @ text @d1 260 @ 1.1.1.1.2.2 log @Merge from pkgsrc-current to buildlink2 branch. @ text @a0 260 $NetBSD: patch-bh,v 1.1.1.1.2.1 2002/06/23 19:06:32 jlam Exp $ --- kio/misc/Makefile.in.orig Tue May 21 15:42:15 2002 +++ kio/misc/Makefile.in @@@@ -286,20 +286,24 @@@@ SUBDIRS = . ksendbugmail kpac kdesasl kssld -lib_LTLIBRARIES = kio_uiserver.la +lib_LTLIBRARIES = libkio_uiserver_main.la kio_uiserver.la bin_PROGRAMS = kio_uiserver kmailservice ktelnetservice -kio_uiserver_SOURCES = dummy.cpp -kio_uiserver_LDADD = kio_uiserver.la +kio_uiserver_SOURCES = kio_uiserver_main.cpp +kio_uiserver_LDADD = libkio_uiserver_main.la kio_uiserver_LDFLAGS = $(KDE_RPATH) $(all_libraries) -#>- kio_uiserver_la_SOURCES = uiserver.cpp uiserver.skel observer.stub \ +#>- libkio_uiserver_main_la_SOURCES = uiserver.cpp uiserver.skel observer.stub \ #>- renamedlg.cpp skipdlg.cpp #>+ 2 -kio_uiserver_la_SOURCES=uiserver.cpp \ +libkio_uiserver_main_la_SOURCES=uiserver.cpp \ renamedlg.cpp skipdlg.cpp uiserver_skel.cpp observer_stub.cpp -kio_uiserver_la_LIBADD = $(LIB_KIO) +libkio_uiserver_main_la_LIBADD = $(LIB_KIO) +libkio_uiserver_main_la_LDFLAGS = $(all_libraries) + +kio_uiserver_la_SOURCES = kio_uiserver_main.cpp +kio_uiserver_la_LIBADD = libkio_uiserver_main.la kio_uiserver_la_LDFLAGS = $(all_libraries) -module -avoid-version observer_DIR = $(top_srcdir)/kio/kio @@@@ -327,24 +331,29 @@@@ CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) -kio_uiserver_la_DEPENDENCIES = -am_kio_uiserver_la_OBJECTS = uiserver.lo renamedlg.lo skipdlg.lo +kio_uiserver_la_DEPENDENCIES = libkio_uiserver_main.la +am_kio_uiserver_la_OBJECTS = kio_uiserver_main.lo #>- kio_uiserver_la_OBJECTS = $(am_kio_uiserver_la_OBJECTS) +#>+ 1 +kio_uiserver_la_OBJECTS = kio_uiserver_main.lo +libkio_uiserver_main_la_DEPENDENCIES = +am_libkio_uiserver_main_la_OBJECTS = uiserver.lo renamedlg.lo skipdlg.lo +#>- libkio_uiserver_main_la_OBJECTS = $(am_libkio_uiserver_main_la_OBJECTS) #>+ 5 -kio_uiserver_la_final_OBJECTS = kio_uiserver_la.all_cpp.lo -kio_uiserver_la_nofinal_OBJECTS = uiserver.lo renamedlg.lo skipdlg.lo uiserver_skel.lo observer_stub.lo \ - kio_uiserver_la_meta_unload.lo -@@KDE_USE_FINAL_FALSE@@kio_uiserver_la_OBJECTS = $(kio_uiserver_la_nofinal_OBJECTS) -@@KDE_USE_FINAL_TRUE@@kio_uiserver_la_OBJECTS = $(kio_uiserver_la_final_OBJECTS) +libkio_uiserver_main_la_final_OBJECTS = libkio_uiserver_main_la.all_cpp.lo +libkio_uiserver_main_la_nofinal_OBJECTS = uiserver.lo renamedlg.lo skipdlg.lo uiserver_skel.lo observer_stub.lo \ + libkio_uiserver_main_la_meta_unload.lo +@@KDE_USE_FINAL_FALSE@@libkio_uiserver_main_la_OBJECTS = $(libkio_uiserver_main_la_nofinal_OBJECTS) +@@KDE_USE_FINAL_TRUE@@libkio_uiserver_main_la_OBJECTS = $(libkio_uiserver_main_la_final_OBJECTS) bin_PROGRAMS = kio_uiserver$(EXEEXT) kmailservice$(EXEEXT) \ ktelnetservice$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) -am_kio_uiserver_OBJECTS = dummy.$(OBJEXT) +am_kio_uiserver_OBJECTS = kio_uiserver_main.$(OBJEXT) #>- kio_uiserver_OBJECTS = $(am_kio_uiserver_OBJECTS) #>+ 1 -kio_uiserver_OBJECTS = dummy.$(OBJEXT) -kio_uiserver_DEPENDENCIES = kio_uiserver.la +kio_uiserver_OBJECTS = kio_uiserver_main.$(OBJEXT) +kio_uiserver_DEPENDENCIES = libkio_uiserver_main.la am_kmailservice_OBJECTS = kmailservice.$(OBJEXT) #>- kmailservice_OBJECTS = $(am_kmailservice_OBJECTS) #>+ 1 @@@@ -362,7 +371,9 @@@@ LDFLAGS = @@LDFLAGS@@ LIBS = @@LIBS@@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp -@@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kmailservice.Po \ +@@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/kio_uiserver_main.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/kio_uiserver_main.Po \ + @@AMDEP_TRUE@@ $(DEPDIR)/kmailservice.Po \ @@AMDEP_TRUE@@ $(DEPDIR)/ktelnetservice.Po $(DEPDIR)/renamedlg.Plo \ @@AMDEP_TRUE@@ $(DEPDIR)/skipdlg.Plo $(DEPDIR)/uiserver.Plo #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@@@ -384,7 +395,8 @@@@ CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@@ CXXFLAGS = @@CXXFLAGS@@ -DIST_SOURCES = $(kio_uiserver_la_SOURCES) $(kio_uiserver_SOURCES) \ +DIST_SOURCES = $(kio_uiserver_la_SOURCES) \ + $(libkio_uiserver_main_la_SOURCES) $(kio_uiserver_SOURCES) \ $(kmailservice_SOURCES) $(ktelnetservice_SOURCES) DATA = $(kde_services_DATA) $(protocol_DATA) @@@@ -397,7 +409,7 @@@@ uninstall-recursive check-recursive installcheck-recursive DIST_COMMON = $(kiomisc_HEADERS) Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) -SOURCES = $(kio_uiserver_la_SOURCES) $(kio_uiserver_SOURCES) $(kmailservice_SOURCES) $(ktelnetservice_SOURCES) +SOURCES = $(kio_uiserver_la_SOURCES) $(libkio_uiserver_main_la_SOURCES) $(kio_uiserver_SOURCES) $(kmailservice_SOURCES) $(ktelnetservice_SOURCES) #>- all: all-recursive #>+ 1 @@@@ -446,6 +458,8 @@@@ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) kio_uiserver.la: $(kio_uiserver_la_OBJECTS) $(kio_uiserver_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kio_uiserver_la_LDFLAGS) $(kio_uiserver_la_OBJECTS) $(kio_uiserver_la_LIBADD) $(LIBS) +libkio_uiserver_main.la: $(libkio_uiserver_main_la_OBJECTS) $(libkio_uiserver_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkio_uiserver_main_la_LDFLAGS) $(libkio_uiserver_main_la_OBJECTS) $(libkio_uiserver_main_la_LIBADD) $(LIBS) install-binPROGRAMS: $(bin_PROGRAMS) @@$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) @@@@ -486,7 +500,8 @@@@ distclean-compile: -rm -f *.tab.c -@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/dummy.Po@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kio_uiserver_main.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kio_uiserver_main.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kmailservice.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/ktelnetservice.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/renamedlg.Plo@@am__quote@@ @@@@ -661,7 +676,7 @@@@ #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=skipdlg.cpp rlogin.protocol kio_uiserver.desktop kmailservice.protocol renamedlg.cpp telnet.protocol rtsp.protocol +KDE_DIST=kio_uiserver.desktop renamedlg.cpp skipdlg.cpp kmailservice.protocol telnet.protocol rlogin.protocol rtsp.protocol DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) @@@@ -808,16 +823,6 @@@@ # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: -#>+ 9 -uiserver.kidl: $(srcdir)/uiserver.h $(DCOPIDL_DEPENDENCIES) - $(DCOPIDL) $(srcdir)/uiserver.h > uiserver.kidl || ( rm -f uiserver.kidl ; /bin/false ) -uiserver_skel.cpp: uiserver.kidl - $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub uiserver.kidl -observer.kidl: $(top_srcdir)/kio/kio/observer.h $(DCOPIDL_DEPENDENCIES) - $(DCOPIDL) $(top_srcdir)/kio/kio/observer.h > observer.kidl || ( rm -f observer.kidl ; /bin/false ) -observer_stub.h: observer.kidl - $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-skel observer.kidl - #>+ 3 uiserver.moc: $(srcdir)/uiserver.h $(MOC) $(srcdir)/uiserver.h -o uiserver.moc @@@@ -830,6 +835,16 @@@@ renamedlg.moc: $(srcdir)/renamedlg.h $(MOC) $(srcdir)/renamedlg.h -o renamedlg.moc +#>+ 9 +uiserver.kidl: $(srcdir)/uiserver.h $(DCOPIDL_DEPENDENCIES) + $(DCOPIDL) $(srcdir)/uiserver.h > uiserver.kidl || ( rm -f uiserver.kidl ; /bin/false ) +uiserver_skel.cpp: uiserver.kidl + $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub uiserver.kidl +observer.kidl: $(top_srcdir)/kio/kio/observer.h $(DCOPIDL_DEPENDENCIES) + $(DCOPIDL) $(top_srcdir)/kio/kio/observer.h > observer.kidl || ( rm -f observer.kidl ; /bin/false ) +observer_stub.h: observer.kidl + $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-skel observer.kidl + #>+ 3 clean-metasources: -rm -f uiserver.moc skipdlg.moc renamedlg.moc @@@@ -851,28 +866,28 @@@@ #>+ 12 -kio_uiserver_la_meta_unload.cpp: uiserver.moc skipdlg.moc renamedlg.moc - @@echo 'creating kio_uiserver_la_meta_unload.cpp' - @@-rm -f kio_uiserver_la_meta_unload.cpp +libkio_uiserver_main_la_meta_unload.cpp: uiserver.moc skipdlg.moc renamedlg.moc + @@echo 'creating libkio_uiserver_main_la_meta_unload.cpp' + @@-rm -f libkio_uiserver_main_la_meta_unload.cpp @@if test ${kde_qtver} = 2; then \ - echo 'static const char * _metalist_kio_uiserver_la[] = {' > kio_uiserver_la_meta_unload.cpp ;\ - cat uiserver.moc skipdlg.moc renamedlg.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kio_uiserver_la_meta_unload.cpp ;\ - echo '0};' >> kio_uiserver_la_meta_unload.cpp ;\ - echo '#include ' >> kio_uiserver_la_meta_unload.cpp ;\ - echo '_UNLOAD(kio_uiserver_la)' >> kio_uiserver_la_meta_unload.cpp ;\ - else echo > kio_uiserver_la_meta_unload.cpp; fi + echo 'static const char * _metalist_libkio_uiserver_main_la[] = {' > libkio_uiserver_main_la_meta_unload.cpp ;\ + cat uiserver.moc skipdlg.moc renamedlg.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkio_uiserver_main_la_meta_unload.cpp ;\ + echo '0};' >> libkio_uiserver_main_la_meta_unload.cpp ;\ + echo '#include ' >> libkio_uiserver_main_la_meta_unload.cpp ;\ + echo '_UNLOAD(libkio_uiserver_main_la)' >> libkio_uiserver_main_la_meta_unload.cpp ;\ + else echo > libkio_uiserver_main_la_meta_unload.cpp; fi #>+ 3 clean-moc-classes: - -rm -f kio_uiserver_la_meta_unload.cpp + -rm -f libkio_uiserver_main_la_meta_unload.cpp #>+ 11 -kio_uiserver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/uiserver.cpp $(srcdir)/renamedlg.cpp $(srcdir)/skipdlg.cpp uiserver_skel.cpp observer_stub.cpp kio_uiserver_la_meta_unload.cpp uiserver.moc skipdlg.moc renamedlg.moc +kio_uiserver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kio_uiserver_main.cpp uiserver.moc skipdlg.moc renamedlg.moc @@echo 'creating kio_uiserver_la.all_cpp.cpp ...'; \ rm -f kio_uiserver_la.all_cpp.files kio_uiserver_la.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kio_uiserver_la.all_cpp.final; \ - for file in uiserver.cpp renamedlg.cpp skipdlg.cpp uiserver_skel.cpp observer_stub.cpp kio_uiserver_la_meta_unload.cpp ; do \ + for file in kio_uiserver_main.cpp ; do \ echo "#include \"$$file\"" >> kio_uiserver_la.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kio_uiserver_la.all_cpp.final; \ done; \ @@@@ -880,11 +895,23 @@@@ rm -f kio_uiserver_la.all_cpp.final kio_uiserver_la.all_cpp.files #>+ 11 -kio_uiserver.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp +libkio_uiserver_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/uiserver.cpp $(srcdir)/renamedlg.cpp $(srcdir)/skipdlg.cpp uiserver_skel.cpp observer_stub.cpp libkio_uiserver_main_la_meta_unload.cpp + @@echo 'creating libkio_uiserver_main_la.all_cpp.cpp ...'; \ + rm -f libkio_uiserver_main_la.all_cpp.files libkio_uiserver_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkio_uiserver_main_la.all_cpp.final; \ + for file in uiserver.cpp renamedlg.cpp skipdlg.cpp uiserver_skel.cpp observer_stub.cpp libkio_uiserver_main_la_meta_unload.cpp ; do \ + echo "#include \"$$file\"" >> libkio_uiserver_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkio_uiserver_main_la.all_cpp.final; \ + done; \ + cat libkio_uiserver_main_la.all_cpp.final libkio_uiserver_main_la.all_cpp.files > libkio_uiserver_main_la.all_cpp.cpp; \ + rm -f libkio_uiserver_main_la.all_cpp.final libkio_uiserver_main_la.all_cpp.files + +#>+ 11 +kio_uiserver.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kio_uiserver_main.cpp @@echo 'creating kio_uiserver.all_cpp.cpp ...'; \ rm -f kio_uiserver.all_cpp.files kio_uiserver.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kio_uiserver.all_cpp.final; \ - for file in dummy.cpp ; do \ + for file in kio_uiserver_main.cpp ; do \ echo "#include \"$$file\"" >> kio_uiserver.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kio_uiserver.all_cpp.final; \ done; \ @@@@ -917,20 +944,20 @@@@ #>+ 3 clean-final: - -rm -f kio_uiserver_la.all_cpp.cpp kio_uiserver.all_cpp.cpp kmailservice.all_cpp.cpp ktelnetservice.all_cpp.cpp + -rm -f kio_uiserver_la.all_cpp.cpp libkio_uiserver_main_la.all_cpp.cpp kio_uiserver.all_cpp.cpp kmailservice.all_cpp.cpp ktelnetservice.all_cpp.cpp #>+ 2 final: - $(MAKE) kio_uiserver_la_OBJECTS="$(kio_uiserver_la_final_OBJECTS)" all-am + $(MAKE) libkio_uiserver_main_la_OBJECTS="$(libkio_uiserver_main_la_final_OBJECTS)" all-am #>+ 2 final-install: - $(MAKE) kio_uiserver_la_OBJECTS="$(kio_uiserver_la_final_OBJECTS)" install-am + $(MAKE) libkio_uiserver_main_la_OBJECTS="$(libkio_uiserver_main_la_final_OBJECTS)" install-am #>+ 2 no-final: - $(MAKE) kio_uiserver_la_OBJECTS="$(kio_uiserver_la_nofinal_OBJECTS)" all-am + $(MAKE) libkio_uiserver_main_la_OBJECTS="$(libkio_uiserver_main_la_nofinal_OBJECTS)" all-am #>+ 2 no-final-install: - $(MAKE) kio_uiserver_la_OBJECTS="$(kio_uiserver_la_nofinal_OBJECTS)" install-am + $(MAKE) libkio_uiserver_main_la_OBJECTS="$(libkio_uiserver_main_la_nofinal_OBJECTS)" install-am #>+ 3 cvs-clean: $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean @