X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=e29439d8cc28c5d619ae2d44584b5912ce0fb4a0;hb=5d66866d96ca7b85b36df99651991b2a1acd2b2e;hp=8e996735ffc7fa423a0fa747bc748ab099a6d45c;hpb=d74ab852161d2dc4093d369495ddfa18460cfd76;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 8e996735f..e29439d8c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -750,7 +750,9 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/ima-util.c \
 	src/shared/ima-util.h \
 	src/shared/ptyfwd.c \
-	src/shared/ptyfwd.h
+	src/shared/ptyfwd.h \
+	src/shared/net-util.c \
+	src/shared/net-util.h
 
 #-------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
@@ -758,11 +760,7 @@ noinst_LTLIBRARIES += \
 
 libsystemd_dbus_la_SOURCES = \
 	src/shared/dbus-common.c \
-	src/shared/dbus-common.h \
-	src/shared/dbus-loop.c \
-	src/shared/dbus-loop.h \
-	src/shared/polkit.c \
-	src/shared/polkit.h
+	src/shared/dbus-common.h
 
 libsystemd_dbus_la_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -2232,6 +2230,7 @@ dist_udevrules_DATA += \
 	rules/99-systemd.rules \
 	rules/42-usb-hid-pm.rules \
 	rules/50-udev-default.rules \
+	rules/60-drm.rules \
 	rules/60-keyboard.rules \
 	rules/60-persistent-storage-tape.rules \
 	rules/60-persistent-serial.rules \
@@ -2328,7 +2327,6 @@ libudev_core_la_SOURCES = \
 	src/udev/udev-builtin-usb_id.c \
 	src/udev/net/link-config.h \
 	src/udev/net/link-config.c \
-	src/udev/net/link-config-parse.c \
 	src/udev/net/ethtool-util.h \
 	src/udev/net/ethtool-util.c
 
@@ -3523,12 +3521,11 @@ hostnamectl_SOURCES = \
 	src/hostname/hostnamectl.c
 
 hostnamectl_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(DBUS_CFLAGS)
+	$(AM_CFLAGS)
 
 hostnamectl_LDADD = \
 	libsystemd-shared.la \
-	libsystemd-dbus.la \
+	libsystemd-bus.la \
 	libsystemd-id128-internal.la
 
 bin_PROGRAMS += \
@@ -3810,16 +3807,15 @@ libsystemd_logind_core_la_SOURCES = \
 	src/login/login-shared.h
 
 libsystemd_logind_core_la_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(DBUS_CFLAGS)
+	$(AM_CFLAGS)
 
 libsystemd_logind_core_la_LIBADD = \
 	libsystemd-label.la \
 	libsystemd-audit.la \
 	libsystemd-shared.la \
 	libsystemd-daemon.la \
-	libsystemd-dbus.la \
 	libsystemd-id128-internal.la \
+	libsystemd-bus.la \
 	libudev.la
 
 if HAVE_ACL