diff options
Diffstat (limited to 'x11/kdebase3/patches/patch-ao')
| -rw-r--r-- | x11/kdebase3/patches/patch-ao | 509 |
1 files changed, 318 insertions, 191 deletions
diff --git a/x11/kdebase3/patches/patch-ao b/x11/kdebase3/patches/patch-ao index fcebbe3d92e..f40ec5f3611 100644 --- a/x11/kdebase3/patches/patch-ao +++ b/x11/kdebase3/patches/patch-ao @@ -1,8 +1,8 @@ -$NetBSD: patch-ao,v 1.2 2002/08/25 19:23:37 jlam Exp $ +$NetBSD: patch-ao,v 1.3 2003/01/02 09:12:33 skrll Exp $ ---- kcontrol/kcontrol/Makefile.in.orig Mon May 13 23:57:39 2002 +--- kcontrol/kcontrol/Makefile.in.orig Fri Dec 27 18:19:11 2002 +++ kcontrol/kcontrol/Makefile.in -@@ -311,52 +311,65 @@ +@@ -310,52 +310,65 @@ INCLUDES = $(all_includes) SUBDIRS = . pics @@ -16,14 +16,14 @@ $NetBSD: patch-ao,v 1.2 2002/08/25 19:23:37 jlam Exp $ + -#>- kcontrol_la_SOURCES = main.cpp toplevel.cpp indexwidget.cpp searchwidget.cpp \ --#>- helpwidget.cpp moduleinfo.cpp modules.cpp proxywidget.cpp \ --#>- modloader.cpp dockcontainer.cpp aboutwidget.cpp global.cpp \ --#>- quickhelp.cpp moduletreeview.cpp moduleiconview.cpp \ +-#>- helpwidget.cpp moduleinfo.cpp modules.cpp proxywidget.cpp \ +-#>- modloader.cpp dockcontainer.cpp aboutwidget.cpp global.cpp \ +-#>- quickhelp.cpp moduletreeview.cpp moduleiconview.cpp \ +#>- libkcontrol_main_la_SOURCES = main.cpp toplevel.cpp indexwidget.cpp \ -+#>- searchwidget.cpp helpwidget.cpp moduleinfo.cpp modules.cpp \ -+#>- proxywidget.cpp modloader.cpp dockcontainer.cpp aboutwidget.cpp \ -+#>- global.cpp quickhelp.cpp moduletreeview.cpp moduleiconview.cpp \ - #>- kecdialog.cpp kcrootonly.cpp moduleIface.cpp moduleIface.skel ++#>- searchwidget.cpp helpwidget.cpp moduleinfo.cpp modules.cpp \ ++#>- proxywidget.cpp modloader.cpp dockcontainer.cpp aboutwidget.cpp \ ++#>- global.cpp quickhelp.cpp moduletreeview.cpp moduleiconview.cpp \ + #>- kecdialog.cpp kcrootonly.cpp moduleIface.cpp moduleIface.skel #>+ 5 -kcontrol_la_SOURCES=main.cpp toplevel.cpp indexwidget.cpp searchwidget.cpp \ - helpwidget.cpp moduleinfo.cpp modules.cpp proxywidget.cpp \ @@ -45,16 +45,19 @@ $NetBSD: patch-ao,v 1.2 2002/08/25 19:23:37 jlam Exp $ kcontrol_la_LDFLAGS = $(all_libraries) -module -avoid-version -#>- kcmshell_la_SOURCES = kcmshell.cpp moduleinfo.cpp modloader.cpp kecdialog.cpp \ --#>- proxywidget.cpp kcdialog.cpp global.cpp \ -+#>- libkcmshell_main_la_SOURCES = kcmshell.cpp moduleinfo.cpp modloader.cpp \ -+#>- kecdialog.cpp proxywidget.cpp kcdialog.cpp global.cpp \ - #>- kcdialog.skel - #>+ 3 +-#>- proxywidget.cpp kcdialog.cpp global.cpp \ +-#>- kcdialog.skel +-#>+ 3 -kcmshell_la_SOURCES=kcmshell.cpp moduleinfo.cpp modloader.cpp kecdialog.cpp \ -- proxywidget.cpp kcdialog.cpp global.cpp \ +- proxywidget.cpp kcdialog.cpp global.cpp \ +- kcdialog_skel.cpp ++#>- libkcmshell_main_la_SOURCES = kcmshell.cpp moduleinfo.cpp modloader.cpp \ ++#>- kecdialog.cpp proxywidget.cpp kcdialog.cpp global.cpp \ ++#>- kcdialog.skel ++#>+ 3 +libkcmshell_main_la_SOURCES=kcmshell.cpp moduleinfo.cpp modloader.cpp \ + kecdialog.cpp proxywidget.cpp kcdialog.cpp global.cpp \ - kcdialog_skel.cpp ++ kcdialog_skel.cpp -kcmshell_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) +libkcmshell_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) @@ -92,7 +95,7 @@ $NetBSD: patch-ao,v 1.2 2002/08/25 19:23:37 jlam Exp $ kcminit_LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic rcdir = $(kde_datadir)/kcontrol -@@ -373,7 +386,7 @@ +@@ -372,7 +385,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -101,7 +104,7 @@ $NetBSD: patch-ao,v 1.2 2002/08/25 19:23:37 jlam Exp $ am_kcminit_la_OBJECTS = kcminit.lo global.lo #>- kcminit_la_OBJECTS = $(am_kcminit_la_OBJECTS) #>+ 4 -@@ -381,52 +394,70 @@ +@@ -380,50 +393,68 @@ kcminit_la_final_OBJECTS = kcminit_la.al kcminit_la_nofinal_OBJECTS = kcminit.lo global.lo @KDE_USE_FINAL_FALSE@kcminit_la_OBJECTS = $(kcminit_la_nofinal_OBJECTS) @KDE_USE_FINAL_TRUE@kcminit_la_OBJECTS = $(kcminit_la_final_OBJECTS) @@ -130,18 +133,16 @@ $NetBSD: patch-ao,v 1.2 2002/08/25 19:23:37 jlam Exp $ +am_libkcmshell_main_la_OBJECTS = kcmshell.lo moduleinfo.lo modloader.lo \ + kecdialog.lo proxywidget.lo kcdialog.lo global.lo +#>- libkcmshell_main_la_OBJECTS = $(am_libkcmshell_main_la_OBJECTS) - #>+ 6 + #>+ 5 -kcmshell_la_final_OBJECTS = kcmshell_la.all_cpp.lo -kcmshell_la_nofinal_OBJECTS = kcmshell.lo moduleinfo.lo modloader.lo \ +libkcmshell_main_la_final_OBJECTS = libkcmshell_main_la.all_cpp.lo +libkcmshell_main_la_nofinal_OBJECTS = kcmshell.lo moduleinfo.lo modloader.lo \ - kecdialog.lo proxywidget.lo kcdialog.lo global.lo kcdialog_skel.lo \ -- kcmshell_la_meta_unload.lo + kecdialog.lo proxywidget.lo kcdialog.lo global.lo kcdialog_skel.lo -@KDE_USE_FINAL_FALSE@kcmshell_la_OBJECTS = $(kcmshell_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@kcmshell_la_OBJECTS = $(kcmshell_la_final_OBJECTS) -kcontrol_la_DEPENDENCIES = -am_kcontrol_la_OBJECTS = main.lo toplevel.lo indexwidget.lo \ -+ libkcmshell_main_la_meta_unload.lo +@KDE_USE_FINAL_FALSE@libkcmshell_main_la_OBJECTS = $(libkcmshell_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libkcmshell_main_la_OBJECTS = $(libkcmshell_main_la_final_OBJECTS) +libkcontrol_main_la_DEPENDENCIES = @@ -152,7 +153,7 @@ $NetBSD: patch-ao,v 1.2 2002/08/25 19:23:37 jlam Exp $ kecdialog.lo kcrootonly.lo moduleIface.lo -#>- kcontrol_la_OBJECTS = $(am_kcontrol_la_OBJECTS) +#>- libkcontrol_main_la_OBJECTS = $(am_libkcontrol_main_la_OBJECTS) - #>+ 9 + #>+ 8 -kcontrol_la_final_OBJECTS = kcontrol_la.all_cpp.lo -kcontrol_la_nofinal_OBJECTS = main.lo toplevel.lo indexwidget.lo \ +libkcontrol_main_la_final_OBJECTS = libkcontrol_main_la.all_cpp.lo @@ -160,11 +161,9 @@ $NetBSD: patch-ao,v 1.2 2002/08/25 19:23:37 jlam Exp $ searchwidget.lo helpwidget.lo moduleinfo.lo modules.lo \ proxywidget.lo modloader.lo dockcontainer.lo aboutwidget.lo \ global.lo quickhelp.lo moduletreeview.lo moduleiconview.lo \ - kecdialog.lo kcrootonly.lo moduleIface.lo moduleIface_skel.lo \ -- kcontrol_la_meta_unload.lo + kecdialog.lo kcrootonly.lo moduleIface.lo moduleIface_skel.lo -@KDE_USE_FINAL_FALSE@kcontrol_la_OBJECTS = $(kcontrol_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@kcontrol_la_OBJECTS = $(kcontrol_la_final_OBJECTS) -+ libkcontrol_main_la_meta_unload.lo +@KDE_USE_FINAL_FALSE@libkcontrol_main_la_OBJECTS = $(libkcontrol_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libkcontrol_main_la_OBJECTS = $(libkcontrol_main_la_final_OBJECTS) bin_PROGRAMS = kcontrol$(EXEEXT) kcmshell$(EXEEXT) kcminit$(EXEEXT) @@ -197,31 +196,80 @@ $NetBSD: patch-ao,v 1.2 2002/08/25 19:23:37 jlam Exp $ DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -435,13 +466,16 @@ +@@ -432,40 +463,49 @@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp - @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/aboutwidget.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/dockcontainer.Plo $(DEPDIR)/dummy.Po \ -- @AMDEP_TRUE@ $(DEPDIR)/global.Plo $(DEPDIR)/helpwidget.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/indexwidget.Plo $(DEPDIR)/kcdialog.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/kcminit.Plo $(DEPDIR)/kcmshell.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/kcrootonly.Plo $(DEPDIR)/kecdialog.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/modloader.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/moduleIface.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/dockcontainer.Plo $(DEPDIR)/global.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/helpwidget.Plo $(DEPDIR)/indexwidget.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/kcdialog.Plo $(DEPDIR)/kcminit.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/kcminit_main.Po $(DEPDIR)/kcmshell.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/kcmshell_main.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/kcmshell_main.Po \ -+ @AMDEP_TRUE@ $(DEPDIR)/kcontrol_main.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/kcontrol_main.Po $(DEPDIR)/kcrootonly.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/kecdialog.Plo $(DEPDIR)/main.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/modloader.Plo $(DEPDIR)/moduleIface.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/moduleiconview.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/moduleinfo.Plo $(DEPDIR)/modules.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/moduletreeview.Plo \ -@@ -467,8 +501,9 @@ + #>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/aboutwidget.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/dockcontainer.Plo $(DEPDIR)/dummy.Po \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/global.Plo $(DEPDIR)/helpwidget.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/indexwidget.Plo $(DEPDIR)/kcdialog.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/kcminit.Plo $(DEPDIR)/kcmshell.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/kcrootonly.Plo $(DEPDIR)/kecdialog.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/modloader.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/moduleIface.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/dockcontainer.Plo $(DEPDIR)/global.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/helpwidget.Plo $(DEPDIR)/indexwidget.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kcdialog.Plo $(DEPDIR)/kcminit.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kcminit_main.Po $(DEPDIR)/kcmshell.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kcmshell_main.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kcmshell_main.Po \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kcontrol_main.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kcontrol_main.Po $(DEPDIR)/kcrootonly.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kecdialog.Plo $(DEPDIR)/main.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/modloader.Plo $(DEPDIR)/moduleIface.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/moduleiconview.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/moduleinfo.Plo $(DEPDIR)/modules.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/moduletreeview.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/proxywidget.Plo $(DEPDIR)/quickhelp.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/searchwidget.Plo $(DEPDIR)/toplevel.Plo +-#>+ 27 +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kcdialog_skel.P $(DEPDIR)/moduleIface_skel.P $(DEPDIR)/kcminit_la.all_cpp.P $(DEPDIR)/kcmshell_la.all_cpp.P $(DEPDIR)/kcontrol_la.all_cpp.P $(DEPDIR)/aboutwidget.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/dockcontainer.Plo $(DEPDIR)/dummy.Po \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/global.Plo $(DEPDIR)/helpwidget.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/indexwidget.Plo $(DEPDIR)/kcdialog.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kcminit.Plo $(DEPDIR)/kcmshell.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kcrootonly.Plo $(DEPDIR)/kecdialog.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/modloader.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/moduleIface.Plo \ ++#>+ 33 ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kcdialog_skel.P $(DEPDIR)/moduleIface_skel.P $(DEPDIR)/kcminit_la.all_cpp.P $(DEPDIR)/libkcminit_main_la.all_cpp.P $(DEPDIR)/libkcmshell_main_la.all_cpp.P $(DEPDIR)/libkcontrol_main_la.all_cpp.P $(DEPDIR)/aboutwidget.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/dockcontainer.Plo $(DEPDIR)/global.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/helpwidget.Plo $(DEPDIR)/indexwidget.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kcdialog.Plo $(DEPDIR)/kcminit.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kcminit_main.Po $(DEPDIR)/kcmshell.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kcmshell_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kcmshell_main.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kcontrol_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kcontrol_main.Po $(DEPDIR)/kcrootonly.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kecdialog.Plo $(DEPDIR)/main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/modloader.Plo $(DEPDIR)/moduleIface.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/moduleiconview.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/moduleinfo.Plo $(DEPDIR)/modules.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/moduletreeview.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/proxywidget.Plo $(DEPDIR)/quickhelp.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/searchwidget.Plo $(DEPDIR)/toplevel.Plo + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/kcdialog_skel.P $(DEPDIR)/moduleIface_skel.P $(DEPDIR)/aboutwidget.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/dockcontainer.Plo $(DEPDIR)/dummy.Po \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/global.Plo $(DEPDIR)/helpwidget.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/indexwidget.Plo $(DEPDIR)/kcdialog.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kcminit.Plo $(DEPDIR)/kcmshell.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kcrootonly.Plo $(DEPDIR)/kecdialog.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/modloader.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/moduleIface.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/dockcontainer.Plo $(DEPDIR)/global.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/helpwidget.Plo $(DEPDIR)/indexwidget.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kcdialog.Plo $(DEPDIR)/kcminit.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kcminit_main.Po $(DEPDIR)/kcmshell.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kcmshell_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kcmshell_main.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kcontrol_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kcontrol_main.Po $(DEPDIR)/kcrootonly.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kecdialog.Plo $(DEPDIR)/main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/modloader.Plo $(DEPDIR)/moduleIface.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/moduleiconview.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/moduleinfo.Plo $(DEPDIR)/modules.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/moduletreeview.Plo \ +@@ -492,8 +532,9 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=C $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ DIST_SOURCES = $(kcminit_la_SOURCES) $(kcmshell_la_SOURCES) \ @@ -233,7 +281,7 @@ $NetBSD: patch-ao,v 1.2 2002/08/25 19:23:37 jlam Exp $ DATA = $(data_DATA) $(rc_DATA) -@@ -478,7 +513,7 @@ +@@ -503,7 +544,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r uninstall-recursive check-recursive installcheck-recursive DIST_COMMON = Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) @@ -242,7 +290,7 @@ $NetBSD: patch-ao,v 1.2 2002/08/25 19:23:37 jlam Exp $ #>- all: all-recursive #>+ 1 -@@ -531,6 +566,12 @@ +@@ -556,6 +597,12 @@ kcmshell.la: $(kcmshell_la_OBJECTS) $(kc $(CXXLINK) -rpath $(libdir) $(kcmshell_la_LDFLAGS) $(kcmshell_la_OBJECTS) $(kcmshell_la_LIBADD) $(LIBS) kcontrol.la: $(kcontrol_la_OBJECTS) $(kcontrol_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kcontrol_la_LDFLAGS) $(kcontrol_la_OBJECTS) $(kcontrol_la_LIBADD) $(LIBS) @@ -255,7 +303,7 @@ $NetBSD: patch-ao,v 1.2 2002/08/25 19:23:37 jlam Exp $ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) -@@ -573,13 +614,17 @@ +@@ -598,13 +645,17 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/aboutwidget.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dockcontainer.Plo@am__quote@ @@ -274,16 +322,16 @@ $NetBSD: patch-ao,v 1.2 2002/08/25 19:23:37 jlam Exp $ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kcrootonly.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kecdialog.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/main.Plo@am__quote@ -@@ -745,7 +790,7 @@ +@@ -770,7 +821,7 @@ distclean-tags: #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=kcontrolui.rc indexwidget.h proxywidget.h dockcontainer.h aboutwidget.cpp modules.cpp main.h moduletreeview.h kecdialog.h moduleIface.h aboutwidget.h kcrootonly.cpp hi16-app-kcontrol.png toplevel.h kcdialog.cpp proxywidget.cpp modules.h moduleinfo.h kcmshell.h modulemenu.cpp modloader.h hi32-app-kcontrol.png modulemenu.h quickhelp.h searchwidget.h moduleiconview.cpp kcdialog.h hi48-app-kcontrol.png kcrootonly.h dockcontainer.cpp helpwidget.h moduleIface.cpp KControl.desktop moduletreeview.cpp version.h quickhelp.cpp moduleiconview.h global.h helpwidget.cpp +-KDE_DIST=quickhelp.cpp moduletreeview.cpp aboutwidget.h toplevel.h hi48-app-kcontrol.png modules.cpp kcontrolui.rc helpwidget.h main.h searchwidget.h proxywidget.cpp moduleIface.cpp hi16-app-kcontrol.png dockcontainer.h kcdialog.cpp kecdialog.h KControl.desktop modules.h modloader.h moduleiconview.cpp hi32-app-kcontrol.png kcdialog.h proxywidget.h quickhelp.h helpwidget.cpp global.h modulemenu.h kcrootonly.cpp modulemenu.cpp kcmshell.h moduleinfo.h moduletreeview.h moduleiconview.h dockcontainer.cpp aboutwidget.cpp version.h indexwidget.h moduleIface.h kcrootonly.h +KDE_DIST=kcontrolui.rc indexwidget.h hi32-app-kcontrol.png proxywidget.h dockcontainer.h modulemenu.h aboutwidget.cpp quickhelp.h searchwidget.h modules.cpp main.h kecdialog.cpp moduletreeview.h moduleiconview.cpp kcdialog.h kecdialog.h moduleIface.h searchwidget.cpp aboutwidget.h hi48-app-kcontrol.png hi16-app-kcontrol.png kcrootonly.cpp kcrootonly.h dockcontainer.cpp toplevel.h helpwidget.h moduleIface.cpp kcdialog.cpp KControl.desktop moduletreeview.cpp proxywidget.cpp modules.h version.h quickhelp.cpp moduleiconview.h moduleinfo.h global.h kcmshell.h helpwidget.cpp modulemenu.cpp modloader.h DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -807,7 +852,6 @@ +@@ -832,7 +883,6 @@ install-strip: mostlyclean-generic: clean-generic: @@ -291,7 +339,7 @@ $NetBSD: patch-ao,v 1.2 2002/08/25 19:23:37 jlam Exp $ distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* -@@ -890,9 +934,6 @@ +@@ -915,84 +965,81 @@ uninstall-info: uninstall-info-recursive messages: rc.cpp $(XGETTEXT) *.cpp -o $(podir)/kcontrol.pot @@ -301,94 +349,133 @@ $NetBSD: patch-ao,v 1.2 2002/08/25 19:23:37 jlam Exp $ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: -@@ -1016,34 +1057,34 @@ - - - #>+ 12 --kcmshell_la_meta_unload.cpp: kcmshell.moc moduleinfo.moc kecdialog.moc kcdialog.moc proxywidget.moc -- @echo 'creating kcmshell_la_meta_unload.cpp' -- @-rm -f kcmshell_la_meta_unload.cpp -+libkcmshell_main_la_meta_unload.cpp: kcmshell.moc moduleinfo.moc kecdialog.moc kcdialog.moc proxywidget.moc -+ @echo 'creating libkcmshell_main_la_meta_unload.cpp' -+ @-rm -f libkcmshell_main_la_meta_unload.cpp - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_kcmshell_la[] = {' > kcmshell_la_meta_unload.cpp ;\ -- cat kcmshell.moc moduleinfo.moc kecdialog.moc kcdialog.moc proxywidget.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kcmshell_la_meta_unload.cpp ;\ -- echo '0};' >> kcmshell_la_meta_unload.cpp ;\ -- echo '#include <kunload.h>' >> kcmshell_la_meta_unload.cpp ;\ -- echo '_UNLOAD(kcmshell_la)' >> kcmshell_la_meta_unload.cpp ;\ -- else echo > kcmshell_la_meta_unload.cpp; fi -+ echo 'static const char * _metalist_libkcmshell_main_la[] = {' > libkcmshell_main_la_meta_unload.cpp ;\ -+ cat kcmshell.moc moduleinfo.moc kecdialog.moc kcdialog.moc proxywidget.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkcmshell_main_la_meta_unload.cpp ;\ -+ echo '0};' >> libkcmshell_main_la_meta_unload.cpp ;\ -+ echo '#include <kunload.h>' >> libkcmshell_main_la_meta_unload.cpp ;\ -+ echo '_UNLOAD(libkcmshell_main_la)' >> libkcmshell_main_la_meta_unload.cpp ;\ -+ else echo > libkcmshell_main_la_meta_unload.cpp; fi - - - #>+ 12 --kcontrol_la_meta_unload.cpp: indexwidget.moc main.moc moduleinfo.moc helpwidget.moc toplevel.moc moduletreeview.moc kecdialog.moc modules.moc moduleiconview.moc searchwidget.moc moduleIface.moc aboutwidget.moc proxywidget.moc quickhelp.moc dockcontainer.moc -- @echo 'creating kcontrol_la_meta_unload.cpp' -- @-rm -f kcontrol_la_meta_unload.cpp -+libkcontrol_main_la_meta_unload.cpp: indexwidget.moc main.moc moduleinfo.moc helpwidget.moc toplevel.moc moduletreeview.moc kecdialog.moc modules.moc moduleiconview.moc searchwidget.moc moduleIface.moc aboutwidget.moc proxywidget.moc quickhelp.moc dockcontainer.moc -+ @echo 'creating libkcontrol_main_la_meta_unload.cpp' -+ @-rm -f libkcontrol_main_la_meta_unload.cpp - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_kcontrol_la[] = {' > kcontrol_la_meta_unload.cpp ;\ -- cat indexwidget.moc main.moc moduleinfo.moc helpwidget.moc toplevel.moc moduletreeview.moc kecdialog.moc modules.moc moduleiconview.moc searchwidget.moc moduleIface.moc aboutwidget.moc proxywidget.moc quickhelp.moc dockcontainer.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kcontrol_la_meta_unload.cpp ;\ -- echo '0};' >> kcontrol_la_meta_unload.cpp ;\ -- echo '#include <kunload.h>' >> kcontrol_la_meta_unload.cpp ;\ -- echo '_UNLOAD(kcontrol_la)' >> kcontrol_la_meta_unload.cpp ;\ -- else echo > kcontrol_la_meta_unload.cpp; fi -+ echo 'static const char * _metalist_libkcontrol_main_la[] = {' > libkcontrol_main_la_meta_unload.cpp ;\ -+ cat indexwidget.moc main.moc moduleinfo.moc helpwidget.moc toplevel.moc moduletreeview.moc kecdialog.moc modules.moc moduleiconview.moc searchwidget.moc moduleIface.moc aboutwidget.moc proxywidget.moc quickhelp.moc dockcontainer.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkcontrol_main_la_meta_unload.cpp ;\ -+ echo '0};' >> libkcontrol_main_la_meta_unload.cpp ;\ -+ echo '#include <kunload.h>' >> libkcontrol_main_la_meta_unload.cpp ;\ -+ echo '_UNLOAD(libkcontrol_main_la)' >> libkcontrol_main_la_meta_unload.cpp ;\ -+ else echo > libkcontrol_main_la_meta_unload.cpp; fi + #>+ 3 +-moduleinfo.moc: $(srcdir)/moduleinfo.h +- $(MOC) $(srcdir)/moduleinfo.h -o moduleinfo.moc +- +-#>+ 3 + indexwidget.moc: $(srcdir)/indexwidget.h + $(MOC) $(srcdir)/indexwidget.h -o indexwidget.moc #>+ 3 - clean-moc-classes: -- -rm -f kcmshell_la_meta_unload.cpp kcontrol_la_meta_unload.cpp -+ -rm -f libkcmshell_main_la_meta_unload.cpp libkcontrol_main_la_meta_unload.cpp +-moduleiconview.moc: $(srcdir)/moduleiconview.h +- $(MOC) $(srcdir)/moduleiconview.h -o moduleiconview.moc +- +-#>+ 3 +-dockcontainer.moc: $(srcdir)/dockcontainer.h +- $(MOC) $(srcdir)/dockcontainer.h -o dockcontainer.moc ++main.moc: $(srcdir)/main.h ++ $(MOC) $(srcdir)/main.h -o main.moc - #>+ 11 - kcminit_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcminit.cpp $(srcdir)/global.cpp indexwidget.moc main.moc moduleinfo.moc kcmshell.moc helpwidget.moc toplevel.moc moduletreeview.moc kecdialog.moc modulemenu.moc modules.moc moduleiconview.moc kcdialog.moc searchwidget.moc moduleIface.moc aboutwidget.moc proxywidget.moc dockcontainer.moc quickhelp.moc -@@ -1058,11 +1099,11 @@ - rm -f kcminit_la.all_cpp.final kcminit_la.all_cpp.files + #>+ 3 +-aboutwidget.moc: $(srcdir)/aboutwidget.h +- $(MOC) $(srcdir)/aboutwidget.h -o aboutwidget.moc ++moduleinfo.moc: $(srcdir)/moduleinfo.h ++ $(MOC) $(srcdir)/moduleinfo.h -o moduleinfo.moc - #>+ 11 --kcmshell_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcmshell.cpp $(srcdir)/moduleinfo.cpp $(srcdir)/modloader.cpp $(srcdir)/kecdialog.cpp $(srcdir)/proxywidget.cpp $(srcdir)/kcdialog.cpp $(srcdir)/global.cpp kcdialog_skel.cpp kcmshell_la_meta_unload.cpp -+kcmshell_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcmshell_main.cpp - @echo 'creating kcmshell_la.all_cpp.cpp ...'; \ - rm -f kcmshell_la.all_cpp.files kcmshell_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kcmshell_la.all_cpp.final; \ -- for file in kcmshell.cpp moduleinfo.cpp modloader.cpp kecdialog.cpp proxywidget.cpp kcdialog.cpp global.cpp kcdialog_skel.cpp kcmshell_la_meta_unload.cpp ; do \ -+ for file in kcmshell_main.cpp ; do \ - echo "#include \"$$file\"" >> kcmshell_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcmshell_la.all_cpp.final; \ - done; \ -@@ -1070,11 +1111,11 @@ - rm -f kcmshell_la.all_cpp.final kcmshell_la.all_cpp.files + #>+ 3 +-proxywidget.moc: $(srcdir)/proxywidget.h +- $(MOC) $(srcdir)/proxywidget.h -o proxywidget.moc ++kcmshell.moc: $(srcdir)/kcmshell.h ++ $(MOC) $(srcdir)/kcmshell.h -o kcmshell.moc - #>+ 11 --kcontrol_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/indexwidget.cpp $(srcdir)/searchwidget.cpp $(srcdir)/helpwidget.cpp $(srcdir)/moduleinfo.cpp $(srcdir)/modules.cpp $(srcdir)/proxywidget.cpp $(srcdir)/modloader.cpp $(srcdir)/dockcontainer.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/global.cpp $(srcdir)/quickhelp.cpp $(srcdir)/moduletreeview.cpp $(srcdir)/moduleiconview.cpp $(srcdir)/kecdialog.cpp $(srcdir)/kcrootonly.cpp $(srcdir)/moduleIface.cpp moduleIface_skel.cpp kcontrol_la_meta_unload.cpp -+kcontrol_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcontrol_main.cpp - @echo 'creating kcontrol_la.all_cpp.cpp ...'; \ - rm -f kcontrol_la.all_cpp.files kcontrol_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kcontrol_la.all_cpp.final; \ -- for file in main.cpp toplevel.cpp indexwidget.cpp searchwidget.cpp helpwidget.cpp moduleinfo.cpp modules.cpp proxywidget.cpp modloader.cpp dockcontainer.cpp aboutwidget.cpp global.cpp quickhelp.cpp moduletreeview.cpp moduleiconview.cpp kecdialog.cpp kcrootonly.cpp moduleIface.cpp moduleIface_skel.cpp kcontrol_la_meta_unload.cpp ; do \ -+ for file in kcontrol_main.cpp ; do \ - echo "#include \"$$file\"" >> kcontrol_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcontrol_la.all_cpp.final; \ - done; \ -@@ -1082,11 +1123,47 @@ - rm -f kcontrol_la.all_cpp.final kcontrol_la.all_cpp.files + #>+ 3 + helpwidget.moc: $(srcdir)/helpwidget.h + $(MOC) $(srcdir)/helpwidget.h -o helpwidget.moc + + #>+ 3 +-quickhelp.moc: $(srcdir)/quickhelp.h +- $(MOC) $(srcdir)/quickhelp.h -o quickhelp.moc ++toplevel.moc: $(srcdir)/toplevel.h ++ $(MOC) $(srcdir)/toplevel.h -o toplevel.moc + + #>+ 3 +-main.moc: $(srcdir)/main.h +- $(MOC) $(srcdir)/main.h -o main.moc ++moduletreeview.moc: $(srcdir)/moduletreeview.h ++ $(MOC) $(srcdir)/moduletreeview.h -o moduletreeview.moc ++ ++#>+ 3 ++kecdialog.moc: $(srcdir)/kecdialog.h ++ $(MOC) $(srcdir)/kecdialog.h -o kecdialog.moc ++ ++#>+ 3 ++modulemenu.moc: $(srcdir)/modulemenu.h ++ $(MOC) $(srcdir)/modulemenu.h -o modulemenu.moc + + #>+ 3 + modules.moc: $(srcdir)/modules.h + $(MOC) $(srcdir)/modules.h -o modules.moc + + #>+ 3 +-kcdialog.moc: $(srcdir)/kcdialog.h +- $(MOC) $(srcdir)/kcdialog.h -o kcdialog.moc ++moduleiconview.moc: $(srcdir)/moduleiconview.h ++ $(MOC) $(srcdir)/moduleiconview.h -o moduleiconview.moc + + #>+ 3 +-moduletreeview.moc: $(srcdir)/moduletreeview.h +- $(MOC) $(srcdir)/moduletreeview.h -o moduletreeview.moc ++kcdialog.moc: $(srcdir)/kcdialog.h ++ $(MOC) $(srcdir)/kcdialog.h -o kcdialog.moc + + #>+ 3 +-kecdialog.moc: $(srcdir)/kecdialog.h +- $(MOC) $(srcdir)/kecdialog.h -o kecdialog.moc ++searchwidget.moc: $(srcdir)/searchwidget.h ++ $(MOC) $(srcdir)/searchwidget.h -o searchwidget.moc + + #>+ 3 +-toplevel.moc: $(srcdir)/toplevel.h +- $(MOC) $(srcdir)/toplevel.h -o toplevel.moc ++moduleIface.moc: $(srcdir)/moduleIface.h ++ $(MOC) $(srcdir)/moduleIface.h -o moduleIface.moc + + #>+ 3 +-modulemenu.moc: $(srcdir)/modulemenu.h +- $(MOC) $(srcdir)/modulemenu.h -o modulemenu.moc ++aboutwidget.moc: $(srcdir)/aboutwidget.h ++ $(MOC) $(srcdir)/aboutwidget.h -o aboutwidget.moc + + #>+ 3 +-kcmshell.moc: $(srcdir)/kcmshell.h +- $(MOC) $(srcdir)/kcmshell.h -o kcmshell.moc ++proxywidget.moc: $(srcdir)/proxywidget.h ++ $(MOC) $(srcdir)/proxywidget.h -o proxywidget.moc + + #>+ 3 +-moduleIface.moc: $(srcdir)/moduleIface.h +- $(MOC) $(srcdir)/moduleIface.h -o moduleIface.moc ++dockcontainer.moc: $(srcdir)/dockcontainer.h ++ $(MOC) $(srcdir)/dockcontainer.h -o dockcontainer.moc + + #>+ 3 +-searchwidget.moc: $(srcdir)/searchwidget.h +- $(MOC) $(srcdir)/searchwidget.h -o searchwidget.moc ++quickhelp.moc: $(srcdir)/quickhelp.h ++ $(MOC) $(srcdir)/quickhelp.h -o quickhelp.moc + + #>+ 5 + kcdialog.kidl: $(srcdir)/kcdialog.h $(DCOP_DEPENDENCIES) +@@ -1008,7 +1055,7 @@ moduleIface_skel.cpp: moduleIface.kidl + + #>+ 3 + clean-metasources: +- -rm -f moduleinfo.moc indexwidget.moc moduleiconview.moc dockcontainer.moc aboutwidget.moc proxywidget.moc helpwidget.moc quickhelp.moc main.moc modules.moc kcdialog.moc moduletreeview.moc kecdialog.moc toplevel.moc modulemenu.moc kcmshell.moc moduleIface.moc searchwidget.moc ++ -rm -f indexwidget.moc main.moc moduleinfo.moc kcmshell.moc helpwidget.moc toplevel.moc moduletreeview.moc kecdialog.moc modulemenu.moc modules.moc moduleiconview.moc kcdialog.moc searchwidget.moc moduleIface.moc aboutwidget.moc proxywidget.moc dockcontainer.moc quickhelp.moc + + #>+ 5 + clean-idl: +@@ -1053,45 +1100,57 @@ kcminit_la.all_cpp.cpp: $(srcdir)/Makefi + rm -f kcminit_la.all_cpp.final kcminit_la.all_cpp.files #>+ 11 --kcminit.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+libkcminit_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcminit.cpp $(srcdir)/global.cpp +-kcmshell_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcmshell.cpp $(srcdir)/moduleinfo.cpp $(srcdir)/modloader.cpp $(srcdir)/kecdialog.cpp $(srcdir)/proxywidget.cpp $(srcdir)/kcdialog.cpp $(srcdir)/global.cpp kcdialog_skel.cpp kecdialog.moc kcdialog.moc moduleinfo.moc proxywidget.moc kcmshell.moc +- @echo 'creating kcmshell_la.all_cpp.cpp ...'; \ +- rm -f kcmshell_la.all_cpp.files kcmshell_la.all_cpp.final; \ +- echo "#define KDE_USE_FINAL 1" >> kcmshell_la.all_cpp.final; \ ++libkcminit_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcminit.cpp $(srcdir)/global.cpp + @echo 'creating libkcminit_main_la.all_cpp.cpp ...'; \ + rm -f libkcminit_main_la.all_cpp.files libkcminit_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkcminit_main_la.all_cpp.final; \ @@ -396,77 +483,49 @@ $NetBSD: patch-ao,v 1.2 2002/08/25 19:23:37 jlam Exp $ + echo "#include \"$$file\"" >> libkcminit_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkcminit_main_la.all_cpp.final; \ + done; \ -+ cat libkcminit_main_la.all_cpp.final libkcminit_main_la.all_cpp.files > libkcminit_main_la.all_cpp.cpp; \ ++ cat libkcminit_main_la.all_cpp.final libkcminit_main_la.all_cpp.files > libkcminit_main_la.all_cpp.cpp; \ + rm -f libkcminit_main_la.all_cpp.final libkcminit_main_la.all_cpp.files + +#>+ 11 -+libkcmshell_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcmshell.cpp $(srcdir)/moduleinfo.cpp $(srcdir)/modloader.cpp $(srcdir)/kecdialog.cpp $(srcdir)/proxywidget.cpp $(srcdir)/kcdialog.cpp $(srcdir)/global.cpp kcdialog_skel.cpp libkcmshell_main_la_meta_unload.cpp ++libkcmshell_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcmshell.cpp $(srcdir)/moduleinfo.cpp $(srcdir)/modloader.cpp $(srcdir)/kecdialog.cpp $(srcdir)/proxywidget.cpp $(srcdir)/kcdialog.cpp $(srcdir)/global.cpp kcdialog_skel.cpp kcmshell.moc moduleinfo.moc kecdialog.moc kcdialog.moc proxywidget.moc + @echo 'creating libkcmshell_main_la.all_cpp.cpp ...'; \ + rm -f libkcmshell_main_la.all_cpp.files libkcmshell_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkcmshell_main_la.all_cpp.final; \ -+ for file in kcmshell.cpp moduleinfo.cpp modloader.cpp kecdialog.cpp proxywidget.cpp kcdialog.cpp global.cpp kcdialog_skel.cpp libkcmshell_main_la_meta_unload.cpp ; do \ + for file in kcmshell.cpp moduleinfo.cpp modloader.cpp kecdialog.cpp proxywidget.cpp kcdialog.cpp global.cpp kcdialog_skel.cpp ; do \ +- echo "#include \"$$file\"" >> kcmshell_la.all_cpp.files; \ +- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcmshell_la.all_cpp.final; \ + echo "#include \"$$file\"" >> libkcmshell_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkcmshell_main_la.all_cpp.final; \ -+ done; \ -+ cat libkcmshell_main_la.all_cpp.final libkcmshell_main_la.all_cpp.files > libkcmshell_main_la.all_cpp.cpp; \ + done; \ +- cat kcmshell_la.all_cpp.final kcmshell_la.all_cpp.files > kcmshell_la.all_cpp.cpp; \ +- rm -f kcmshell_la.all_cpp.final kcmshell_la.all_cpp.files ++ cat libkcmshell_main_la.all_cpp.final libkcmshell_main_la.all_cpp.files > libkcmshell_main_la.all_cpp.cpp; \ + rm -f libkcmshell_main_la.all_cpp.final libkcmshell_main_la.all_cpp.files -+ -+#>+ 11 -+libkcontrol_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/indexwidget.cpp $(srcdir)/searchwidget.cpp $(srcdir)/helpwidget.cpp $(srcdir)/moduleinfo.cpp $(srcdir)/modules.cpp $(srcdir)/proxywidget.cpp $(srcdir)/modloader.cpp $(srcdir)/dockcontainer.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/global.cpp $(srcdir)/quickhelp.cpp $(srcdir)/moduletreeview.cpp $(srcdir)/moduleiconview.cpp $(srcdir)/kecdialog.cpp $(srcdir)/kcrootonly.cpp $(srcdir)/moduleIface.cpp moduleIface_skel.cpp libkcontrol_main_la_meta_unload.cpp + + #>+ 11 +-kcontrol_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/indexwidget.cpp $(srcdir)/searchwidget.cpp $(srcdir)/helpwidget.cpp $(srcdir)/moduleinfo.cpp $(srcdir)/modules.cpp $(srcdir)/proxywidget.cpp $(srcdir)/modloader.cpp $(srcdir)/dockcontainer.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/global.cpp $(srcdir)/quickhelp.cpp $(srcdir)/moduletreeview.cpp $(srcdir)/moduleiconview.cpp $(srcdir)/kecdialog.cpp $(srcdir)/kcrootonly.cpp $(srcdir)/moduleIface.cpp moduleIface_skel.cpp indexwidget.moc dockcontainer.moc moduleiconview.moc helpwidget.moc kecdialog.moc moduletreeview.moc searchwidget.moc moduleinfo.moc aboutwidget.moc proxywidget.moc quickhelp.moc main.moc modules.moc toplevel.moc moduleIface.moc +- @echo 'creating kcontrol_la.all_cpp.cpp ...'; \ +- rm -f kcontrol_la.all_cpp.files kcontrol_la.all_cpp.final; \ +- echo "#define KDE_USE_FINAL 1" >> kcontrol_la.all_cpp.final; \ ++libkcontrol_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/indexwidget.cpp $(srcdir)/searchwidget.cpp $(srcdir)/helpwidget.cpp $(srcdir)/moduleinfo.cpp $(srcdir)/modules.cpp $(srcdir)/proxywidget.cpp $(srcdir)/modloader.cpp $(srcdir)/dockcontainer.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/global.cpp $(srcdir)/quickhelp.cpp $(srcdir)/moduletreeview.cpp $(srcdir)/moduleiconview.cpp $(srcdir)/kecdialog.cpp $(srcdir)/kcrootonly.cpp $(srcdir)/moduleIface.cpp moduleIface_skel.cpp indexwidget.moc main.moc moduleinfo.moc helpwidget.moc toplevel.moc moduletreeview.moc kecdialog.moc modules.moc moduleiconview.moc searchwidget.moc moduleIface.moc aboutwidget.moc proxywidget.moc quickhelp.moc dockcontainer.moc + @echo 'creating libkcontrol_main_la.all_cpp.cpp ...'; \ + rm -f libkcontrol_main_la.all_cpp.files libkcontrol_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkcontrol_main_la.all_cpp.final; \ -+ for file in main.cpp toplevel.cpp indexwidget.cpp searchwidget.cpp helpwidget.cpp moduleinfo.cpp modules.cpp proxywidget.cpp modloader.cpp dockcontainer.cpp aboutwidget.cpp global.cpp quickhelp.cpp moduletreeview.cpp moduleiconview.cpp kecdialog.cpp kcrootonly.cpp moduleIface.cpp moduleIface_skel.cpp libkcontrol_main_la_meta_unload.cpp ; do \ + for file in main.cpp toplevel.cpp indexwidget.cpp searchwidget.cpp helpwidget.cpp moduleinfo.cpp modules.cpp proxywidget.cpp modloader.cpp dockcontainer.cpp aboutwidget.cpp global.cpp quickhelp.cpp moduletreeview.cpp moduleiconview.cpp kecdialog.cpp kcrootonly.cpp moduleIface.cpp moduleIface_skel.cpp ; do \ +- echo "#include \"$$file\"" >> kcontrol_la.all_cpp.files; \ +- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcontrol_la.all_cpp.final; \ + echo "#include \"$$file\"" >> libkcontrol_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkcontrol_main_la.all_cpp.final; \ -+ done; \ -+ cat libkcontrol_main_la.all_cpp.final libkcontrol_main_la.all_cpp.files > libkcontrol_main_la.all_cpp.cpp; \ -+ rm -f libkcontrol_main_la.all_cpp.final libkcontrol_main_la.all_cpp.files -+ -+#>+ 11 -+kcminit.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcminit_main.cpp - @echo 'creating kcminit.all_cpp.cpp ...'; \ - rm -f kcminit.all_cpp.files kcminit.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kcminit.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in kcminit_main.cpp ; do \ - echo "#include \"$$file\"" >> kcminit.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcminit.all_cpp.final; \ - done; \ -@@ -1094,11 +1171,11 @@ - rm -f kcminit.all_cpp.final kcminit.all_cpp.files - - #>+ 11 --kcmshell.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+kcmshell.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcmshell_main.cpp - @echo 'creating kcmshell.all_cpp.cpp ...'; \ - rm -f kcmshell.all_cpp.files kcmshell.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kcmshell.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in kcmshell_main.cpp ; do \ - echo "#include \"$$file\"" >> kcmshell.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcmshell.all_cpp.final; \ done; \ -@@ -1106,11 +1183,11 @@ - rm -f kcmshell.all_cpp.final kcmshell.all_cpp.files - - #>+ 11 --kcontrol.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+kcontrol.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcontrol_main.cpp - @echo 'creating kcontrol.all_cpp.cpp ...'; \ - rm -f kcontrol.all_cpp.files kcontrol.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kcontrol.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in kcontrol_main.cpp ; do \ - echo "#include \"$$file\"" >> kcontrol.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcontrol.all_cpp.final; \ - done; \ -@@ -1119,20 +1196,20 @@ +- cat kcontrol_la.all_cpp.final kcontrol_la.all_cpp.files > kcontrol_la.all_cpp.cpp; \ +- rm -f kcontrol_la.all_cpp.final kcontrol_la.all_cpp.files ++ cat libkcontrol_main_la.all_cpp.final libkcontrol_main_la.all_cpp.files > libkcontrol_main_la.all_cpp.cpp; \ ++ rm -f libkcontrol_main_la.all_cpp.final libkcontrol_main_la.all_cpp.files #>+ 3 clean-final: -- -rm -f kcminit_la.all_cpp.cpp kcmshell_la.all_cpp.cpp kcontrol_la.all_cpp.cpp kcminit.all_cpp.cpp kcmshell.all_cpp.cpp kcontrol.all_cpp.cpp -+ -rm -f kcminit_la.all_cpp.cpp kcmshell_la.all_cpp.cpp kcontrol_la.all_cpp.cpp libkcminit_main_la.all_cpp.cpp libkcmshell_main_la.all_cpp.cpp libkcontrol_main_la.all_cpp.cpp kcminit.all_cpp.cpp kcmshell.all_cpp.cpp kcontrol.all_cpp.cpp +- -rm -f kcminit_la.all_cpp.cpp kcmshell_la.all_cpp.cpp kcontrol_la.all_cpp.cpp ++ -rm -f kcminit_la.all_cpp.cpp libkcminit_main_la.all_cpp.cpp libkcmshell_main_la.all_cpp.cpp libkcontrol_main_la.all_cpp.cpp #>+ 2 final: @@ -486,4 +545,72 @@ $NetBSD: patch-ao,v 1.2 2002/08/25 19:23:37 jlam Exp $ + $(MAKE) kcminit_la_OBJECTS="$(kcminit_la_nofinal_OBJECTS)" libkcminit_main_la_OBJECTS="$(libkcminit_main_la_nofinal_OBJECTS)" libkcmshell_main_la_OBJECTS="$(libkcmshell_main_la_nofinal_OBJECTS)" libkcontrol_main_la_OBJECTS="$(libkcontrol_main_la_nofinal_OBJECTS)" install-am #>+ 3 cvs-clean: - $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean + $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean +@@ -1101,39 +1160,39 @@ kde-rpo-clean: + -rm -f *.rpo + + #>+ 37 +-quickhelp.o: quickhelp.moc ++searchwidget.lo: searchwidget.moc + toplevel.lo: toplevel.moc +-moduletreeview.lo: moduletreeview.moc +-main.lo: main.moc +-kcmshell.lo: kcmshell.moc +-kcdialog.lo: kcdialog.moc +-searchwidget.o: searchwidget.moc +-modulemenu.lo: modulemenu.moc +-moduleinfo.lo: moduleinfo.moc +-dockcontainer.o: dockcontainer.moc +-moduleiconview.o: moduleiconview.moc +-modules.o: modules.moc +-proxywidget.lo: proxywidget.moc +-kcmshell.o: kcmshell.moc +-dockcontainer.lo: dockcontainer.moc +-quickhelp.lo: quickhelp.moc +-indexwidget.o: indexwidget.moc +-kcdialog.o: kcdialog.moc + helpwidget.lo: helpwidget.moc +-modulemenu.o: modulemenu.moc ++indexwidget.o: indexwidget.moc ++moduleIface.lo: moduleIface.moc ++kcdialog.lo: kcdialog.moc + aboutwidget.lo: aboutwidget.moc +-main.o: main.moc + indexwidget.lo: indexwidget.moc +-helpwidget.o: helpwidget.moc +-moduleinfo.o: moduleinfo.moc +-aboutwidget.o: aboutwidget.moc +-toplevel.o: toplevel.moc +-moduleIface.o: moduleIface.moc +-moduletreeview.o: moduletreeview.moc + kecdialog.lo: kecdialog.moc +-searchwidget.lo: searchwidget.moc ++dockcontainer.o: dockcontainer.moc + proxywidget.o: proxywidget.moc +-moduleIface.lo: moduleIface.moc +-moduleiconview.lo: moduleiconview.moc ++modulemenu.o: modulemenu.moc ++moduletreeview.lo: moduletreeview.moc ++quickhelp.o: quickhelp.moc ++searchwidget.o: searchwidget.moc ++main.o: main.moc ++moduletreeview.o: moduletreeview.moc ++dockcontainer.lo: dockcontainer.moc ++kcdialog.o: kcdialog.moc ++moduleIface.o: moduleIface.moc + kecdialog.o: kecdialog.moc ++proxywidget.lo: proxywidget.moc ++aboutwidget.o: aboutwidget.moc ++quickhelp.lo: quickhelp.moc ++main.lo: main.moc ++moduleiconview.lo: moduleiconview.moc ++toplevel.o: toplevel.moc ++helpwidget.o: helpwidget.moc ++moduleinfo.lo: moduleinfo.moc ++modules.o: modules.moc ++kcmshell.lo: kcmshell.moc ++moduleiconview.o: moduleiconview.moc + modules.lo: modules.moc ++moduleinfo.o: moduleinfo.moc ++kcmshell.o: kcmshell.moc ++modulemenu.lo: modulemenu.moc |