X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=e79756e30baec81c62fb7c6d02ee0cefd5485106;hp=3ab14753aca801fc6bea588bb2787ed412af62c8;hb=eb2059d897dbf2c5e4bc97fb950e8e5defa72f13;hpb=c2756a68401102786be343712c0c35acbd73d28d

diff --git a/Makefile.am b/Makefile.am
index 3ab14753a..e79756e30 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -850,6 +850,8 @@ libsystemd_core_la_SOURCES = \
 	src/core/path.h \
 	src/core/slice.c \
 	src/core/slice.h \
+	src/core/scope.c \
+	src/core/scope.h \
 	src/core/load-dropin.c \
 	src/core/load-dropin.h \
 	src/core/execute.c \
@@ -886,6 +888,8 @@ libsystemd_core_la_SOURCES = \
 	src/core/dbus-path.h \
 	src/core/dbus-slice.c \
 	src/core/dbus-slice.h \
+	src/core/dbus-scope.c \
+	src/core/dbus-scope.h \
 	src/core/dbus-execute.c \
 	src/core/dbus-execute.h \
 	src/core/dbus-kill.c \
@@ -1999,6 +2003,7 @@ libudev_la_LDFLAGS = \
 
 libudev_la_LIBADD = \
 	libsystemd-shared.la \
+	libsystemd-label.la \
 	libsystemd-daemon-internal.la \
 	libsystemd-id128-internal.la
 
@@ -2586,7 +2591,6 @@ dist_udevkeymap_DATA = \
 	keymaps/medion-fid2060 \
 	keymaps/medionnb-a555 \
 	keymaps/micro-star \
-	keymaps/module-asus-w3j \
 	keymaps/module-ibm \
 	keymaps/module-lenovo \
 	keymaps/module-sony \
@@ -2598,6 +2602,7 @@ dist_udevkeymap_DATA = \
 	keymaps/oqo-model2 \
 	keymaps/samsung-other \
 	keymaps/samsung-series-9 \
+	keymaps/samsung-series-3 \
 	keymaps/samsung-sq1us \
 	keymaps/samsung-sx20s \
 	keymaps/toshiba-satellite_a100 \
@@ -2612,6 +2617,7 @@ dist_udevkeymapforcerel_DATA = \
 	keymaps-force-release/hp-other \
 	keymaps-force-release/samsung-other \
 	keymaps-force-release/samsung-series-9 \
+	keymaps-force-release/samsung-series-3 \
 	keymaps-force-release/common-volume-keys
 
 src/udev/keymap/keys.txt: Makefile
@@ -2662,6 +2668,7 @@ libsystemd_id128_la_LDFLAGS = \
 
 libsystemd_id128_la_LIBADD = \
 	libsystemd-shared.la \
+	libsystemd-label.la \
 	libsystemd-daemon-internal.la
 
 libsystemd_id128_internal_la_SOURCES = \