X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=76d1eeb3935474c9127ee8e1d7639fd8da92fd22;hb=9cada1952a371e1b74b5e4bcae020ca1e88fdec8;hp=fcdb69fd17cfef570cc8f48dd204c35369912336;hpb=f405e86de361ec305dc2b8634efeaa23dc144053;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index fcdb69fd1..76d1eeb39 100644
--- 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/udev-util.h \
 	src/shared/virt.c \
 	src/shared/virt.h \
 	src/shared/efivars.c \
@@ -1137,6 +1138,7 @@ tests += \
 	test-unit-name \
 	test-unit-file \
 	test-utf8 \
+	test-ellipsize \
 	test-util \
 	test-date \
 	test-sleep \
@@ -1327,6 +1329,12 @@ test_log_SOURCES = \
 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
 
@@ -2190,9 +2198,7 @@ libudev_la_LDFLAGS = \
 
 libudev_la_LIBADD = \
 	libsystemd-shared.la \
-	libsystemd-label.la \
 	libsystemd-daemon-internal.la \
-	$(RT_LIBS) \
 	libsystemd-id128-internal.la
 
 pkgconfiglib_DATA += \
@@ -2364,7 +2370,6 @@ libudev_core_la_LIBADD = \
 	libudev-private.la \
 	libsystemd-label.la \
 	libsystemd-daemon-internal.la \
-	$(RT_LIBS) \
 	libsystemd-shared.la \
 	$(BLKID_LIBS) \
 	$(KMOD_LIBS)
@@ -2426,6 +2431,7 @@ udevadm_SOURCES = \
 
 udevadm_LDADD = \
 	libudev-core.la \
+	libsystemd-label.la \
 	libsystemd-shared.la
 
 # Update hwdb on installation. Do not bother if installing
@@ -2753,7 +2759,6 @@ libsystemd_id128_la_LDFLAGS = \
 
 libsystemd_id128_la_LIBADD = \
 	libsystemd-shared.la \
-	libsystemd-label.la \
 	libsystemd-daemon-internal.la \
 	$(RT_LIBS)
 
@@ -3005,7 +3010,6 @@ libsystemd_journal_internal_la_CFLAGS = \
 	$(AM_CFLAGS)
 
 libsystemd_journal_internal_la_LIBADD = \
-	libsystemd-label.la \
 	libsystemd-audit.la \
 	libsystemd-daemon.la \
 	libudev.la \
@@ -3425,6 +3429,26 @@ endif
 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 += \