1 files changed, 72 insertions, 27 deletions
diff --git a/mate-volume-control/Makefile.am b/mate-volume-control/Makefile.am
index 06eae15..881b78d 100644
--- a/mate-volume-control/Makefile.am
+++ b/mate-volume-control/Makefile.am
@@ -3,15 +3,11 @@ bin_PROGRAMS = \
 mate-volume-control-status-icon \
 mate-volume-control \
 $(NULL)
-else
+else !ENABLE_STATUSICON
 bin_PROGRAMS = \
 mate-volume-control \
 $(NULL)
-endif
-
-if ENABLE_PANELAPPLET
-libexec_PROGRAMS = mate-volume-control-applet
-endif
+endif !ENABLE_STATUSICON
 
 AM_CPPFLAGS = \
 $(WARN_CFLAGS) \
@@ -24,35 +20,40 @@ AM_CPPFLAGS = \
 -I$(srcdir) \
 $(NULL)
 
-if ENABLE_PANELAPPLET
-APPLET_LOCATION = $(libexecdir)/mate-volume-control-applet
+applets_in_files = org.mate.applets.GvcApplet.mate-panel-applet.desktop.in
+service_in_files = org.mate.panel.applet.GvcAppletFactory.service.in
 
+if ENABLE_PANELAPPLET
 appletsdir = $(datadir)/mate-panel/applets
-applets_in_files = org.mate.applets.GvcApplet.mate-panel-applet.desktop.in
 applets_DATA = $(applets_in_files:.mate-panel-applet.desktop.in=.mate-panel-applet)
 
-$(applets_in_files): $(applets_in_files).in Makefile
- $(AM_V_GEN)sed \
- -e "s|\@LOCATION\@|$(APPLET_LOCATION)|" \
- $< > $@
-
-$(applets_DATA): $(applets_in_files) Makefile
- $(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
-
+if IN_PROCESS
+APPLET_LOCATION = $(libdir)/libmate-volume-control-applet.so
+mate_volume_control_applet_libdir= $(libdir)
+mate_volume_control_applet_lib_LTLIBRARIES=libmate-volume-control-applet.la
+IN_PROCESS = true
+else !IN_PROCESS
+APPLET_LOCATION = $(libexecdir)/mate-volume-control-applet
 servicedir = $(datadir)/dbus-1/services
-service_in_files = org.mate.panel.applet.GvcAppletFactory.service.in
 service_DATA = $(service_in_files:.service.in=.service)
+IN_PROCESS = false
 
-org.mate.panel.applet.GvcAppletFactory.service: $(service_in_files)
+$(service_in_files:.service.in=.service): $(service_in_files)
 $(AM_V_GEN)sed \
 -e "s|\@LOCATION\@|$(APPLET_LOCATION)|" \
 $< > $@
+endif !IN_PROCESS
 
-EXTRA_DIST = \
- $(applets_in_files).in \
- $(service_in_files)
+$(applets_in_files): $(applets_in_files).in Makefile
+ $(AM_V_GEN)sed \
+ -e "s|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \
+ -e "s|\@IN_PROCESS\@|$(IN_PROCESS)|" \
+ $< > $@
+
+$(applets_DATA): $(applets_in_files) Makefile
+ $(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
 
-endif
+endif ENABLE_PANELAPPLET
 
 noinst_LTLIBRARIES = libmatevolumecontrol.la
 libmatevolumecontrol_la_SOURCES = \
@@ -76,9 +77,43 @@ mate_volume_control_status_icon_SOURCES = \
 $(NULL)
 
 mate_volume_control_status_icon_CFLAGS = $(WARN_CFLAGS)
-endif
+endif ENABLE_STATUSICON
 
 if ENABLE_PANELAPPLET
+if IN_PROCESS
+libmate_volume_control_applet_la_LDFLAGS = \
+ -module -avoid-version \
+ $(WARN_LDFLAGS) \
+ $(AM_LDFLAGS) \
+ $(NULL)
+
+libmate_volume_control_applet_la_SOURCES = \
+ gvc-stream-applet-icon.h \
+ gvc-stream-applet-icon.c \
+ gvc-applet.h \
+ gvc-applet.c \
+ applet-main.c \
+ $(NULL)
+
+libmate_volume_control_applet_la_CFLAGS = $(WARN_CFLAGS)
+
+libmate_volume_control_applet_la_LIBADD = \
+ -lm \
+ libmatevolumecontrol.la \
+ $(MATE_APPLETS4_CFLAGS) \
+ $(VOLUME_CONTROL_LIBS) \
+ $(NULL)
+
+if ENABLE_WAYLAND
+libmate_volume_control_applet_la_LIBADD += \
+ $(WAYLAND_LIBS)
+
+AM_CPPFLAGS += \
+ $(WAYLAND_CFLAGS)
+endif ENABLE_WAYLAND
+
+else !IN_PROCESS
+libexec_PROGRAMS = mate-volume-control-applet
 mate_volume_control_applet_LDADD = \
 -lm \
 libmatevolumecontrol.la \
@@ -93,9 +128,16 @@ mate_volume_control_applet_SOURCES = \
 gvc-applet.c \
 applet-main.c \
 $(NULL)
-
 mate_volume_control_applet_CFLAGS = $(WARN_CFLAGS)
-endif
+
+mate_volume_control_applet_LDFLAGS = \
+ -module -avoid-version \
+ $(WARN_LDFLAGS) \
+ $(AM_LDFLAGS) \
+ $(NULL)
+
+endif !IN_PROCESS
+endif ENABLE_PANELAPPLET
 
 mate_volume_control_LDADD = \
 -lm \
@@ -128,11 +170,14 @@ BUILT_SOURCES = \
 
 CLEANFILES = \
 $(applets_in_files) \
- $(BUILT_SOURCES) \
 $(NULL)
 
 MAINTAINERCLEANFILES = \
 *~ \
 Makefile.in
 
+EXTRA_DIST = \
+ $(applets_in_files).in \
+ $(service_in_files)
+
 -include $(top_srcdir)/git.mk