build-sys: libudev - get rid of the needless selinux linking (again)

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index e5cd7a5ed8262297d813de4a2b1ceb2bc18b3051..76d1eeb3935474c9127ee8e1d7639fd8da92fd22 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -647,6 +647,7 @@ libsystemd_shared_la_SOURCES = \
        src/shared/sparse-endian.h \
        src/shared/util.c \
        src/shared/util.h \
        src/shared/sparse-endian.h \
        src/shared/util.c \
        src/shared/util.h \

+       src/shared/udev-util.h \

        src/shared/virt.c \
        src/shared/virt.h \
        src/shared/efivars.c \
        src/shared/virt.c \
        src/shared/virt.h \
        src/shared/efivars.c \


@@ -683,6 +684,8 @@ libsystemd_shared_la_SOURCES = \
        src/shared/exit-status.h \
        src/shared/utf8.c \
        src/shared/utf8.h \
        src/shared/exit-status.h \
        src/shared/utf8.c \
        src/shared/utf8.h \

+       src/shared/gunicode.c \
+       src/shared/gunicode.h \

        src/shared/pager.c \
        src/shared/pager.h \
        src/shared/ioprio.h \
        src/shared/pager.c \
        src/shared/pager.h \
        src/shared/ioprio.h \


@@ -1135,6 +1138,7 @@ tests += \
        test-unit-name \
        test-unit-file \
        test-utf8 \
        test-unit-name \
        test-unit-file \
        test-utf8 \

+       test-ellipsize \

        test-util \
        test-date \
        test-sleep \
        test-util \
        test-date \
        test-sleep \


@@ -1325,6 +1329,12 @@ test_log_SOURCES = \
 test_log_LDADD = \
        libsystemd-core.la
 
 test_log_LDADD = \
        libsystemd-core.la
 

+test_ellipsize_SOURCES = \
+       src/test/test-ellipsize.c
+
+test_ellipsize_LDADD = \
+       libsystemd-core.la
+

 test_date_SOURCES = \
        src/test/test-date.c
 
 test_date_SOURCES = \
        src/test/test-date.c
 


@@ -2188,9 +2198,7 @@ libudev_la_LDFLAGS = \
 
 libudev_la_LIBADD = \
        libsystemd-shared.la \
 
 libudev_la_LIBADD = \
        libsystemd-shared.la \

-       libsystemd-label.la \

        libsystemd-daemon-internal.la \
        libsystemd-daemon-internal.la \

-       $(RT_LIBS) \

        libsystemd-id128-internal.la
 
 pkgconfiglib_DATA += \
        libsystemd-id128-internal.la
 
 pkgconfiglib_DATA += \


@@ -2362,7 +2370,6 @@ libudev_core_la_LIBADD = \
        libudev-private.la \
        libsystemd-label.la \
        libsystemd-daemon-internal.la \
        libudev-private.la \
        libsystemd-label.la \
        libsystemd-daemon-internal.la \

-       $(RT_LIBS) \

        libsystemd-shared.la \
        $(BLKID_LIBS) \
        $(KMOD_LIBS)
        libsystemd-shared.la \
        $(BLKID_LIBS) \
        $(KMOD_LIBS)


@@ -2424,6 +2431,7 @@ udevadm_SOURCES = \
 
 udevadm_LDADD = \
        libudev-core.la \
 
 udevadm_LDADD = \
        libudev-core.la \

+       libsystemd-label.la \

        libsystemd-shared.la
 
 # Update hwdb on installation. Do not bother if installing
        libsystemd-shared.la
 
 # Update hwdb on installation. Do not bother if installing


@@ -2751,7 +2759,6 @@ libsystemd_id128_la_LDFLAGS = \
 
 libsystemd_id128_la_LIBADD = \
        libsystemd-shared.la \
 
 libsystemd_id128_la_LIBADD = \
        libsystemd-shared.la \

-       libsystemd-label.la \

        libsystemd-daemon-internal.la \
        $(RT_LIBS)
 
        libsystemd-daemon-internal.la \
        $(RT_LIBS)
 


@@ -3003,7 +3010,6 @@ libsystemd_journal_internal_la_CFLAGS = \
        $(AM_CFLAGS)
 
 libsystemd_journal_internal_la_LIBADD = \
        $(AM_CFLAGS)
 
 libsystemd_journal_internal_la_LIBADD = \

-       libsystemd-label.la \

        libsystemd-audit.la \
        libsystemd-daemon.la \
        libudev.la \
        libsystemd-audit.la \
        libsystemd-daemon.la \
        libudev.la \


@@ -3423,6 +3429,26 @@ endif
 EXTRA_DIST += \
        units/systemd-backlight@.service.in
 
 EXTRA_DIST += \
        units/systemd-backlight@.service.in
 

+# ------------------------------------------------------------------------------
+if ENABLE_RFKILL
+rootlibexec_PROGRAMS += \
+       systemd-rfkill
+
+nodist_systemunit_DATA += \
+       units/systemd-rfkill@.service
+
+systemd_rfkill_SOURCES = \
+       src/rfkill/rfkill.c
+
+systemd_rfkill_LDADD = \
+       libsystemd-label.la \
+       libsystemd-shared.la \
+       libudev-private.la
+endif
+
+EXTRA_DIST += \
+       units/systemd-rfkill@.service.in
+

 # ------------------------------------------------------------------------------
 if HAVE_LIBCRYPTSETUP
 rootlibexec_PROGRAMS += \
 # ------------------------------------------------------------------------------
 if HAVE_LIBCRYPTSETUP
 rootlibexec_PROGRAMS += \