From 5fd1ba21e41281195e39366061e0d9d0535df014 Mon Sep 17 00:00:00 2001
From: Victor Kareh <vkareh@redhat.com>
Date: Thu, 7 Feb 2019 12:17:22 -0500
Subject: Convert GtkStatusIcon to real applet

---
 mate-volume-control/Makefile.am | 130 ++++++++++++++++++++++++----------------
 1 file changed, 79 insertions(+), 51 deletions(-)

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

diff --git a/mate-volume-control/Makefile.am b/mate-volume-control/Makefile.am
index e830802..f67d087 100644
--- a/mate-volume-control/Makefile.am
+++ b/mate-volume-control/Makefile.am
@@ -1,74 +1,102 @@
 NULL =
 
-bin_PROGRAMS = 						\
-	mate-volume-control-applet			\
-	mate-volume-control				\
-	$(NULL)
+bin_PROGRAMS = mate-volume-control
+libexec_PROGRAMS = mate-volume-control-applet
 
-AM_CPPFLAGS =						\
-	$(WARN_CFLAGS)					\
-	$(VOLUME_CONTROL_CFLAGS)			\
-	$(DISABLE_DEPRECATED)				\
-	-DLOCALE_DIR=\""$(datadir)/locale"\"		\
-	-DICON_DATA_DIR="\"$(pkgdatadir)/icons\"" 	\
-	-DSOUND_SET_DIR="\"$(pkgdatadir)/sounds\""	\
+AM_CPPFLAGS = \
+	$(WARN_CFLAGS) \
+	$(VOLUME_CONTROL_CFLAGS) \
+	$(DISABLE_DEPRECATED) \
+	-DMATELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+	-DLOCALE_DIR=\""$(datadir)/locale"\" \
+	-DICON_DATA_DIR="\"$(pkgdatadir)/icons\"" \
+	-DSOUND_SET_DIR="\"$(pkgdatadir)/sounds\"" \
+	-I$(srcdir) \
 	$(NULL)
 
+APPLET_LOCATION = $(libexecdir)/mate-volume-control-applet
+
+appletsdir       = $(datadir)/mate-panel/applets
+applets_in_files = org.mate.applets.GvcApplet.mate-panel-applet.in
+applets_DATA     = $(applets_in_files:.mate-panel-applet.in=.mate-panel-applet)
+
+$(applets_in_files): $(applets_in_files).in Makefile
+	$(AM_V_GEN)sed \
+		-e "s|\@LOCATION\@|$(APPLET_LOCATION)|" \
+		$< > $@
+%.mate-panel-applet: %.mate-panel-applet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+
+servicedir       = $(datadir)/dbus-1/services
+service_in_files = org.mate.panel.applet.GvcAppletFactory.service.in
+service_DATA     = $(service_in_files:.service.in=.service)
+
+org.mate.panel.applet.GvcAppletFactory.service: $(service_in_files)
+	$(AM_V_GEN)sed \
+		-e "s|\@LOCATION\@|$(APPLET_LOCATION)|" \
+		$< > $@
+
+EXTRA_DIST = \
+	$(applets_in_files).in \
+	$(service_in_files)
+
 noinst_LTLIBRARIES = libmatevolumecontrol.la
-libmatevolumecontrol_la_SOURCES =			\
-	gvc-channel-bar.h				\
-	gvc-channel-bar.c				\
+libmatevolumecontrol_la_SOURCES = \
+	gvc-channel-bar.h \
+	gvc-channel-bar.c \
 	$(NULL)
 
-mate_volume_control_applet_LDADD =			\
-	-lm						\
-	libmatevolumecontrol.la				\
-	$(VOLUME_CONTROL_LIBS)				\
+mate_volume_control_applet_LDADD = \
+	-lm \
+	libmatevolumecontrol.la \
+	$(VOLUME_CONTROL_LIBS) \
+	$(MATEDESKTOP_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				\
-	$(VOLUME_CONTROL_LIBS)				\
+mate_volume_contro_applet_CFLAGS = $(WARN_CFLAGS)
+
+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				\
-	gvc-utils.c 					\
-	gvc-utils.h					\
-	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 \
+	gvc-utils.c \
+	gvc-utils.h \
+	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 =					\
-	*~						\
+MAINTAINERCLEANFILES = \
+	*~ \
 	Makefile.in
 
 -include $(top_srcdir)/git.mk
-- 
cgit v1.2.1