summaryrefslogtreecommitdiff
path: root/applets
diff options
context:
space:
mode:
authorColomban Wendling <[email protected]>2023-06-28 15:18:47 +0200
committerColomban Wendling <[email protected]>2023-06-28 15:18:47 +0200
commit54786e2663840035f61840205735e16c0dbe5214 (patch)
treedb4dd1163b7bbfde5a403071eed7035cf6c34372 /applets
parente61dad01e852d7913f4c9b3dae508088e3e7b287 (diff)
downloadmate-panel-54786e2663840035f61840205735e16c0dbe5214.tar.bz2
mate-panel-54786e2663840035f61840205735e16c0dbe5214.tar.xz
Fix distribution of applet service files
Fix distribution of the applet service files sources when building from an in-process-configured build. This fixes `make distcheck` and tarballs in builds configured with `--with-in-process-applets=all` (or actually any in-process applet). The issue was that the .service.in file was referenced indirectly in EXTRA_DIST, and the variable listed there was only filled in a conditional. Automake is not able to resolve this and see it still should distribute the reference of that variable, even if set conditionally. Fix this by always setting the variable properly, even if it's only used for out-of-process builds.
Diffstat (limited to 'applets')
-rw-r--r--applets/clock/Makefile.am2
-rw-r--r--applets/fish/Makefile.am2
-rw-r--r--applets/notification_area/Makefile.am2
-rw-r--r--applets/wncklet/Makefile.am2
4 files changed, 4 insertions, 4 deletions
diff --git a/applets/clock/Makefile.am b/applets/clock/Makefile.am
index 55f94e93..c452fab9 100644
--- a/applets/clock/Makefile.am
+++ b/applets/clock/Makefile.am
@@ -138,9 +138,9 @@ $(applet_in_files): $(applet_in_files).in Makefile
$(applet_DATA): $(applet_in_files)
$(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
+service_in_files = org.mate.panel.applet.ClockAppletFactory.service.in
if !CLOCK_INPROCESS
servicedir = $(datadir)/dbus-1/services
-service_in_files = org.mate.panel.applet.ClockAppletFactory.service.in
service_DATA = $(service_in_files:.service.in=.service)
org.mate.panel.applet.ClockAppletFactory.service: $(service_in_files)
diff --git a/applets/fish/Makefile.am b/applets/fish/Makefile.am
index 814d5d8c..604983a3 100644
--- a/applets/fish/Makefile.am
+++ b/applets/fish/Makefile.am
@@ -53,9 +53,9 @@ $(applet_in_files): $(applet_in_files).in Makefile
$(applet_DATA): $(applet_in_files)
$(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
+service_in_files = org.mate.panel.applet.FishAppletFactory.service.in
if !FISH_INPROCESS
servicedir = $(datadir)/dbus-1/services
-service_in_files = org.mate.panel.applet.FishAppletFactory.service.in
service_DATA = $(service_in_files:.service.in=.service)
org.mate.panel.applet.FishAppletFactory.service: $(service_in_files)
diff --git a/applets/notification_area/Makefile.am b/applets/notification_area/Makefile.am
index 365cdf5d..8f6ec8d3 100644
--- a/applets/notification_area/Makefile.am
+++ b/applets/notification_area/Makefile.am
@@ -83,9 +83,9 @@ $(applet_in_files): $(applet_in_files).in Makefile
-e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \
$< > $@
+service_in_files = org.mate.panel.applet.NotificationAreaAppletFactory.service.in
if !NOTIFICATION_AREA_INPROCESS
servicedir = $(datadir)/dbus-1/services
-service_in_files = org.mate.panel.applet.NotificationAreaAppletFactory.service.in
service_DATA = $(service_in_files:.service.in=.service)
org.mate.panel.applet.NotificationAreaAppletFactory.service: $(service_in_files)
diff --git a/applets/wncklet/Makefile.am b/applets/wncklet/Makefile.am
index ed442671..14f8a5c7 100644
--- a/applets/wncklet/Makefile.am
+++ b/applets/wncklet/Makefile.am
@@ -78,9 +78,9 @@ $(applet_in_files): $(applet_in_files).in Makefile
$(applet_DATA): $(applet_in_files)
$(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
+service_in_files = org.mate.panel.applet.WnckletFactory.service.in
if !WNCKLET_INPROCESS
servicedir = $(datadir)/dbus-1/services
-service_in_files = org.mate.panel.applet.WnckletFactory.service.in
service_DATA = $(service_in_files:.service.in=.service)
org.mate.panel.applet.WnckletFactory.service: $(service_in_files)