Remove unused parts of Makefiles and clean up tabs

4 files changed, 75 insertions, 82 deletions

diff --git a/Makefile.am b/Makefile.am
index ccfd2dc..378e1c8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,33 +2,31 @@ NULL =
 
 SUBDIRS = data po man mate-volume-control
 
-DISTCHECK_CONFIGURE_FLAGS = \
-	--disable-scrollkeeper	\
-	--enable-more-warnings  \
-	--enable-compile-warnings=maximum \
+DISTCHECK_CONFIGURE_FLAGS =			\
+	--enable-more-warnings			\
+	--enable-compile-warnings=maximum	\
 	--enable-deprecated
 
-DIST_SUBDIRS = \
-	data		\
-	po 			\
-	man			\
-	mate-volume-control	\
+DIST_SUBDIRS =					\
+	data					\
+	po 					\
+	man					\
+	mate-volume-control			\
 	$(NULL)
 
-EXTRA_DIST = \
-	.version		\
-	autogen.sh		\
-	configure		\
-	ChangeLog		\
-	COPYING			\
-	COPYING-DOCS		\
-	build-aux/git-version-gen \
-	$(INTLTOOL_BUILT:=.in)	\
+EXTRA_DIST =					\
+	.version				\
+	autogen.sh				\
+	configure				\
+	ChangeLog				\
+	COPYING					\
+	COPYING-DOCS				\
+	build-aux/git-version-gen 		\
+	$(INTLTOOL_BUILT:=.in)			\
 	$(NULL)
 
-DISTCLEANFILES = \
-	build-aux/mate-doc-utils.make	\
-	po/.intltool-merge-cache	\
+DISTCLEANFILES =				\
+	po/.intltool-merge-cache		\
 	$(NULL)
 
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
diff --git a/data/Makefile.am b/data/Makefile.am
index 58159fb..47394ff 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,8 +1,8 @@
 NULL =
 
-SUBDIRS =			\
-	icons			\
-	sounds 			\
+SUBDIRS =	\
+	icons	\
+	sounds	\
 	$(NULL)
 
 @INTLTOOL_DESKTOP_RULE@
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 67d9cea..119338b 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -1,11 +1,11 @@
 NULL =
 
-SUBDIRS = \
-	scalable \
-	16x16 \
-	22x22 \
-	24x24 \
-	32x32 \
+SUBDIRS = 		\
+	scalable 	\
+	16x16 		\
+	22x22 		\
+	24x24 		\
+	32x32 		\
 	$(NULL)
 
 gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/mate
@@ -21,5 +21,4 @@ update-icon-cache:
 		echo "***   $(gtk_update_icon_cache)"; \
 	fi
 
-
 -include $(top_srcdir)/git.mk
diff --git a/mate-volume-control/Makefile.am b/mate-volume-control/Makefile.am
index 0814356..93c1bbc 100644
--- a/mate-volume-control/Makefile.am
+++ b/mate-volume-control/Makefile.am
@@ -1,78 +1,74 @@
 NULL =
 
-bin_PROGRAMS = 					\
-	mate-volume-control-applet		\
-	mate-volume-control			\
+bin_PROGRAMS = 						\
+	mate-volume-control-applet			\
+	mate-volume-control				\
 	$(NULL)
 
-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\""	\
+AM_CPPFLAGS =						\
+	$(WARN_CFLAGS)					\
+	$(VOLUME_CONTROL_CFLAGS)			\
+	$(DISABLE_DEPRECATED)				\
+	-DLOCALE_DIR=\""$(datadir)/locale"\"		\
+	-DICON_DATA_DIR="\"$(pkgdatadir)/icons\"" 	\
 	-DSOUND_SET_DIR="\"$(pkgdatadir)/sounds\""	\
 	$(NULL)
 
 noinst_LTLIBRARIES = libmatevolumecontrol.la
-libmatevolumecontrol_la_SOURCES =		\
-	gvc-channel-bar.h			\
-	gvc-channel-bar.c			\
-    gvc-utils.c               \
-    gvc-utils.h               \
+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)			\
+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				\
+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			\
+	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				\
+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 =				\
+BUILT_SOURCES =						\
 	$(NULL)
 
-CLEANFILES =				\
-	$(BUILT_SOURCES)		\
+CLEANFILES =						\
+	$(BUILT_SOURCES)				\
 	$(NULL)
 
-MAINTAINERCLEANFILES =                  \
-        *~                              \
-        Makefile.in
+MAINTAINERCLEANFILES =					\
+	*~						\
+	Makefile.in
 
 -include $(top_srcdir)/git.mk