3 files changed, 22 insertions, 10 deletions
diff --git a/geyes/data/Makefile.am b/geyes/data/Makefile.am
index 0342bdaf..7d85e179 100644
--- a/geyes/data/Makefile.am
+++ b/geyes/data/Makefile.am
@@ -1,29 +1,39 @@
 NULL =
 
-appletdir = $(datadir)/mate-panel/applets
 applet_in_files = org.mate.applets.GeyesApplet.mate-panel-applet.desktop.in
+service_in_files = org.mate.panel.applet.GeyesAppletFactory.service.in
+gschema_in_files = org.mate.panel.applet.geyes.gschema.xml.in
+
+if ENABLE_IN_PROCESS
+APPLET_LOCATION = $(pkglibdir)/libmate-geyes-applet.so
+else !ENABLE_IN_PROCESS
+APPLET_LOCATION = $(libexecdir)/mate-geyes-applet
+endif !ENABLE_IN_PROCESS
+
+appletdir = $(datadir)/mate-panel/applets
 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 $@
 
+if !ENABLE_IN_PROCESS
 servicedir = $(datadir)/dbus-1/services
-service_in_files = org.mate.panel.applet.GeyesAppletFactory.service.in
 service_DATA = $(service_in_files:.service.in=.service)
 
-org.mate.panel.applet.GeyesAppletFactory.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
 
-geyes_gschema_in_files = org.mate.panel.applet.geyes.gschema.xml.in
-gsettings_SCHEMAS = $(geyes_gschema_in_files:.xml.in=.xml)
+gsettings_SCHEMAS = $(gschema_in_files:.xml.in=.xml)
 @GSETTINGS_RULES@
 
 CLEANFILES = \
@@ -40,7 +50,7 @@ EXTRA_DIST = \
 themes.ui \
 $(applet_in_files).in \
 $(service_in_files) \
- $(geyes_gschema_in_files) \
+ $(gschema_in_files) \
 $(NULL)
 
 -include $(top_srcdir)/git.mk
diff --git a/geyes/data/org.mate.applets.GeyesApplet.mate-panel-applet.desktop.in.in b/geyes/data/org.mate.applets.GeyesApplet.mate-panel-applet.desktop.in.in
index eaadb5f3..3a7c4f21 100644
--- a/geyes/data/org.mate.applets.GeyesApplet.mate-panel-applet.desktop.in.in
+++ b/geyes/data/org.mate.applets.GeyesApplet.mate-panel-applet.desktop.in.in
@@ -1,6 +1,7 @@
 [Applet Factory]
 Id=GeyesAppletFactory
-Location=@LIBEXECDIR@/mate-geyes-applet
+Location=@APPLET_LOCATION@
+InProcess=@APPLET_IN_PROCESS@
 Name=Eyes Applet Factory
 Description=Eyes Applet Factory
 
@@ -10,6 +11,7 @@ Description=A set of eyeballs for your panel
 # Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=mate-eyes-applet
 MateComponentId=OAFIID:MATE_GeyesApplet
+Platforms=X11;
 X-MATE-Bugzilla-Bugzilla=MATE
 X-MATE-Bugzilla-Product=mate-applets
 X-MATE-Bugzilla-Component=geyes
diff --git a/geyes/data/org.mate.panel.applet.GeyesAppletFactory.service.in b/geyes/data/org.mate.panel.applet.GeyesAppletFactory.service.in
index 2f490e7b..9f2b6073 100644
--- a/geyes/data/org.mate.panel.applet.GeyesAppletFactory.service.in
+++ b/geyes/data/org.mate.panel.applet.GeyesAppletFactory.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.mate.panel.applet.GeyesAppletFactory
-Exec=@LIBEXECDIR@/mate-geyes-applet
+Exec=@APPLET_LOCATION@