From cecbc8d173c98cd060d6143e58626e1e1d867939 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Wed, 13 Dec 2017 18:41:22 +0100 Subject: [PATCH] ensure xfce4-notifyd.desktop.in makes it into the tarball MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- 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 -- 2.9.5