Merge branch 'michal-wip'

1 files changed, 0 insertions, 76 deletions

diff --git a/mate-volume-control/src/Makefile.am b/mate-volume-control/src/Makefile.am
deleted file mode 100644
index 50e3c15..0000000
--- a/mate-volume-control/src/Makefile.am
+++ /dev/null
@@ -1,76 +0,0 @@
-NULL =
-
-bin_PROGRAMS = 					\
-	mate-volume-control-applet		\
-	mate-volume-control			\
-	$(NULL)
-
-AM_CPPFLAGS =					\
-	$(WARN_CFLAGS)				\
-	-I$(top_srcdir)/sound-theme		\
-	$(VOLUME_CONTROL_CFLAGS)		\
-	$(xxDISABLE_DEPRECATED)			\
-	$(PULSEAUDIO_CFLAGS)			\
-	-DLOCALE_DIR=\""$(datadir)/locale"\"	\
-	-DLIBEXECDIR=\"$(libexecdir)\"		\
-	-DGLADEDIR=\""$(pkgdatadir)"\"		\
-	-DICON_DATA_DIR="\"$(pkgdatadir)/icons\"" \
-	$(NULL)
-
-noinst_LTLIBRARIES = libmatevolumecontrol.la
-libmatevolumecontrol_la_SOURCES =		\
-	gvc-channel-bar.h			\
-	gvc-channel-bar.c			\
-    mvc-helpers.c               \
-    mvc-helpers.h               \
-	$(NULL)
-
-mate_volume_control_applet_LDADD =		\
-	-lm					\
-	libmatevolumecontrol.la		\
-	$(VOLUME_CONTROL_LIBS)			\
-	$(PULSEAUDIO_LIBS)			\
-	$(NULL)
-
-mate_volume_control_applet_SOURCES =		\
-	gvc-stream-status-icon.h		\
-	gvc-stream-status-icon.c		\
-	gvc-applet.h				\
-	gvc-applet.c				\
-	applet-main.c				\
-	$(NULL)
-
-mate_volume_control_LDADD =				\
-	-lm						\
-	libmatevolumecontrol.la			\
-	$(top_builddir)/sound-theme/libsoundtheme.la	\
-	$(VOLUME_CONTROL_LIBS)				\
-	$(PULSEAUDIO_LIBS)				\
-	$(NULL)
-
-mate_volume_control_SOURCES =			\
-	gvc-balance-bar.h			\
-	gvc-balance-bar.c			\
-	gvc-level-bar.h				\
-	gvc-level-bar.c				\
-	gvc-combo-box.h				\
-	gvc-combo-box.c				\
-	gvc-speaker-test.h			\
-	gvc-speaker-test.c			\
-    gvc-mixer-dialog.h          \
-    gvc-mixer-dialog.c          \
-	dialog-main.c				\
-	$(NULL)
-
-BUILT_SOURCES =				\
-	$(NULL)
-
-CLEANFILES =				\
-	$(BUILT_SOURCES)		\
-	$(NULL)
-
-MAINTAINERCLEANFILES =                  \
-        *~                              \
-        Makefile.in
-
--include $(top_srcdir)/git.mk