diff options
Diffstat (limited to 'command/data')
3 files changed, 27 insertions, 6 deletions
diff --git a/command/data/Makefile.am b/command/data/Makefile.am index b6c82434..47709166 100644 --- a/command/data/Makefile.am +++ b/command/data/Makefile.am @@ -1,31 +1,49 @@ -APPLET_LOCATION = $(libdir)/mate-applets/libcommand-applet.so +applets_in_files = org.mate.applets.CommandApplet.mate-panel-applet.desktop.in +service_in_files = org.mate.panel.applet.CommandAppletFactory.service.in +gschema_in_files = org.mate.panel.applet.command.gschema.xml.in + +if ENABLE_IN_PROCESS +APPLET_LOCATION = $(pkglibdir)/libcommand-applet.so +else !ENABLE_IN_PROCESS +APPLET_LOCATION = $(libexecdir)/command-applet +endif !ENABLE_IN_PROCESS appletsdir = $(datadir)/mate-panel/applets -applets_in_files = org.mate.applets.CommandApplet.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|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \ + -e "s|\@APPLET_IN_PROCESS\@|$(APPLET_IN_PROCESS)|" \ $< > $@ $(applets_DATA): $(applets_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_DATA = $(service_in_files:.service.in=.service) + +$(service_DATA): $(service_in_files) Makefile + $(AM_V_GEN)sed \ + -e "s|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \ + $< > $@ +endif !ENABLE_IN_PROCESS -command_gschema_in_files = org.mate.panel.applet.command.gschema.xml.in -gsettings_SCHEMAS = $(command_gschema_in_files:.xml.in=.xml) +gsettings_SCHEMAS = $(gschema_in_files:.xml.in=.xml) @GSETTINGS_RULES@ EXTRA_DIST = \ $(applets_in_files).in \ - $(command_gschema_in_files) \ + $(service_in_files) \ + $(gschema_in_files) \ command-preferences.ui \ command-resources.gresource.xml CLEANFILES = \ $(applets_DATA) \ $(applets_in_files) \ + $(service_DATA) \ $(gsettings_SCHEMAS) \ *.gschema.valid diff --git a/command/data/org.mate.applets.CommandApplet.mate-panel-applet.desktop.in.in b/command/data/org.mate.applets.CommandApplet.mate-panel-applet.desktop.in.in index 1b2495ee..6d14aedb 100644 --- a/command/data/org.mate.applets.CommandApplet.mate-panel-applet.desktop.in.in +++ b/command/data/org.mate.applets.CommandApplet.mate-panel-applet.desktop.in.in @@ -1,7 +1,7 @@ [Applet Factory] Id=CommandAppletFactory Location=@APPLET_LOCATION@ -InProcess=true +InProcess=@APPLET_IN_PROCESS@ Name=Command Factory Description=Command Factory diff --git a/command/data/org.mate.panel.applet.CommandAppletFactory.service.in b/command/data/org.mate.panel.applet.CommandAppletFactory.service.in new file mode 100644 index 00000000..aad043dd --- /dev/null +++ b/command/data/org.mate.panel.applet.CommandAppletFactory.service.in @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=org.mate.panel.applet.CommandAppletFactory +Exec=@APPLET_LOCATION@ |