head 1.4; access; symbols pkgsrc-2017Q3:1.3.0.114 pkgsrc-2017Q3-base:1.3 pkgsrc-2017Q2:1.3.0.110 pkgsrc-2017Q2-base:1.3 pkgsrc-2017Q1:1.3.0.108 pkgsrc-2017Q1-base:1.3 pkgsrc-2016Q4:1.3.0.106 pkgsrc-2016Q4-base:1.3 pkgsrc-2016Q3:1.3.0.104 pkgsrc-2016Q3-base:1.3 pkgsrc-2016Q2:1.3.0.102 pkgsrc-2016Q2-base:1.3 pkgsrc-2016Q1:1.3.0.100 pkgsrc-2016Q1-base:1.3 pkgsrc-2015Q4:1.3.0.98 pkgsrc-2015Q4-base:1.3 pkgsrc-2015Q3:1.3.0.96 pkgsrc-2015Q3-base:1.3 pkgsrc-2015Q2:1.3.0.94 pkgsrc-2015Q2-base:1.3 pkgsrc-2015Q1:1.3.0.92 pkgsrc-2015Q1-base:1.3 pkgsrc-2014Q4:1.3.0.90 pkgsrc-2014Q4-base:1.3 pkgsrc-2014Q3:1.3.0.88 pkgsrc-2014Q3-base:1.3 pkgsrc-2014Q2:1.3.0.86 pkgsrc-2014Q2-base:1.3 pkgsrc-2014Q1:1.3.0.84 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.82 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.80 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.78 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.76 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.74 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.72 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.70 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.68 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.66 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.3.0.64 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.3.0.62 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.3.0.60 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.3.0.58 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.3.0.56 pkgsrc-2010Q3-base:1.3 pkgsrc-2010Q2:1.3.0.54 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.3.0.52 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.3.0.50 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.48 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.46 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.44 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.42 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.40 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.38 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.36 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.34 pkgsrc-2008Q1:1.3.0.32 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.30 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.28 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.26 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.24 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.22 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.20 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.18 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.16 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.14 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.12 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.10 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.3.0.8 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.3.0.6 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.3.0.4 pkgsrc-2004Q3-base:1.3 pkgsrc-2004Q2:1.3.0.2 pkgsrc-2004Q2-base:1.3 pkgsrc-2004Q1:1.2.0.2 pkgsrc-2004Q1-base:1.2 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.4 date 2017.09.26.10.27.09; author wiz; state dead; branches; next 1.3; commitid 9ARpkXTuh9Wg2H8A; 1.3 date 2004.04.20.13.13.42; author markd; state Exp; branches; next 1.2; 1.2 date 2004.02.05.07.43.30; author markd; state dead; branches; next 1.1; 1.1 date 2004.01.26.15.42.04; author jmmv; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2004.01.26.15.42.04; author jmmv; state Exp; branches; next ; desc @@ 1.4 log @*: remove qt3 and the packages using it, including KDE3 Announced in https://mail-index.netbsd.org/pkgsrc-users/2017/09/10/msg025556.html @ text @$NetBSD: patch-ac,v 1.3 2004/04/20 13:13:42 markd Exp $ --- mpeglib/lib/decoder/cddaPlugin.cpp.orig 2004-04-12 16:32:14.000000000 +0100 +++ mpeglib/lib/decoder/cddaPlugin.cpp 2004-04-12 16:32:31.000000000 +0100 @@@@ -25,8 +25,8 @@@@ typedef int32_t size32; extern "C" { -#include -#include +#include +#include } @ 1.3 log @bl3ify and update to kde3.2.2. audiocd/cdparanoia patches from Chris Gilbert. Changes: * KRec: Corrected calculation of position in KB. * kio (audiocd): Fix kio-audiocd gives no error message when device permissions are wrong * kio (audiocd): Fix kaudiocreator error "/By Track/Track 01.wav" should start with "audiocd:/" * kmid: Fix KMid doesn't support international characters * juk: Fix Not adding m3u, pls... lists when refreshing directory * juk: Fix Show Total running time of selection/playlist * juk: Fix extra option (random play) in popup-window * juk: Fix TimeLeft widget listens to too many signals * juk: Fix Juk crashed when I was retagging a bunch of songs and started to play with search * Fix FLAC dependency isn't mentioned anywhere and can cause compilation errors * Fix kdemultimedia build fails with parallel make * configure: Fix Extraneous message in admin/Makefile.common using --prefix * kmix: Fix the executable linking against the part, by adding a common library. @ text @d1 1 a1 1 $NetBSD:$ @ 1.2 log @Update to KDE 3.2 Changes: Multimedia aRts * New mixer-channel: LittleStereoMixer Arnold Krille * Create KAudioPlayStream and put it into kdelibs/arts/kde. Needed at least for KRec and its the logical counterpart to KAudoRecordStream... It is basicly a total rewrite of the (not compiling) version Matthias Kretz put into kdenonbeta/arts/kde so I could grab and finish it. Arnold Krille * New Widget: LayoutBox being able to change direction dynamically. As replacement for [HV]Box. Arnold Krille * New Widget: PopupBox with the ability to hide its contents and showing them inside the widget or a new top-level widget (like a tooltip but permanent). Arnold Krille * New Widget: Label that can rotate its text. Arnold Krille * New Widget: Tickmarks specially for deciBel. Arnold Krille * New Widget: VolumeFader specially for Volumes supporting deciBel. Arnold Krille * New Widget: VU-Meter specially for deciBel. * Supports various styles: NormalBars (just a configurable number of bars), FireBars (a colored bar moving), LineBar (a bar moving, color depends on the actual volume), Small (whole widget painted in a color depending on the volume) * Configurable things: Direction, Peak, Peakfalloff, min. dB, style. Arnold Krille * A Gui for the StereoVolumeControl. Arnold Krille * First part of the rewriting/reordering of artscontrol. Making the features available via a lib. Arnold Krille * A little kicker-applet named artscontrol ;-) Perhaps with the ability to include not only the master-fader but an environment-mixer with a small gui. Of course it includes all the normal artscontrol features. Arnold Krille * AudioIOEsd: output to an esd Ian Chiew * autosuspend in full duplex Stefan Westerfeld Noatun * Equalizer in KJofol Skin Loader. Stefan Gehn * Support for loading of EXTM3U Format (saved by Winamp since 2.x). Stefan Gehn * Support for loading of Windows Media Player Playlists. Stefan Gehn * Variable Band Equalizer. Charles Samuels * New playlist, Oblique. Charles Samuels KRec * Big rewrite to create a new simplier Gui and make it easier to use. Its a big bunch of work and depends on a lot of small things. Arnold Krille * Make exporting to various soundformats work. OGG and MP3 need some additional work for 3.3 but are working for now. Arnold Krille * Saving and loading of KRec's own fileformat. Arnold Krille * Create a view-mode for the soundfiles. Arnold Krille * Create an informative time/size/etc display. Arnold Krille * Add a menu to open the Audiomanager (and other tools) since there is an artscontrol library. Arnold Krille * Make it use the Arts::LevelMeter. Arnold Krille aKtion * Drop aKtion. Chris Howells KsCD * LIRC support Aaron J. Seigo * Using the new KDE cddb library. Richard Laerkaeng, Aaron J. Seigo KAudioCreator * Using the new KDE cddb library. Benjamin Meyer * Automaticly detects CD's. Benjamin Meyer * Many new small features including: File text regular expression replacment. Benjamin Meyer * Disk drive now user selectable. Benjamin Meyer libkcddb * NEW IN KDE: Common library for accessing cddb information Richard Laerkaeng * Add support for sending cddb information Richard Laerkaeng KFileMetaInfo * ID3v2 support (without id3lib) Scott Wheeler JuK [Not yet built in pkgsrc] * NEW IN KDE: A jukebox and music manager Scott Wheeler * Advanced search mode Scott Wheeler * Tree view mode Scott Wheeler * Storable searches Scott Wheeler * A "weighted width" mode for the playlists -- possibly to be merged into KListView Scott Wheeler @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.1 2004/01/26 15:42:04 jmmv Exp $ d3 11 a13 3 --- kaboodle/Makefile.in.orig 2003-12-29 11:29:36.000000000 +1300 +++ kaboodle/Makefile.in @@@@ -381,7 +381,7 @@@@ INCLUDES = -I$(kde_includes)/kio -I$(kde a14 1 SUBDIRS = pics actions a15 324 -lib_LTLIBRARIES = kaboodle.la +lib_LTLIBRARIES = libkaboodle_main.la kaboodle.la kde_module_LTLIBRARIES = libkaboodlepart.la @@@@ -396,24 +396,26 @@@@ libkaboodlepart_la_SOURCES = conf.cpp \ libkaboodlepart_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) libkaboodlepart_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) -lqtmcop -lkmedia2_idl -lsoundserver_idl -lartskde -lkmediaplayer -kaboodle_la_SOURCES = main.cpp \ +libkaboodle_main_la_SOURCES = main.cpp \ kaboodleapp.cpp \ userinterface.cpp -kaboodle_la_LIBADD = libkaboodlepart.la +libkaboodle_main_la_LIBADD = libkaboodlepart.la +libkaboodle_main_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) + +kaboodle_la_SOURCES = kaboodle_main.cpp +kaboodle_la_LIBADD = libkaboodle_main.la kaboodle_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version bin_PROGRAMS = kaboodle -kaboodle_LDADD = kaboodle.la +kaboodle_LDADD = libkaboodle_main.la kaboodle_LDFLAGS = $(all_libraries) $(KDE_RPATH) -kaboodle_SOURCES = dummy.cpp +kaboodle_SOURCES = kaboodle_main.cpp #>- libkaboodlepart_la_METASOURCES = AUTO -CLEANFILES = dummy.cpp - applnk_DATA = kaboodle.desktop applnkdir = $(kde_appsdir)/Multimedia @@@@ -427,14 +429,19 @@@@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES) -kaboodle_la_DEPENDENCIES = libkaboodlepart.la -am_kaboodle_la_OBJECTS = main.lo kaboodleapp.lo userinterface.lo +kaboodle_la_DEPENDENCIES = libkaboodle_main.la +am_kaboodle_la_OBJECTS = kaboodle_main.lo #>- kaboodle_la_OBJECTS = $(am_kaboodle_la_OBJECTS) +#>+ 1 +kaboodle_la_OBJECTS = kaboodle_main.lo +libkaboodle_main_la_DEPENDENCIES = libkaboodlepart.la +am_libkaboodle_main_la_OBJECTS = main.lo kaboodleapp.lo userinterface.lo +#>- libkaboodle_main_la_OBJECTS = $(am_libkaboodle_main_la_OBJECTS) #>+ 4 -kaboodle_la_final_OBJECTS = kaboodle_la.all_cpp.lo -kaboodle_la_nofinal_OBJECTS = main.lo kaboodleapp.lo userinterface.lo -@@KDE_USE_FINAL_FALSE@@kaboodle_la_OBJECTS = $(kaboodle_la_nofinal_OBJECTS) -@@KDE_USE_FINAL_TRUE@@kaboodle_la_OBJECTS = $(kaboodle_la_final_OBJECTS) +libkaboodle_main_la_final_OBJECTS = libkaboodle_main_la.all_cpp.lo +libkaboodle_main_la_nofinal_OBJECTS = main.lo kaboodleapp.lo userinterface.lo +@@KDE_USE_FINAL_FALSE@@libkaboodle_main_la_OBJECTS = $(libkaboodle_main_la_nofinal_OBJECTS) +@@KDE_USE_FINAL_TRUE@@libkaboodle_main_la_OBJECTS = $(libkaboodle_main_la_final_OBJECTS) libkaboodlepart_la_DEPENDENCIES = am_libkaboodlepart_la_OBJECTS = conf.lo controls.lo engine.lo \ kaboodle_factory.lo player.lo view.lo @@@@ -448,31 +455,37 @@@@ libkaboodlepart_la_nofinal_OBJECTS = con bin_PROGRAMS = kaboodle$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) -am_kaboodle_OBJECTS = dummy.$(OBJEXT) +am_kaboodle_OBJECTS = kaboodle_main.$(OBJEXT) #>- kaboodle_OBJECTS = $(am_kaboodle_OBJECTS) #>+ 1 -kaboodle_OBJECTS = dummy.$(OBJEXT) -kaboodle_DEPENDENCIES = kaboodle.la +kaboodle_OBJECTS = kaboodle_main.$(OBJEXT) +kaboodle_DEPENDENCIES = libkaboodle_main.la DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles #>- @@AMDEP_TRUE@@DEP_FILES = ./$(DEPDIR)/conf.Plo ./$(DEPDIR)/controls.Plo \ -#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/engine.Plo \ +#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/engine.Plo \ #>- @@AMDEP_TRUE@@ ./$(DEPDIR)/kaboodle_factory.Plo \ +#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/kaboodle_main.Plo \ +#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/kaboodle_main.Po \ #>- @@AMDEP_TRUE@@ ./$(DEPDIR)/kaboodleapp.Plo ./$(DEPDIR)/main.Plo \ #>- @@AMDEP_TRUE@@ ./$(DEPDIR)/player.Plo \ #>- @@AMDEP_TRUE@@ ./$(DEPDIR)/userinterface.Plo ./$(DEPDIR)/view.Plo -#>+ 13 -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@DEP_FILES = $(DEPDIR)/kaboodle_la.all_cpp.P $(DEPDIR)/libkaboodlepart_la.all_cpp.P ./$(DEPDIR)/conf.Plo ./$(DEPDIR)/controls.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/engine.Plo \ +#>+ 17 +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@DEP_FILES = $(DEPDIR)/libkaboodle_main_la.all_cpp.P $(DEPDIR)/libkaboodlepart_la.all_cpp.P ./$(DEPDIR)/conf.Plo ./$(DEPDIR)/controls.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/engine.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kaboodle_factory.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kaboodle_main.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kaboodle_main.Po \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kaboodleapp.Plo ./$(DEPDIR)/main.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/player.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/userinterface.Plo ./$(DEPDIR)/view.Plo @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@DEP_FILES = ./$(DEPDIR)/conf.Plo ./$(DEPDIR)/controls.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/engine.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/engine.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kaboodle_factory.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kaboodle_main.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kaboodle_main.Po \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kaboodleapp.Plo ./$(DEPDIR)/main.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/player.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/userinterface.Plo ./$(DEPDIR)/view.Plo @@@@ -495,8 +508,8 @@@@ CXXLD = $(CXX) #>+ 2 CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@@ -DIST_SOURCES = $(kaboodle_la_SOURCES) $(libkaboodlepart_la_SOURCES) \ - $(kaboodle_SOURCES) +DIST_SOURCES = $(kaboodle_la_SOURCES) $(libkaboodle_main_la_SOURCES) \ + $(libkaboodlepart_la_SOURCES) $(kaboodle_SOURCES) DATA = $(applnk_DATA) $(data_DATA) $(kde_services_DATA) @@@@ -507,7 +520,7 @@@@ RECURSIVE_TARGETS = info-recursive dvi-r check-recursive installcheck-recursive DIST_COMMON = AUTHORS Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) -SOURCES = $(kaboodle_la_SOURCES) $(libkaboodlepart_la_SOURCES) $(kaboodle_SOURCES) +SOURCES = $(kaboodle_la_SOURCES) $(libkaboodle_main_la_SOURCES) $(libkaboodlepart_la_SOURCES) $(kaboodle_SOURCES) #>- all: all-recursive #>+ 1 @@@@ -582,6 +595,8 @@@@ clean-libLTLIBRARIES: done kaboodle.la: $(kaboodle_la_OBJECTS) $(kaboodle_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kaboodle_la_LDFLAGS) $(kaboodle_la_OBJECTS) $(kaboodle_la_LIBADD) $(LIBS) +libkaboodle_main.la: $(libkaboodle_main_la_OBJECTS) $(libkaboodle_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkaboodle_main_la_LDFLAGS) $(libkaboodle_main_la_OBJECTS) $(libkaboodle_main_la_LIBADD) $(LIBS) #>- libkaboodlepart.la: $(libkaboodlepart_la_OBJECTS) $(libkaboodlepart_la_DEPENDENCIES) #>+ 2 @@KDE_USE_CLOSURE_TRUE@@libkaboodlepart.la: libkaboodlepart.la.closure $(libkaboodlepart_la_OBJECTS) $(libkaboodlepart_la_DEPENDENCIES) @@@@ -628,9 +643,10 @@@@ distclean-compile: @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/conf.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/controls.Plo@@am__quote@@ -@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/dummy.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/engine.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/kaboodle_factory.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/kaboodle_main.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/kaboodle_main.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/kaboodleapp.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/main.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/player.Plo@@am__quote@@ @@@@ -862,7 +878,7 @@@@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=uninstall.desktop kaboodle.desktop player.h controls.h kaboodle_component.desktop conf.h kaboodleengine.desktop kaboodle_factory.h kaboodleapp.h view.h kaboodleui.rc engine.h userinterface.h kaboodlepartui.rc +KDE_DIST=view.h kaboodleapp.h kaboodle_factory.h engine.h controls.h kaboodlepartui.rc kaboodleui.rc kaboodle.desktop kaboodle_component.desktop Makefile.in.rej kaboodleengine.desktop conf.h uninstall.desktop player.h userinterface.h DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) @@@@ -936,7 +952,6 @@@@ install-strip: mostlyclean-generic: clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) @@@@ -1032,9 +1047,6 @@@@ uninstall-info: uninstall-info-recursive uninstall-libLTLIBRARIES uninstall-recursive -dummy.cpp: - echo > dummy.cpp - install-data-local: uninstall.desktop $(mkinstalldirs) $(DESTDIR)$(kde_appsdir)/Multimedia/More $(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_appsdir)/Multimedia/More/kaboodle.desktop @@@@ -1055,17 +1067,11 @@@@ libkaboodlepart.la.closure: $(libkaboodl #>+ 3 -userinterface.moc: $(srcdir)/userinterface.h - $(MOC) $(srcdir)/userinterface.h -o userinterface.moc - -#>+ 1 -mocs: userinterface.moc -#>+ 3 -kaboodleapp.moc: $(srcdir)/kaboodleapp.h - $(MOC) $(srcdir)/kaboodleapp.h -o kaboodleapp.moc +view.moc: $(srcdir)/view.h + $(MOC) $(srcdir)/view.h -o view.moc #>+ 1 -mocs: kaboodleapp.moc +mocs: view.moc #>+ 3 controls.moc: $(srcdir)/controls.h $(MOC) $(srcdir)/controls.h -o controls.moc @@@@ -1073,11 +1079,17 @@@@ controls.moc: $(srcdir)/controls.h #>+ 1 mocs: controls.moc #>+ 3 -engine.moc: $(srcdir)/engine.h - $(MOC) $(srcdir)/engine.h -o engine.moc +kaboodleapp.moc: $(srcdir)/kaboodleapp.h + $(MOC) $(srcdir)/kaboodleapp.h -o kaboodleapp.moc #>+ 1 -mocs: engine.moc +mocs: kaboodleapp.moc +#>+ 3 +userinterface.moc: $(srcdir)/userinterface.h + $(MOC) $(srcdir)/userinterface.h -o userinterface.moc + +#>+ 1 +mocs: userinterface.moc #>+ 3 kaboodle_factory.moc: $(srcdir)/kaboodle_factory.h $(MOC) $(srcdir)/kaboodle_factory.h -o kaboodle_factory.moc @@@@ -1097,14 +1109,14 @@@@ player.moc: $(srcdir)/player.h #>+ 1 mocs: player.moc #>+ 3 -view.moc: $(srcdir)/view.h - $(MOC) $(srcdir)/view.h -o view.moc +engine.moc: $(srcdir)/engine.h + $(MOC) $(srcdir)/engine.h -o engine.moc #>+ 1 -mocs: view.moc +mocs: engine.moc #>+ 3 clean-metasources: - -rm -f userinterface.moc kaboodleapp.moc controls.moc engine.moc kaboodle_factory.moc conf.moc player.moc view.moc + -rm -f view.moc controls.moc kaboodleapp.moc userinterface.moc kaboodle_factory.moc conf.moc player.moc engine.moc #>+ 3 clean-closures: @@@@ -1121,19 +1133,19 @@@@ force-reedit: #>+ 11 -kaboodle_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kaboodleapp.cpp $(srcdir)/userinterface.cpp userinterface.moc kaboodleapp.moc - @@echo 'creating kaboodle_la.all_cpp.cpp ...'; \ - rm -f kaboodle_la.all_cpp.files kaboodle_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kaboodle_la.all_cpp.final; \ +libkaboodle_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kaboodleapp.cpp $(srcdir)/userinterface.cpp kaboodleapp.moc userinterface.moc + @@echo 'creating libkaboodle_main_la.all_cpp.cpp ...'; \ + rm -f libkaboodle_main_la.all_cpp.files libkaboodle_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkaboodle_main_la.all_cpp.final; \ for file in main.cpp kaboodleapp.cpp userinterface.cpp ; do \ - echo "#include \"$$file\"" >> kaboodle_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kaboodle_la.all_cpp.final; \ + echo "#include \"$$file\"" >> libkaboodle_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkaboodle_main_la.all_cpp.final; \ done; \ - cat kaboodle_la.all_cpp.final kaboodle_la.all_cpp.files > kaboodle_la.all_cpp.cpp; \ - rm -f kaboodle_la.all_cpp.final kaboodle_la.all_cpp.files + cat libkaboodle_main_la.all_cpp.final libkaboodle_main_la.all_cpp.files > libkaboodle_main_la.all_cpp.cpp; \ + rm -f libkaboodle_main_la.all_cpp.final libkaboodle_main_la.all_cpp.files #>+ 11 -libkaboodlepart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/conf.cpp $(srcdir)/controls.cpp $(srcdir)/engine.cpp $(srcdir)/kaboodle_factory.cpp $(srcdir)/player.cpp $(srcdir)/view.cpp controls.moc engine.moc kaboodle_factory.moc conf.moc view.moc player.moc +libkaboodlepart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/conf.cpp $(srcdir)/controls.cpp $(srcdir)/engine.cpp $(srcdir)/kaboodle_factory.cpp $(srcdir)/player.cpp $(srcdir)/view.cpp view.moc controls.moc kaboodle_factory.moc conf.moc player.moc engine.moc @@echo 'creating libkaboodlepart_la.all_cpp.cpp ...'; \ rm -f libkaboodlepart_la.all_cpp.files libkaboodlepart_la.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> libkaboodlepart_la.all_cpp.final; \ @@@@ -1146,20 +1158,20 @@@@ libkaboodlepart_la.all_cpp.cpp: $(srcdir #>+ 3 clean-final: - -rm -f kaboodle_la.all_cpp.cpp libkaboodlepart_la.all_cpp.cpp + -rm -f libkaboodle_main_la.all_cpp.cpp libkaboodlepart_la.all_cpp.cpp #>+ 2 final: - $(MAKE) kaboodle_la_OBJECTS="$(kaboodle_la_final_OBJECTS)" libkaboodlepart_la_OBJECTS="$(libkaboodlepart_la_final_OBJECTS)" all-am + $(MAKE) libkaboodle_main_la_OBJECTS="$(libkaboodle_main_la_final_OBJECTS)" libkaboodlepart_la_OBJECTS="$(libkaboodlepart_la_final_OBJECTS)" all-am #>+ 2 final-install: - $(MAKE) kaboodle_la_OBJECTS="$(kaboodle_la_final_OBJECTS)" libkaboodlepart_la_OBJECTS="$(libkaboodlepart_la_final_OBJECTS)" install-am + $(MAKE) libkaboodle_main_la_OBJECTS="$(libkaboodle_main_la_final_OBJECTS)" libkaboodlepart_la_OBJECTS="$(libkaboodlepart_la_final_OBJECTS)" install-am #>+ 2 no-final: - $(MAKE) kaboodle_la_OBJECTS="$(kaboodle_la_nofinal_OBJECTS)" libkaboodlepart_la_OBJECTS="$(libkaboodlepart_la_nofinal_OBJECTS)" all-am + $(MAKE) libkaboodle_main_la_OBJECTS="$(libkaboodle_main_la_nofinal_OBJECTS)" libkaboodlepart_la_OBJECTS="$(libkaboodlepart_la_nofinal_OBJECTS)" all-am #>+ 2 no-final-install: - $(MAKE) kaboodle_la_OBJECTS="$(kaboodle_la_nofinal_OBJECTS)" libkaboodlepart_la_OBJECTS="$(libkaboodlepart_la_nofinal_OBJECTS)" install-am + $(MAKE) libkaboodle_main_la_OBJECTS="$(libkaboodle_main_la_nofinal_OBJECTS)" libkaboodlepart_la_OBJECTS="$(libkaboodlepart_la_nofinal_OBJECTS)" install-am #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean @@@@ -1169,19 +1181,19 @@@@ kde-rpo-clean: -rm -f *.rpo #>+ 17 -kaboodleapp.lo: kaboodleapp.moc -kaboodle_factory.o: kaboodle_factory.moc -player.lo: player.moc -engine.o: engine.moc conf.o: conf.moc -userinterface.lo: userinterface.moc -engine.lo: engine.moc -controls.lo: controls.moc player.o: player.moc -view.o: view.moc -view.lo: view.moc userinterface.o: userinterface.moc -conf.lo: conf.moc +view.o: view.moc kaboodleapp.o: kaboodleapp.moc +kaboodle_factory.o: kaboodle_factory.moc +controls.lo: controls.moc +engine.lo: engine.moc kaboodle_factory.lo: kaboodle_factory.moc +engine.o: engine.moc +view.lo: view.moc controls.o: controls.moc +conf.lo: conf.moc +kaboodleapp.lo: kaboodleapp.moc +player.lo: player.moc +userinterface.lo: userinterface.moc @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.6 2004/01/15 10:30:03 markd Exp $ @ 1.1.1.1 log @Move kdemultimedia3 to the multimedia category (coming from audio). This is version 3.1.5nb2. @ text @@