diff options
Diffstat (limited to 'x11/kdebase3/patches/patch-dh')
| -rw-r--r-- | x11/kdebase3/patches/patch-dh | 225 |
1 files changed, 126 insertions, 99 deletions
diff --git a/x11/kdebase3/patches/patch-dh b/x11/kdebase3/patches/patch-dh index c9bc7cf1f77..96353a037a8 100644 --- a/x11/kdebase3/patches/patch-dh +++ b/x11/kdebase3/patches/patch-dh @@ -1,8 +1,8 @@ -$NetBSD: patch-dh,v 1.2 2002/08/25 19:23:45 jlam Exp $ +$NetBSD: patch-dh,v 1.3 2003/01/02 09:12:35 skrll Exp $ ---- kwin/Makefile.in.orig Mon May 13 23:57:54 2002 +--- kwin/Makefile.in.orig Fri Dec 27 18:19:11 2002 +++ kwin/Makefile.in -@@ -293,18 +293,22 @@ +@@ -292,18 +292,22 @@ INCLUDES = $(all_includes) SUBDIRS = . kcmkwin pics clients bin_PROGRAMS = kwin @@ -12,8 +12,8 @@ $NetBSD: patch-dh,v 1.2 2002/08/25 19:23:45 jlam Exp $ # workspace.cpp has to be first in order not to break --enable-final -#>- kwin_la_SOURCES = workspace.cpp atoms.cpp client.cpp main.cpp \ +#>- libkwin_la_SOURCES = workspace.cpp atoms.cpp client.cpp main.cpp \ - #>- tabbox.cpp options.cpp plugins.cpp events.cpp KWinInterface.skel \ - #>- killwindow.cpp kwinbutton.cpp + #>- tabbox.cpp options.cpp plugins.cpp events.cpp KWinInterface.skel \ + #>- killwindow.cpp kwinbutton.cpp #>+ 3 -kwin_la_SOURCES=workspace.cpp atoms.cpp client.cpp main.cpp \ +libkwin_la_SOURCES=workspace.cpp atoms.cpp client.cpp main.cpp \ @@ -29,7 +29,7 @@ $NetBSD: patch-dh,v 1.2 2002/08/25 19:23:45 jlam Exp $ kwin_la_LDFLAGS = $(all_libraries) -module -avoid-version include_HEADERS = KWinInterface.h -@@ -313,7 +317,7 @@ +@@ -312,7 +316,7 @@ kwinincludedir = $(includedir)/kwin kwininclude_HEADERS = options.h client.h workspace.h kwinbutton.h kwin_SOURCES = kwin_main.cpp @@ -38,7 +38,7 @@ $NetBSD: patch-dh,v 1.2 2002/08/25 19:23:45 jlam Exp $ kwin_LDFLAGS = $(all_libraries) $(KDE_RPATH) KDE_ICON = kwin -@@ -324,7 +328,6 @@ +@@ -323,7 +327,6 @@ data_DATA = eventsrc sounddir = $(kde_sounddir) sound_DATA = pop.wav @@ -46,7 +46,7 @@ $NetBSD: patch-dh,v 1.2 2002/08/25 19:23:45 jlam Exp $ update_DATA = kwin.upd pluginlibFix.pl updatedir = $(kde_datadir)/kconf_update subdir = kwin -@@ -333,17 +336,24 @@ +@@ -332,16 +335,23 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -56,11 +56,10 @@ $NetBSD: patch-dh,v 1.2 2002/08/25 19:23:45 jlam Exp $ +kwin_la_DEPENDENCIES = libkwin.la +am_kwin_la_OBJECTS = kwin_main.lo #>- kwin_la_OBJECTS = $(am_kwin_la_OBJECTS) --#>+ 6 +-#>+ 5 -kwin_la_final_OBJECTS = kwin_la.all_cpp.lo -kwin_la_nofinal_OBJECTS = workspace.lo atoms.lo client.lo main.lo tabbox.lo \ -- options.lo plugins.lo events.lo killwindow.lo kwinbutton.lo KWinInterface_skel.lo \ -- kwin_la_meta_unload.lo +- options.lo plugins.lo events.lo killwindow.lo kwinbutton.lo KWinInterface_skel.lo -@KDE_USE_FINAL_FALSE@kwin_la_OBJECTS = $(kwin_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@kwin_la_OBJECTS = $(kwin_la_final_OBJECTS) +#>+ 1 @@ -70,18 +69,17 @@ $NetBSD: patch-dh,v 1.2 2002/08/25 19:23:45 jlam Exp $ + tabbox.lo options.lo plugins.lo events.lo killwindow.lo \ + kwinbutton.lo +#>- libkwin_la_OBJECTS = $(am_libkwin_la_OBJECTS) -+#>+ 7 ++#>+ 6 +libkwin_la_final_OBJECTS = libkwin_la.all_cpp.lo +libkwin_la_nofinal_OBJECTS = workspace.lo atoms.lo client.lo main.lo \ + tabbox.lo options.lo plugins.lo events.lo killwindow.lo \ -+ kwinbutton.lo KWinInterface_skel.lo \ -+ libkwin_la_meta_unload.lo ++ kwinbutton.lo KWinInterface_skel.lo +@KDE_USE_FINAL_FALSE@libkwin_la_OBJECTS = $(libkwin_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libkwin_la_OBJECTS = $(libkwin_la_final_OBJECTS) bin_PROGRAMS = kwin$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) -@@ -351,7 +361,7 @@ +@@ -349,7 +359,7 @@ am_kwin_OBJECTS = kwin_main.$(OBJEXT) #>- kwin_OBJECTS = $(am_kwin_OBJECTS) #>+ 1 kwin_OBJECTS = kwin_main.$(OBJEXT) @@ -90,22 +88,44 @@ $NetBSD: patch-dh,v 1.2 2002/08/25 19:23:45 jlam Exp $ DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -361,10 +371,10 @@ +@@ -359,23 +369,23 @@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp - @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/atoms.Plo $(DEPDIR)/client.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/events.Plo $(DEPDIR)/killwindow.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/kwin_main.Po $(DEPDIR)/kwinbutton.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/options.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/plugins.Plo $(DEPDIR)/tabbox.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/workspace.Plo -+ @AMDEP_TRUE@ $(DEPDIR)/kwin_main.Plo $(DEPDIR)/kwin_main.Po \ -+ @AMDEP_TRUE@ $(DEPDIR)/kwinbutton.Plo $(DEPDIR)/main.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/options.Plo $(DEPDIR)/plugins.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/tabbox.Plo $(DEPDIR)/workspace.Plo + #>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/atoms.Plo $(DEPDIR)/client.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/events.Plo $(DEPDIR)/killwindow.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/kwin_main.Po $(DEPDIR)/kwinbutton.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/options.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/plugins.Plo $(DEPDIR)/tabbox.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/workspace.Plo ++#>- @AMDEP_TRUE@ $(DEPDIR)/kwin_main.Plo $(DEPDIR)/kwin_main.Po \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kwinbutton.Plo $(DEPDIR)/main.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/options.Plo $(DEPDIR)/plugins.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/tabbox.Plo $(DEPDIR)/workspace.Plo + #>+ 13 +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/KWinInterface_skel.P $(DEPDIR)/kwin_la.all_cpp.P $(DEPDIR)/atoms.Plo $(DEPDIR)/client.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/KWinInterface_skel.P $(DEPDIR)/libkwin_la.all_cpp.P $(DEPDIR)/atoms.Plo $(DEPDIR)/client.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/events.Plo $(DEPDIR)/killwindow.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kwin_main.Po $(DEPDIR)/kwinbutton.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/options.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/plugins.Plo $(DEPDIR)/tabbox.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/workspace.Plo ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kwin_main.Plo $(DEPDIR)/kwin_main.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kwinbutton.Plo $(DEPDIR)/main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/options.Plo $(DEPDIR)/plugins.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/tabbox.Plo $(DEPDIR)/workspace.Plo + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/KWinInterface_skel.P $(DEPDIR)/atoms.Plo $(DEPDIR)/client.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/events.Plo $(DEPDIR)/killwindow.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kwin_main.Po $(DEPDIR)/kwinbutton.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/options.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/plugins.Plo $(DEPDIR)/tabbox.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/workspace.Plo ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kwin_main.Plo $(DEPDIR)/kwin_main.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kwinbutton.Plo $(DEPDIR)/main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/options.Plo $(DEPDIR)/plugins.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/tabbox.Plo $(DEPDIR)/workspace.Plo + #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - #>+ 2 -@@ -384,7 +394,7 @@ + #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +@@ -396,7 +406,7 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ @@ -114,7 +134,7 @@ $NetBSD: patch-dh,v 1.2 2002/08/25 19:23:45 jlam Exp $ DATA = $(data_DATA) $(sound_DATA) $(update_DATA) HEADERS = $(include_HEADERS) $(kwininclude_HEADERS) -@@ -397,7 +407,7 @@ +@@ -409,7 +419,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r DIST_COMMON = README $(include_HEADERS) $(kwininclude_HEADERS) \ Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) @@ -123,7 +143,7 @@ $NetBSD: patch-dh,v 1.2 2002/08/25 19:23:45 jlam Exp $ #>- all: all-recursive #>+ 1 -@@ -446,6 +456,8 @@ +@@ -458,6 +468,8 @@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) kwin.la: $(kwin_la_OBJECTS) $(kwin_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kwin_la_LDFLAGS) $(kwin_la_OBJECTS) $(kwin_la_LIBADD) $(LIBS) @@ -132,7 +152,7 @@ $NetBSD: patch-dh,v 1.2 2002/08/25 19:23:45 jlam Exp $ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) -@@ -484,6 +496,7 @@ +@@ -496,6 +508,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/client.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/events.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/killwindow.Plo@am__quote@ @@ -140,107 +160,91 @@ $NetBSD: patch-dh,v 1.2 2002/08/25 19:23:45 jlam Exp $ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kwin_main.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kwinbutton.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/main.Plo@am__quote@ -@@ -694,7 +707,7 @@ +@@ -706,7 +719,7 @@ distclean-tags: #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=NEWCOLORSCHEME.README plugins.cpp stdclient_bitmaps.h kwin.upd options.cpp tabbox.h hi48-app-kwin.png pluginlibFix.pl LICENSE main.h hi32-app-kwin.png pop.wav kwinbutton.cpp events.cpp plugins.h killwindow.h kwinbindings.cpp events.h atoms.h eventsrc killwindow.cpp tabbox.cpp hi16-app-kwin.png +-KDE_DIST=stdclient_bitmaps.h NEWCOLORSCHEME.README killwindow.h eventsrc atoms.h main.h killwindow.cpp kwin.upd pop.wav plugins.cpp pluginlibFix.pl tabbox.cpp hi16-app-kwin.png plugins.h events.h kwinbindings.cpp LICENSE hi48-app-kwin.png options.cpp kwinbutton.cpp hi32-app-kwin.png tabbox.h events.cpp +KDE_DIST=pluginlibFix.pl kwinbutton.cpp kwin.upd events.cpp plugins.h options.cpp LICENSE killwindow.h main.h NEWCOLORSCHEME.README hi32-app-kwin.png tabbox.h hi48-app-kwin.png kwinbindings.cpp plugins.cpp pop.wav stdclient_bitmaps.h events.h atoms.h killwindow.cpp tabbox.cpp eventsrc hi16-app-kwin.png DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -851,12 +864,6 @@ +@@ -863,25 +876,15 @@ messages: # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: -#>+ 5 --KWinInterface.kidl: $(srcdir)/KWinInterface.h $(DCOPIDL_DEPENDENCIES) +-KWinInterface.kidl: $(srcdir)/KWinInterface.h $(DCOP_DEPENDENCIES) - $(DCOPIDL) $(srcdir)/KWinInterface.h > KWinInterface.kidl || ( rm -f KWinInterface.kidl ; /bin/false ) -KWinInterface_skel.cpp: KWinInterface.kidl - $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub KWinInterface.kidl -- ++#>+ 3 ++workspace.moc: $(srcdir)/workspace.h ++ $(MOC) $(srcdir)/workspace.h -o workspace.moc + + #>+ 3 + client.moc: $(srcdir)/client.h + $(MOC) $(srcdir)/client.h -o client.moc + #>+ 3 - workspace.moc: $(srcdir)/workspace.h - $(MOC) $(srcdir)/workspace.h -o workspace.moc -@@ -881,6 +888,12 @@ - plugins.moc: $(srcdir)/plugins.h - $(MOC) $(srcdir)/plugins.h -o plugins.moc +-plugins.moc: $(srcdir)/plugins.h +- $(MOC) $(srcdir)/plugins.h -o plugins.moc +- +-#>+ 3 +-workspace.moc: $(srcdir)/workspace.h +- $(MOC) $(srcdir)/workspace.h -o workspace.moc +- +-#>+ 3 + options.moc: $(srcdir)/options.h + $(MOC) $(srcdir)/options.h -o options.moc +@@ -894,8 +897,18 @@ kwinbutton.moc: $(srcdir)/kwinbutton.h + $(MOC) $(srcdir)/kwinbutton.h -o kwinbutton.moc + + #>+ 3 ++plugins.moc: $(srcdir)/plugins.h ++ $(MOC) $(srcdir)/plugins.h -o plugins.moc ++ +#>+ 5 -+KWinInterface.kidl: $(srcdir)/KWinInterface.h $(DCOPIDL_DEPENDENCIES) ++KWinInterface.kidl: $(srcdir)/KWinInterface.h $(DCOP_DEPENDENCIES) + $(DCOPIDL) $(srcdir)/KWinInterface.h > KWinInterface.kidl || ( rm -f KWinInterface.kidl ; /bin/false ) +KWinInterface_skel.cpp: KWinInterface.kidl + $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub KWinInterface.kidl + - #>+ 3 ++#>+ 3 clean-metasources: - -rm -f workspace.moc client.moc options.moc tabbox.moc kwinbutton.moc plugins.moc -@@ -915,28 +928,28 @@ - - - #>+ 12 --kwin_la_meta_unload.cpp: workspace.moc client.moc tabbox.moc options.moc kwinbutton.moc plugins.moc -- @echo 'creating kwin_la_meta_unload.cpp' -- @-rm -f kwin_la_meta_unload.cpp -+libkwin_la_meta_unload.cpp: workspace.moc client.moc tabbox.moc options.moc kwinbutton.moc plugins.moc -+ @echo 'creating libkwin_la_meta_unload.cpp' -+ @-rm -f libkwin_la_meta_unload.cpp - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_kwin_la[] = {' > kwin_la_meta_unload.cpp ;\ -- cat workspace.moc client.moc tabbox.moc options.moc kwinbutton.moc plugins.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kwin_la_meta_unload.cpp ;\ -- echo '0};' >> kwin_la_meta_unload.cpp ;\ -- echo '#include <kunload.h>' >> kwin_la_meta_unload.cpp ;\ -- echo '_UNLOAD(kwin_la)' >> kwin_la_meta_unload.cpp ;\ -- else echo > kwin_la_meta_unload.cpp; fi -+ echo 'static const char * _metalist_libkwin_la[] = {' > libkwin_la_meta_unload.cpp ;\ -+ cat workspace.moc client.moc tabbox.moc options.moc kwinbutton.moc plugins.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkwin_la_meta_unload.cpp ;\ -+ echo '0};' >> libkwin_la_meta_unload.cpp ;\ -+ echo '#include <kunload.h>' >> libkwin_la_meta_unload.cpp ;\ -+ echo '_UNLOAD(libkwin_la)' >> libkwin_la_meta_unload.cpp ;\ -+ else echo > libkwin_la_meta_unload.cpp; fi +- -rm -f client.moc plugins.moc workspace.moc options.moc tabbox.moc kwinbutton.moc ++ -rm -f workspace.moc client.moc options.moc tabbox.moc kwinbutton.moc plugins.moc + #>+ 4 + clean-idl: +@@ -927,33 +940,33 @@ force-reedit: - #>+ 3 - clean-moc-classes: -- -rm -f kwin_la_meta_unload.cpp -+ -rm -f libkwin_la_meta_unload.cpp #>+ 11 --kwin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/workspace.cpp $(srcdir)/atoms.cpp $(srcdir)/client.cpp $(srcdir)/main.cpp $(srcdir)/tabbox.cpp $(srcdir)/options.cpp $(srcdir)/plugins.cpp $(srcdir)/events.cpp $(srcdir)/killwindow.cpp $(srcdir)/kwinbutton.cpp KWinInterface_skel.cpp kwin_la_meta_unload.cpp workspace.moc client.moc options.moc tabbox.moc kwinbutton.moc plugins.moc -+kwin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwin_main.cpp workspace.moc client.moc options.moc tabbox.moc kwinbutton.moc plugins.moc - @echo 'creating kwin_la.all_cpp.cpp ...'; \ - rm -f kwin_la.all_cpp.files kwin_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kwin_la.all_cpp.final; \ -- for file in workspace.cpp atoms.cpp client.cpp main.cpp tabbox.cpp options.cpp plugins.cpp events.cpp killwindow.cpp kwinbutton.cpp KWinInterface_skel.cpp kwin_la_meta_unload.cpp ; do \ -+ for file in kwin_main.cpp ; do \ - echo "#include \"$$file\"" >> kwin_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kwin_la.all_cpp.final; \ - done; \ -@@ -944,6 +957,18 @@ - rm -f kwin_la.all_cpp.final kwin_la.all_cpp.files - - #>+ 11 -+libkwin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/workspace.cpp $(srcdir)/atoms.cpp $(srcdir)/client.cpp $(srcdir)/main.cpp $(srcdir)/tabbox.cpp $(srcdir)/options.cpp $(srcdir)/plugins.cpp $(srcdir)/events.cpp $(srcdir)/killwindow.cpp $(srcdir)/kwinbutton.cpp KWinInterface_skel.cpp libkwin_la_meta_unload.cpp +-kwin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/workspace.cpp $(srcdir)/atoms.cpp $(srcdir)/client.cpp $(srcdir)/main.cpp $(srcdir)/tabbox.cpp $(srcdir)/options.cpp $(srcdir)/plugins.cpp $(srcdir)/events.cpp $(srcdir)/killwindow.cpp $(srcdir)/kwinbutton.cpp KWinInterface_skel.cpp client.moc workspace.moc plugins.moc options.moc tabbox.moc kwinbutton.moc +- @echo 'creating kwin_la.all_cpp.cpp ...'; \ +- rm -f kwin_la.all_cpp.files kwin_la.all_cpp.final; \ +- echo "#define KDE_USE_FINAL 1" >> kwin_la.all_cpp.final; \ ++libkwin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/workspace.cpp $(srcdir)/atoms.cpp $(srcdir)/client.cpp $(srcdir)/main.cpp $(srcdir)/tabbox.cpp $(srcdir)/options.cpp $(srcdir)/plugins.cpp $(srcdir)/events.cpp $(srcdir)/killwindow.cpp $(srcdir)/kwinbutton.cpp KWinInterface_skel.cpp workspace.moc client.moc tabbox.moc options.moc kwinbutton.moc plugins.moc + @echo 'creating libkwin_la.all_cpp.cpp ...'; \ + rm -f libkwin_la.all_cpp.files libkwin_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkwin_la.all_cpp.final; \ -+ for file in workspace.cpp atoms.cpp client.cpp main.cpp tabbox.cpp options.cpp plugins.cpp events.cpp killwindow.cpp kwinbutton.cpp KWinInterface_skel.cpp libkwin_la_meta_unload.cpp ; do \ + for file in workspace.cpp atoms.cpp client.cpp main.cpp tabbox.cpp options.cpp plugins.cpp events.cpp killwindow.cpp kwinbutton.cpp KWinInterface_skel.cpp ; do \ +- echo "#include \"$$file\"" >> kwin_la.all_cpp.files; \ +- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kwin_la.all_cpp.final; \ + echo "#include \"$$file\"" >> libkwin_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkwin_la.all_cpp.final; \ -+ done; \ -+ cat libkwin_la.all_cpp.final libkwin_la.all_cpp.files > libkwin_la.all_cpp.cpp; \ + done; \ +- cat kwin_la.all_cpp.final kwin_la.all_cpp.files > kwin_la.all_cpp.cpp; \ +- rm -f kwin_la.all_cpp.final kwin_la.all_cpp.files ++ cat libkwin_la.all_cpp.final libkwin_la.all_cpp.files > libkwin_la.all_cpp.cpp; \ + rm -f libkwin_la.all_cpp.final libkwin_la.all_cpp.files -+ -+#>+ 11 - kwin.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwin_main.cpp - @echo 'creating kwin.all_cpp.cpp ...'; \ - rm -f kwin.all_cpp.files kwin.all_cpp.final; \ -@@ -957,20 +982,20 @@ #>+ 3 clean-final: -- -rm -f kwin_la.all_cpp.cpp kwin.all_cpp.cpp -+ -rm -f kwin_la.all_cpp.cpp libkwin_la.all_cpp.cpp kwin.all_cpp.cpp +- -rm -f kwin_la.all_cpp.cpp ++ -rm -f libkwin_la.all_cpp.cpp #>+ 2 final: @@ -260,4 +264,27 @@ $NetBSD: patch-dh,v 1.2 2002/08/25 19:23:45 jlam Exp $ + $(MAKE) libkwin_la_OBJECTS="$(libkwin_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 +@@ -963,15 +976,15 @@ kde-rpo-clean: + -rm -f *.rpo + + #>+ 13 +-kwinbutton.lo: kwinbutton.moc + kwinbutton.o: kwinbutton.moc +-tabbox.lo: tabbox.moc +-tabbox.o: tabbox.moc +-options.o: options.moc +-client.lo: client.moc + workspace.o: workspace.moc +-client.o: client.moc +-options.lo: options.moc + plugins.o: plugins.moc ++options.lo: options.moc ++client.o: client.moc ++tabbox.o: tabbox.moc + workspace.lo: workspace.moc ++client.lo: client.moc ++options.o: options.moc + plugins.lo: plugins.moc ++kwinbutton.lo: kwinbutton.moc ++tabbox.lo: tabbox.moc |