add .vimrc to .gitignore

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 1841ad5c5a734371b3a998762c5c9f652a758505..7bbdb24bd8a2cd25ee2b74765754b42c76e571e1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -98,7 +98,8 @@ rootbin_PROGRAMS = \
        systemd-notify \
        systemd-ask-password \
        systemd-tty-ask-password-agent \
-       systemd-tmpfiles
+       systemd-tmpfiles \
+       systemd-machine-id-setup
 
 bin_PROGRAMS = \
        systemd-cgls
@@ -232,6 +233,7 @@ dist_systemunit_DATA = \
        units/sys-kernel-security.mount \
        units/var-lock.mount \
        units/var-run.mount \
+       units/media.mount \
        units/hwclock-load.service \
        units/hwclock-save.service \
        units/remount-rootfs.service \
@@ -434,6 +436,7 @@ libsystemd_core_la_SOURCES = \
        src/loopback-setup.c \
        src/kmod-setup.c \
        src/locale-setup.c \
+       src/machine-id-setup.c \
        src/specifier.c \
        src/unit-name.c \
        src/fdset.c \
@@ -523,6 +526,7 @@ MANPAGES = \
        man/systemd.conf.5 \
        man/tmpfiles.d.5 \
        man/hostname.5 \
+       man/machine-id.5 \
        man/vconsole.conf.5 \
        man/locale.conf.5 \
        man/os-release.5 \
@@ -737,6 +741,16 @@ systemd_tmpfiles_CFLAGS = \
 systemd_tmpfiles_LDADD = \
        libsystemd-basic.la
 
+systemd_machine_id_setup_SOURCES = \
+       src/machine-id-setup.c \
+       src/machine-id-main.c
+
+systemd_machine_id_setup_CFLAGS = \
+       $(AM_CFLAGS)
+
+systemd_machine_id_setup_LDADD = \
+       libsystemd-basic.la
+
 systemd_sysctl_SOURCES = \
        src/sysctl.c
 
@@ -1213,12 +1227,14 @@ install-data-hook:
                        fsck-root.service \
                        remount-rootfs.service \
                        var-run.mount \
-                       var-lock.mount && \
+                       var-lock.mount \
+                       media.mount && \
                $(LN_S) ../systemd-remount-api-vfs.service systemd-remount-api-vfs.service && \
                $(LN_S) ../fsck-root.service fsck-root.service && \
                $(LN_S) ../remount-rootfs.service remount-rootfs.service && \
                $(LN_S) ../var-run.mount var-run.mount && \
-               $(LN_S) ../var-lock.mount var-lock.mount )
+               $(LN_S) ../var-lock.mount var-lock.mount && \
+               $(LN_S) ../media.mount media.mount )
        ( cd $(DESTDIR)$(userunitdir) && \
                rm -f shutdown.target sockets.target local-fs.target swap.target bluetooth.target printer.target sound.target && \
                $(LN_S) $(systemunitdir)/shutdown.target shutdown.target && \