nspawn: make /dev/kmsg unavailable in the container, but allow access to /proc/kmsg

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 90c225ec01ddd90bed03dfd792b86ddf7c59994f..22a04d4a1bafc3e1abfda0c80f6e2c54006d8d4b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -600,7 +600,9 @@ libsystemd_label_la_SOURCES = \
        src/shared/mkdir.c \
        src/shared/mkdir.h \
        src/shared/ask-password-api.c \
-       src/shared/ask-password-api.h
+       src/shared/ask-password-api.h \
+       src/shared/dev-setup.c \
+       src/shared/dev-setup.h
 
 libsystemd_label_la_CFLAGS = \
        $(AM_CFLAGS) \
@@ -679,6 +681,8 @@ libsystemd_core_la_SOURCES = \
        src/core/job.h \
        src/core/manager.c \
        src/core/manager.h \
+       src/core/transaction.c \
+       src/core/transaction.h \
        src/core/load-fragment.c \
        src/core/load-fragment.h \
        src/core/service.c \
@@ -1276,8 +1280,10 @@ EXTRA_DIST += \
        src/libsystemd-daemon/libsystemd-daemon.sym
 
 # ------------------------------------------------------------------------------
+if ENABLE_GTK_DOC
 SUBDIRS += \
        docs/libudev
+endif
 
 include_HEADERS += \
        src/libudev/libudev.h
@@ -1337,23 +1343,15 @@ noinst_LTLIBRARIES += \
 
 libudev_private_la_SOURCES =\
        $(libudev_la_SOURCES) \
-       src/libudev/libudev-util-private.c \
        src/libudev/libudev-device-private.c \
        src/libudev/libudev-queue-private.c
 
-if HAVE_SELINUX
-libudev_private_la_SOURCES +=\
-       src/libudev/libudev-selinux-private.c
-endif
-
 libudev_private_la_CFLAGS = \
        $(AM_CFLAGS) \
-       $(SELINUX_CFLAGS)
        -fvisibility=default
 
 libudev_private_la_LIBADD = \
-       libsystemd-shared.la \
-       $(SELINUX_LIBS)
+       libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 MANPAGES += \
@@ -1451,6 +1449,7 @@ libudev_core_la_CFLAGS = \
 
 libudev_core_la_LIBADD = \
        libudev-private.la \
+       libsystemd-label.la \
        libsystemd-shared.la \
        $(BLKID_LIBS) \
        $(KMOD_LIBS)
@@ -1503,6 +1502,7 @@ test_libudev_SOURCES = \
        src/test/test-libudev.c
 
 test_libudev_LDADD = \
+       libsystemd-label.la \
        libsystemd-shared.la \
        libudev.la
 
@@ -1522,6 +1522,7 @@ test_udev_CPPFLAGS =\
        $(libudev_core_la_CPPFLAGS)
 
 test_udev_LDADD = \
+       libsystemd-label.la \
        libsystemd-shared.la \
        $(BLKID_LIBS) \
        $(KMOD_LIBS) \
@@ -1630,8 +1631,10 @@ dist_udevrules_DATA += \
 
 # ------------------------------------------------------------------------------
 if ENABLE_GUDEV
+if ENABLE_GTK_DOC
 SUBDIRS += \
        docs/gudev
+endif
 
 libgudev_includedir = \
        $(includedir)/gudev-1.0/gudev
@@ -3120,7 +3123,6 @@ systemd-install-data-hook:
                $(LN_S) ../system-services/org.freedesktop.systemd1.service org.freedesktop.systemd1.service )
 if HAVE_PLYMOUTH
        $(MKDIR_P) -m 0755 \
-               $(DESTDIR)$(SYSTEM_SYSVINIT_PATH) \
                $(DESTDIR)$(systemunitdir)/reboot.target.wants \
                $(DESTDIR)$(systemunitdir)/kexec.target.wants \
                $(DESTDIR)$(systemunitdir)/poweroff.target.wants \
@@ -3238,8 +3240,12 @@ DISTCHECK_CONFIGURE_FLAGS = \
        --with-dbusinterfacedir=$$dc_install_base/$(dbusinterfacedir) \
        --with-pamlibdir=$$dc_install_base/$(pamlibdir) \
        --with-rootprefix=$$dc_install_base \
-       --disable-split-usr \
+       --disable-split-usr
+
+if ENABLE_GTK_DOC
+DISTCHECK_CONFIGURE_FLAGS += \
        --enable-gtk-doc
+endif
 
 upload: all distcheck
        cp -v systemd-$(VERSION).tar.xz /home/lennart/git.fedora/systemd/
@@ -3247,9 +3253,11 @@ upload: all distcheck
        scp man/*.html tango:public/systemd-man/
 
 doc-sync: all
-       rsync -av --delete docs/libudev/html/ www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd/libudev/
-       rsync -av --delete docs/gudev/html/ www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd/gudev/
-       rsync -av --delete man/*.html www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd/man/
+       gtkdoc-rebase --html-dir=docs/libudev/html --online
+       rsync -av --delete docs/libudev/html/ --omit-dir-times www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd/libudev/
+       gtkdoc-rebase --html-dir=docs/gudev/html --online
+       rsync -av --delete docs/gudev/html/ --omit-dir-times www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd/gudev/
+       rsync -av --delete-excluded --include="*.html" --exclude="*" --omit-dir-times man/ www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd/man/
 
 git-tag:
        git tag "v$(VERSION)" -m "systemd $(VERSION)"