From 6133a03263321ab85fae9299968a8f069b3dfad5 Mon Sep 17 00:00:00 2001 From: lukefromdc Date: Mon, 19 Jun 2023 17:31:40 -0400 Subject: multiload: port to in-process for wayland *Fully functional on both x11 and wayland --- multiload/data/Makefile.am | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'multiload/data/Makefile.am') diff --git a/multiload/data/Makefile.am b/multiload/data/Makefile.am index 0f1f9723..c98d4ff5 100644 --- a/multiload/data/Makefile.am +++ b/multiload/data/Makefile.am @@ -1,3 +1,7 @@ +NULL = + +APPLET_LOCATION = $(libdir)/mate-applets/libmate-multiload-applet.so + multiload_gschema_in_files = org.mate.panel.applet.multiload.gschema.xml.in gsettings_SCHEMAS = $(multiload_gschema_in_files:.xml.in=.xml) @GSETTINGS_RULES@ @@ -9,32 +13,22 @@ applet_DATA = $(applet_in_files:.mate-panel-applet.desktop.in=.mate-panel $(applet_in_files): $(applet_in_files).in Makefile $(AM_V_GEN)sed \ - -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \ + -e "s|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \ -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.MultiLoadAppletFactory.service.in -service_DATA = $(service_in_files:.service.in=.service) - -org.mate.panel.applet.MultiLoadAppletFactory.service: $(service_in_files) - $(AM_V_GEN)sed \ - -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \ - $< > $@ CLEANFILES = \ $(applet_DATA) \ $(applet_in_files) \ - $(service_DATA) \ $(gsettings_SCHEMAS) \ *.gschema.valid EXTRA_DIST = \ $(applet_in_in_files) \ - $(service_in_files) \ $(multiload_gschema_in_files) \ multiload-applet-menu.xml \ multiload-resources.gresource.xml \ -- cgit v1.2.1