selinux: unify systemd and udev code

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 90c225ec01ddd90bed03dfd792b86ddf7c59994f..13c4ed1699b6fee05fa7bf133d9467a7d66c9ecf 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1337,23 +1337,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 +1443,7 @@ libudev_core_la_CFLAGS = \
 
 libudev_core_la_LIBADD = \
        libudev-private.la \
+       libsystemd-label.la \
        libsystemd-shared.la \
        $(BLKID_LIBS) \
        $(KMOD_LIBS)
@@ -1503,6 +1496,7 @@ test_libudev_SOURCES = \
        src/test/test-libudev.c
 
 test_libudev_LDADD = \
+       libsystemd-label.la \
        libsystemd-shared.la \
        libudev.la
 
@@ -1522,6 +1516,7 @@ test_udev_CPPFLAGS =\
        $(libudev_core_la_CPPFLAGS)
 
 test_udev_LDADD = \
+       libsystemd-label.la \
        libsystemd-shared.la \
        $(BLKID_LIBS) \
        $(KMOD_LIBS) \
@@ -3249,7 +3244,7 @@ upload: all distcheck
 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/
+       rsync -av man/*.html www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd/man/
 
 git-tag:
        git tag "v$(VERSION)" -m "systemd $(VERSION)"