unit: introduce ConditionDirectoryNotEmpty=

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index e008cc78d8cd923a0fe20a299f2dd2ba93aba72a..3389f436dfc73ac12e551b542bb8befb9e7ff188 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -218,7 +218,6 @@ dist_systemunit_DATA = \
        units/sys-kernel-debug.mount \
        units/sys-kernel-security.automount \
        units/sys-kernel-security.mount \
-       units/tmp.mount \
        units/var-lock.mount \
        units/var-run.mount \
        units/hwclock-load.service \
@@ -328,13 +327,6 @@ dist_systemunit_DATA += \
        units/fedora/plymouth-halt.service
 endif
 
-if TARGET_DEBIAN_OR_UBUNTU
-dist_systemunit_DATA += \
-       units/debian/umountfs.service \
-       units/debian/umountnfs.service \
-       units/debian/umountroot.service
-endif
-
 if TARGET_GENTOO
 dist_systemunit_DATA += \
        units/gentoo/xdm.service
@@ -938,6 +930,7 @@ systemd_gnome_ask_password_agent_SOURCES = \
 systemd_gnome_ask_password_agent_CFLAGS = \
        $(AM_CFLAGS) \
        $(DBUSGLIB_CFLAGS) \
+       $(LIBNOTIFY_CFLAGS) \
        $(GTK_CFLAGS) \
        -Wno-unused-variable \
        -Wno-unused-function \
@@ -955,6 +948,7 @@ systemd_gnome_ask_password_agent_VALAFLAGS = \
 
 systemd_gnome_ask_password_agent_LDADD = \
        $(DBUSGLIB_LIBS) \
+       $(LIBNOTIFY_LIBS) \
        $(GTK_LIBS)
 
 systemd_tty_ask_password_agent_SOURCES = \
@@ -1294,13 +1288,6 @@ if TARGET_GENTOO
                $(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
 endif
 if TARGET_DEBIAN_OR_UBUNTU
-       $(MKDIR_P) -m 0755 \
-               $(DESTDIR)$(systemunitdir)/umount.target.wants
-       ( cd $(DESTDIR)$(systemunitdir)/umount.target.wants && \
-               rm -f umountfs.service umountnfs.service umountroot.service && \
-               $(LN_S) ../umountfs.service umountfs.service && \
-               $(LN_S) ../umountnfs.service umountnfs.service && \
-               $(LN_S) ../umountroot.service umountroot.service )
        ( cd $(DESTDIR)$(systemunitdir) && \
                rm -f runlevel5.target && \
                $(LN_S) multi-user.target runlevel5.target )