diff options
Diffstat (limited to 'netspeed/data')
3 files changed, 22 insertions, 12 deletions
diff --git a/netspeed/data/Makefile.am b/netspeed/data/Makefile.am index 350217f2..b6cb4875 100644 --- a/netspeed/data/Makefile.am +++ b/netspeed/data/Makefile.am @@ -1,36 +1,44 @@ NULL = +applet_in_files = org.mate.applets.NetspeedApplet.mate-panel-applet.desktop.in +service_in_files = org.mate.panel.applet.NetspeedAppletFactory.service.in +gschema_in_files = org.mate.panel.applet.netspeed.gschema.xml.in + +if ENABLE_IN_PROCESS +APPLET_LOCATION = $(pkglibdir)/libmate-netspeed-applet.so +else !ENABLE_IN_PROCESS APPLET_LOCATION = $(libexecdir)/mate-netspeed-applet +endif !ENABLE_IN_PROCESS appletdir = $(datadir)/mate-panel/applets -applet_in_files = org.mate.applets.NetspeedApplet.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|\@LOCATION\@|$(APPLET_LOCATION)|" \ + -e "s|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \ + -e "s|\@APPLET_IN_PROCESS\@|$(APPLET_IN_PROCESS)|" \ $< > $@ $(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.NetspeedAppletFactory.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.NetspeedAppletFactory.service: $(service_in_files) +$(service_DATA): $(service_in_files) Makefile $(AM_V_GEN)sed \ - -e "s|\@LOCATION\@|$(APPLET_LOCATION)|" \ + -e "s|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \ $< > $@ +endif !ENABLE_IN_PROCESS -netspeed_gschema_in_files = org.mate.panel.applet.netspeed.gschema.xml.in -gsettings_SCHEMAS = $(netspeed_gschema_in_files:.xml.in=.xml) +gsettings_SCHEMAS = $(gschema_in_files:.xml.in=.xml) @GSETTINGS_RULES@ EXTRA_DIST = \ $(applet_in_files).in \ $(service_in_files) \ - $(netspeed_gschema_in_files) \ + $(gschema_in_files) \ netspeed-details.ui \ netspeed-menu.xml \ netspeed-preferences.ui \ diff --git a/netspeed/data/org.mate.applets.NetspeedApplet.mate-panel-applet.desktop.in.in b/netspeed/data/org.mate.applets.NetspeedApplet.mate-panel-applet.desktop.in.in index fdc64666..2d156785 100644 --- a/netspeed/data/org.mate.applets.NetspeedApplet.mate-panel-applet.desktop.in.in +++ b/netspeed/data/org.mate.applets.NetspeedApplet.mate-panel-applet.desktop.in.in @@ -1,6 +1,7 @@ [Applet Factory] Id=NetspeedAppletFactory -Location=@LOCATION@ +Location=@APPLET_LOCATION@ +InProcess=@APPLET_IN_PROCESS@ Name=Netspeed Applet Factory Description=Netspeed Applet @@ -10,6 +11,7 @@ Description=Netspeed Applet # Translators: Do NOT translate or transliterate this text (this is an icon file name)! Icon=mate-netspeed-applet MateComponentId=OAFIID:MATE_NetspeedApplet +Platforms=X11;Wayland; X-MATE-Bugzilla-Bugzilla=MATE X-MATE-Bugzilla-Product=mate-netspeed X-MATE-Bugzilla-Component=netspeed diff --git a/netspeed/data/org.mate.panel.applet.NetspeedAppletFactory.service.in b/netspeed/data/org.mate.panel.applet.NetspeedAppletFactory.service.in index 2868eec8..49f7ff15 100644 --- a/netspeed/data/org.mate.panel.applet.NetspeedAppletFactory.service.in +++ b/netspeed/data/org.mate.panel.applet.NetspeedAppletFactory.service.in @@ -1,3 +1,3 @@ [D-BUS Service] Name=org.mate.panel.applet.NetspeedAppletFactory -Exec=@LOCATION@ +Exec=@APPLET_LOCATION@ |