head 1.8; access; symbols pkgsrc-2013Q2:1.8.0.52 pkgsrc-2013Q2-base:1.8 pkgsrc-2012Q4:1.8.0.50 pkgsrc-2012Q4-base:1.8 pkgsrc-2011Q4:1.8.0.48 pkgsrc-2011Q4-base:1.8 pkgsrc-2011Q2:1.8.0.46 pkgsrc-2011Q2-base:1.8 pkgsrc-2009Q4:1.8.0.44 pkgsrc-2009Q4-base:1.8 pkgsrc-2008Q4:1.8.0.42 pkgsrc-2008Q4-base:1.8 pkgsrc-2008Q3:1.8.0.40 pkgsrc-2008Q3-base:1.8 cube-native-xorg:1.8.0.38 cube-native-xorg-base:1.8 pkgsrc-2008Q2:1.8.0.36 pkgsrc-2008Q2-base:1.8 pkgsrc-2008Q1:1.8.0.34 pkgsrc-2008Q1-base:1.8 pkgsrc-2007Q4:1.8.0.32 pkgsrc-2007Q4-base:1.8 pkgsrc-2007Q3:1.8.0.30 pkgsrc-2007Q3-base:1.8 pkgsrc-2007Q2:1.8.0.28 pkgsrc-2007Q2-base:1.8 pkgsrc-2007Q1:1.8.0.26 pkgsrc-2007Q1-base:1.8 pkgsrc-2006Q4:1.8.0.24 pkgsrc-2006Q4-base:1.8 pkgsrc-2006Q3:1.8.0.22 pkgsrc-2006Q3-base:1.8 pkgsrc-2006Q2:1.8.0.20 pkgsrc-2006Q2-base:1.8 pkgsrc-2006Q1:1.8.0.18 pkgsrc-2006Q1-base:1.8 pkgsrc-2005Q4:1.8.0.16 pkgsrc-2005Q4-base:1.8 pkgsrc-2005Q3:1.8.0.14 pkgsrc-2005Q3-base:1.8 pkgsrc-2005Q2:1.8.0.12 pkgsrc-2005Q2-base:1.8 pkgsrc-2005Q1:1.8.0.10 pkgsrc-2005Q1-base:1.8 pkgsrc-2004Q4:1.8.0.8 pkgsrc-2004Q4-base:1.8 pkgsrc-2004Q3:1.8.0.6 pkgsrc-2004Q3-base:1.8 pkgsrc-2004Q2:1.8.0.4 pkgsrc-2004Q2-base:1.8 pkgsrc-2004Q1:1.8.0.2 pkgsrc-2004Q1-base:1.8 pkgsrc-2003Q4:1.6.0.2 pkgsrc-2003Q4-base:1.6 netbsd-1-6-1:1.3.0.2 netbsd-1-6-1-base:1.3 netbsd-1-6:1.2.0.6 netbsd-1-6-RELEASE-base:1.2 pkgviews:1.2.0.2 pkgviews-base:1.2 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.8 date 2004.01.26.15.45.22; author jmmv; state dead; branches; next 1.7; 1.7 date 2004.01.15.10.30.03; author markd; state Exp; branches; next 1.6; 1.6 date 2003.07.30.14.56.02; author markd; state Exp; branches; next 1.5; 1.5 date 2003.05.22.03.05.40; author markd; state Exp; branches; next 1.4; 1.4 date 2003.03.11.13.33.50; author markd; state Exp; branches; next 1.3; 1.3 date 2003.01.02.09.12.21; author skrll; state Exp; branches; next 1.2; 1.2 date 2002.06.25.19.38.30; author skrll; state Exp; branches; next 1.1; 1.1 date 2002.05.31.14.46.49; author skrll; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2002.05.31.14.46.49; author skrll; state Exp; branches 1.1.1.1.2.1; next ; 1.1.1.1.2.1 date 2002.05.31.14.46.49; author jlam; state dead; branches; next 1.1.1.1.2.2; 1.1.1.1.2.2 date 2002.06.23.18.38.07; author jlam; state Exp; branches; next ; desc @@ 1.8 log @kdemultimedia[23] moved to the multimedia category. @ text @$NetBSD: patch-ak,v 1.7 2004/01/15 10:30:03 markd Exp $ --- kmix/Makefile.in.orig 2003-12-29 11:29:37.000000000 +1300 +++ kmix/Makefile.in @@@@ -381,7 +381,7 @@@@ SUBDIRS = control pics INCLUDES = $(all_includes) bin_PROGRAMS = kmix kmixctrl -lib_LTLIBRARIES = kmix.la kmixctrl.la +lib_LTLIBRARIES = libkmix_main.la kmix.la libkmixctrl_main.la kmixctrl.la kde_module_LTLIBRARIES = kmix_panelapplet.la noinst_HEADERS = kmix.h kmixdockwidget.h kmixprefdlg.h kmixerwidget.h \ @@@@ -390,29 +390,37 @@@@ noinst_HEADERS = kmix.h kmixdockwidget.h #>- METASOURCES = AUTO -#>- kmix_la_SOURCES = main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp \ +#>- libkmix_main_la_SOURCES = main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp \ #>- kmixerwidget.cpp channel.cpp mixer.cpp ksmallslider.cpp VerticalText.cpp \ #>- volume.cpp kledbutton.cpp mixdevicewidget.cpp mixerIface.skel #>+ 3 -kmix_la_SOURCES=main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp \ +libkmix_main_la_SOURCES=main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp \ kmixerwidget.cpp channel.cpp mixer.cpp ksmallslider.cpp VerticalText.cpp \ volume.cpp kledbutton.cpp mixdevicewidget.cpp mixerIface_skel.cpp -kmix_la_LIBADD = $(LIB_KDEUI) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) +libkmix_main_la_LIBADD = $(LIB_KDEUI) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) +libkmix_main_la_LDFLAGS = $(all_libraries) + +kmix_la_SOURCES = kmix_main.cpp +kmix_la_LIBADD = libkmix_main.la kmix_la_LDFLAGS = $(all_libraries) -module -avoid-version -kmix_SOURCES = dummy.cpp -kmix_LDADD = kmix.la +kmix_SOURCES = kmix_main.cpp +kmix_LDADD = libkmix_main.la kmix_LDFLAGS = $(all_libraries) $(KDE_RPATH) -#>- kmixctrl_la_SOURCES = kmixctrl.cpp channel.cpp mixer.cpp volume.cpp mixerIface.skel +#>- libkmixctrl_main_la_SOURCES = kmixctrl.cpp channel.cpp mixer.cpp volume.cpp mixerIface.skel #>+ 1 -kmixctrl_la_SOURCES=kmixctrl.cpp channel.cpp mixer.cpp volume.cpp mixerIface_skel.cpp -kmixctrl_la_LIBADD = $(LIB_KDEUI) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) +libkmixctrl_main_la_SOURCES=kmixctrl.cpp channel.cpp mixer.cpp volume.cpp mixerIface_skel.cpp +libkmixctrl_main_la_LIBADD = $(LIB_KDEUI) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) +libkmixctrl_main_la_LDFLAGS = $(all_libraries) + +kmixctrl_la_SOURCES = kmixctrl_main.cpp +kmixctrl_la_LIBADD = libkmixctrl_main.la kmixctrl_la_LDFLAGS = $(all_libraries) -module -avoid-version -kmixctrl_SOURCES = dummy.cpp -kmixctrl_LDADD = kmixctrl.la +kmixctrl_SOURCES = kmixctrl_main.cpp +kmixctrl_LDADD = libkmixctrl_main.la kmixctrl_LDFLAGS = $(all_libraries) $(KDE_RPATH) #>- kmix_panelapplet_la_SOURCES = kmixapplet.cpp kmixerwidget.cpp channel.cpp \ @@@@ -446,18 +454,11 @@@@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES) -kmix_la_DEPENDENCIES = -am_kmix_la_OBJECTS = main.lo kmix.lo kmixdockwidget.lo kmixprefdlg.lo \ - kmixerwidget.lo channel.lo mixer.lo ksmallslider.lo \ - VerticalText.lo volume.lo kledbutton.lo mixdevicewidget.lo +kmix_la_DEPENDENCIES = libkmix_main.la +am_kmix_la_OBJECTS = kmix_main.lo #>- kmix_la_OBJECTS = $(am_kmix_la_OBJECTS) -#>+ 6 -kmix_la_final_OBJECTS = kmix_la.all_cpp.lo -kmix_la_nofinal_OBJECTS = main.lo kmix.lo kmixdockwidget.lo kmixprefdlg.lo \ - kmixerwidget.lo channel.lo mixer.lo ksmallslider.lo \ - VerticalText.lo volume.lo kledbutton.lo mixdevicewidget.lo mixerIface_skel.lo -@@KDE_USE_FINAL_FALSE@@kmix_la_OBJECTS = $(kmix_la_nofinal_OBJECTS) -@@KDE_USE_FINAL_TRUE@@kmix_la_OBJECTS = $(kmix_la_final_OBJECTS) +#>+ 1 +kmix_la_OBJECTS = kmix_main.lo kmix_panelapplet_la_DEPENDENCIES = am_kmix_panelapplet_la_OBJECTS = kmixapplet.lo kmixerwidget.lo \ channel.lo mixer.lo ksmallslider.lo volume.lo kledbutton.lo \ @@@@ -470,46 +471,73 @@@@ kmix_panelapplet_la_nofinal_OBJECTS = km VerticalText.lo mixdevicewidget.lo mixerIface_skel.lo colorwidget.lo @@KDE_USE_FINAL_FALSE@@kmix_panelapplet_la_OBJECTS = $(kmix_panelapplet_la_nofinal_OBJECTS) @@KDE_USE_FINAL_TRUE@@kmix_panelapplet_la_OBJECTS = $(kmix_panelapplet_la_final_OBJECTS) -kmixctrl_la_DEPENDENCIES = -am_kmixctrl_la_OBJECTS = kmixctrl.lo channel.lo mixer.lo volume.lo +kmixctrl_la_DEPENDENCIES = libkmixctrl_main.la +am_kmixctrl_la_OBJECTS = kmixctrl_main.lo #>- kmixctrl_la_OBJECTS = $(am_kmixctrl_la_OBJECTS) -#>+ 4 -kmixctrl_la_final_OBJECTS = kmixctrl_la.all_cpp.lo -kmixctrl_la_nofinal_OBJECTS = kmixctrl.lo channel.lo mixer.lo volume.lo mixerIface_skel.lo -@@KDE_USE_FINAL_FALSE@@kmixctrl_la_OBJECTS = $(kmixctrl_la_nofinal_OBJECTS) -@@KDE_USE_FINAL_TRUE@@kmixctrl_la_OBJECTS = $(kmixctrl_la_final_OBJECTS) +#>+ 1 +kmixctrl_la_OBJECTS = kmixctrl_main.lo +libkmix_main_la_DEPENDENCIES = +am_libkmix_main_la_OBJECTS = main.lo kmix.lo kmixdockwidget.lo \ + kmixprefdlg.lo kmixerwidget.lo channel.lo mixer.lo \ + ksmallslider.lo VerticalText.lo volume.lo kledbutton.lo \ + mixdevicewidget.lo +#>- libkmix_main_la_OBJECTS = $(am_libkmix_main_la_OBJECTS) +#>+ 7 +libkmix_main_la_final_OBJECTS = libkmix_main_la.all_cpp.lo +libkmix_main_la_nofinal_OBJECTS = main.lo kmix.lo kmixdockwidget.lo \ + kmixprefdlg.lo kmixerwidget.lo channel.lo mixer.lo \ + ksmallslider.lo VerticalText.lo volume.lo kledbutton.lo \ + mixdevicewidget.lo mixerIface_skel.lo +@@KDE_USE_FINAL_FALSE@@libkmix_main_la_OBJECTS = $(libkmix_main_la_nofinal_OBJECTS) +@@KDE_USE_FINAL_TRUE@@libkmix_main_la_OBJECTS = $(libkmix_main_la_final_OBJECTS) +libkmixctrl_main_la_DEPENDENCIES = +am_libkmixctrl_main_la_OBJECTS = kmixctrl.lo channel.lo mixer.lo \ + volume.lo +#>- libkmixctrl_main_la_OBJECTS = $(am_libkmixctrl_main_la_OBJECTS) +#>+ 5 +libkmixctrl_main_la_final_OBJECTS = libkmixctrl_main_la.all_cpp.lo +libkmixctrl_main_la_nofinal_OBJECTS = kmixctrl.lo channel.lo mixer.lo \ + volume.lo mixerIface_skel.lo +@@KDE_USE_FINAL_FALSE@@libkmixctrl_main_la_OBJECTS = $(libkmixctrl_main_la_nofinal_OBJECTS) +@@KDE_USE_FINAL_TRUE@@libkmixctrl_main_la_OBJECTS = $(libkmixctrl_main_la_final_OBJECTS) bin_PROGRAMS = kmix$(EXEEXT) kmixctrl$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) -am_kmix_OBJECTS = dummy.$(OBJEXT) +am_kmix_OBJECTS = kmix_main.$(OBJEXT) #>- kmix_OBJECTS = $(am_kmix_OBJECTS) #>+ 1 -kmix_OBJECTS = dummy.$(OBJEXT) -kmix_DEPENDENCIES = kmix.la -am_kmixctrl_OBJECTS = dummy.$(OBJEXT) +kmix_OBJECTS = kmix_main.$(OBJEXT) +kmix_DEPENDENCIES = libkmix_main.la +am_kmixctrl_OBJECTS = kmixctrl_main.$(OBJEXT) #>- kmixctrl_OBJECTS = $(am_kmixctrl_OBJECTS) #>+ 1 -kmixctrl_OBJECTS = dummy.$(OBJEXT) -kmixctrl_DEPENDENCIES = kmixctrl.la +kmixctrl_OBJECTS = kmixctrl_main.$(OBJEXT) +kmixctrl_DEPENDENCIES = libkmixctrl_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)/VerticalText.Plo \ -#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/channel.Plo ./$(DEPDIR)/dummy.Po \ -#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/kledbutton.Plo ./$(DEPDIR)/kmix.Plo \ -#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/kmixapplet.Plo ./$(DEPDIR)/kmixctrl.Plo \ +#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/channel.Plo ./$(DEPDIR)/kledbutton.Plo \ +#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/kmix.Plo ./$(DEPDIR)/kmix_main.Plo \ +#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/kmix_main.Po ./$(DEPDIR)/kmixapplet.Plo \ +#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/kmixctrl.Plo \ +#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/kmixctrl_main.Plo \ +#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/kmixctrl_main.Po \ #>- @@AMDEP_TRUE@@ ./$(DEPDIR)/kmixdockwidget.Plo \ #>- @@AMDEP_TRUE@@ ./$(DEPDIR)/kmixerwidget.Plo \ #>- @@AMDEP_TRUE@@ ./$(DEPDIR)/kmixprefdlg.Plo \ #>- @@AMDEP_TRUE@@ ./$(DEPDIR)/ksmallslider.Plo ./$(DEPDIR)/main.Plo \ #>- @@AMDEP_TRUE@@ ./$(DEPDIR)/mixdevicewidget.Plo \ #>- @@AMDEP_TRUE@@ ./$(DEPDIR)/mixer.Plo ./$(DEPDIR)/volume.Plo -#>+ 21 -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@DEP_FILES = $(DEPDIR)/mixerIface_skel.P $(DEPDIR)/colorwidget.P $(DEPDIR)/kmix_la.all_cpp.P $(DEPDIR)/kmix_panelapplet_la.all_cpp.P $(DEPDIR)/kmixctrl_la.all_cpp.P ./$(DEPDIR)/VerticalText.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/channel.Plo ./$(DEPDIR)/dummy.Po \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kledbutton.Plo ./$(DEPDIR)/kmix.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kmixapplet.Plo ./$(DEPDIR)/kmixctrl.Plo \ +#>+ 27 +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@DEP_FILES = $(DEPDIR)/mixerIface_skel.P $(DEPDIR)/colorwidget.P $(DEPDIR)/kmix_panelapplet_la.all_cpp.P $(DEPDIR)/libkmix_main_la.all_cpp.P $(DEPDIR)/libkmixctrl_main_la.all_cpp.P ./$(DEPDIR)/VerticalText.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/channel.Plo ./$(DEPDIR)/kledbutton.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kmix.Plo ./$(DEPDIR)/kmix_main.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kmix_main.Po ./$(DEPDIR)/kmixapplet.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kmixctrl.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kmixctrl_main.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kmixctrl_main.Po \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kmixdockwidget.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kmixerwidget.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kmixprefdlg.Plo \ @@@@ -517,9 +545,12 @@@@ am__depfiles_maybe = depfiles @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/mixdevicewidget.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/mixer.Plo ./$(DEPDIR)/volume.Plo @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@DEP_FILES = $(DEPDIR)/mixerIface_skel.P $(DEPDIR)/colorwidget.P ./$(DEPDIR)/VerticalText.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/channel.Plo ./$(DEPDIR)/dummy.Po \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kledbutton.Plo ./$(DEPDIR)/kmix.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kmixapplet.Plo ./$(DEPDIR)/kmixctrl.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/channel.Plo ./$(DEPDIR)/kledbutton.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kmix.Plo ./$(DEPDIR)/kmix_main.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kmix_main.Po ./$(DEPDIR)/kmixapplet.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kmixctrl.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kmixctrl_main.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kmixctrl_main.Po \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kmixdockwidget.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kmixerwidget.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kmixprefdlg.Plo \ @@@@ -546,7 +577,9 @@@@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@@ DIST_SOURCES = $(kmix_la_SOURCES) $(kmix_panelapplet_la_SOURCES) \ - $(kmixctrl_la_SOURCES) $(kmix_SOURCES) $(kmixctrl_SOURCES) + $(kmixctrl_la_SOURCES) $(libkmix_main_la_SOURCES) \ + $(libkmixctrl_main_la_SOURCES) $(kmix_SOURCES) \ + $(kmixctrl_SOURCES) DATA = $(apps_DATA) $(lnk_DATA) $(rc_DATA) $(services_DATA) HEADERS = $(noinst_HEADERS) @@@@ -559,7 +592,7 @@@@ RECURSIVE_TARGETS = info-recursive dvi-r check-recursive installcheck-recursive DIST_COMMON = $(noinst_HEADERS) AUTHORS Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) -SOURCES = $(kmix_la_SOURCES) $(kmix_panelapplet_la_SOURCES) $(kmixctrl_la_SOURCES) $(kmix_SOURCES) $(kmixctrl_SOURCES) +SOURCES = $(kmix_la_SOURCES) $(kmix_panelapplet_la_SOURCES) $(kmixctrl_la_SOURCES) $(libkmix_main_la_SOURCES) $(libkmixctrl_main_la_SOURCES) $(kmix_SOURCES) $(kmixctrl_SOURCES) #>- all: all-recursive #>+ 1 @@@@ -641,6 +674,10 @@@@ kmix.la: $(kmix_la_OBJECTS) $(kmix_la_DE $(CXXLINK) -rpath $(kde_moduledir) $(kmix_panelapplet_la_LDFLAGS) $(kmix_panelapplet_la_OBJECTS) $(kmix_panelapplet_la_LIBADD) $(LIBS) kmixctrl.la: $(kmixctrl_la_OBJECTS) $(kmixctrl_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kmixctrl_la_LDFLAGS) $(kmixctrl_la_OBJECTS) $(kmixctrl_la_LIBADD) $(LIBS) +libkmix_main.la: $(libkmix_main_la_OBJECTS) $(libkmix_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkmix_main_la_LDFLAGS) $(libkmix_main_la_OBJECTS) $(libkmix_main_la_LIBADD) $(LIBS) +libkmixctrl_main.la: $(libkmixctrl_main_la_OBJECTS) $(libkmixctrl_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkmixctrl_main_la_LDFLAGS) $(libkmixctrl_main_la_OBJECTS) $(libkmixctrl_main_la_LIBADD) $(LIBS) binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @@$(NORMAL_INSTALL) @@@@ -685,11 +722,14 @@@@ distclean-compile: @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/VerticalText.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/channel.Plo@@am__quote@@ -@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/dummy.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/kledbutton.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/kmix.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/kmix_main.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/kmix_main.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/kmixapplet.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/kmixctrl.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/kmixctrl_main.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/kmixctrl_main.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/kmixdockwidget.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/kmixerwidget.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/kmixprefdlg.Plo@@am__quote@@ @@@@ -942,7 +982,7 @@@@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=mixer_irix.h configure.in.in mixer_sun.h kmixui.rc kmixctrl_restore.desktop mixer_oss.cpp resource.h mixer_alsa.h mixer_none.h kmix-platforms.cpp mixer_alsa5.cpp mixer_alsa9.cpp mixer_irix.cpp colorwidget.ui mixer_hpux.cpp kmixapplet.desktop mixer_none.cpp mixer_oss.h mixer_hpux.h mixer_sun.cpp +KDE_DIST=mixer_alsa9.cpp colorwidget.ui kmix-platforms.cpp configure.in.in mixer_hpux.h mixer_irix.h mixer_hpux.cpp kmixui.rc Makefile.in.rej kmixctrl_restore.desktop resource.h mixer_oss.cpp mixer_irix.cpp mixer_sun.h mixer_alsa5.cpp mixer_sun.cpp mixer_none.cpp mixer_none.h mixer_oss.h kmixapplet.desktop mixer_alsa.h DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) @@@@ -1117,25 +1157,16 @@@@ $(srcdir)/version.h: VERSION messages: rc.cpp $(XGETTEXT) *.cpp -o $(podir)/kmix.pot - -dummy.cpp: - echo > dummy.cpp # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: -#>+ 5 -mixerIface.kidl: $(srcdir)/mixerIface.h $(DCOP_DEPENDENCIES) - $(DCOPIDL) $(srcdir)/mixerIface.h > mixerIface.kidl || ( rm -f mixerIface.kidl ; false ) -mixerIface_skel.cpp: mixerIface.kidl - $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub mixerIface.kidl - #>+ 3 -kmix.moc: $(srcdir)/kmix.h - $(MOC) $(srcdir)/kmix.h -o kmix.moc +kmixdockwidget.moc: $(srcdir)/kmixdockwidget.h + $(MOC) $(srcdir)/kmixdockwidget.h -o kmixdockwidget.moc #>+ 1 -mocs: kmix.moc +mocs: kmixdockwidget.moc #>+ 3 mixdevicewidget.moc: $(srcdir)/mixdevicewidget.h $(MOC) $(srcdir)/mixdevicewidget.h -o mixdevicewidget.moc @@@@ -1143,17 +1174,11 @@@@ mixdevicewidget.moc: $(srcdir)/mixdevice #>+ 1 mocs: mixdevicewidget.moc #>+ 3 -kmixerwidget.moc: $(srcdir)/kmixerwidget.h - $(MOC) $(srcdir)/kmixerwidget.h -o kmixerwidget.moc - -#>+ 1 -mocs: kmixerwidget.moc -#>+ 3 -kmixapplet.moc: $(srcdir)/kmixapplet.h - $(MOC) $(srcdir)/kmixapplet.h -o kmixapplet.moc +ksmallslider.moc: $(srcdir)/ksmallslider.h + $(MOC) $(srcdir)/ksmallslider.h -o ksmallslider.moc #>+ 1 -mocs: kmixapplet.moc +mocs: ksmallslider.moc #>+ 3 kmixprefdlg.moc: $(srcdir)/kmixprefdlg.h $(MOC) $(srcdir)/kmixprefdlg.h -o kmixprefdlg.moc @@@@ -1161,29 +1186,41 @@@@ kmixprefdlg.moc: $(srcdir)/kmixprefdlg.h #>+ 1 mocs: kmixprefdlg.moc #>+ 3 -kledbutton.moc: $(srcdir)/kledbutton.h - $(MOC) $(srcdir)/kledbutton.h -o kledbutton.moc +mixer.moc: $(srcdir)/mixer.h + $(MOC) $(srcdir)/mixer.h -o mixer.moc #>+ 1 -mocs: kledbutton.moc +mocs: mixer.moc #>+ 3 -ksmallslider.moc: $(srcdir)/ksmallslider.h - $(MOC) $(srcdir)/ksmallslider.h -o ksmallslider.moc +kmix.moc: $(srcdir)/kmix.h + $(MOC) $(srcdir)/kmix.h -o kmix.moc #>+ 1 -mocs: ksmallslider.moc +mocs: kmix.moc #>+ 3 -mixer.moc: $(srcdir)/mixer.h - $(MOC) $(srcdir)/mixer.h -o mixer.moc +kmixapplet.moc: $(srcdir)/kmixapplet.h + $(MOC) $(srcdir)/kmixapplet.h -o kmixapplet.moc #>+ 1 -mocs: mixer.moc +mocs: kmixapplet.moc #>+ 3 -kmixdockwidget.moc: $(srcdir)/kmixdockwidget.h - $(MOC) $(srcdir)/kmixdockwidget.h -o kmixdockwidget.moc +kledbutton.moc: $(srcdir)/kledbutton.h + $(MOC) $(srcdir)/kledbutton.h -o kledbutton.moc #>+ 1 -mocs: kmixdockwidget.moc +mocs: kledbutton.moc +#>+ 3 +kmixerwidget.moc: $(srcdir)/kmixerwidget.h + $(MOC) $(srcdir)/kmixerwidget.h -o kmixerwidget.moc + +#>+ 1 +mocs: kmixerwidget.moc +#>+ 5 +mixerIface.kidl: $(srcdir)/mixerIface.h $(DCOP_DEPENDENCIES) + $(DCOPIDL) $(srcdir)/mixerIface.h > mixerIface.kidl || ( rm -f mixerIface.kidl ; false ) +mixerIface_skel.cpp: mixerIface.kidl + $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub mixerIface.kidl + #>+ 8 kmix_panelapplet.la.closure: $(kmix_panelapplet_la_OBJECTS) $(kmix_panelapplet_la_DEPENDENCIES) @@echo "int main() {return 0;}" > kmix_panelapplet_la_closure.cpp @@@@ -1210,7 +1247,7 @@@@ colorwidget.moc: colorwidget.h #>+ 3 clean-metasources: - -rm -f kmix.moc mixdevicewidget.moc kmixerwidget.moc kmixapplet.moc kmixprefdlg.moc kledbutton.moc ksmallslider.moc mixer.moc kmixdockwidget.moc + -rm -f kmixdockwidget.moc mixdevicewidget.moc ksmallslider.moc kmixprefdlg.moc mixer.moc kmix.moc kmixapplet.moc kledbutton.moc kmixerwidget.moc #>+ 6 clean-idl: @@@@ -1239,19 +1276,7 @@@@ force-reedit: #>+ 11 -kmix_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kmix.cpp $(srcdir)/kmixdockwidget.cpp $(srcdir)/kmixprefdlg.cpp $(srcdir)/kmixerwidget.cpp $(srcdir)/channel.cpp $(srcdir)/mixer.cpp $(srcdir)/ksmallslider.cpp $(srcdir)/VerticalText.cpp $(srcdir)/volume.cpp $(srcdir)/kledbutton.cpp $(srcdir)/mixdevicewidget.cpp mixerIface_skel.cpp kmix.moc kmixerwidget.moc mixdevicewidget.moc kmixprefdlg.moc kledbutton.moc ksmallslider.moc mixer.moc kmixdockwidget.moc - @@echo 'creating kmix_la.all_cpp.cpp ...'; \ - rm -f kmix_la.all_cpp.files kmix_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kmix_la.all_cpp.final; \ - for file in main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp kmixerwidget.cpp channel.cpp mixer.cpp ksmallslider.cpp VerticalText.cpp volume.cpp kledbutton.cpp mixdevicewidget.cpp mixerIface_skel.cpp ; do \ - echo "#include \"$$file\"" >> kmix_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kmix_la.all_cpp.final; \ - done; \ - cat kmix_la.all_cpp.final kmix_la.all_cpp.files > kmix_la.all_cpp.cpp; \ - rm -f kmix_la.all_cpp.final kmix_la.all_cpp.files - -#>+ 11 -kmix_panelapplet_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmixapplet.cpp $(srcdir)/kmixerwidget.cpp $(srcdir)/channel.cpp $(srcdir)/mixer.cpp $(srcdir)/ksmallslider.cpp $(srcdir)/volume.cpp $(srcdir)/kledbutton.cpp $(srcdir)/VerticalText.cpp $(srcdir)/mixdevicewidget.cpp mixerIface_skel.cpp colorwidget.cpp kmixerwidget.moc mixdevicewidget.moc kmixapplet.moc kledbutton.moc ksmallslider.moc colorwidget.moc mixer.moc +kmix_panelapplet_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmixapplet.cpp $(srcdir)/kmixerwidget.cpp $(srcdir)/channel.cpp $(srcdir)/mixer.cpp $(srcdir)/ksmallslider.cpp $(srcdir)/volume.cpp $(srcdir)/kledbutton.cpp $(srcdir)/VerticalText.cpp $(srcdir)/mixdevicewidget.cpp mixerIface_skel.cpp colorwidget.cpp mixdevicewidget.moc ksmallslider.moc colorwidget.moc mixer.moc kmixapplet.moc kledbutton.moc kmixerwidget.moc @@echo 'creating kmix_panelapplet_la.all_cpp.cpp ...'; \ rm -f kmix_panelapplet_la.all_cpp.files kmix_panelapplet_la.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kmix_panelapplet_la.all_cpp.final; \ @@@@ -1263,33 +1288,45 @@@@ kmix_panelapplet_la.all_cpp.cpp: $(srcdi rm -f kmix_panelapplet_la.all_cpp.final kmix_panelapplet_la.all_cpp.files #>+ 11 -kmixctrl_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmixctrl.cpp $(srcdir)/channel.cpp $(srcdir)/mixer.cpp $(srcdir)/volume.cpp mixerIface_skel.cpp mixer.moc - @@echo 'creating kmixctrl_la.all_cpp.cpp ...'; \ - rm -f kmixctrl_la.all_cpp.files kmixctrl_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kmixctrl_la.all_cpp.final; \ +libkmix_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kmix.cpp $(srcdir)/kmixdockwidget.cpp $(srcdir)/kmixprefdlg.cpp $(srcdir)/kmixerwidget.cpp $(srcdir)/channel.cpp $(srcdir)/mixer.cpp $(srcdir)/ksmallslider.cpp $(srcdir)/VerticalText.cpp $(srcdir)/volume.cpp $(srcdir)/kledbutton.cpp $(srcdir)/mixdevicewidget.cpp mixerIface_skel.cpp kmixdockwidget.moc mixdevicewidget.moc ksmallslider.moc kmixprefdlg.moc mixer.moc kmix.moc kledbutton.moc kmixerwidget.moc + @@echo 'creating libkmix_main_la.all_cpp.cpp ...'; \ + rm -f libkmix_main_la.all_cpp.files libkmix_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkmix_main_la.all_cpp.final; \ + for file in main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp kmixerwidget.cpp channel.cpp mixer.cpp ksmallslider.cpp VerticalText.cpp volume.cpp kledbutton.cpp mixdevicewidget.cpp mixerIface_skel.cpp ; do \ + echo "#include \"$$file\"" >> libkmix_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkmix_main_la.all_cpp.final; \ + done; \ + cat libkmix_main_la.all_cpp.final libkmix_main_la.all_cpp.files > libkmix_main_la.all_cpp.cpp; \ + rm -f libkmix_main_la.all_cpp.final libkmix_main_la.all_cpp.files + +#>+ 11 +libkmixctrl_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmixctrl.cpp $(srcdir)/channel.cpp $(srcdir)/mixer.cpp $(srcdir)/volume.cpp mixerIface_skel.cpp mixer.moc + @@echo 'creating libkmixctrl_main_la.all_cpp.cpp ...'; \ + rm -f libkmixctrl_main_la.all_cpp.files libkmixctrl_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkmixctrl_main_la.all_cpp.final; \ for file in kmixctrl.cpp channel.cpp mixer.cpp volume.cpp mixerIface_skel.cpp ; do \ - echo "#include \"$$file\"" >> kmixctrl_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kmixctrl_la.all_cpp.final; \ + echo "#include \"$$file\"" >> libkmixctrl_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkmixctrl_main_la.all_cpp.final; \ done; \ - cat kmixctrl_la.all_cpp.final kmixctrl_la.all_cpp.files > kmixctrl_la.all_cpp.cpp; \ - rm -f kmixctrl_la.all_cpp.final kmixctrl_la.all_cpp.files + cat libkmixctrl_main_la.all_cpp.final libkmixctrl_main_la.all_cpp.files > libkmixctrl_main_la.all_cpp.cpp; \ + rm -f libkmixctrl_main_la.all_cpp.final libkmixctrl_main_la.all_cpp.files #>+ 3 clean-final: - -rm -f kmix_la.all_cpp.cpp kmix_panelapplet_la.all_cpp.cpp kmixctrl_la.all_cpp.cpp + -rm -f kmix_panelapplet_la.all_cpp.cpp libkmix_main_la.all_cpp.cpp libkmixctrl_main_la.all_cpp.cpp #>+ 2 final: - $(MAKE) kmix_la_OBJECTS="$(kmix_la_final_OBJECTS)" kmix_panelapplet_la_OBJECTS="$(kmix_panelapplet_la_final_OBJECTS)" kmixctrl_la_OBJECTS="$(kmixctrl_la_final_OBJECTS)" all-am + $(MAKE) kmix_panelapplet_la_OBJECTS="$(kmix_panelapplet_la_final_OBJECTS)" libkmix_main_la_OBJECTS="$(libkmix_main_la_final_OBJECTS)" libkmixctrl_main_la_OBJECTS="$(libkmixctrl_main_la_final_OBJECTS)" all-am #>+ 2 final-install: - $(MAKE) kmix_la_OBJECTS="$(kmix_la_final_OBJECTS)" kmix_panelapplet_la_OBJECTS="$(kmix_panelapplet_la_final_OBJECTS)" kmixctrl_la_OBJECTS="$(kmixctrl_la_final_OBJECTS)" install-am + $(MAKE) kmix_panelapplet_la_OBJECTS="$(kmix_panelapplet_la_final_OBJECTS)" libkmix_main_la_OBJECTS="$(libkmix_main_la_final_OBJECTS)" libkmixctrl_main_la_OBJECTS="$(libkmixctrl_main_la_final_OBJECTS)" install-am #>+ 2 no-final: - $(MAKE) kmix_la_OBJECTS="$(kmix_la_nofinal_OBJECTS)" kmix_panelapplet_la_OBJECTS="$(kmix_panelapplet_la_nofinal_OBJECTS)" kmixctrl_la_OBJECTS="$(kmixctrl_la_nofinal_OBJECTS)" all-am + $(MAKE) kmix_panelapplet_la_OBJECTS="$(kmix_panelapplet_la_nofinal_OBJECTS)" libkmix_main_la_OBJECTS="$(libkmix_main_la_nofinal_OBJECTS)" libkmixctrl_main_la_OBJECTS="$(libkmixctrl_main_la_nofinal_OBJECTS)" all-am #>+ 2 no-final-install: - $(MAKE) kmix_la_OBJECTS="$(kmix_la_nofinal_OBJECTS)" kmix_panelapplet_la_OBJECTS="$(kmix_panelapplet_la_nofinal_OBJECTS)" kmixctrl_la_OBJECTS="$(kmixctrl_la_nofinal_OBJECTS)" install-am + $(MAKE) kmix_panelapplet_la_OBJECTS="$(kmix_panelapplet_la_nofinal_OBJECTS)" libkmix_main_la_OBJECTS="$(libkmix_main_la_nofinal_OBJECTS)" libkmixctrl_main_la_OBJECTS="$(libkmixctrl_main_la_nofinal_OBJECTS)" install-am #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean @@@@ -1299,30 +1336,30 @@@@ kde-rpo-clean: -rm -f *.rpo #>+ 28 -$(srcdir)/mixdevicewidget.cpp: colorwidget.h -kmixapplet.o: kmixapplet.moc -$(srcdir)/kledbutton.cpp: colorwidget.h -$(srcdir)/VerticalText.cpp: colorwidget.h +kmixerwidget.lo: kmixerwidget.moc +mixer.lo: mixer.moc +kmixapplet.lo: kmixapplet.moc ksmallslider.lo: ksmallslider.moc -kmixprefdlg.lo: kmixprefdlg.moc -mixdevicewidget.lo: mixdevicewidget.moc -mixdevicewidget.o: mixdevicewidget.moc kmixerwidget.o: kmixerwidget.moc -kmix.lo: kmix.moc +mixdevicewidget.o: mixdevicewidget.moc kmixdockwidget.lo: kmixdockwidget.moc -kmixerwidget.lo: kmixerwidget.moc -kmixapplet.lo: kmixapplet.moc -kmixprefdlg.o: kmixprefdlg.moc -kmixdockwidget.o: kmixdockwidget.moc +$(srcdir)/mixdevicewidget.cpp: colorwidget.h $(srcdir)/kmixerwidget.cpp: colorwidget.h +kmix.o: kmix.moc $(srcdir)/mixer.cpp: colorwidget.h -kledbutton.lo: kledbutton.moc -ksmallslider.o: ksmallslider.moc +kmix.lo: kmix.moc $(srcdir)/channel.cpp: colorwidget.h -kledbutton.o: kledbutton.moc +kmixprefdlg.o: kmixprefdlg.moc +$(srcdir)/kledbutton.cpp: colorwidget.h +mixdevicewidget.lo: mixdevicewidget.moc +ksmallslider.o: ksmallslider.moc mixer.o: mixer.moc +kledbutton.o: kledbutton.moc +$(srcdir)/VerticalText.cpp: colorwidget.h +kmixprefdlg.lo: kmixprefdlg.moc +kmixapplet.o: kmixapplet.moc +kledbutton.lo: kledbutton.moc $(srcdir)/volume.cpp: colorwidget.h -mixer.lo: mixer.moc -$(srcdir)/kmixapplet.cpp: colorwidget.h $(srcdir)/ksmallslider.cpp: colorwidget.h -kmix.o: kmix.moc +$(srcdir)/kmixapplet.cpp: colorwidget.h +kmixdockwidget.o: kmixdockwidget.moc @ 1.7 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.6 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 --- kmix/Makefile.in.orig 2003-07-15 22:13:58.000000000 +1200 d5 1 a5 1 @@@@ -380,7 +380,7 @@@@ SUBDIRS = control pics d14 1 a14 1 @@@@ -389,29 +389,37 @@@@ noinst_HEADERS = kmix.h kmixdockwidget.h d62 1 a62 1 @@@@ -444,18 +452,11 @@@@ CONFIG_HEADER = $(top_builddir)/config.h d85 1 a85 1 @@@@ -468,46 +469,73 @@@@ kmix_panelapplet_la_nofinal_OBJECTS = km d180 1 a180 1 @@@@ -515,9 +543,12 @@@@ am__depfiles_maybe = depfiles d196 1 a196 1 @@@@ -544,7 +575,9 @@@@ CXXLD = $(CXX) d207 1 a207 1 @@@@ -557,7 +590,7 @@@@ RECURSIVE_TARGETS = info-recursive dvi-r d216 1 a216 1 @@@@ -639,6 +672,10 @@@@ kmix.la: $(kmix_la_OBJECTS) $(kmix_la_DE d227 1 a227 1 @@@@ -683,11 +720,14 @@@@ distclean-compile: d243 1 a243 1 @@@@ -934,7 +974,7 @@@@ distclean-tags: d247 1 a247 1 -KDE_DIST=mixer_hpux.h mixer_irix.h resource.h kmixui.rc kmix-platforms.cpp colorwidget.ui mixer_sun.h mixer_none.cpp mixer_alsa.h mixer_hpux.cpp kmixapplet.desktop mixer_irix.cpp mixer_alsa5.cpp mixer_sun.cpp configure.in.in kmixctrl_restore.desktop mixer_oss.cpp mixer_none.h mixer_alsa9.cpp mixer_oss.h d252 1 a252 1 @@@@ -1109,37 +1149,34 @@@@ $(srcdir)/version.h: VERSION d268 4 a271 1 +#>+ 3 d275 2 a276 1 +#>+ 1 d279 3 a281 5 -ksmallslider.moc: $(srcdir)/ksmallslider.h - $(MOC) $(srcdir)/ksmallslider.h -o ksmallslider.moc +mixdevicewidget.moc: $(srcdir)/mixdevicewidget.h + $(MOC) $(srcdir)/mixdevicewidget.h -o mixdevicewidget.moc d283 1 a283 2 -mocs: ksmallslider.moc +mocs: mixdevicewidget.moc d285 6 d300 3 a302 5 -kmix.moc: $(srcdir)/kmix.h - $(MOC) $(srcdir)/kmix.h -o kmix.moc +kmixprefdlg.moc: $(srcdir)/kmixprefdlg.h + $(MOC) $(srcdir)/kmixprefdlg.h -o kmixprefdlg.moc d304 1 a304 2 -mocs: kmix.moc +mocs: kmixprefdlg.moc d306 5 a310 3 mixer.moc: $(srcdir)/mixer.h $(MOC) $(srcdir)/mixer.h -o mixer.moc @@@@ -1147,35 +1184,35 @@@@ mixer.moc: $(srcdir)/mixer.h d312 2 a313 1 mocs: mixer.moc d315 2 a316 2 -kmixerwidget.moc: $(srcdir)/kmixerwidget.h - $(MOC) $(srcdir)/kmixerwidget.h -o kmixerwidget.moc d321 1 a321 1 -mocs: kmixerwidget.moc d324 2 a325 2 -kledbutton.moc: $(srcdir)/kledbutton.h - $(MOC) $(srcdir)/kledbutton.h -o kledbutton.moc d330 1 a330 1 -mocs: kledbutton.moc d341 1 a341 3 #>+ 3 -mixdevicewidget.moc: $(srcdir)/mixdevicewidget.h - $(MOC) $(srcdir)/mixdevicewidget.h -o mixdevicewidget.moc d344 2 a345 6 #>+ 1 -mocs: mixdevicewidget.moc -#>+ 3 -kmixprefdlg.moc: $(srcdir)/kmixprefdlg.h - $(MOC) $(srcdir)/kmixprefdlg.h -o kmixprefdlg.moc d352 1 a352 3 -#>+ 1 -mocs: kmixprefdlg.moc d356 1 a356 1 @@@@ -1202,7 +1239,7 @@@@ colorwidget.moc: colorwidget.h d360 1 a360 1 - -rm -f ksmallslider.moc kmixapplet.moc kmix.moc mixer.moc kmixerwidget.moc kledbutton.moc kmixdockwidget.moc mixdevicewidget.moc kmixprefdlg.moc d365 1 a365 1 @@@@ -1231,19 +1268,7 @@@@ force-reedit: d369 1 a369 1 -kmix_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kmix.cpp $(srcdir)/kmixdockwidget.cpp $(srcdir)/kmixprefdlg.cpp $(srcdir)/kmixerwidget.cpp $(srcdir)/channel.cpp $(srcdir)/mixer.cpp $(srcdir)/ksmallslider.cpp $(srcdir)/VerticalText.cpp $(srcdir)/volume.cpp $(srcdir)/kledbutton.cpp $(srcdir)/mixdevicewidget.cpp mixerIface_skel.cpp kmix.moc kmixdockwidget.moc ksmallslider.moc mixer.moc kmixerwidget.moc kledbutton.moc mixdevicewidget.moc kmixprefdlg.moc d381 1 a381 1 -kmix_panelapplet_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmixapplet.cpp $(srcdir)/kmixerwidget.cpp $(srcdir)/channel.cpp $(srcdir)/mixer.cpp $(srcdir)/ksmallslider.cpp $(srcdir)/volume.cpp $(srcdir)/kledbutton.cpp $(srcdir)/VerticalText.cpp $(srcdir)/mixdevicewidget.cpp mixerIface_skel.cpp colorwidget.cpp kmixapplet.moc ksmallslider.moc colorwidget.moc mixer.moc kmixerwidget.moc kledbutton.moc mixdevicewidget.moc d386 1 a386 1 @@@@ -1255,33 +1280,45 @@@@ kmix_panelapplet_la.all_cpp.cpp: $(srcdi d445 1 a445 1 @@@@ -1291,30 +1328,30 @@@@ kde-rpo-clean: d450 7 a456 8 -kledbutton.lo: kledbutton.moc -mixer.o: mixer.moc -$(srcdir)/channel.cpp: colorwidget.h -$(srcdir)/ksmallslider.cpp: colorwidget.h -kmixprefdlg.o: kmixprefdlg.moc -kledbutton.o: kledbutton.moc -$(srcdir)/kmixapplet.cpp: colorwidget.h kmixerwidget.lo: kmixerwidget.moc a457 2 -kmix.lo: kmix.moc mixer.lo: mixer.moc d459 1 a459 2 +kmixapplet.lo: kmixapplet.moc +ksmallslider.lo: ksmallslider.moc d461 6 a467 2 +mixdevicewidget.o: mixdevicewidget.moc +kmixdockwidget.lo: kmixdockwidget.moc d471 3 a473 1 +$(srcdir)/mixer.cpp: colorwidget.h d475 2 a476 1 +$(srcdir)/channel.cpp: colorwidget.h d478 1 a478 2 $(srcdir)/kledbutton.cpp: colorwidget.h -$(srcdir)/VerticalText.cpp: colorwidget.h d480 2 a481 7 ksmallslider.o: ksmallslider.moc -mixdevicewidget.o: mixdevicewidget.moc -$(srcdir)/mixer.cpp: colorwidget.h -kmix.o: kmix.moc -kmixapplet.lo: kmixapplet.moc -$(srcdir)/volume.cpp: colorwidget.h +mixer.o: mixer.moc d485 1 a485 3 kmixapplet.o: kmixapplet.moc -ksmallslider.lo: ksmallslider.moc -kmixdockwidget.lo: kmixdockwidget.moc d487 5 a491 2 +$(srcdir)/volume.cpp: colorwidget.h +$(srcdir)/ksmallslider.cpp: colorwidget.h @ 1.5 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 --- kmix/Makefile.in.orig Thu May 8 00:05:28 2003 d5 1 a5 1 @@@@ -379,7 +379,7 @@@@ SUBDIRS = control pics d14 1 a14 1 @@@@ -388,29 +388,37 @@@@ noinst_HEADERS = kmix.h kmixdockwidget.h d62 1 a62 1 @@@@ -443,18 +451,11 @@@@ CONFIG_HEADER = $(top_builddir)/config.h d85 1 a85 1 @@@@ -467,46 +468,73 @@@@ kmix_panelapplet_la_nofinal_OBJECTS = km d180 1 a180 1 @@@@ -514,9 +542,12 @@@@ am__depfiles_maybe = depfiles d196 1 a196 1 @@@@ -543,7 +574,9 @@@@ CXXLD = $(CXX) d207 1 a207 1 @@@@ -556,7 +589,7 @@@@ RECURSIVE_TARGETS = info-recursive dvi-r d216 1 a216 1 @@@@ -638,6 +671,10 @@@@ kmix.la: $(kmix_la_OBJECTS) $(kmix_la_DE d227 1 a227 1 @@@@ -682,11 +719,14 @@@@ distclean-compile: d243 1 a243 1 @@@@ -933,7 +973,7 @@@@ distclean-tags: d248 1 a248 1 +KDE_DIST=mixer_alsa9.cpp colorwidget.ui kmix-platforms.cpp configure.in.in mixer_hpux.h mixer_irix.h mixer_hpux.cpp kmixui.rc kmixctrl_restore.desktop resource.h mixer_oss.cpp mixer_irix.cpp mixer_sun.h mixer_alsa5.cpp mixer_sun.cpp mixer_none.cpp mixer_none.h mixer_oss.h kmixapplet.desktop mixer_alsa.h d252 1 a252 1 @@@@ -1108,54 +1148,51 @@@@ $(srcdir)/version.h: VERSION d265 1 a265 1 - $(DCOPIDL) $(srcdir)/mixerIface.h > mixerIface.kidl || ( rm -f mixerIface.kidl ; /bin/false ) d272 2 d280 3 d289 3 d298 3 d304 3 a306 1 d313 3 d322 3 d331 3 d340 2 d345 1 d348 1 a348 1 + $(DCOPIDL) $(srcdir)/mixerIface.h > mixerIface.kidl || ( rm -f mixerIface.kidl ; /bin/false ) d352 2 d356 2 a357 1 @@@@ -1183,7 +1220,7 @@@@ colorwidget.moc: colorwidget.h d366 1 a366 1 @@@@ -1212,19 +1249,7 @@@@ force-reedit: d387 1 a387 1 @@@@ -1236,33 +1261,45 @@@@ kmix_panelapplet_la.all_cpp.cpp: $(srcdi d446 1 a446 1 @@@@ -1272,30 +1309,30 @@@@ kde-rpo-clean: @ 1.4 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 --- kmix/Makefile.in.orig Fri Jan 17 08:49:40 2003 d5 1 a5 1 @@@@ -328,7 +328,7 @@@@ SUBDIRS = control pics d14 1 a14 1 @@@@ -337,29 +337,37 @@@@ noinst_HEADERS = kmix.h kmixdockwidget.h d20 1 a20 1 #>- kmixerwidget.cpp channel.cpp mixer.cpp ksmallslider.cpp \ d25 1 a25 1 kmixerwidget.cpp channel.cpp mixer.cpp ksmallslider.cpp \ d62 1 a62 1 @@@@ -392,18 +400,11 @@@@ CONFIG_HEADER = $(top_builddir)/config.h d68 2 a69 2 - kmixerwidget.lo channel.lo mixer.lo ksmallslider.lo volume.lo \ - kledbutton.lo mixdevicewidget.lo d76 2 a77 2 - kmixerwidget.lo channel.lo mixer.lo ksmallslider.lo volume.lo \ - kledbutton.lo mixdevicewidget.lo mixerIface_skel.lo d85 2 a86 2 @@@@ -416,27 +417,46 @@@@ kmix_panelapplet_la_nofinal_OBJECTS = km mixdevicewidget.lo mixerIface_skel.lo colorwidget.lo d104 2 a105 1 + ksmallslider.lo volume.lo kledbutton.lo mixdevicewidget.lo d107 1 a107 1 +#>+ 6 d111 2 a112 1 + ksmallslider.lo volume.lo kledbutton.lo mixdevicewidget.lo mixerIface_skel.lo a144 1 DEFS = @@DEFS@@ a145 2 @@@@ -444,28 +464,37 @@@@ LDFLAGS = @@LDFLAGS@@ LIBS = @@LIBS@@ d148 8 a155 5 -#>- @@AMDEP_TRUE@@DEP_FILES = ./$(DEPDIR)/channel.Plo ./$(DEPDIR)/dummy.Po \ +#>- @@AMDEP_TRUE@@DEP_FILES = ./$(DEPDIR)/channel.Plo \ #>- @@AMDEP_TRUE@@ ./$(DEPDIR)/kledbutton.Plo ./$(DEPDIR)/kmix.Plo \ +#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/kmix_main.Plo ./$(DEPDIR)/kmix_main.Po \ #>- @@AMDEP_TRUE@@ ./$(DEPDIR)/kmixapplet.Plo ./$(DEPDIR)/kmixctrl.Plo \ d164 11 a174 7 -#>+ 19 -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@DEP_FILES = $(DEPDIR)/mixerIface_skel.P $(DEPDIR)/colorwidget.P $(DEPDIR)/kmix_la.all_cpp.P $(DEPDIR)/kmix_panelapplet_la.all_cpp.P $(DEPDIR)/kmixctrl_la.all_cpp.P ./$(DEPDIR)/channel.Plo ./$(DEPDIR)/dummy.Po \ +#>+ 25 +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@DEP_FILES = $(DEPDIR)/mixerIface_skel.P $(DEPDIR)/colorwidget.P $(DEPDIR)/kmix_panelapplet_la.all_cpp.P $(DEPDIR)/libkmix_main_la.all_cpp.P $(DEPDIR)/libkmixctrl_main_la.all_cpp.P ./$(DEPDIR)/channel.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kledbutton.Plo ./$(DEPDIR)/kmix.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kmix_main.Plo ./$(DEPDIR)/kmix_main.Po \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kmixapplet.Plo ./$(DEPDIR)/kmixctrl.Plo \ d180 1 a180 1 @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/ksmallslider.Plo ./$(DEPDIR)/main.Plo \ d183 8 a190 5 -@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@DEP_FILES = $(DEPDIR)/mixerIface_skel.P $(DEPDIR)/colorwidget.P ./$(DEPDIR)/channel.Plo ./$(DEPDIR)/dummy.Po \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@DEP_FILES = $(DEPDIR)/mixerIface_skel.P $(DEPDIR)/colorwidget.P ./$(DEPDIR)/channel.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kledbutton.Plo ./$(DEPDIR)/kmix.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kmix_main.Plo ./$(DEPDIR)/kmix_main.Po \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kmixapplet.Plo ./$(DEPDIR)/kmixctrl.Plo \ d196 2 a197 1 @@@@ -493,7 +522,9 @@@@ CXXLINK = $(LIBTOOL) --mode=link --tag=C a198 1 CXXFLAGS = @@CXXFLAGS@@ d207 2 a208 2 @@@@ -505,7 +536,7 @@@@ RECURSIVE_TARGETS = info-recursive dvi-r uninstall-recursive check-recursive installcheck-recursive d216 1 a216 1 @@@@ -587,6 +618,10 @@@@ kmix.la: $(kmix_la_OBJECTS) $(kmix_la_DE d227 1 a227 2 @@@@ -630,11 +665,14 @@@@ distclean-compile: -rm -f *.tab.c d229 1 d243 2 a244 2 @@@@ -845,7 +883,7 @@@@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH d247 2 a248 2 -KDE_DIST=mixer_hpux.h mixer_irix.h resource.h kmixui.rc kledbutton.cpp kmix-platforms.cpp colorwidget.ui mixer_sun.h mixer_none.cpp mixer_alsa.h mixer_hpux.cpp kmixapplet.desktop ksmallslider.cpp mixdevicewidget.cpp mixer_irix.cpp mixer_alsa5.cpp mixer_sun.cpp configure.in.in kmixctrl_restore.desktop mixer_oss.cpp mixer_none.h mixer_alsa9.cpp mixer_oss.h +KDE_DIST=mixer_alsa9.cpp colorwidget.ui kmix-platforms.cpp configure.in.in mixer_hpux.h mixer_irix.h mixer_hpux.cpp kmixui.rc kmixctrl_restore.desktop resource.h kledbutton.cpp mixer_oss.cpp mixer_irix.cpp mixer_sun.h mixer_alsa5.cpp mixer_sun.cpp ksmallslider.cpp mixer_none.cpp mixer_none.h mixdevicewidget.cpp mixer_oss.h kmixapplet.desktop mixer_alsa.h d252 1 a252 1 @@@@ -1005,54 +1043,51 @@@@ $(srcdir)/version.h: VERSION d329 1 a329 1 @@@@ -1080,7 +1115,7 @@@@ colorwidget.moc: colorwidget.h d338 1 a338 1 @@@@ -1109,19 +1144,7 @@@@ force-reedit: d342 1 a342 1 -kmix_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kmix.cpp $(srcdir)/kmixdockwidget.cpp $(srcdir)/kmixprefdlg.cpp $(srcdir)/kmixerwidget.cpp $(srcdir)/channel.cpp $(srcdir)/mixer.cpp $(srcdir)/ksmallslider.cpp $(srcdir)/volume.cpp $(srcdir)/kledbutton.cpp $(srcdir)/mixdevicewidget.cpp mixerIface_skel.cpp kmix.moc kmixdockwidget.moc ksmallslider.moc mixer.moc kmixerwidget.moc kledbutton.moc mixdevicewidget.moc kmixprefdlg.moc d346 1 a346 1 - for file in main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp kmixerwidget.cpp channel.cpp mixer.cpp ksmallslider.cpp volume.cpp kledbutton.cpp mixdevicewidget.cpp mixerIface_skel.cpp ; do \ d354 2 a355 2 -kmix_panelapplet_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmixapplet.cpp $(srcdir)/kmixerwidget.cpp $(srcdir)/channel.cpp $(srcdir)/mixer.cpp $(srcdir)/ksmallslider.cpp $(srcdir)/volume.cpp $(srcdir)/kledbutton.cpp $(srcdir)/mixdevicewidget.cpp mixerIface_skel.cpp colorwidget.cpp kmixapplet.moc ksmallslider.moc colorwidget.moc mixer.moc kmixerwidget.moc kledbutton.moc mixdevicewidget.moc +kmix_panelapplet_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmixapplet.cpp $(srcdir)/kmixerwidget.cpp $(srcdir)/channel.cpp $(srcdir)/mixer.cpp $(srcdir)/ksmallslider.cpp $(srcdir)/volume.cpp $(srcdir)/kledbutton.cpp $(srcdir)/mixdevicewidget.cpp mixerIface_skel.cpp colorwidget.cpp mixdevicewidget.moc ksmallslider.moc colorwidget.moc mixer.moc kmixapplet.moc kledbutton.moc kmixerwidget.moc d359 1 a359 1 @@@@ -1133,33 +1156,45 @@@@ kmix_panelapplet_la.all_cpp.cpp: $(srcdi d367 1 a367 1 +libkmix_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kmix.cpp $(srcdir)/kmixdockwidget.cpp $(srcdir)/kmixprefdlg.cpp $(srcdir)/kmixerwidget.cpp $(srcdir)/channel.cpp $(srcdir)/mixer.cpp $(srcdir)/ksmallslider.cpp $(srcdir)/volume.cpp $(srcdir)/kledbutton.cpp $(srcdir)/mixdevicewidget.cpp mixerIface_skel.cpp kmixdockwidget.moc mixdevicewidget.moc ksmallslider.moc kmixprefdlg.moc mixer.moc kmix.moc kledbutton.moc kmixerwidget.moc d371 1 a371 1 + for file in main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp kmixerwidget.cpp channel.cpp mixer.cpp ksmallslider.cpp volume.cpp kledbutton.cpp mixdevicewidget.cpp mixerIface_skel.cpp ; do \ d418 1 a418 1 @@@@ -1169,29 +1204,29 @@@@ kde-rpo-clean: d421 1 a421 1 #>+ 27 d449 1 d459 1 @ 1.3 log @Update KDE to the 3.0.5a distribution. Packages are numbered 3.0.5.1 or 1.0.5.1 accordingly. Fixes and changes are: Multiple vulnerabilities. kdelibs KHTML : Fixed several crashes and misrenderings. rlogin.protocol: fixed command execution in specially crafted urls. kdebase KAddressbook: Don't squeeze columns on startup/properly restore column width settings. kdenetwork lisa, reslisa: Fixed several security vulnerabilities. kdesdk Cervisia: Show long lines in diff view always completely. @ text @d3 1 a3 1 --- kmix/Makefile.in.orig Sat Dec 28 14:04:00 2002 d5 1 a5 1 @@@@ -292,7 +292,7 @@@@ SUBDIRS = control pics d14 1 a14 1 @@@@ -301,23 +301,31 @@@@ noinst_HEADERS = kmix.h kmixdockwidget.h d17 8 a24 3 METASOURCES = AUTO -kmix_la_SOURCES = main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp \ +libkmix_main_la_SOURCES = main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp \ d26 1 a26 1 volume.cpp kledbutton.cpp mixdevicewidget.cpp d42 4 a45 7 -kmixctrl_SOURCES = dummy.cpp -kmixctrl_LDADD = kmixctrl.la +kmixctrl_SOURCES = kmixctrl_main.cpp +kmixctrl_LDADD = libkmixctrl_main.la kmixctrl_LDFLAGS = $(all_libraries) $(KDE_RPATH) -kmixctrl_la_SOURCES = kmixctrl.cpp channel.cpp mixer.cpp volume.cpp d47 1 a47 1 +libkmixctrl_main_la_SOURCES = kmixctrl.cpp channel.cpp mixer.cpp volume.cpp d55 8 a62 2 #>- kmix_panelapplet_la_METASOURCES = AUTO @@@@ -351,18 +359,11 @@@@ CONFIG_HEADER = $(top_builddir)/config.h d77 1 a77 1 - kledbutton.lo mixdevicewidget.lo d85 2 a86 2 @@@@ -375,27 +376,46 @@@@ kmix_panelapplet_la_nofinal_OBJECTS = km mixdevicewidget.lo colorwidget.lo d96 1 a96 1 -kmixctrl_la_nofinal_OBJECTS = kmixctrl.lo channel.lo mixer.lo volume.lo d110 1 a110 1 + ksmallslider.lo volume.lo kledbutton.lo mixdevicewidget.lo d120 1 a120 1 + volume.lo d145 1 a145 2 @@@@ -403,28 +423,34 @@@@ CPPFLAGS = @@CPPFLAGS@@ LDFLAGS = @@LDFLAGS@@ d148 14 a161 14 -#>- @@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/channel.Plo $(DEPDIR)/dummy.Po \ -#>- @@AMDEP_TRUE@@ $(DEPDIR)/kledbutton.Plo $(DEPDIR)/kmix.Plo \ -#>- @@AMDEP_TRUE@@ $(DEPDIR)/kmixapplet.Plo $(DEPDIR)/kmixctrl.Plo \ +#>- @@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/channel.Plo $(DEPDIR)/kledbutton.Plo \ +#>- @@AMDEP_TRUE@@ $(DEPDIR)/kmix.Plo $(DEPDIR)/kmix_main.Plo \ +#>- @@AMDEP_TRUE@@ $(DEPDIR)/kmix_main.Po $(DEPDIR)/kmixapplet.Plo \ +#>- @@AMDEP_TRUE@@ $(DEPDIR)/kmixctrl.Plo $(DEPDIR)/kmixctrl_main.Plo \ +#>- @@AMDEP_TRUE@@ $(DEPDIR)/kmixctrl_main.Po \ #>- @@AMDEP_TRUE@@ $(DEPDIR)/kmixdockwidget.Plo \ #>- @@AMDEP_TRUE@@ $(DEPDIR)/kmixerwidget.Plo \ #>- @@AMDEP_TRUE@@ $(DEPDIR)/kmixprefdlg.Plo \ #>- @@AMDEP_TRUE@@ $(DEPDIR)/ksmallslider.Plo $(DEPDIR)/main.Plo \ #>- @@AMDEP_TRUE@@ $(DEPDIR)/mixdevicewidget.Plo $(DEPDIR)/mixer.Plo \ #>- @@AMDEP_TRUE@@ $(DEPDIR)/volume.Plo d163 25 a187 27 -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@DEP_FILES = $(DEPDIR)/colorwidget.P $(DEPDIR)/kmix_la.all_cpp.P $(DEPDIR)/kmix_panelapplet_la.all_cpp.P $(DEPDIR)/kmixctrl_la.all_cpp.P $(DEPDIR)/channel.Plo $(DEPDIR)/dummy.Po \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kledbutton.Plo $(DEPDIR)/kmix.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kmixapplet.Plo $(DEPDIR)/kmixctrl.Plo \ +#>+ 23 +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@DEP_FILES = $(DEPDIR)/colorwidget.P $(DEPDIR)/kmix_panelapplet_la.all_cpp.P $(DEPDIR)/libkmix_main_la.all_cpp.P $(DEPDIR)/libkmixctrl_main_la.all_cpp.P $(DEPDIR)/channel.Plo $(DEPDIR)/kledbutton.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kmix.Plo $(DEPDIR)/kmix_main.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kmix_main.Po $(DEPDIR)/kmixapplet.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kmixctrl.Plo $(DEPDIR)/kmixctrl_main.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kmixctrl_main.Po \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kmixdockwidget.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kmixerwidget.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kmixprefdlg.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/ksmallslider.Plo $(DEPDIR)/main.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/mixdevicewidget.Plo $(DEPDIR)/mixer.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/volume.Plo -@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@DEP_FILES = $(DEPDIR)/colorwidget.P $(DEPDIR)/channel.Plo $(DEPDIR)/dummy.Po \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kledbutton.Plo $(DEPDIR)/kmix.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kmixapplet.Plo $(DEPDIR)/kmixctrl.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@DEP_FILES = $(DEPDIR)/colorwidget.P $(DEPDIR)/channel.Plo $(DEPDIR)/kledbutton.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kmix.Plo $(DEPDIR)/kmix_main.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kmix_main.Po $(DEPDIR)/kmixapplet.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kmixctrl.Plo $(DEPDIR)/kmixctrl_main.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kmixctrl_main.Po \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kmixdockwidget.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kmixerwidget.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kmixprefdlg.Plo \ @@@@ -452,7 +478,9 @@@@ CXXLINK = $(LIBTOOL) --mode=link --tag=C d198 1 a198 1 @@@@ -464,7 +492,7 @@@@ RECURSIVE_TARGETS = info-recursive dvi-r d207 1 a207 1 @@@@ -539,6 +567,10 @@@@ kmix.la: $(kmix_la_OBJECTS) $(kmix_la_DE d215 1 d218 1 a218 2 $(mkinstalldirs) $(DESTDIR)$(bindir) @@@@ -577,11 +609,14 @@@@ distclean-compile: d221 15 a235 15 @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/channel.Plo@@am__quote@@ -@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/dummy.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kledbutton.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kmix.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kmix_main.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kmix_main.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kmixapplet.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kmixctrl.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kmixctrl_main.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kmixctrl_main.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kmixdockwidget.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kmixerwidget.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kmixprefdlg.Plo@@am__quote@@ @@@@ -776,7 +811,7 @@@@ distclean-tags: d238 2 a239 2 -KDE_DIST=mixer_hpux.h mixer_irix.h resource.h kmixui.rc kmix-platforms.cpp colorwidget.ui mixer_sun.h mixer_none.cpp mixer_alsa.h mixer_hpux.cpp kmixapplet.desktop mixer_alsa.cpp mixer_irix.cpp mixer_sun.cpp configure.in.in kmixctrl_restore.desktop mixer_oss.cpp mixer_none.h mixer_oss.h +KDE_DIST=colorwidget.ui kmix-platforms.cpp configure.in.in mixer_hpux.h mixer_irix.h mixer_hpux.cpp kmixui.rc kmixctrl_restore.desktop resource.h mixer_oss.cpp mixer_irix.cpp mixer_sun.h mixer_sun.cpp mixer_none.cpp mixer_none.h mixer_oss.h mixer_alsa.cpp kmixapplet.desktop mixer_alsa.h d243 1 a243 1 @@@@ -930,9 +965,6 @@@@ $(srcdir)/version.h: VERSION a252 2 @@@@ -962,44 +994,44 @@@@ colorwidget.moc: colorwidget.h $(MOC) colorwidget.h -o colorwidget.moc d254 6 a259 3 #>+ 3 -ksmallslider.moc: $(srcdir)/ksmallslider.h - $(MOC) $(srcdir)/ksmallslider.h -o ksmallslider.moc d264 2 a265 2 -kmixapplet.moc: $(srcdir)/kmixapplet.h - $(MOC) $(srcdir)/kmixapplet.h -o kmixapplet.moc d270 2 a271 2 -kmix.moc: $(srcdir)/kmix.h - $(MOC) $(srcdir)/kmix.h -o kmix.moc d276 2 a277 2 -mixer.moc: $(srcdir)/mixer.h - $(MOC) $(srcdir)/mixer.h -o mixer.moc d282 4 d288 2 a289 2 +mixer.moc: $(srcdir)/mixer.h + $(MOC) $(srcdir)/mixer.h -o mixer.moc d294 2 a295 2 +kmix.moc: $(srcdir)/kmix.h + $(MOC) $(srcdir)/kmix.h -o kmix.moc d300 2 a301 2 +kmixapplet.moc: $(srcdir)/kmixapplet.h + $(MOC) $(srcdir)/kmixapplet.h -o kmixapplet.moc d306 2 a307 2 +kledbutton.moc: $(srcdir)/kledbutton.h + $(MOC) $(srcdir)/kledbutton.h -o kledbutton.moc d309 1 a309 1 #>+ 3 d312 9 a320 2 +kmixerwidget.moc: $(srcdir)/kmixerwidget.h + $(MOC) $(srcdir)/kmixerwidget.h -o kmixerwidget.moc d327 3 a329 3 #>+ 4 clean-ui: @@@@ -1021,19 +1053,7 @@@@ force-reedit: d333 1 a333 1 -kmix_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kmix.cpp $(srcdir)/kmixdockwidget.cpp $(srcdir)/kmixprefdlg.cpp $(srcdir)/kmixerwidget.cpp $(srcdir)/channel.cpp $(srcdir)/mixer.cpp $(srcdir)/ksmallslider.cpp $(srcdir)/volume.cpp $(srcdir)/kledbutton.cpp $(srcdir)/mixdevicewidget.cpp kmix.moc kmixdockwidget.moc ksmallslider.moc mixer.moc kmixerwidget.moc kledbutton.moc kmixprefdlg.moc mixdevicewidget.moc d337 1 a337 1 - for file in main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp kmixerwidget.cpp channel.cpp mixer.cpp ksmallslider.cpp volume.cpp kledbutton.cpp mixdevicewidget.cpp ; do \ d345 2 a346 2 -kmix_panelapplet_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmixapplet.cpp $(srcdir)/kmixerwidget.cpp $(srcdir)/channel.cpp $(srcdir)/mixer.cpp $(srcdir)/ksmallslider.cpp $(srcdir)/volume.cpp $(srcdir)/kledbutton.cpp $(srcdir)/mixdevicewidget.cpp colorwidget.cpp kmixapplet.moc ksmallslider.moc colorwidget.moc mixer.moc kmixerwidget.moc kledbutton.moc mixdevicewidget.moc +kmix_panelapplet_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmixapplet.cpp $(srcdir)/kmixerwidget.cpp $(srcdir)/channel.cpp $(srcdir)/mixer.cpp $(srcdir)/ksmallslider.cpp $(srcdir)/volume.cpp $(srcdir)/kledbutton.cpp $(srcdir)/mixdevicewidget.cpp colorwidget.cpp mixdevicewidget.moc ksmallslider.moc colorwidget.moc mixer.moc kmixapplet.moc kledbutton.moc kmixerwidget.moc d350 1 a350 1 @@@@ -1045,33 +1065,45 @@@@ kmix_panelapplet_la.all_cpp.cpp: $(srcdi d354 1 a354 1 -kmixctrl_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmixctrl.cpp $(srcdir)/channel.cpp $(srcdir)/mixer.cpp $(srcdir)/volume.cpp mixer.moc d358 1 a358 1 +libkmix_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kmix.cpp $(srcdir)/kmixdockwidget.cpp $(srcdir)/kmixprefdlg.cpp $(srcdir)/kmixerwidget.cpp $(srcdir)/channel.cpp $(srcdir)/mixer.cpp $(srcdir)/ksmallslider.cpp $(srcdir)/volume.cpp $(srcdir)/kledbutton.cpp $(srcdir)/mixdevicewidget.cpp kmixdockwidget.moc mixdevicewidget.moc ksmallslider.moc kmixprefdlg.moc mixer.moc kmix.moc kledbutton.moc kmixerwidget.moc d362 1 a362 1 + for file in main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp kmixerwidget.cpp channel.cpp mixer.cpp ksmallslider.cpp volume.cpp kledbutton.cpp mixdevicewidget.cpp ; do \ d370 1 a370 1 +libkmixctrl_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmixctrl.cpp $(srcdir)/channel.cpp $(srcdir)/mixer.cpp $(srcdir)/volume.cpp mixer.moc d374 1 a374 1 for file in kmixctrl.cpp channel.cpp mixer.cpp volume.cpp ; do \ d409 1 a409 1 @@@@ -1081,29 +1113,29 @@@@ kde-rpo-clean: @ 1.2 log @Improve the patch to admin/am_edit. No affect for this pkg. @ text @d3 1 a3 1 --- kmix/Makefile.in.orig Tue May 14 01:53:26 2002 d5 1 a5 1 @@@@ -293,7 +293,7 @@@@ d14 1 a14 1 @@@@ -302,23 +302,31 @@@@ d54 1 a54 1 @@@@ -352,19 +360,11 @@@@ d65 1 a65 1 -#>+ 7 d69 1 a69 2 - kledbutton.lo mixdevicewidget.lo \ - kmix_la_meta_unload.lo d77 2 a78 2 @@@@ -378,28 +378,48 @@@@ kmix_panelapplet_la_meta_unload.lo d86 1 a86 1 -#>+ 5 d88 1 a88 2 -kmixctrl_la_nofinal_OBJECTS = kmixctrl.lo channel.lo mixer.lo volume.lo \ - kmixctrl_la_meta_unload.lo d98 1 a98 1 +#>+ 7 d102 1 a102 2 + ksmallslider.lo volume.lo kledbutton.lo mixdevicewidget.lo \ + libkmix_main_la_meta_unload.lo d109 1 a109 1 +#>+ 6 d112 1 a112 2 + volume.lo \ + libkmixctrl_main_la_meta_unload.lo d137 1 a137 1 @@@@ -407,9 +427,11 @@@@ d141 42 a182 12 -@@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/channel.Plo $(DEPDIR)/dummy.Po \ - @@AMDEP_TRUE@@ $(DEPDIR)/kledbutton.Plo $(DEPDIR)/kmix.Plo \ - @@AMDEP_TRUE@@ $(DEPDIR)/kmixapplet.Plo $(DEPDIR)/kmixctrl.Plo \ +@@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/channel.Plo $(DEPDIR)/kledbutton.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/kmix.Plo $(DEPDIR)/kmix_main.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/kmix_main.Po $(DEPDIR)/kmixapplet.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/kmixctrl.Plo $(DEPDIR)/kmixctrl_main.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/kmixctrl_main.Po \ @@AMDEP_TRUE@@ $(DEPDIR)/kmixdockwidget.Plo \ @@AMDEP_TRUE@@ $(DEPDIR)/kmixerwidget.Plo \ @@AMDEP_TRUE@@ $(DEPDIR)/kmixprefdlg.Plo \ @@@@ -436,7 +458,9 @@@@ d193 1 a193 1 @@@@ -448,7 +472,7 @@@@ d202 1 a202 1 @@@@ -523,6 +547,10 @@@@ d213 1 a213 1 @@@@ -561,11 +589,14 @@@@ d229 1 a229 1 @@@@ -760,7 +791,7 @@@@ d233 1 a233 1 -KDE_DIST=mixer_irix.h mixer_hpux.cpp resource.h mixer_irix.cpp mixer_sun.h mixer_none.cpp mixer_none.h mixer_alsa.cpp kmixapplet.desktop colorwidget.ui kmix-platforms.cpp configure.in.in mixer_hpux.h kmixui.rc kmixctrl_restore.desktop mixer_oss.cpp mixer_sun.cpp mixer_oss.h mixer_alsa.h d238 1 a238 10 @@@@ -860,7 +891,7 @@@@ #>- install-exec-am: install-binPROGRAMS install-libLTLIBRARIES #>+ 1 -install-exec-am: install-kde_moduleLTLIBRARIES install-binPROGRAMS install-libLTLIBRARIES +install-exec-am: install-binPROGRAMS install-libLTLIBRARIES install-kde_moduleLTLIBRARIES install-info: install-info-recursive @@@@ -914,9 +945,6 @@@@ d248 8 a255 1 @@@@ -1003,19 +1031,6 @@@@ d257 35 d293 5 a297 53 #>+ 12 -kmix_la_meta_unload.cpp: kmixdockwidget.moc mixdevicewidget.moc ksmallslider.moc kmixprefdlg.moc mixer.moc kmix.moc kledbutton.moc kmixerwidget.moc - @@echo 'creating kmix_la_meta_unload.cpp' - @@-rm -f kmix_la_meta_unload.cpp - @@if test ${kde_qtver} = 2; then \ - echo 'static const char * _metalist_kmix_la[] = {' > kmix_la_meta_unload.cpp ;\ - cat kmixdockwidget.moc mixdevicewidget.moc ksmallslider.moc kmixprefdlg.moc mixer.moc kmix.moc kledbutton.moc kmixerwidget.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kmix_la_meta_unload.cpp ;\ - echo '0};' >> kmix_la_meta_unload.cpp ;\ - echo '#include ' >> kmix_la_meta_unload.cpp ;\ - echo '_UNLOAD(kmix_la)' >> kmix_la_meta_unload.cpp ;\ - else echo > kmix_la_meta_unload.cpp; fi - - -#>+ 12 kmix_panelapplet_la_meta_unload.cpp: mixdevicewidget.moc ksmallslider.moc colorwidget.moc mixer.moc kmixapplet.moc kledbutton.moc kmixerwidget.moc @@echo 'creating kmix_panelapplet_la_meta_unload.cpp' @@-rm -f kmix_panelapplet_la_meta_unload.cpp @@@@ -1029,28 +1044,41 @@@@ #>+ 12 -kmixctrl_la_meta_unload.cpp: mixer.moc - @@echo 'creating kmixctrl_la_meta_unload.cpp' - @@-rm -f kmixctrl_la_meta_unload.cpp +libkmix_main_la_meta_unload.cpp: kmixdockwidget.moc mixdevicewidget.moc ksmallslider.moc kmixprefdlg.moc mixer.moc kmix.moc kledbutton.moc kmixerwidget.moc + @@echo 'creating libkmix_main_la_meta_unload.cpp' + @@-rm -f libkmix_main_la_meta_unload.cpp + @@if test ${kde_qtver} = 2; then \ + echo 'static const char * _metalist_libkmix_main_la[] = {' > libkmix_main_la_meta_unload.cpp ;\ + cat kmixdockwidget.moc mixdevicewidget.moc ksmallslider.moc kmixprefdlg.moc mixer.moc kmix.moc kledbutton.moc kmixerwidget.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkmix_main_la_meta_unload.cpp ;\ + echo '0};' >> libkmix_main_la_meta_unload.cpp ;\ + echo '#include ' >> libkmix_main_la_meta_unload.cpp ;\ + echo '_UNLOAD(libkmix_main_la)' >> libkmix_main_la_meta_unload.cpp ;\ + else echo > libkmix_main_la_meta_unload.cpp; fi + + +#>+ 12 +libkmixctrl_main_la_meta_unload.cpp: mixer.moc + @@echo 'creating libkmixctrl_main_la_meta_unload.cpp' + @@-rm -f libkmixctrl_main_la_meta_unload.cpp @@if test ${kde_qtver} = 2; then \ - echo 'static const char * _metalist_kmixctrl_la[] = {' > kmixctrl_la_meta_unload.cpp ;\ - cat mixer.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kmixctrl_la_meta_unload.cpp ;\ - echo '0};' >> kmixctrl_la_meta_unload.cpp ;\ - echo '#include ' >> kmixctrl_la_meta_unload.cpp ;\ - echo '_UNLOAD(kmixctrl_la)' >> kmixctrl_la_meta_unload.cpp ;\ - else echo > kmixctrl_la_meta_unload.cpp; fi + echo 'static const char * _metalist_libkmixctrl_main_la[] = {' > libkmixctrl_main_la_meta_unload.cpp ;\ + cat mixer.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkmixctrl_main_la_meta_unload.cpp ;\ + echo '0};' >> libkmixctrl_main_la_meta_unload.cpp ;\ + echo '#include ' >> libkmixctrl_main_la_meta_unload.cpp ;\ + echo '_UNLOAD(libkmixctrl_main_la)' >> libkmixctrl_main_la_meta_unload.cpp ;\ + else echo > libkmixctrl_main_la_meta_unload.cpp; fi d299 5 d306 8 a313 3 clean-moc-classes: - -rm -f kmix_la_meta_unload.cpp kmix_panelapplet_la_meta_unload.cpp kmixctrl_la_meta_unload.cpp + -rm -f kmix_panelapplet_la_meta_unload.cpp libkmix_main_la_meta_unload.cpp libkmixctrl_main_la_meta_unload.cpp d316 18 a333 11 -kmix_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kmix.cpp $(srcdir)/kmixdockwidget.cpp $(srcdir)/kmixprefdlg.cpp $(srcdir)/kmixerwidget.cpp $(srcdir)/channel.cpp $(srcdir)/mixer.cpp $(srcdir)/ksmallslider.cpp $(srcdir)/volume.cpp $(srcdir)/kledbutton.cpp $(srcdir)/mixdevicewidget.cpp kmix_la_meta_unload.cpp +kmix_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmix_main.cpp @@echo 'creating kmix_la.all_cpp.cpp ...'; \ rm -f kmix_la.all_cpp.files kmix_la.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kmix_la.all_cpp.final; \ - for file in main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp kmixerwidget.cpp channel.cpp mixer.cpp ksmallslider.cpp volume.cpp kledbutton.cpp mixdevicewidget.cpp kmix_la_meta_unload.cpp ; do \ + for file in kmix_main.cpp ; do \ echo "#include \"$$file\"" >> kmix_la.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kmix_la.all_cpp.final; \ done; \ @@@@ -1070,11 +1098,11 @@@@ d337 5 a341 16 -kmixctrl_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmixctrl.cpp $(srcdir)/channel.cpp $(srcdir)/mixer.cpp $(srcdir)/volume.cpp kmixctrl_la_meta_unload.cpp +kmixctrl_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmixctrl_main.cpp @@echo 'creating kmixctrl_la.all_cpp.cpp ...'; \ rm -f kmixctrl_la.all_cpp.files kmixctrl_la.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kmixctrl_la.all_cpp.final; \ - for file in kmixctrl.cpp channel.cpp mixer.cpp volume.cpp kmixctrl_la_meta_unload.cpp ; do \ + for file in kmixctrl_main.cpp ; do \ echo "#include \"$$file\"" >> kmixctrl_la.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kmixctrl_la.all_cpp.final; \ done; \ @@@@ -1082,11 +1110,35 @@@@ rm -f kmixctrl_la.all_cpp.final kmixctrl_la.all_cpp.files #>+ 11 -kmix.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp +libkmix_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kmix.cpp $(srcdir)/kmixdockwidget.cpp $(srcdir)/kmixprefdlg.cpp $(srcdir)/kmixerwidget.cpp $(srcdir)/channel.cpp $(srcdir)/mixer.cpp $(srcdir)/ksmallslider.cpp $(srcdir)/volume.cpp $(srcdir)/kledbutton.cpp $(srcdir)/mixdevicewidget.cpp libkmix_main_la_meta_unload.cpp d345 1 a345 1 + for file in main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp kmixerwidget.cpp channel.cpp mixer.cpp ksmallslider.cpp volume.cpp kledbutton.cpp mixdevicewidget.cpp libkmix_main_la_meta_unload.cpp ; do \ d349 1 a349 1 + cat libkmix_main_la.all_cpp.final libkmix_main_la.all_cpp.files > libkmix_main_la.all_cpp.cpp; \ d353 1 a353 1 +libkmixctrl_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmixctrl.cpp $(srcdir)/channel.cpp $(srcdir)/mixer.cpp $(srcdir)/volume.cpp libkmixctrl_main_la_meta_unload.cpp d357 3 a359 1 + for file in kmixctrl.cpp channel.cpp mixer.cpp volume.cpp libkmixctrl_main_la_meta_unload.cpp ; do \ d362 4 a365 2 + done; \ + cat libkmixctrl_main_la.all_cpp.final libkmixctrl_main_la.all_cpp.files > libkmixctrl_main_la.all_cpp.cpp; \ a366 26 + +#>+ 11 +kmix.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmix_main.cpp @@echo 'creating kmix.all_cpp.cpp ...'; \ rm -f kmix.all_cpp.files kmix.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kmix.all_cpp.final; \ - for file in dummy.cpp ; do \ + for file in kmix_main.cpp ; do \ echo "#include \"$$file\"" >> kmix.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kmix.all_cpp.final; \ done; \ @@@@ -1094,11 +1146,11 @@@@ rm -f kmix.all_cpp.final kmix.all_cpp.files #>+ 11 -kmixctrl.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp +kmixctrl.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmixctrl_main.cpp @@echo 'creating kmixctrl.all_cpp.cpp ...'; \ rm -f kmixctrl.all_cpp.files kmixctrl.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kmixctrl.all_cpp.final; \ - for file in dummy.cpp ; do \ + for file in kmixctrl_main.cpp ; do \ echo "#include \"$$file\"" >> kmixctrl.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kmixctrl.all_cpp.final; \ done; \ @@@@ -1107,20 +1159,20 @@@@ d370 2 a371 2 - -rm -f kmix_la.all_cpp.cpp kmix_panelapplet_la.all_cpp.cpp kmixctrl_la.all_cpp.cpp kmix.all_cpp.cpp kmixctrl.all_cpp.cpp + -rm -f kmix_la.all_cpp.cpp kmix_panelapplet_la.all_cpp.cpp kmixctrl_la.all_cpp.cpp libkmix_main_la.all_cpp.cpp libkmixctrl_main_la.all_cpp.cpp kmix.all_cpp.cpp kmixctrl.all_cpp.cpp d391 50 a440 1 $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean @ 1.1 log @Initial revision @ text @d212 9 d296 1 a296 1 +kmix_la.all_cpp.cpp: $(srcdir)/Makefile.in kmix_main.cpp d310 1 a310 1 +kmixctrl_la.all_cpp.cpp: $(srcdir)/Makefile.in kmixctrl_main.cpp d348 1 a348 1 +kmix.all_cpp.cpp: $(srcdir)/Makefile.in kmix_main.cpp d362 1 a362 1 +kmixctrl.all_cpp.cpp: $(srcdir)/Makefile.in kmixctrl_main.cpp @ 1.1.1.1 log @Initial import of a kdemultimedia3 pkg. @ text @@ 1.1.1.1.2.1 log @file patch-ak was added on branch buildlink2 on 2002-06-23 18:38:07 +0000 @ text @d1 387 @ 1.1.1.1.2.2 log @Merge from pkgsrc-current to buildlink2 branch. @ text @a0 387 $NetBSD: patch-ak,v 1.1.1.1.2.1 2002/06/23 18:38:07 jlam Exp $ --- kmix/Makefile.in.orig Tue May 14 01:53:26 2002 +++ kmix/Makefile.in @@@@ -293,7 +293,7 @@@@ INCLUDES = $(all_includes) bin_PROGRAMS = kmix kmixctrl -lib_LTLIBRARIES = kmix.la kmixctrl.la +lib_LTLIBRARIES = libkmix_main.la kmix.la libkmixctrl_main.la kmixctrl.la kde_module_LTLIBRARIES = kmix_panelapplet.la noinst_HEADERS = kmix.h kmixdockwidget.h kmixprefdlg.h kmixerwidget.h \ @@@@ -302,23 +302,31 @@@@ METASOURCES = AUTO -kmix_la_SOURCES = main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp \ +libkmix_main_la_SOURCES = main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp \ kmixerwidget.cpp channel.cpp mixer.cpp ksmallslider.cpp \ volume.cpp kledbutton.cpp mixdevicewidget.cpp -kmix_la_LIBADD = $(LIB_KDEUI) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) +libkmix_main_la_LIBADD = $(LIB_KDEUI) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) +libkmix_main_la_LDFLAGS = $(all_libraries) + +kmix_la_SOURCES = kmix_main.cpp +kmix_la_LIBADD = libkmix_main.la kmix_la_LDFLAGS = $(all_libraries) -module -avoid-version -kmix_SOURCES = dummy.cpp -kmix_LDADD = kmix.la +kmix_SOURCES = kmix_main.cpp +kmix_LDADD = libkmix_main.la kmix_LDFLAGS = $(all_libraries) $(KDE_RPATH) -kmixctrl_SOURCES = dummy.cpp -kmixctrl_LDADD = kmixctrl.la +kmixctrl_SOURCES = kmixctrl_main.cpp +kmixctrl_LDADD = libkmixctrl_main.la kmixctrl_LDFLAGS = $(all_libraries) $(KDE_RPATH) -kmixctrl_la_SOURCES = kmixctrl.cpp channel.cpp mixer.cpp volume.cpp -kmixctrl_la_LIBADD = $(LIB_KDEUI) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) +libkmixctrl_main_la_SOURCES = kmixctrl.cpp channel.cpp mixer.cpp volume.cpp +libkmixctrl_main_la_LIBADD = $(LIB_KDEUI) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) +libkmixctrl_main_la_LDFLAGS = $(all_libraries) + +kmixctrl_la_SOURCES = kmixctrl_main.cpp +kmixctrl_la_LIBADD = libkmixctrl_main.la kmixctrl_la_LDFLAGS = $(all_libraries) -module -avoid-version #>- kmix_panelapplet_la_METASOURCES = AUTO @@@@ -352,19 +360,11 @@@@ CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES) -kmix_la_DEPENDENCIES = -am_kmix_la_OBJECTS = main.lo kmix.lo kmixdockwidget.lo kmixprefdlg.lo \ - kmixerwidget.lo channel.lo mixer.lo ksmallslider.lo volume.lo \ - kledbutton.lo mixdevicewidget.lo +kmix_la_DEPENDENCIES = libkmix_main.la +am_kmix_la_OBJECTS = kmix_main.lo #>- kmix_la_OBJECTS = $(am_kmix_la_OBJECTS) -#>+ 7 -kmix_la_final_OBJECTS = kmix_la.all_cpp.lo -kmix_la_nofinal_OBJECTS = main.lo kmix.lo kmixdockwidget.lo kmixprefdlg.lo \ - kmixerwidget.lo channel.lo mixer.lo ksmallslider.lo volume.lo \ - kledbutton.lo mixdevicewidget.lo \ - kmix_la_meta_unload.lo -@@KDE_USE_FINAL_FALSE@@kmix_la_OBJECTS = $(kmix_la_nofinal_OBJECTS) -@@KDE_USE_FINAL_TRUE@@kmix_la_OBJECTS = $(kmix_la_final_OBJECTS) +#>+ 1 +kmix_la_OBJECTS = kmix_main.lo kmix_panelapplet_la_DEPENDENCIES = am_kmix_panelapplet_la_OBJECTS = kmixapplet.lo kmixerwidget.lo \ channel.lo mixer.lo ksmallslider.lo volume.lo kledbutton.lo \ @@@@ -378,28 +378,48 @@@@ kmix_panelapplet_la_meta_unload.lo @@KDE_USE_FINAL_FALSE@@kmix_panelapplet_la_OBJECTS = $(kmix_panelapplet_la_nofinal_OBJECTS) @@KDE_USE_FINAL_TRUE@@kmix_panelapplet_la_OBJECTS = $(kmix_panelapplet_la_final_OBJECTS) -kmixctrl_la_DEPENDENCIES = -am_kmixctrl_la_OBJECTS = kmixctrl.lo channel.lo mixer.lo volume.lo +kmixctrl_la_DEPENDENCIES = libkmixctrl_main.la +am_kmixctrl_la_OBJECTS = kmixctrl_main.lo #>- kmixctrl_la_OBJECTS = $(am_kmixctrl_la_OBJECTS) -#>+ 5 -kmixctrl_la_final_OBJECTS = kmixctrl_la.all_cpp.lo -kmixctrl_la_nofinal_OBJECTS = kmixctrl.lo channel.lo mixer.lo volume.lo \ - kmixctrl_la_meta_unload.lo -@@KDE_USE_FINAL_FALSE@@kmixctrl_la_OBJECTS = $(kmixctrl_la_nofinal_OBJECTS) -@@KDE_USE_FINAL_TRUE@@kmixctrl_la_OBJECTS = $(kmixctrl_la_final_OBJECTS) +#>+ 1 +kmixctrl_la_OBJECTS = kmixctrl_main.lo +libkmix_main_la_DEPENDENCIES = +am_libkmix_main_la_OBJECTS = main.lo kmix.lo kmixdockwidget.lo \ + kmixprefdlg.lo kmixerwidget.lo channel.lo mixer.lo \ + ksmallslider.lo volume.lo kledbutton.lo mixdevicewidget.lo +#>- libkmix_main_la_OBJECTS = $(am_libkmix_main_la_OBJECTS) +#>+ 7 +libkmix_main_la_final_OBJECTS = libkmix_main_la.all_cpp.lo +libkmix_main_la_nofinal_OBJECTS = main.lo kmix.lo kmixdockwidget.lo \ + kmixprefdlg.lo kmixerwidget.lo channel.lo mixer.lo \ + ksmallslider.lo volume.lo kledbutton.lo mixdevicewidget.lo \ + libkmix_main_la_meta_unload.lo +@@KDE_USE_FINAL_FALSE@@libkmix_main_la_OBJECTS = $(libkmix_main_la_nofinal_OBJECTS) +@@KDE_USE_FINAL_TRUE@@libkmix_main_la_OBJECTS = $(libkmix_main_la_final_OBJECTS) +libkmixctrl_main_la_DEPENDENCIES = +am_libkmixctrl_main_la_OBJECTS = kmixctrl.lo channel.lo mixer.lo \ + volume.lo +#>- libkmixctrl_main_la_OBJECTS = $(am_libkmixctrl_main_la_OBJECTS) +#>+ 6 +libkmixctrl_main_la_final_OBJECTS = libkmixctrl_main_la.all_cpp.lo +libkmixctrl_main_la_nofinal_OBJECTS = kmixctrl.lo channel.lo mixer.lo \ + volume.lo \ + libkmixctrl_main_la_meta_unload.lo +@@KDE_USE_FINAL_FALSE@@libkmixctrl_main_la_OBJECTS = $(libkmixctrl_main_la_nofinal_OBJECTS) +@@KDE_USE_FINAL_TRUE@@libkmixctrl_main_la_OBJECTS = $(libkmixctrl_main_la_final_OBJECTS) bin_PROGRAMS = kmix$(EXEEXT) kmixctrl$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) -am_kmix_OBJECTS = dummy.$(OBJEXT) +am_kmix_OBJECTS = kmix_main.$(OBJEXT) #>- kmix_OBJECTS = $(am_kmix_OBJECTS) #>+ 1 -kmix_OBJECTS = dummy.$(OBJEXT) -kmix_DEPENDENCIES = kmix.la -am_kmixctrl_OBJECTS = dummy.$(OBJEXT) +kmix_OBJECTS = kmix_main.$(OBJEXT) +kmix_DEPENDENCIES = libkmix_main.la +am_kmixctrl_OBJECTS = kmixctrl_main.$(OBJEXT) #>- kmixctrl_OBJECTS = $(am_kmixctrl_OBJECTS) #>+ 1 -kmixctrl_OBJECTS = dummy.$(OBJEXT) -kmixctrl_DEPENDENCIES = kmixctrl.la +kmixctrl_OBJECTS = kmixctrl_main.$(OBJEXT) +kmixctrl_DEPENDENCIES = libkmixctrl_main.la DEFS = @@DEFS@@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) @@@@ -407,9 +427,11 @@@@ LDFLAGS = @@LDFLAGS@@ LIBS = @@LIBS@@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp -@@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/channel.Plo $(DEPDIR)/dummy.Po \ - @@AMDEP_TRUE@@ $(DEPDIR)/kledbutton.Plo $(DEPDIR)/kmix.Plo \ - @@AMDEP_TRUE@@ $(DEPDIR)/kmixapplet.Plo $(DEPDIR)/kmixctrl.Plo \ +@@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/channel.Plo $(DEPDIR)/kledbutton.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/kmix.Plo $(DEPDIR)/kmix_main.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/kmix_main.Po $(DEPDIR)/kmixapplet.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/kmixctrl.Plo $(DEPDIR)/kmixctrl_main.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/kmixctrl_main.Po \ @@AMDEP_TRUE@@ $(DEPDIR)/kmixdockwidget.Plo \ @@AMDEP_TRUE@@ $(DEPDIR)/kmixerwidget.Plo \ @@AMDEP_TRUE@@ $(DEPDIR)/kmixprefdlg.Plo \ @@@@ -436,7 +458,9 @@@@ $(AM_LDFLAGS) $(LDFLAGS) -o $@@ CXXFLAGS = @@CXXFLAGS@@ DIST_SOURCES = $(kmix_la_SOURCES) $(kmix_panelapplet_la_SOURCES) \ - $(kmixctrl_la_SOURCES) $(kmix_SOURCES) $(kmixctrl_SOURCES) + $(kmixctrl_la_SOURCES) $(libkmix_main_la_SOURCES) \ + $(libkmixctrl_main_la_SOURCES) $(kmix_SOURCES) \ + $(kmixctrl_SOURCES) DATA = $(apps_DATA) $(lnk_DATA) $(rc_DATA) $(services_DATA) HEADERS = $(noinst_HEADERS) @@@@ -448,7 +472,7 @@@@ uninstall-recursive check-recursive installcheck-recursive DIST_COMMON = $(noinst_HEADERS) AUTHORS Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) -SOURCES = $(kmix_la_SOURCES) $(kmix_panelapplet_la_SOURCES) $(kmixctrl_la_SOURCES) $(kmix_SOURCES) $(kmixctrl_SOURCES) +SOURCES = $(kmix_la_SOURCES) $(kmix_panelapplet_la_SOURCES) $(kmixctrl_la_SOURCES) $(libkmix_main_la_SOURCES) $(libkmixctrl_main_la_SOURCES) $(kmix_SOURCES) $(kmixctrl_SOURCES) #>- all: all-recursive #>+ 1 @@@@ -523,6 +547,10 @@@@ $(CXXLINK) -rpath $(kde_moduledir) $(kmix_panelapplet_la_LDFLAGS) $(kmix_panelapplet_la_OBJECTS) $(kmix_panelapplet_la_LIBADD) $(LIBS) kmixctrl.la: $(kmixctrl_la_OBJECTS) $(kmixctrl_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kmixctrl_la_LDFLAGS) $(kmixctrl_la_OBJECTS) $(kmixctrl_la_LIBADD) $(LIBS) +libkmix_main.la: $(libkmix_main_la_OBJECTS) $(libkmix_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkmix_main_la_LDFLAGS) $(libkmix_main_la_OBJECTS) $(libkmix_main_la_LIBADD) $(LIBS) +libkmixctrl_main.la: $(libkmixctrl_main_la_OBJECTS) $(libkmixctrl_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkmixctrl_main_la_LDFLAGS) $(libkmixctrl_main_la_OBJECTS) $(libkmixctrl_main_la_LIBADD) $(LIBS) install-binPROGRAMS: $(bin_PROGRAMS) @@$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) @@@@ -561,11 +589,14 @@@@ -rm -f *.tab.c @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/channel.Plo@@am__quote@@ -@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/dummy.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kledbutton.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kmix.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kmix_main.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kmix_main.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kmixapplet.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kmixctrl.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kmixctrl_main.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kmixctrl_main.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kmixdockwidget.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kmixerwidget.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kmixprefdlg.Plo@@am__quote@@ @@@@ -760,7 +791,7 @@@@ #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=mixer_irix.h mixer_hpux.cpp resource.h mixer_irix.cpp mixer_sun.h mixer_none.cpp mixer_none.h mixer_alsa.cpp kmixapplet.desktop colorwidget.ui kmix-platforms.cpp configure.in.in mixer_hpux.h kmixui.rc kmixctrl_restore.desktop mixer_oss.cpp mixer_sun.cpp mixer_oss.h mixer_alsa.h +KDE_DIST=colorwidget.ui kmix-platforms.cpp configure.in.in mixer_hpux.h mixer_irix.h mixer_hpux.cpp kmixui.rc kmixctrl_restore.desktop resource.h mixer_oss.cpp mixer_irix.cpp mixer_sun.h mixer_sun.cpp mixer_none.cpp mixer_none.h mixer_oss.h mixer_alsa.cpp kmixapplet.desktop mixer_alsa.h DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) @@@@ -914,9 +945,6 @@@@ messages: rc.cpp $(XGETTEXT) *.cpp -o $(podir)/kmix.pot - -dummy.cpp: - echo > dummy.cpp # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: @@@@ -1003,19 +1031,6 @@@@ #>+ 12 -kmix_la_meta_unload.cpp: kmixdockwidget.moc mixdevicewidget.moc ksmallslider.moc kmixprefdlg.moc mixer.moc kmix.moc kledbutton.moc kmixerwidget.moc - @@echo 'creating kmix_la_meta_unload.cpp' - @@-rm -f kmix_la_meta_unload.cpp - @@if test ${kde_qtver} = 2; then \ - echo 'static const char * _metalist_kmix_la[] = {' > kmix_la_meta_unload.cpp ;\ - cat kmixdockwidget.moc mixdevicewidget.moc ksmallslider.moc kmixprefdlg.moc mixer.moc kmix.moc kledbutton.moc kmixerwidget.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kmix_la_meta_unload.cpp ;\ - echo '0};' >> kmix_la_meta_unload.cpp ;\ - echo '#include ' >> kmix_la_meta_unload.cpp ;\ - echo '_UNLOAD(kmix_la)' >> kmix_la_meta_unload.cpp ;\ - else echo > kmix_la_meta_unload.cpp; fi - - -#>+ 12 kmix_panelapplet_la_meta_unload.cpp: mixdevicewidget.moc ksmallslider.moc colorwidget.moc mixer.moc kmixapplet.moc kledbutton.moc kmixerwidget.moc @@echo 'creating kmix_panelapplet_la_meta_unload.cpp' @@-rm -f kmix_panelapplet_la_meta_unload.cpp @@@@ -1029,28 +1044,41 @@@@ #>+ 12 -kmixctrl_la_meta_unload.cpp: mixer.moc - @@echo 'creating kmixctrl_la_meta_unload.cpp' - @@-rm -f kmixctrl_la_meta_unload.cpp +libkmix_main_la_meta_unload.cpp: kmixdockwidget.moc mixdevicewidget.moc ksmallslider.moc kmixprefdlg.moc mixer.moc kmix.moc kledbutton.moc kmixerwidget.moc + @@echo 'creating libkmix_main_la_meta_unload.cpp' + @@-rm -f libkmix_main_la_meta_unload.cpp + @@if test ${kde_qtver} = 2; then \ + echo 'static const char * _metalist_libkmix_main_la[] = {' > libkmix_main_la_meta_unload.cpp ;\ + cat kmixdockwidget.moc mixdevicewidget.moc ksmallslider.moc kmixprefdlg.moc mixer.moc kmix.moc kledbutton.moc kmixerwidget.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkmix_main_la_meta_unload.cpp ;\ + echo '0};' >> libkmix_main_la_meta_unload.cpp ;\ + echo '#include ' >> libkmix_main_la_meta_unload.cpp ;\ + echo '_UNLOAD(libkmix_main_la)' >> libkmix_main_la_meta_unload.cpp ;\ + else echo > libkmix_main_la_meta_unload.cpp; fi + + +#>+ 12 +libkmixctrl_main_la_meta_unload.cpp: mixer.moc + @@echo 'creating libkmixctrl_main_la_meta_unload.cpp' + @@-rm -f libkmixctrl_main_la_meta_unload.cpp @@if test ${kde_qtver} = 2; then \ - echo 'static const char * _metalist_kmixctrl_la[] = {' > kmixctrl_la_meta_unload.cpp ;\ - cat mixer.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kmixctrl_la_meta_unload.cpp ;\ - echo '0};' >> kmixctrl_la_meta_unload.cpp ;\ - echo '#include ' >> kmixctrl_la_meta_unload.cpp ;\ - echo '_UNLOAD(kmixctrl_la)' >> kmixctrl_la_meta_unload.cpp ;\ - else echo > kmixctrl_la_meta_unload.cpp; fi + echo 'static const char * _metalist_libkmixctrl_main_la[] = {' > libkmixctrl_main_la_meta_unload.cpp ;\ + cat mixer.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkmixctrl_main_la_meta_unload.cpp ;\ + echo '0};' >> libkmixctrl_main_la_meta_unload.cpp ;\ + echo '#include ' >> libkmixctrl_main_la_meta_unload.cpp ;\ + echo '_UNLOAD(libkmixctrl_main_la)' >> libkmixctrl_main_la_meta_unload.cpp ;\ + else echo > libkmixctrl_main_la_meta_unload.cpp; fi #>+ 3 clean-moc-classes: - -rm -f kmix_la_meta_unload.cpp kmix_panelapplet_la_meta_unload.cpp kmixctrl_la_meta_unload.cpp + -rm -f kmix_panelapplet_la_meta_unload.cpp libkmix_main_la_meta_unload.cpp libkmixctrl_main_la_meta_unload.cpp #>+ 11 -kmix_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kmix.cpp $(srcdir)/kmixdockwidget.cpp $(srcdir)/kmixprefdlg.cpp $(srcdir)/kmixerwidget.cpp $(srcdir)/channel.cpp $(srcdir)/mixer.cpp $(srcdir)/ksmallslider.cpp $(srcdir)/volume.cpp $(srcdir)/kledbutton.cpp $(srcdir)/mixdevicewidget.cpp kmix_la_meta_unload.cpp +kmix_la.all_cpp.cpp: $(srcdir)/Makefile.in kmix_main.cpp @@echo 'creating kmix_la.all_cpp.cpp ...'; \ rm -f kmix_la.all_cpp.files kmix_la.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kmix_la.all_cpp.final; \ - for file in main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp kmixerwidget.cpp channel.cpp mixer.cpp ksmallslider.cpp volume.cpp kledbutton.cpp mixdevicewidget.cpp kmix_la_meta_unload.cpp ; do \ + for file in kmix_main.cpp ; do \ echo "#include \"$$file\"" >> kmix_la.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kmix_la.all_cpp.final; \ done; \ @@@@ -1070,11 +1098,11 @@@@ rm -f kmix_panelapplet_la.all_cpp.final kmix_panelapplet_la.all_cpp.files #>+ 11 -kmixctrl_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmixctrl.cpp $(srcdir)/channel.cpp $(srcdir)/mixer.cpp $(srcdir)/volume.cpp kmixctrl_la_meta_unload.cpp +kmixctrl_la.all_cpp.cpp: $(srcdir)/Makefile.in kmixctrl_main.cpp @@echo 'creating kmixctrl_la.all_cpp.cpp ...'; \ rm -f kmixctrl_la.all_cpp.files kmixctrl_la.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kmixctrl_la.all_cpp.final; \ - for file in kmixctrl.cpp channel.cpp mixer.cpp volume.cpp kmixctrl_la_meta_unload.cpp ; do \ + for file in kmixctrl_main.cpp ; do \ echo "#include \"$$file\"" >> kmixctrl_la.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kmixctrl_la.all_cpp.final; \ done; \ @@@@ -1082,11 +1110,35 @@@@ rm -f kmixctrl_la.all_cpp.final kmixctrl_la.all_cpp.files #>+ 11 -kmix.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp +libkmix_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kmix.cpp $(srcdir)/kmixdockwidget.cpp $(srcdir)/kmixprefdlg.cpp $(srcdir)/kmixerwidget.cpp $(srcdir)/channel.cpp $(srcdir)/mixer.cpp $(srcdir)/ksmallslider.cpp $(srcdir)/volume.cpp $(srcdir)/kledbutton.cpp $(srcdir)/mixdevicewidget.cpp libkmix_main_la_meta_unload.cpp + @@echo 'creating libkmix_main_la.all_cpp.cpp ...'; \ + rm -f libkmix_main_la.all_cpp.files libkmix_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkmix_main_la.all_cpp.final; \ + for file in main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp kmixerwidget.cpp channel.cpp mixer.cpp ksmallslider.cpp volume.cpp kledbutton.cpp mixdevicewidget.cpp libkmix_main_la_meta_unload.cpp ; do \ + echo "#include \"$$file\"" >> libkmix_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkmix_main_la.all_cpp.final; \ + done; \ + cat libkmix_main_la.all_cpp.final libkmix_main_la.all_cpp.files > libkmix_main_la.all_cpp.cpp; \ + rm -f libkmix_main_la.all_cpp.final libkmix_main_la.all_cpp.files + +#>+ 11 +libkmixctrl_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmixctrl.cpp $(srcdir)/channel.cpp $(srcdir)/mixer.cpp $(srcdir)/volume.cpp libkmixctrl_main_la_meta_unload.cpp + @@echo 'creating libkmixctrl_main_la.all_cpp.cpp ...'; \ + rm -f libkmixctrl_main_la.all_cpp.files libkmixctrl_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkmixctrl_main_la.all_cpp.final; \ + for file in kmixctrl.cpp channel.cpp mixer.cpp volume.cpp libkmixctrl_main_la_meta_unload.cpp ; do \ + echo "#include \"$$file\"" >> libkmixctrl_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkmixctrl_main_la.all_cpp.final; \ + done; \ + cat libkmixctrl_main_la.all_cpp.final libkmixctrl_main_la.all_cpp.files > libkmixctrl_main_la.all_cpp.cpp; \ + rm -f libkmixctrl_main_la.all_cpp.final libkmixctrl_main_la.all_cpp.files + +#>+ 11 +kmix.all_cpp.cpp: $(srcdir)/Makefile.in kmix_main.cpp @@echo 'creating kmix.all_cpp.cpp ...'; \ rm -f kmix.all_cpp.files kmix.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kmix.all_cpp.final; \ - for file in dummy.cpp ; do \ + for file in kmix_main.cpp ; do \ echo "#include \"$$file\"" >> kmix.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kmix.all_cpp.final; \ done; \ @@@@ -1094,11 +1146,11 @@@@ rm -f kmix.all_cpp.final kmix.all_cpp.files #>+ 11 -kmixctrl.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp +kmixctrl.all_cpp.cpp: $(srcdir)/Makefile.in kmixctrl_main.cpp @@echo 'creating kmixctrl.all_cpp.cpp ...'; \ rm -f kmixctrl.all_cpp.files kmixctrl.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kmixctrl.all_cpp.final; \ - for file in dummy.cpp ; do \ + for file in kmixctrl_main.cpp ; do \ echo "#include \"$$file\"" >> kmixctrl.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kmixctrl.all_cpp.final; \ done; \ @@@@ -1107,20 +1159,20 @@@@ #>+ 3 clean-final: - -rm -f kmix_la.all_cpp.cpp kmix_panelapplet_la.all_cpp.cpp kmixctrl_la.all_cpp.cpp kmix.all_cpp.cpp kmixctrl.all_cpp.cpp + -rm -f kmix_la.all_cpp.cpp kmix_panelapplet_la.all_cpp.cpp kmixctrl_la.all_cpp.cpp libkmix_main_la.all_cpp.cpp libkmixctrl_main_la.all_cpp.cpp kmix.all_cpp.cpp kmixctrl.all_cpp.cpp #>+ 2 final: - $(MAKE) kmix_la_OBJECTS="$(kmix_la_final_OBJECTS)" kmix_panelapplet_la_OBJECTS="$(kmix_panelapplet_la_final_OBJECTS)" kmixctrl_la_OBJECTS="$(kmixctrl_la_final_OBJECTS)" all-am + $(MAKE) kmix_panelapplet_la_OBJECTS="$(kmix_panelapplet_la_final_OBJECTS)" libkmix_main_la_OBJECTS="$(libkmix_main_la_final_OBJECTS)" libkmixctrl_main_la_OBJECTS="$(libkmixctrl_main_la_final_OBJECTS)" all-am #>+ 2 final-install: - $(MAKE) kmix_la_OBJECTS="$(kmix_la_final_OBJECTS)" kmix_panelapplet_la_OBJECTS="$(kmix_panelapplet_la_final_OBJECTS)" kmixctrl_la_OBJECTS="$(kmixctrl_la_final_OBJECTS)" install-am + $(MAKE) kmix_panelapplet_la_OBJECTS="$(kmix_panelapplet_la_final_OBJECTS)" libkmix_main_la_OBJECTS="$(libkmix_main_la_final_OBJECTS)" libkmixctrl_main_la_OBJECTS="$(libkmixctrl_main_la_final_OBJECTS)" install-am #>+ 2 no-final: - $(MAKE) kmix_la_OBJECTS="$(kmix_la_nofinal_OBJECTS)" kmix_panelapplet_la_OBJECTS="$(kmix_panelapplet_la_nofinal_OBJECTS)" kmixctrl_la_OBJECTS="$(kmixctrl_la_nofinal_OBJECTS)" all-am + $(MAKE) kmix_panelapplet_la_OBJECTS="$(kmix_panelapplet_la_nofinal_OBJECTS)" libkmix_main_la_OBJECTS="$(libkmix_main_la_nofinal_OBJECTS)" libkmixctrl_main_la_OBJECTS="$(libkmixctrl_main_la_nofinal_OBJECTS)" all-am #>+ 2 no-final-install: - $(MAKE) kmix_la_OBJECTS="$(kmix_la_nofinal_OBJECTS)" kmix_panelapplet_la_OBJECTS="$(kmix_panelapplet_la_nofinal_OBJECTS)" kmixctrl_la_OBJECTS="$(kmixctrl_la_nofinal_OBJECTS)" install-am + $(MAKE) kmix_panelapplet_la_OBJECTS="$(kmix_panelapplet_la_nofinal_OBJECTS)" libkmix_main_la_OBJECTS="$(libkmix_main_la_nofinal_OBJECTS)" libkmixctrl_main_la_OBJECTS="$(libkmixctrl_main_la_nofinal_OBJECTS)" install-am #>+ 3 cvs-clean: $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean @