From 93332554c235c7de59c64d0733f791a3be9f1775 Mon Sep 17 00:00:00 2001
From: Michal Ratajsky <michal.ratajsky@gmail.com>
Date: Sat, 8 Nov 2014 15:14:10 +0100
Subject: Move some files and directories to better locations

- mate-volume-control/data changed to /data
- mate-volume-control/src/* moved to mate-volume-control
- sound-theme/sounds changed to /data/sounds
- sound-theme/*.{c,h} moved to mate-volume-control
- Removed AUTHORS and ChangeLog.pre-2-26 from mate-volume-control
---
 mate-volume-control/Makefile.am | 76 +++++++++++++++++++++++++++++++++++++----
 1 file changed, 69 insertions(+), 7 deletions(-)

(limited to 'mate-volume-control/Makefile.am')

diff --git a/mate-volume-control/Makefile.am b/mate-volume-control/Makefile.am
index 0c3fa4c..0814356 100644
--- a/mate-volume-control/Makefile.am
+++ b/mate-volume-control/Makefile.am
@@ -1,16 +1,78 @@
 NULL =
 
-SUBDIRS =			\
-	data			\
-	src			\
+bin_PROGRAMS = 					\
+	mate-volume-control-applet		\
+	mate-volume-control			\
 	$(NULL)
 
-EXTRA_DIST = \
-	ChangeLog.pre-2-26	\
+AM_CPPFLAGS =					\
+	$(WARN_CFLAGS)				\
+	-I$(top_srcdir)/sound-theme		\
+	$(VOLUME_CONTROL_CFLAGS)		\
+	$(DISABLE_DEPRECATED)			\
+	-DLOCALE_DIR=\""$(datadir)/locale"\"	\
+	-DLIBEXECDIR=\"$(libexecdir)\"		\
+	-DGLADEDIR=\""$(pkgdatadir)"\"		\
+	-DICON_DATA_DIR="\"$(pkgdatadir)/icons\"" \
+	-DSOUND_DATA_DIR="\"$(datadir)/sounds\""	\
+	-DSOUND_SET_DIR="\"$(pkgdatadir)/sounds\""	\
 	$(NULL)
 
-MAINTAINERCLEANFILES =		\
-	*~			\
+noinst_LTLIBRARIES = libmatevolumecontrol.la
+libmatevolumecontrol_la_SOURCES =		\
+	gvc-channel-bar.h			\
+	gvc-channel-bar.c			\
+    gvc-utils.c               \
+    gvc-utils.h               \
 	$(NULL)
 
+mate_volume_control_applet_LDADD =		\
+	-lm					\
+	libmatevolumecontrol.la		\
+	$(VOLUME_CONTROL_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			\
+	$(VOLUME_CONTROL_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-sound-theme-chooser.c 	\
+	gvc-sound-theme-chooser.h 	\
+	gvc-speaker-test.h			\
+	gvc-speaker-test.c			\
+	sound-theme-file-utils.c 	\
+	sound-theme-file-utils.h 	\
+	gvc-mixer-dialog.c			\
+	gvc-mixer-dialog.h 			\
+	dialog-main.c				\
+	$(NULL)
+
+BUILT_SOURCES =				\
+	$(NULL)
+
+CLEANFILES =				\
+	$(BUILT_SOURCES)		\
+	$(NULL)
+
+MAINTAINERCLEANFILES =                  \
+        *~                              \
+        Makefile.in
+
 -include $(top_srcdir)/git.mk
-- 
cgit v1.2.1