[Xfce4-commits] [apps/xfce4-notifyd] 01/02: Ensure xfce4-notifyd.desktop.in goes into the tarball (Bug #13989)

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

o   c   h   o   s   i       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository apps/xfce4-notifyd.

commit 8772d89db2f1df9aff7f26ae6b5b07f0511e1511
Author: Andreas Müller <schnitzeltony at gmail.com>
Date:   Wed Dec 13 18:41:22 2017 +0100

    Ensure xfce4-notifyd.desktop.in goes into the tarball (Bug #13989)
    
    Otherwise building with --disable-dbus-start-daemon fails with
    
    | make[2]: *** No rule to make target 'xfce4-notifyd/xfce4-notifyd.desktop', needed by 'all-am'.  Stop.
    
    Signed-off-by: Andreas Müller <schnitzeltony at gmail.com>
---
 Makefile.am | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 6a79f25..93bafdb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -81,28 +81,30 @@ xfce4_notifyd_config_xfce4_notifyd_config_LDADD = \
 	$(common_ldadd) \
 	$(LIBNOTIFY_LIBS)
 
-if USE_DBUS_START_DAEMON
-servicedir = $(datadir)/dbus-1/services
 service_in_files = xfce4-notifyd/org.xfce.xfce4-notifyd.Notifications.service.in
-service_DATA = $(service_in_files:.service.in=.service)
-
-systemd_userdir = $(prefix)/lib/systemd/user
 systemd_user_in_files = xfce4-notifyd/xfce4-notifyd.service.in
-systemd_user_DATA = $(systemd_user_in_files:.service.in=.service)
-
 dist_service = \
 	$(service_in_files) \
 	$(systemd_user_in_files) \
 	xfce4-notifyd/notify-dbus.xml \
 	xfce4-notifyd/xfce-notify-marshal.list
+
+autostart_in_files = xfce4-notifyd/xfce4-notifyd.desktop.in
+dist_autostart = \
+	$(autostart_in_files)
+
+if USE_DBUS_START_DAEMON
+servicedir = $(datadir)/dbus-1/services
+service_DATA = $(service_in_files:.service.in=.service)
+
+systemd_userdir = $(prefix)/lib/systemd/user
+systemd_user_DATA = $(systemd_user_in_files:.service.in=.service)
+
 distclean_service = $(service_DATA) $(systemd_user_DATA)
 else
 autostartdir = $(sysconfdir)/xdg/autostart
-autostart_in_files = xfce4-notifyd/xfce4-notifyd.desktop.in
 autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
 
-dist_autostart = \
-	$(autostart_in_files)
 distclean_autostart = $(autostart_DATA)
 endif
 
@@ -186,6 +188,7 @@ dist_noinst_DATA = \
 	$(dist_misc) \
 	$(dist_intltool) \
 	$(dist_service) \
+	$(dist_autostart) \
 	$(dist_xfce4_notifyd_config) \
 	$(dist_themes)
 
@@ -202,7 +205,8 @@ CLEANFILES = \
 
 DISTCLEANFILES = \
 	$(distclean_intltool) \
-	$(distclean_service)
+	$(distclean_service) \
+	$(distclean_autostart)
 
 xfce4-notifyd/xfce-notify-gbus.h:
 xfce4-notifyd/xfce-notify-gbus.c: $(srcdir)/xfce4-notifyd/notify-dbus.xml Makefile

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.