Copy the KDE 3.5 branch to branches/trinity for new KDE 3.5 features.

BUG:215923


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1054174 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 63 insertions, 0 deletions

diff --git a/kmix/Makefile.am b/kmix/Makefile.am
new file mode 100644
index 00000000..307c8168
--- /dev/null
+++ b/kmix/Makefile.am
@@ -0,0 +1,63 @@
+SUBDIRS = pics
+INCLUDES= $(all_includes)
+
+bin_PROGRAMS = 
+lib_LTLIBRARIES = 
+kdeinit_LTLIBRARIES = kmix.la kmixctrl.la
+kde_module_LTLIBRARIES = kmix_panelapplet.la
+
+
+noinst_HEADERS = kmix.h kmixdockwidget.h kmixprefdlg.h kmixerwidget.h \
+	viewbase.h viewoutput.h viewinput.h viewsliders.h viewswitches.h viewsurround.h viewdockareapopup.h viewgrid.h \
+	mixdevicewidget.h mdwslider.h mdwswitch.h mdwenum.h \
+	mixer.h mixset.h mixdevice.h mixer_backend.h volume.h kledbutton.h version.h kmixtoolbox.h \
+	ksmallslider.h kmixapplet.h mixerIface.h verticaltext.h \
+	KMixApp.h dialogviewconfiguration.h kmixtoolbox.h mixertoolbox.h dialogselectmaster.h
+
+
+METASOURCES = AUTO
+
+kmix_la_SOURCES = main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp \
+	viewbase.cpp viewoutput.cpp viewinput.cpp viewswitches.cpp viewsurround.cpp viewdockareapopup.cpp \
+	viewsliders.cpp viewgrid.cpp \
+	mixdevicewidget.cpp mdwslider.cpp mdwswitch.cpp mdwenum.cpp \
+	kmixerwidget.cpp mixer.cpp mixset.cpp mixdevice.cpp mixer_backend.cpp ksmallslider.cpp \
+	volume.cpp kledbutton.cpp verticaltext.cpp mixerIface.skel \
+	kmixtoolbox.cpp mixertoolbox.cpp dialogviewconfiguration.cpp KMixApp.cpp dialogselectmaster.cpp
+
+kmix_la_LIBADD = $(LIB_KDEUI) $(LIB_KUTILS) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND)
+kmix_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -avoid-version
+
+kmixctrl_la_SOURCES = kmixctrl.cpp mixer.cpp mixset.cpp mixdevice.cpp volume.cpp mixerIface.skel \
+	mixertoolbox.cpp mixer_backend.cpp
+
+kmixctrl_la_LIBADD = $(LIB_KDECORE) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND)
+kmixctrl_la_LDFLAGS = $(all_libraries) -module -avoid-version
+
+kmix_panelapplet_la_SOURCES = kmixapplet.cpp \
+	viewbase.cpp viewapplet.cpp \
+	mixdevicewidget.cpp mdwslider.cpp \
+	mixer.cpp mixset.cpp mixdevice.cpp mixer_backend.cpp ksmallslider.cpp volume.cpp kledbutton.cpp \
+	verticaltext.cpp mixerIface.skel colorwidget.ui dialogviewconfiguration.cpp \
+	kmixtoolbox.cpp mixertoolbox.cpp dialogselectmaster.cpp
+
+kmix_panelapplet_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+kmix_panelapplet_la_LIBADD = $(LIB_KDEUI) $(LIB_KUTILS) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND)
+
+xdg_apps_DATA = kmix.desktop
+
+rcdir = $(kde_datadir)/kmix
+rc_DATA = kmixui.rc
+
+autostart_DATA = restore_kmix_volumes.desktop
+autostartdir = $(datadir)/autostart
+
+lnkdir = $(kde_datadir)/kicker/applets
+lnk_DATA = kmixapplet.desktop
+
+servicesdir = $(kde_servicesdir)
+services_DATA = kmixctrl_restore.desktop
+
+messages: rc.cpp
+	$(XGETTEXT) *.cpp -o $(podir)/kmix.pot
+