3 files changed, 28 insertions, 15 deletions
diff --git a/multiload/data/Makefile.am b/multiload/data/Makefile.am
index 0f1f9723..377ddc3f 100644
--- a/multiload/data/Makefile.am
+++ b/multiload/data/Makefile.am
@@ -1,29 +1,40 @@
-multiload_gschema_in_files = org.mate.panel.applet.multiload.gschema.xml.in
-gsettings_SCHEMAS = $(multiload_gschema_in_files:.xml.in=.xml)
+NULL =
+
+applet_in_files = org.mate.applets.MultiLoadApplet.mate-panel-applet.desktop.in
+service_in_files = org.mate.panel.applet.MultiLoadAppletFactory.service.in
+gschema_in_files = org.mate.panel.applet.multiload.gschema.xml.in
+
+if ENABLE_IN_PROCESS
+APPLET_LOCATION = $(pkglibdir)/libmate-multiload-applet.so
+else !ENABLE_IN_PROCESS
+APPLET_LOCATION = $(libexecdir)/mate-multiload-applet
+endif !ENABLE_IN_PROCESS
+
+gsettings_SCHEMAS = $(gschema_in_files:.xml.in=.xml)
 @GSETTINGS_RULES@
 
 appletdir = $(datadir)/mate-panel/applets
-applet_in_in_files = org.mate.applets.MultiLoadApplet.mate-panel-applet.desktop.in.in
-applet_in_files = $(applet_in_in_files:.desktop.in.in=.desktop.in)
 applet_DATA = $(applet_in_files:.mate-panel-applet.desktop.in=.mate-panel-applet)
 
 $(applet_in_files): $(applet_in_files).in Makefile
 $(AM_V_GEN)sed \
- -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
+ -e "s|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \
+ -e "s|\@APPLET_IN_PROCESS\@|$(APPLET_IN_PROCESS)|" \
 -e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \
 $< > $@
 
 $(applet_DATA): $(applet_in_files) Makefile
 $(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
 
-servicedir = $(datadir)/dbus-1/services
-service_in_files = org.mate.panel.applet.MultiLoadAppletFactory.service.in
-service_DATA = $(service_in_files:.service.in=.service)
+if !ENABLE_IN_PROCESS
+servicedir = $(datadir)/dbus-1/services
+service_DATA = $(service_in_files:.service.in=.service)
 
-org.mate.panel.applet.MultiLoadAppletFactory.service: $(service_in_files)
+$(service_DATA): $(service_in_files) Makefile
 $(AM_V_GEN)sed \
- -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
- $< > $@
+ -e "s|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \
+ $< > $@
+endif !ENABLE_IN_PROCESS
 
 CLEANFILES = \
 $(applet_DATA) \
@@ -33,9 +44,9 @@ CLEANFILES = \
 *.gschema.valid
 
 EXTRA_DIST = \
- $(applet_in_in_files) \
+ $(applet_in_files).in \
 $(service_in_files) \
- $(multiload_gschema_in_files) \
+ $(gschema_in_files) \
 multiload-applet-menu.xml \
 multiload-resources.gresource.xml \
 properties.ui
diff --git a/multiload/data/org.mate.applets.MultiLoadApplet.mate-panel-applet.desktop.in.in b/multiload/data/org.mate.applets.MultiLoadApplet.mate-panel-applet.desktop.in.in
index 3eacb2fb..a2b9de2d 100644
--- a/multiload/data/org.mate.applets.MultiLoadApplet.mate-panel-applet.desktop.in.in
+++ b/multiload/data/org.mate.applets.MultiLoadApplet.mate-panel-applet.desktop.in.in
@@ -1,6 +1,7 @@
 [Applet Factory]
 Id=MultiLoadAppletFactory
-Location=@LIBEXECDIR@/mate-multiload-applet
+Location=@APPLET_LOCATION@
+InProcess=@APPLET_IN_PROCESS@
 Name=MultiLoad Applet Factory
 Description=Factory for creating the load applet.
 
@@ -10,6 +11,7 @@ Description=A system load indicator
 # Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=utilities-system-monitor
 MateComponentId=OAFIID:MATE_MultiLoadApplet
+Platforms=X11;Wayland;
 X-MATE-Bugzilla-Bugzilla=MATE
 X-MATE-Bugzilla-Product=mate-applets
 X-MATE-Bugzilla-Component=multiload
diff --git a/multiload/data/org.mate.panel.applet.MultiLoadAppletFactory.service.in b/multiload/data/org.mate.panel.applet.MultiLoadAppletFactory.service.in
index d4c7da3c..0c75e063 100644
--- a/multiload/data/org.mate.panel.applet.MultiLoadAppletFactory.service.in
+++ b/multiload/data/org.mate.panel.applet.MultiLoadAppletFactory.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.mate.panel.applet.MultiLoadAppletFactory
-Exec=@LIBEXECDIR@/mate-multiload-applet
+Exec=@APPLET_LOCATION@