diff options
| author | lukefromdc <[email protected]> | 2023-07-11 21:28:01 -0400 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2023-07-17 02:47:28 +0200 |
| commit | 08bb8398e0d218daaefdfe95c44940e370802508 (patch) | |
| tree | 0c567b638dd31d831141a2ca4ef355a406883e08 /multiload/data | |
| parent | f94afff3bd198dca2412a75053e122c55b4b48dd (diff) | |
| download | mate-applets-08bb8398e0d218daaefdfe95c44940e370802508.tar.bz2 mate-applets-08bb8398e0d218daaefdfe95c44940e370802508.tar.xz | |
Allow building all applets in or out of process
*Use --enable-in-process selector for in-process builds
*Accessx-status: mark as incompatable with wayland
*Accessx-status: Fix in-process runtime warning
*Stickynote, Geyes: style fixes
Diffstat (limited to 'multiload/data')
3 files changed, 28 insertions, 8 deletions
diff --git a/multiload/data/Makefile.am b/multiload/data/Makefile.am index c98d4ff5..377ddc3f 100644 --- a/multiload/data/Makefile.am +++ b/multiload/data/Makefile.am @@ -1,35 +1,52 @@ NULL = -APPLET_LOCATION = $(libdir)/mate-applets/libmate-multiload-applet.so +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 -multiload_gschema_in_files = org.mate.panel.applet.multiload.gschema.xml.in -gsettings_SCHEMAS = $(multiload_gschema_in_files:.xml.in=.xml) +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|\@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_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 CLEANFILES = \ $(applet_DATA) \ $(applet_in_files) \ + $(service_DATA) \ $(gsettings_SCHEMAS) \ *.gschema.valid EXTRA_DIST = \ - $(applet_in_in_files) \ - $(multiload_gschema_in_files) \ + $(applet_in_files).in \ + $(service_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 7ce492c2..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,7 +1,7 @@ [Applet Factory] Id=MultiLoadAppletFactory Location=@APPLET_LOCATION@ -InProcess=true +InProcess=@APPLET_IN_PROCESS@ Name=MultiLoad Applet Factory Description=Factory for creating the load applet. diff --git a/multiload/data/org.mate.panel.applet.MultiLoadAppletFactory.service.in b/multiload/data/org.mate.panel.applet.MultiLoadAppletFactory.service.in new file mode 100644 index 00000000..0c75e063 --- /dev/null +++ b/multiload/data/org.mate.panel.applet.MultiLoadAppletFactory.service.in @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=org.mate.panel.applet.MultiLoadAppletFactory +Exec=@APPLET_LOCATION@ |