X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=21097bf6ba2b53bdde6f40ddfedb35397153f897;hp=89f3af89f5dc199ccda040e55bbeaceb5f948cd0;hb=92ff080be100aff15f292e2631921131c610afe7;hpb=901992209e3c87a4cf06b530d7b26ae2d35680ef

diff --git a/Makefile.am b/Makefile.am
index 89f3af89f..21097bf6b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -74,7 +74,6 @@ dbussessionservicedir=@dbussessionservicedir@
 dbussystemservicedir=@dbussystemservicedir@
 pamlibdir=@pamlibdir@
 pamconfdir=@pamconfdir@
-pkgconfigdatadir=$(datadir)/pkgconfig
 pkgconfiglibdir=$(libdir)/pkgconfig
 polkitpolicydir=$(datadir)/polkit-1/actions
 bashcompletiondir=@bashcompletiondir@
@@ -506,7 +505,8 @@ dist_systemunit_DATA = \
 	units/systemd-udevd-control.socket \
 	units/systemd-udevd-kernel.socket \
 	units/system-update.target \
-	units/initrd-switch-root.target
+	units/initrd-switch-root.target \
+	units/machines.target
 
 if ENABLE_KDBUS
 dist_systemunit_DATA += \
@@ -896,8 +896,13 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/nss-util.h \
 	src/shared/btrfs-util.c \
 	src/shared/btrfs-util.h \
+	src/shared/btrfs-ctree.h \
 	src/shared/verbs.c \
 	src/shared/verbs.h \
+	src/shared/machine-image.c \
+	src/shared/machine-image.h \
+	src/shared/sigbus.c \
+	src/shared/sigbus.h \
 	src/shared/build.h
 
 if HAVE_UTMP
@@ -1299,7 +1304,7 @@ dist_dbussystemservice_DATA += \
 polkitpolicy_in_in_files += \
 	src/core/org.freedesktop.systemd1.policy.in.in
 
-pkgconfigdata_DATA = \
+pkgconfiglib_DATA += \
 	src/core/systemd.pc
 
 nodist_rpmmacros_DATA = \
@@ -1383,7 +1388,8 @@ tests += \
 	test-locale-util \
 	test-execute \
 	test-copy \
-	test-cap-list
+	test-cap-list \
+	test-sigbus
 
 EXTRA_DIST += \
 	test/a.service \
@@ -1577,6 +1583,12 @@ test_copy_SOURCES = \
 test_copy_LDADD = \
 	libsystemd-shared.la
 
+test_sigbus_SOURCES = \
+	src/test/test-sigbus.c
+
+test_sigbus_LDADD = \
+	libsystemd-shared.la
+
 test_condition_SOURCES = \
 	src/test/test-condition.c
 
@@ -3054,6 +3066,7 @@ libsystemd_network_la_SOURCES = \
 	src/systemd/sd-dhcp6-client.h \
 	src/systemd/sd-dhcp6-lease.h \
 	src/systemd/sd-pppoe.h \
+	src/systemd/sd-lldp.h \
 	src/libsystemd-network/sd-dhcp-client.c \
 	src/libsystemd-network/sd-dhcp-server.c \
 	src/libsystemd-network/dhcp-network.c \
@@ -3089,7 +3102,6 @@ libsystemd_network_la_SOURCES = \
 	src/libsystemd-network/lldp-internal.h \
 	src/libsystemd-network/lldp-internal.c \
 	src/libsystemd-network/lldp-util.h \
-	src/libsystemd-network/sd-lldp.h \
 	src/libsystemd-network/sd-lldp.c
 
 libsystemd_network_la_LIBADD = \
@@ -3766,7 +3778,8 @@ v4l_id_SOURCES = \
 	src/udev/v4l_id/v4l_id.c
 
 v4l_id_LDADD = \
-	libudev-internal.la
+	libudev-internal.la \
+	libsystemd-shared.la
 
 udevlibexec_PROGRAMS += \
 	v4l_id
@@ -5038,11 +5051,11 @@ rootlibexec_PROGRAMS += \
 libsystemd_machine_core_la_SOURCES = \
 	src/machine/machine.c \
 	src/machine/machine.h \
-	src/machine/image.c \
-	src/machine/image.h \
 	src/machine/machined-dbus.c \
 	src/machine/machine-dbus.c \
-	src/machine/image-dbus.c
+	src/machine/machine-dbus.h \
+	src/machine/image-dbus.c \
+	src/machine/image-dbus.h
 
 libsystemd_machine_core_la_LIBADD = \
 	libsystemd-label.la \
@@ -6079,7 +6092,6 @@ EXTRA_DIST += \
 CLEANFILES += \
 	$(nodist_systemunit_DATA) \
 	$(nodist_userunit_DATA) \
-	$(pkgconfigdata_DATA) \
 	$(pkgconfiglib_DATA) \
 	$(nodist_polkitpolicy_DATA)