diff options
Diffstat (limited to 'drivemount/data')
3 files changed, 30 insertions, 18 deletions
diff --git a/drivemount/data/Makefile.am b/drivemount/data/Makefile.am index b0dc7718..5c7205a7 100644 --- a/drivemount/data/Makefile.am +++ b/drivemount/data/Makefile.am @@ -1,30 +1,40 @@ NULL = -drivemount_gschema_in_files = org.mate.drivemount.gschema.xml.in -gsettings_SCHEMAS = $(drivemount_gschema_in_files:.xml.in=.xml) +applet_in_files = org.mate.applets.DriveMountApplet.mate-panel-applet.desktop.in +service_in_files = org.mate.panel.applet.DriveMountAppletFactory.service.in +gschema_in_files = org.mate.drivemount.gschema.xml.in + +if ENABLE_IN_PROCESS +APPLET_LOCATION = $(pkglibdir)/libmate-drivemount-applet.so +else !ENABLE_IN_PROCESS +APPLET_LOCATION = $(libexecdir)/mate-drivemount-applet +endif !ENABLE_IN_PROCESS + +gsettings_SCHEMAS = $(gschema_in_files:.xml.in=.xml) @GSETTINGS_RULES@ appletdir = $(datadir)/mate-panel/applets -applet_in_files = org.mate.applets.DriveMountApplet.mate-panel-applet.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.DriveMountAppletFactory.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.DriveMountAppletFactory.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) \ @@ -34,12 +44,12 @@ CLEANFILES = \ *.gschema.valid \ $(NULL) -EXTRA_DIST = \ - $(applet_in_files:=.in) \ - $(drivemount_gschema_in_files) \ - $(service_in_files) \ - drivemount-applet-menu.xml \ - drivemount-resources.gresource.xml \ +EXTRA_DIST = \ + $(applet_in_files:=.in) \ + $(gschema_in_files) \ + $(service_in_files) \ + drivemount-applet-menu.xml \ + drivemount-resources.gresource.xml \ $(NULL) -include $(top_srcdir)/git.mk diff --git a/drivemount/data/org.mate.applets.DriveMountApplet.mate-panel-applet.desktop.in.in b/drivemount/data/org.mate.applets.DriveMountApplet.mate-panel-applet.desktop.in.in index 637628d2..01e12296 100644 --- a/drivemount/data/org.mate.applets.DriveMountApplet.mate-panel-applet.desktop.in.in +++ b/drivemount/data/org.mate.applets.DriveMountApplet.mate-panel-applet.desktop.in.in @@ -1,6 +1,7 @@ [Applet Factory] Id=DriveMountAppletFactory -Location=@LIBEXECDIR@/mate-drivemount-applet +Location=@APPLET_LOCATION@ +InProcess=@APPLET_IN_PROCESS@ Name=Drive Mount Applet Factory Description=Factory for drive mount applet @@ -10,6 +11,7 @@ Description=Mount local disks and devices # Translators: Do NOT translate or transliterate this text (this is an icon file name)! Icon=media-floppy MateComponentId=OAFIID:MATE_DriveMountApplet +Platforms=X11;Wayland; X-MATE-Bugzilla-Bugzilla=MATE X-MATE-Bugzilla-Product=mate-applets X-MATE-Bugzilla-Component=Disk Mounter (drivemount) diff --git a/drivemount/data/org.mate.panel.applet.DriveMountAppletFactory.service.in b/drivemount/data/org.mate.panel.applet.DriveMountAppletFactory.service.in index 90d44b42..8034ae4d 100644 --- a/drivemount/data/org.mate.panel.applet.DriveMountAppletFactory.service.in +++ b/drivemount/data/org.mate.panel.applet.DriveMountAppletFactory.service.in @@ -1,3 +1,3 @@ [D-BUS Service] Name=org.mate.panel.applet.DriveMountAppletFactory -Exec=@LIBEXECDIR@/mate-drivemount-applet +Exec=@APPLET_LOCATION@ |