head 1.7; access; symbols pkgsrc-2013Q2:1.7.0.52 pkgsrc-2013Q2-base:1.7 pkgsrc-2012Q4:1.7.0.50 pkgsrc-2012Q4-base:1.7 pkgsrc-2011Q4:1.7.0.48 pkgsrc-2011Q4-base:1.7 pkgsrc-2011Q2:1.7.0.46 pkgsrc-2011Q2-base:1.7 pkgsrc-2009Q4:1.7.0.44 pkgsrc-2009Q4-base:1.7 pkgsrc-2008Q4:1.7.0.42 pkgsrc-2008Q4-base:1.7 pkgsrc-2008Q3:1.7.0.40 pkgsrc-2008Q3-base:1.7 cube-native-xorg:1.7.0.38 cube-native-xorg-base:1.7 pkgsrc-2008Q2:1.7.0.36 pkgsrc-2008Q2-base:1.7 pkgsrc-2008Q1:1.7.0.34 pkgsrc-2008Q1-base:1.7 pkgsrc-2007Q4:1.7.0.32 pkgsrc-2007Q4-base:1.7 pkgsrc-2007Q3:1.7.0.30 pkgsrc-2007Q3-base:1.7 pkgsrc-2007Q2:1.7.0.28 pkgsrc-2007Q2-base:1.7 pkgsrc-2007Q1:1.7.0.26 pkgsrc-2007Q1-base:1.7 pkgsrc-2006Q4:1.7.0.24 pkgsrc-2006Q4-base:1.7 pkgsrc-2006Q3:1.7.0.22 pkgsrc-2006Q3-base:1.7 pkgsrc-2006Q2:1.7.0.20 pkgsrc-2006Q2-base:1.7 pkgsrc-2006Q1:1.7.0.18 pkgsrc-2006Q1-base:1.7 pkgsrc-2005Q4:1.7.0.16 pkgsrc-2005Q4-base:1.7 pkgsrc-2005Q3:1.7.0.14 pkgsrc-2005Q3-base:1.7 pkgsrc-2005Q2:1.7.0.12 pkgsrc-2005Q2-base:1.7 pkgsrc-2005Q1:1.7.0.10 pkgsrc-2005Q1-base:1.7 pkgsrc-2004Q4:1.7.0.8 pkgsrc-2004Q4-base:1.7 pkgsrc-2004Q3:1.7.0.6 pkgsrc-2004Q3-base:1.7 pkgsrc-2004Q2:1.7.0.4 pkgsrc-2004Q2-base:1.7 pkgsrc-2004Q1:1.7.0.2 pkgsrc-2004Q1-base:1.7 pkgsrc-2003Q4:1.5.0.2 pkgsrc-2003Q4-base:1.5 netbsd-1-6-1:1.2.0.2 netbsd-1-6-1-base:1.2 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.1.1 buildlink2:1.1.1.1.0.2 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.7 date 2004.01.26.15.45.21; author jmmv; state dead; branches; next 1.6; 1.6 date 2004.01.15.10.30.03; author markd; state Exp; branches; next 1.5; 1.5 date 2003.07.30.14.56.01; author markd; state Exp; branches; next 1.4; 1.4 date 2003.05.22.03.05.40; author markd; state Exp; branches; next 1.3; 1.3 date 2003.03.11.13.33.48; author markd; state Exp; branches; next 1.2; 1.2 date 2003.01.02.09.12.21; author skrll; state Exp; branches; next 1.1; 1.1 date 2002.05.31.14.46.48; author skrll; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2002.05.31.14.46.48; author skrll; state Exp; branches 1.1.1.1.2.1; next ; 1.1.1.1.2.1 date 2002.05.31.14.46.48; author jlam; state dead; branches; next 1.1.1.1.2.2; 1.1.1.1.2.2 date 2002.06.23.18.38.01; author jlam; state Exp; branches; next ; desc @@ 1.7 log @kdemultimedia[23] moved to the multimedia category. @ text @$NetBSD: patch-ac,v 1.6 2004/01/15 10:30:03 markd Exp $ --- 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 SUBDIRS = pics actions -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.6 log @Update to KDE-3.1.5. Also move patch-bh to patch-da so it applies after patch-co so autoconf doesn't kick in to redo it. @ text @d1 1 a1 1 $NetBSD$ @ 1.5 log @Update kdemultimedia to 3.1.3. Changes: * kscd: add method to determine if KsCD is playing * noatun: memory leak and memory corruption fixes * noatun: Add volume slider for "simple" module * artsbuilder: fix several corruptsions and other crashes @ text @d3 1 a3 1 --- kaboodle/Makefile.in.orig 2003-07-15 22:13:57.000000000 +1200 d5 1 a5 1 @@@@ -380,7 +380,7 @@@@ INCLUDES = -I$(kde_includes)/kio -I$(kde d14 1 a14 1 @@@@ -395,24 +395,26 @@@@ libkaboodlepart_la_SOURCES = conf.cpp \ d47 1 a47 1 @@@@ -425,14 +427,19 @@@@ CONFIG_HEADER = $(top_builddir)/config.h d73 1 a73 1 @@@@ -446,31 +453,37 @@@@ libkaboodlepart_la_nofinal_OBJECTS = con d119 1 a119 1 @@@@ -493,8 +506,8 @@@@ CXXLD = $(CXX) d130 1 a130 1 @@@@ -505,7 +518,7 @@@@ RECURSIVE_TARGETS = info-recursive dvi-r d139 1 a139 1 @@@@ -580,6 +593,8 @@@@ clean-libLTLIBRARIES: d148 1 a148 1 @@@@ -626,9 +641,10 @@@@ distclean-compile: d160 1 a160 1 @@@@ -854,7 +870,7 @@@@ distclean-tags: d164 1 a164 1 -KDE_DIST=engine.h kaboodleengine.desktop kaboodle_factory.h kaboodleapp.h userinterface.h controls.h conf.h player.h kaboodleui.rc kaboodle.desktop view.h kaboodlepartui.rc uninstall.desktop kaboodle_component.desktop d169 1 a169 1 @@@@ -928,7 +944,6 @@@@ install-strip: d177 1 a177 1 @@@@ -1024,9 +1039,6 @@@@ uninstall-info: uninstall-info-recursive d187 1 a187 1 @@@@ -1047,23 +1059,17 @@@@ libkaboodlepart.la.closure: $(libkaboodl d191 2 a192 2 -engine.moc: $(srcdir)/engine.h - $(MOC) $(srcdir)/engine.h -o engine.moc d195 1 a195 1 -mocs: engine.moc d197 4 a200 2 view.moc: $(srcdir)/view.h $(MOC) $(srcdir)/view.h -o view.moc d203 2 a204 1 mocs: view.moc d206 3 a208 5 -userinterface.moc: $(srcdir)/userinterface.h - $(MOC) $(srcdir)/userinterface.h -o userinterface.moc +controls.moc: $(srcdir)/controls.h + $(MOC) $(srcdir)/controls.h -o controls.moc d210 1 a210 2 -mocs: userinterface.moc +mocs: controls.moc d212 5 a216 3 kaboodleapp.moc: $(srcdir)/kaboodleapp.h $(MOC) $(srcdir)/kaboodleapp.h -o kaboodleapp.moc @@@@ -1071,32 +1077,38 @@@@ kaboodleapp.moc: $(srcdir)/kaboodleapp.h d218 3 a220 2 mocs: kaboodleapp.moc #>+ 3 d226 1 a226 1 +#>+ 3 d229 1 a229 18 #>+ 1 mocs: kaboodle_factory.moc #>+ 3 -player.moc: $(srcdir)/player.h - $(MOC) $(srcdir)/player.h -o player.moc +conf.moc: $(srcdir)/conf.h + $(MOC) $(srcdir)/conf.h -o conf.moc #>+ 1 -mocs: player.moc +mocs: conf.moc #>+ 3 -controls.moc: $(srcdir)/controls.h - $(MOC) $(srcdir)/controls.h -o controls.moc +player.moc: $(srcdir)/player.h + $(MOC) $(srcdir)/player.h -o player.moc d231 1 a231 2 -mocs: controls.moc +mocs: player.moc d233 2 a234 2 -conf.moc: $(srcdir)/conf.h - $(MOC) $(srcdir)/conf.h -o conf.moc d239 1 a239 1 -mocs: conf.moc d243 1 a243 1 - -rm -f engine.moc view.moc userinterface.moc kaboodleapp.moc kaboodle_factory.moc player.moc controls.moc conf.moc d248 1 a248 1 @@@@ -1113,19 +1125,19 @@@@ force-reedit: d272 1 a272 1 -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 kaboodle_factory.moc player.moc conf.moc engine.moc view.moc controls.moc d277 1 a277 1 @@@@ -1138,20 +1150,20 @@@@ libkaboodlepart_la.all_cpp.cpp: $(srcdir d303 1 a303 1 @@@@ -1161,19 +1173,19 @@@@ kde-rpo-clean: d307 5 a311 1 -controls.o: controls.moc d313 8 a320 4 +conf.o: conf.moc +player.o: player.moc +userinterface.o: userinterface.moc view.o: view.moc d322 1 a322 2 -kaboodleapp.lo: kaboodleapp.moc kaboodle_factory.o: kaboodle_factory.moc d324 1 a324 1 engine.lo: engine.moc d326 1 a326 7 -conf.o: conf.moc -view.lo: view.moc -player.o: player.moc -player.lo: player.moc -userinterface.o: userinterface.moc -controls.lo: controls.moc engine.o: engine.moc d328 2 a329 2 +controls.o: controls.moc conf.lo: conf.moc @ 1.4 log @Update KDE to 3.1.2. Changes: kdemultimedia: * Ogg Vorbis Info List view column titles were incorrect. * kmix: Vertical label widget to sliders in replacement of large horizontal labels * kmix: Fixed alsa 0.9x to restore current volumes * kmix: Fixed multiple alsa 0.9x cards detection @ text @d3 1 a3 1 --- kaboodle/Makefile.in.orig Thu May 8 00:05:27 2003 d5 1 a5 1 @@@@ -379,7 +379,7 @@@@ INCLUDES = -I$(kde_includes)/kio -I$(kde d14 1 a14 1 @@@@ -394,24 +394,26 @@@@ libkaboodlepart_la_SOURCES = conf.cpp \ d47 1 a47 1 @@@@ -424,14 +426,19 @@@@ CONFIG_HEADER = $(top_builddir)/config.h d73 1 a73 1 @@@@ -445,31 +452,37 @@@@ libkaboodlepart_la_nofinal_OBJECTS = con d119 1 a119 1 @@@@ -492,8 +505,8 @@@@ CXXLD = $(CXX) d130 1 a130 1 @@@@ -504,7 +517,7 @@@@ RECURSIVE_TARGETS = info-recursive dvi-r d139 1 a139 1 @@@@ -579,6 +592,8 @@@@ clean-libLTLIBRARIES: d148 1 a148 1 @@@@ -625,9 +640,10 @@@@ distclean-compile: d160 1 a160 1 @@@@ -853,7 +869,7 @@@@ distclean-tags: d169 1 a169 1 @@@@ -927,7 +943,6 @@@@ install-strip: d177 1 a177 1 @@@@ -1023,9 +1038,6 @@@@ uninstall-info: uninstall-info-recursive d187 1 a187 1 @@@@ -1046,40 +1058,40 @@@@ libkaboodlepart.la.closure: $(libkaboodl d194 2 d200 2 d208 3 d214 3 a216 1 d221 2 d227 2 d235 3 d244 3 d253 3 d263 1 a263 1 @@@@ -1096,19 +1108,19 @@@@ force-reedit: d292 1 a292 1 @@@@ -1121,20 +1133,20 @@@@ libkaboodlepart_la.all_cpp.cpp: $(srcdir d318 1 a318 1 @@@@ -1144,19 +1156,19 @@@@ kde-rpo-clean: @ 1.3 log @Update KDE to 3.1. Many bugfixes and functionality enhancements including: kdemultimedia Started a video framework More consistent internationalisation in many applications. NEW IN KDE: KAudioCreator, a CD ripper and audio encoder frontend. NEW IN KDE: KRec, an audio recorder using aRts. KMediaPlayer interface added to kdelibs to reuse Kaboodle. Noatun: Added option to clear the playlist when running with a file as command line option. Added video thumbnail creator using xine-arts. KMix: Added mute control support. @ text @d3 1 a3 1 --- kaboodle/Makefile.in.orig Fri Jan 17 08:49:39 2003 d5 1 a5 1 @@@@ -328,7 +328,7 @@@@ INCLUDES = -I$(kde_includes)/kio -I$(kde d14 1 a14 1 @@@@ -343,24 +343,26 @@@@ libkaboodlepart_la_SOURCES = conf.cpp \ d47 1 a47 1 @@@@ -373,14 +375,19 @@@@ CONFIG_HEADER = $(top_builddir)/config.h d73 1 a73 1 @@@@ -394,11 +401,11 @@@@ libkaboodlepart_la_nofinal_OBJECTS = con a85 1 DEFS = @@DEFS@@ a86 1 @@@@ -407,21 +414,27 @@@@ LIBS = @@LIBS@@ d119 2 a120 1 @@@@ -445,8 +458,8 @@@@ CXXLD = $(CXX) a122 1 CXXFLAGS = @@CXXFLAGS@@ d130 2 a131 2 @@@@ -456,7 +469,7 @@@@ RECURSIVE_TARGETS = info-recursive dvi-r uninstall-recursive check-recursive installcheck-recursive d139 1 a139 1 @@@@ -531,6 +544,8 @@@@ clean-libLTLIBRARIES: d148 1 a148 1 @@@@ -577,9 +592,10 @@@@ distclean-compile: d160 2 a161 2 @@@@ -769,7 +785,7 @@@@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH d165 1 a165 1 +KDE_DIST=view.h kaboodleapp.h kaboodle_factory.h engine.h controls.h kaboodlepartui.rc kaboodleui.rc kaboodle.desktop kaboodle_component.desktop kaboodleengine.desktop conf.h uninstall.desktop player.h userinterface.h d169 1 a169 1 @@@@ -837,7 +853,6 @@@@ install-strip: d177 2 a178 2 @@@@ -924,9 +939,6 @@@@ uninstall-info: uninstall-info-recursive uninstall-recursive d187 1 a187 1 @@@@ -947,40 +959,40 @@@@ libkaboodlepart.la.closure: $(libkaboodl d241 1 a241 1 @@@@ -997,19 +1009,19 @@@@ force-reedit: d270 1 a270 1 @@@@ -1022,20 +1034,20 @@@@ libkaboodlepart_la.all_cpp.cpp: $(srcdir d296 1 a296 1 @@@@ -1045,19 +1057,19 @@@@ kde-rpo-clean: @ 1.2 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 --- kaboodle/Makefile.in.orig Sat Dec 28 14:04:00 2002 d5 1 a5 1 @@@@ -292,7 +292,7 @@@@ INCLUDES = -I$(kde_includes)/kio -I$(kde d9 2 a10 2 -lib_LTLIBRARIES = libkaboodlepart.la kaboodle.la +lib_LTLIBRARIES = libkaboodlepart.la libkaboodle_main.la kaboodle.la d12 5 a16 5 libkaboodlepart_la_SOURCES = conf.cpp \ controls.cpp \ @@@@ -306,24 +306,26 @@@@ libkaboodlepart_la_SOURCES = conf.cpp \ libkaboodlepart_la_LDFLAGS = $(KDE_RPATH) $(KDE_PLUGIN) $(all_libraries) libkaboodlepart_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) -lqtmcop -lkmedia2_idl -lsoundserver_idl -lartskde a18 4 +kaboodle_la_SOURCES = kaboodle_main.cpp +kaboodle_la_LIBADD = libkaboodle_main.la +kaboodle_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version + d20 2 a21 2 kaboodleapp.cpp \ userinterface.cpp a24 1 -kaboodle_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version d27 4 d47 1 a47 1 @@@@ -336,14 +338,19 @@@@ CONFIG_HEADER = $(top_builddir)/config.h d49 1 a49 1 LTLIBRARIES = $(lib_LTLIBRARIES) d72 2 a73 2 kaboodle_factory.lo kaboodle_part.lo player.lo videoembed.lo @@@@ -357,11 +364,11 @@@@ libkaboodlepart_la_nofinal_OBJECTS = con d88 1 a88 2 @@@@ -370,23 +377,26 @@@@ LDFLAGS = @@LDFLAGS@@ LIBS = @@LIBS@@ d90 13 a102 14 #>- @@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/conf.Plo $(DEPDIR)/controls.Plo \ -#>- @@AMDEP_TRUE@@ $(DEPDIR)/dummy.Po $(DEPDIR)/engine.Plo \ -#>- @@AMDEP_TRUE@@ $(DEPDIR)/kaboodle_factory.Plo \ +#>- @@AMDEP_TRUE@@ $(DEPDIR)/engine.Plo $(DEPDIR)/kaboodle_factory.Plo \ +#>- @@AMDEP_TRUE@@ $(DEPDIR)/kaboodle_main.Plo \ +#>- @@AMDEP_TRUE@@ $(DEPDIR)/kaboodle_main.Po \ #>- @@AMDEP_TRUE@@ $(DEPDIR)/kaboodle_part.Plo \ #>- @@AMDEP_TRUE@@ $(DEPDIR)/kaboodleapp.Plo $(DEPDIR)/main.Plo \ #>- @@AMDEP_TRUE@@ $(DEPDIR)/player.Plo $(DEPDIR)/userinterface.Plo \ #>- @@AMDEP_TRUE@@ $(DEPDIR)/videoembed.Plo -#>+ 15 -@@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 \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kaboodle_factory.Plo \ d104 18 a121 18 +@@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 $(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)/kaboodle_part.Plo \ @@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 $(DEPDIR)/userinterface.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/videoembed.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)/kaboodle_factory.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/engine.Plo $(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)/kaboodle_part.Plo \ @@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 $(DEPDIR)/userinterface.Plo \ @@@@ -411,8 +421,8 @@@@ CXXLD = $(CXX) d132 1 a132 1 @@@@ -422,7 +432,7 @@@@ RECURSIVE_TARGETS = info-recursive dvi-r d141 2 a142 2 @@@@ -471,6 +481,8 @@@@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) d150 1 a150 13 @@@@ -512,9 +524,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)/kaboodle_part.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kaboodleapp.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/main.Plo@@am__quote@@ @@@@ -690,7 +703,7 @@@@ distclean-tags: d152 12 d166 2 a167 2 -KDE_DIST=engine.h kaboodle_factory.h kaboodleapp.h kaboodle_part.h userinterface.h controls.h conf.h player.h kaboodleui.rc videoembed.h kaboodle.desktop README-USERS kaboodlepartui.rc kaboodle_component.desktop +KDE_DIST=kaboodleapp.h kaboodle_factory.h engine.h controls.h kaboodlepartui.rc kaboodleui.rc README-USERS kaboodle.desktop kaboodle_component.desktop kaboodle_part.h conf.h videoembed.h player.h userinterface.h d171 1 a171 1 @@@@ -752,7 +765,6 @@@@ install-strip: d178 3 a180 3 -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* @@@@ -831,9 +843,6 @@@@ uninstall-info: uninstall-info-recursive uninstall-libLTLIBRARIES uninstall-recursive d186 4 a189 4 messages: rc.cpp $(XGETTEXT) rc.cpp *.cpp *.h -o $(podir)/kaboodle.pot # Tell versions [3.59,3.63) of GNU make to not export all variables. @@@@ -850,26 +859,30 @@@@ libkaboodlepart.la.closure: $(libkaboodl d195 4 a198 2 +kaboodle_part.moc: $(srcdir)/kaboodle_part.h + $(MOC) $(srcdir)/kaboodle_part.h -o kaboodle_part.moc a210 2 -kaboodle_part.moc: $(srcdir)/kaboodle_part.h - $(MOC) $(srcdir)/kaboodle_part.h -o kaboodle_part.moc d213 2 a214 2 #>+ 3 d219 2 a222 7 + +#>+ 3 player.moc: $(srcdir)/player.h $(MOC) $(srcdir)/player.h -o player.moc @@@@ -878,16 +891,12 @@@@ videoembed.moc: $(srcdir)/videoembed.h $(MOC) $(srcdir)/videoembed.h -o videoembed.moc d227 4 a230 2 - -#>+ 3 d238 2 a239 2 - -rm -f engine.moc userinterface.moc kaboodleapp.moc kaboodle_part.moc kaboodle_factory.moc player.moc videoembed.moc controls.moc conf.moc + -rm -f kaboodle_part.moc controls.moc kaboodleapp.moc userinterface.moc kaboodle_factory.moc conf.moc player.moc videoembed.moc engine.moc d243 1 a243 1 @@@@ -904,19 +913,19 @@@@ force-reedit: d267 2 a268 2 -libkaboodlepart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/conf.cpp $(srcdir)/controls.cpp $(srcdir)/engine.cpp $(srcdir)/kaboodle_factory.cpp $(srcdir)/kaboodle_part.cpp $(srcdir)/player.cpp $(srcdir)/videoembed.cpp kaboodle_factory.moc kaboodle_part.moc player.moc conf.moc engine.moc videoembed.moc controls.moc +libkaboodlepart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/conf.cpp $(srcdir)/controls.cpp $(srcdir)/engine.cpp $(srcdir)/kaboodle_factory.cpp $(srcdir)/kaboodle_part.cpp $(srcdir)/player.cpp $(srcdir)/videoembed.cpp kaboodle_part.moc controls.moc kaboodle_factory.moc conf.moc player.moc videoembed.moc engine.moc d272 1 a272 1 @@@@ -929,20 +938,20 @@@@ libkaboodlepart_la.all_cpp.cpp: $(srcdir d298 1 a298 1 @@@@ -952,21 +961,21 @@@@ kde-rpo-clean: d301 1 a301 1 #>+ 19 d304 5 a308 3 -kaboodle_part.o: kaboodle_part.moc videoembed.lo: videoembed.moc -kaboodleapp.o: kaboodleapp.moc d310 7 a316 7 videoembed.o: videoembed.moc -kaboodle_factory.o: kaboodle_factory.moc -engine.lo: engine.moc -kaboodle_factory.lo: kaboodle_factory.moc conf.o: conf.moc -kaboodle_part.lo: kaboodle_part.moc player.o: player.moc d318 2 a319 6 userinterface.o: userinterface.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 d321 1 a325 1 +kaboodle_part.o: kaboodle_part.moc a326 1 +kaboodle_part.lo: kaboodle_part.moc @ 1.1 log @Initial revision @ text @d3 1 a3 1 --- kaboodle/Makefile.in.orig Tue May 14 01:53:25 2002 d5 1 a5 1 @@@@ -293,7 +293,7 @@@@ d14 1 a14 1 @@@@ -307,24 +307,26 @@@@ d24 2 a25 2 kaboodleapp.cpp \ userinterface.cpp d48 1 a48 1 @@@@ -337,15 +339,20 @@@@ d62 1 a62 1 #>+ 5 d64 1 a64 2 -kaboodle_la_nofinal_OBJECTS = main.lo kaboodleapp.lo userinterface.lo \ - kaboodle_la_meta_unload.lo d68 1 a68 2 +libkaboodle_main_la_nofinal_OBJECTS = main.lo kaboodleapp.lo userinterface.lo \ + libkaboodle_main_la_meta_unload.lo d74 1 a74 1 @@@@ -360,11 +367,11 @@@@ d89 1 a89 1 @@@@ -373,8 +380,9 @@@@ d92 33 a124 10 @@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/conf.Plo $(DEPDIR)/controls.Plo \ - @@AMDEP_TRUE@@ $(DEPDIR)/dummy.Po $(DEPDIR)/engine.Plo \ - @@AMDEP_TRUE@@ $(DEPDIR)/kaboodle_factory.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/engine.Plo $(DEPDIR)/kaboodle_factory.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/kaboodle_main.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/kaboodle_main.Po \ @@AMDEP_TRUE@@ $(DEPDIR)/kaboodle_part.Plo \ @@AMDEP_TRUE@@ $(DEPDIR)/kaboodleapp.Plo $(DEPDIR)/main.Plo \ @@AMDEP_TRUE@@ $(DEPDIR)/player.Plo $(DEPDIR)/userinterface.Plo \ @@@@ -398,8 +406,8 @@@@ d135 1 a135 1 @@@@ -409,7 +417,7 @@@@ d144 1 a144 1 @@@@ -458,6 +466,8 @@@@ d153 1 a153 1 @@@@ -499,9 +509,10 @@@@ d165 1 a165 1 @@@@ -677,7 +688,7 @@@@ d169 2 a170 2 -KDE_DIST=README-USERS kaboodle.desktop kaboodle_part.h conf.h kaboodle_factory.h engine.h kaboodlepartui.rc kaboodle_component.desktop videoembed.h player.h kaboodleapp.h kaboodleui.rc controls.h userinterface.h +KDE_DIST=kaboodleapp.h kaboodle_factory.h libkaboodlepart.la.closure engine.h controls.h kaboodlepartui.rc kaboodleui.rc README-USERS kaboodle.desktop kaboodle_component.desktop kaboodle_part.h conf.h videoembed.h player.h dummy.cpp userinterface.h d174 1 a174 1 @@@@ -739,7 +750,6 @@@@ d182 1 a182 1 @@@@ -818,9 +828,6 @@@@ d192 36 a227 1 @@@@ -891,16 +898,16 @@@@ d229 2 d232 18 a249 29 #>+ 12 -kaboodle_la_meta_unload.cpp: kaboodleapp.moc userinterface.moc - @@echo 'creating kaboodle_la_meta_unload.cpp' - @@-rm -f kaboodle_la_meta_unload.cpp +libkaboodle_main_la_meta_unload.cpp: kaboodleapp.moc userinterface.moc + @@echo 'creating libkaboodle_main_la_meta_unload.cpp' + @@-rm -f libkaboodle_main_la_meta_unload.cpp @@if test ${kde_qtver} = 2; then \ - echo 'static const char * _metalist_kaboodle_la[] = {' > kaboodle_la_meta_unload.cpp ;\ - cat kaboodleapp.moc userinterface.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kaboodle_la_meta_unload.cpp ;\ - echo '0};' >> kaboodle_la_meta_unload.cpp ;\ - echo '#include ' >> kaboodle_la_meta_unload.cpp ;\ - echo '_UNLOAD(kaboodle_la)' >> kaboodle_la_meta_unload.cpp ;\ - else echo > kaboodle_la_meta_unload.cpp; fi + echo 'static const char * _metalist_libkaboodle_main_la[] = {' > libkaboodle_main_la_meta_unload.cpp ;\ + cat kaboodleapp.moc userinterface.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkaboodle_main_la_meta_unload.cpp ;\ + echo '0};' >> libkaboodle_main_la_meta_unload.cpp ;\ + echo '#include ' >> libkaboodle_main_la_meta_unload.cpp ;\ + echo '_UNLOAD(libkaboodle_main_la)' >> libkaboodle_main_la_meta_unload.cpp ;\ + else echo > libkaboodle_main_la_meta_unload.cpp; fi #>+ 12 @@@@ -918,14 +925,14 @@@@ #>+ 3 clean-moc-classes: - -rm -f kaboodle_la_meta_unload.cpp libkaboodlepart_la_meta_unload.cpp + -rm -f libkaboodle_main_la_meta_unload.cpp libkaboodlepart_la_meta_unload.cpp a250 13 #>+ 11 -kaboodle_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kaboodleapp.cpp $(srcdir)/userinterface.cpp kaboodle_la_meta_unload.cpp +kaboodle_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kaboodle_main.cpp @@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; \ - for file in main.cpp kaboodleapp.cpp userinterface.cpp kaboodle_la_meta_unload.cpp ; do \ + for file in kaboodle_main.cpp ; do \ echo "#include \"$$file\"" >> kaboodle_la.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kaboodle_la.all_cpp.final; \ done; \ @@@@ -933,7 +940,19 @@@@ rm -f kaboodle_la.all_cpp.final kaboodle_la.all_cpp.files d253 5 a257 2 -libkaboodlepart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/conf.cpp $(srcdir)/controls.cpp $(srcdir)/engine.cpp $(srcdir)/kaboodle_factory.cpp $(srcdir)/kaboodle_part.cpp $(srcdir)/player.cpp $(srcdir)/videoembed.cpp libkaboodlepart_la_meta_unload.cpp kaboodle_part.moc controls.moc kaboodleapp.moc userinterface.moc kaboodle_factory.moc conf.moc player.moc videoembed.moc engine.moc +libkaboodle_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kaboodleapp.cpp $(srcdir)/userinterface.cpp libkaboodle_main_la_meta_unload.cpp d261 3 a263 1 + for file in main.cpp kaboodleapp.cpp userinterface.cpp libkaboodle_main_la_meta_unload.cpp ; do \ d266 4 a269 2 + done; \ + cat libkaboodle_main_la.all_cpp.final libkaboodle_main_la.all_cpp.files > libkaboodle_main_la.all_cpp.cpp; \ d271 4 a274 3 + +#>+ 11 +libkaboodlepart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/conf.cpp $(srcdir)/controls.cpp $(srcdir)/engine.cpp $(srcdir)/kaboodle_factory.cpp $(srcdir)/kaboodle_part.cpp $(srcdir)/player.cpp $(srcdir)/videoembed.cpp $(srcdir)/libkaboodlepart_la_meta_unload.cpp kaboodle_part.moc controls.moc kaboodleapp.moc userinterface.moc kaboodle_factory.moc conf.moc player.moc videoembed.moc engine.moc d278 1 a278 15 @@@@ -945,11 +964,11 @@@@ rm -f libkaboodlepart_la.all_cpp.final libkaboodlepart_la.all_cpp.files #>+ 11 -kaboodle.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp +kaboodle.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kaboodle_main.cpp @@echo 'creating kaboodle.all_cpp.cpp ...'; \ rm -f kaboodle.all_cpp.files kaboodle.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kaboodle.all_cpp.final; \ - for file in dummy.cpp ; do \ + for file in kaboodle_main.cpp ; do \ echo "#include \"$$file\"" >> kaboodle.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kaboodle.all_cpp.final; \ done; \ @@@@ -958,20 +977,20 @@@@ d282 2 a283 2 - -rm -f kaboodle_la.all_cpp.cpp libkaboodlepart_la.all_cpp.cpp kaboodle.all_cpp.cpp + -rm -f kaboodle_la.all_cpp.cpp libkaboodle_main_la.all_cpp.cpp libkaboodlepart_la.all_cpp.cpp kaboodle.all_cpp.cpp d303 33 a335 1 $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean @ 1.1.1.1 log @Initial import of a kdemultimedia3 pkg. @ text @@ 1.1.1.1.2.1 log @file patch-ac was added on branch buildlink2 on 2002-06-23 18:38:01 +0000 @ text @d1 275 @ 1.1.1.1.2.2 log @Merge from pkgsrc-current to buildlink2 branch. @ text @a0 275 $NetBSD: patch-ac,v 1.1.1.1.2.1 2002/06/23 18:38:01 jlam Exp $ --- kaboodle/Makefile.in.orig Tue May 14 01:53:25 2002 +++ kaboodle/Makefile.in @@@@ -293,7 +293,7 @@@@ SUBDIRS = pics actions -lib_LTLIBRARIES = libkaboodlepart.la kaboodle.la +lib_LTLIBRARIES = libkaboodlepart.la libkaboodle_main.la kaboodle.la libkaboodlepart_la_SOURCES = conf.cpp \ controls.cpp \ @@@@ -307,24 +307,26 @@@@ libkaboodlepart_la_LDFLAGS = $(KDE_RPATH) $(KDE_PLUGIN) $(all_libraries) libkaboodlepart_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) -lqtmcop -lkmedia2_idl -lsoundserver_idl -lartskde -kaboodle_la_SOURCES = main.cpp \ +kaboodle_la_SOURCES = kaboodle_main.cpp +kaboodle_la_LIBADD = libkaboodle_main.la +kaboodle_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version + +libkaboodle_main_la_SOURCES = main.cpp \ kaboodleapp.cpp \ userinterface.cpp -kaboodle_la_LIBADD = libkaboodlepart.la -kaboodle_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version +libkaboodle_main_la_LIBADD = libkaboodlepart.la +libkaboodle_main_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) 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 @@@@ -337,15 +339,20 @@@@ CONFIG_CLEAN_FILES = 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) #>+ 5 -kaboodle_la_final_OBJECTS = kaboodle_la.all_cpp.lo -kaboodle_la_nofinal_OBJECTS = main.lo kaboodleapp.lo userinterface.lo \ - kaboodle_la_meta_unload.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 \ + libkaboodle_main_la_meta_unload.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 kaboodle_part.lo player.lo videoembed.lo @@@@ -360,11 +367,11 @@@@ 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 DEFS = @@DEFS@@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) @@@@ -373,8 +380,9 @@@@ LIBS = @@LIBS@@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp @@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/conf.Plo $(DEPDIR)/controls.Plo \ - @@AMDEP_TRUE@@ $(DEPDIR)/dummy.Po $(DEPDIR)/engine.Plo \ - @@AMDEP_TRUE@@ $(DEPDIR)/kaboodle_factory.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/engine.Plo $(DEPDIR)/kaboodle_factory.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/kaboodle_main.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/kaboodle_main.Po \ @@AMDEP_TRUE@@ $(DEPDIR)/kaboodle_part.Plo \ @@AMDEP_TRUE@@ $(DEPDIR)/kaboodleapp.Plo $(DEPDIR)/main.Plo \ @@AMDEP_TRUE@@ $(DEPDIR)/player.Plo $(DEPDIR)/userinterface.Plo \ @@@@ -398,8 +406,8 @@@@ CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@@ CXXFLAGS = @@CXXFLAGS@@ -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) @@@@ -409,7 +417,7 @@@@ uninstall-recursive 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 @@@@ -458,6 +466,8 @@@@ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) 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) @@@@ -499,9 +509,10 @@@@ @@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)/kaboodle_part.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kaboodleapp.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/main.Plo@@am__quote@@ @@@@ -677,7 +688,7 @@@@ #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=README-USERS kaboodle.desktop kaboodle_part.h conf.h kaboodle_factory.h engine.h kaboodlepartui.rc kaboodle_component.desktop videoembed.h player.h kaboodleapp.h kaboodleui.rc controls.h userinterface.h +KDE_DIST=kaboodleapp.h kaboodle_factory.h libkaboodlepart.la.closure engine.h controls.h kaboodlepartui.rc kaboodleui.rc README-USERS kaboodle.desktop kaboodle_component.desktop kaboodle_part.h conf.h videoembed.h player.h dummy.cpp userinterface.h DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) @@@@ -739,7 +750,6 @@@@ mostlyclean-generic: clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* @@@@ -818,9 +828,6 @@@@ uninstall-libLTLIBRARIES uninstall-recursive -dummy.cpp: - echo > dummy.cpp - messages: rc.cpp $(XGETTEXT) rc.cpp *.cpp *.h -o $(podir)/kaboodle.pot # Tell versions [3.59,3.63) of GNU make to not export all variables. @@@@ -891,16 +898,16 @@@@ #>+ 12 -kaboodle_la_meta_unload.cpp: kaboodleapp.moc userinterface.moc - @@echo 'creating kaboodle_la_meta_unload.cpp' - @@-rm -f kaboodle_la_meta_unload.cpp +libkaboodle_main_la_meta_unload.cpp: kaboodleapp.moc userinterface.moc + @@echo 'creating libkaboodle_main_la_meta_unload.cpp' + @@-rm -f libkaboodle_main_la_meta_unload.cpp @@if test ${kde_qtver} = 2; then \ - echo 'static const char * _metalist_kaboodle_la[] = {' > kaboodle_la_meta_unload.cpp ;\ - cat kaboodleapp.moc userinterface.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kaboodle_la_meta_unload.cpp ;\ - echo '0};' >> kaboodle_la_meta_unload.cpp ;\ - echo '#include ' >> kaboodle_la_meta_unload.cpp ;\ - echo '_UNLOAD(kaboodle_la)' >> kaboodle_la_meta_unload.cpp ;\ - else echo > kaboodle_la_meta_unload.cpp; fi + echo 'static const char * _metalist_libkaboodle_main_la[] = {' > libkaboodle_main_la_meta_unload.cpp ;\ + cat kaboodleapp.moc userinterface.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkaboodle_main_la_meta_unload.cpp ;\ + echo '0};' >> libkaboodle_main_la_meta_unload.cpp ;\ + echo '#include ' >> libkaboodle_main_la_meta_unload.cpp ;\ + echo '_UNLOAD(libkaboodle_main_la)' >> libkaboodle_main_la_meta_unload.cpp ;\ + else echo > libkaboodle_main_la_meta_unload.cpp; fi #>+ 12 @@@@ -918,14 +925,14 @@@@ #>+ 3 clean-moc-classes: - -rm -f kaboodle_la_meta_unload.cpp libkaboodlepart_la_meta_unload.cpp + -rm -f libkaboodle_main_la_meta_unload.cpp libkaboodlepart_la_meta_unload.cpp #>+ 11 -kaboodle_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kaboodleapp.cpp $(srcdir)/userinterface.cpp kaboodle_la_meta_unload.cpp +kaboodle_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kaboodle_main.cpp @@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; \ - for file in main.cpp kaboodleapp.cpp userinterface.cpp kaboodle_la_meta_unload.cpp ; do \ + for file in kaboodle_main.cpp ; do \ echo "#include \"$$file\"" >> kaboodle_la.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kaboodle_la.all_cpp.final; \ done; \ @@@@ -933,7 +940,19 @@@@ rm -f kaboodle_la.all_cpp.final kaboodle_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)/kaboodle_part.cpp $(srcdir)/player.cpp $(srcdir)/videoembed.cpp libkaboodlepart_la_meta_unload.cpp kaboodle_part.moc controls.moc kaboodleapp.moc userinterface.moc kaboodle_factory.moc conf.moc player.moc videoembed.moc engine.moc +libkaboodle_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kaboodleapp.cpp $(srcdir)/userinterface.cpp libkaboodle_main_la_meta_unload.cpp + @@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 libkaboodle_main_la_meta_unload.cpp ; do \ + 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 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)/kaboodle_part.cpp $(srcdir)/player.cpp $(srcdir)/videoembed.cpp $(srcdir)/libkaboodlepart_la_meta_unload.cpp kaboodle_part.moc controls.moc kaboodleapp.moc userinterface.moc kaboodle_factory.moc conf.moc player.moc videoembed.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; \ @@@@ -945,11 +964,11 @@@@ rm -f libkaboodlepart_la.all_cpp.final libkaboodlepart_la.all_cpp.files #>+ 11 -kaboodle.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp +kaboodle.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kaboodle_main.cpp @@echo 'creating kaboodle.all_cpp.cpp ...'; \ rm -f kaboodle.all_cpp.files kaboodle.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kaboodle.all_cpp.final; \ - for file in dummy.cpp ; do \ + for file in kaboodle_main.cpp ; do \ echo "#include \"$$file\"" >> kaboodle.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kaboodle.all_cpp.final; \ done; \ @@@@ -958,20 +977,20 @@@@ #>+ 3 clean-final: - -rm -f kaboodle_la.all_cpp.cpp libkaboodlepart_la.all_cpp.cpp kaboodle.all_cpp.cpp + -rm -f kaboodle_la.all_cpp.cpp libkaboodle_main_la.all_cpp.cpp libkaboodlepart_la.all_cpp.cpp kaboodle.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) -f $(top_srcdir)/admin/Makefile.common cvs-clean @