X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=4bbe69ebafd181820f6dcff7f980ce1443e88d7b;hp=00218b77ba59902a7bafc2689b667e4b79ed968c;hb=c0395aeb903cde25bd9e81fba3334f63335fe0ef;hpb=6d0b55c272ea31d025e8b3c311cea8cda0bfefd7

diff --git a/Makefile.am b/Makefile.am
index 00218b77b..4bbe69eba 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1352,8 +1352,12 @@ manual_tests += \
 	test-watchdog \
 	test-log \
 	test-ipcrm \
-	test-btrfs \
+	test-btrfs
+
+if HAVE_LIBIPTC
+manual_tests += \
 	test-fw-util
+endif
 
 if HAVE_KMOD
 manual_tests += \
@@ -1834,6 +1838,7 @@ test_btrfs_LDADD = \
 	libsystemd-label.la \
 	libsystemd-shared.la
 
+if HAVE_LIBIPTC
 test_fw_util_SOURCES = \
 	src/test/test-fw-util.c
 
@@ -1845,6 +1850,7 @@ test_fw_util_LDADD = \
 	libsystemd-fw.la \
 	libsystemd-shared.la \
 	$(LIBIPTC_LIBS)
+endif
 
 test_rtnl_manual_SOURCES = \
 	src/test/test-rtnl-manual.c
@@ -2676,7 +2682,13 @@ systemd_run_LDADD = \
 systemd_bus_proxyd_SOURCES = \
 	src/bus-proxyd/bus-proxyd.c \
 	src/bus-proxyd/bus-xml-policy.c \
-	src/bus-proxyd/bus-xml-policy.h
+	src/bus-proxyd/bus-xml-policy.h \
+	src/bus-proxyd/driver.c \
+	src/bus-proxyd/driver.h \
+	src/bus-proxyd/proxy.c \
+	src/bus-proxyd/proxy.h \
+	src/bus-proxyd/synthesize.c \
+	src/bus-proxyd/synthesize.h
 
 systemd_bus_proxyd_LDADD = \
 	libsystemd-internal.la \
@@ -3514,7 +3526,6 @@ dist_udevrules_DATA += \
 	rules/42-usb-hid-pm.rules \
 	rules/50-udev-default.rules \
 	rules/60-drm.rules \
-	rules/60-evdev_id.rules \
 	rules/60-keyboard.rules \
 	rules/70-mouse.rules \
 	rules/60-persistent-storage-tape.rules \
@@ -3598,7 +3609,6 @@ libudev_core_la_SOURCES = \
 	src/udev/udev-builtin.c \
 	src/udev/udev-builtin-btrfs.c \
 	src/udev/udev-builtin-hwdb.c \
-	src/udev/udev-builtin-evdev_id.c \
 	src/udev/udev-builtin-input_id.c \
 	src/udev/udev-builtin-keyboard.c \
 	src/udev/udev-builtin-net_id.c \
@@ -5218,24 +5228,50 @@ bin_PROGRAMS += \
 
 systemd_import_SOURCES = \
 	src/import/import.c \
-	src/import/import-gpt.c \
-	src/import/import-gpt.h \
+	src/import/import-raw.c \
+	src/import/import-raw.h \
 	src/import/import-dkr.c \
 	src/import/import-dkr.h \
 	src/import/curl-util.c \
 	src/import/curl-util.h \
 	src/import/aufs-util.c \
-	src/import/aufs-util.h
+	src/import/aufs-util.h \
+	src/import/qcow2-util.c \
+	src/import/qcow2-util.h
 
 systemd_import_CFLAGS = \
 	$(AM_CFLAGS) \
-	$(LIBCURL_CFLAGS)
+	$(LIBCURL_CFLAGS) \
+	$(XZ_CFLAGS) \
+	$(ZLIB_CFLAGS)
 
 systemd_import_LDADD = \
 	libsystemd-internal.la \
 	libsystemd-label.la \
 	libsystemd-shared.la \
-	$(LIBCURL_LIBS)
+	$(LIBCURL_LIBS) \
+	$(XZ_LIBS) \
+	$(ZLIB_LIBS)
+
+endif
+
+if HAVE_ZLIB
+manual_tests += \
+	test-qcow2
+
+test_qcow2_SOURCES = \
+	src/import/test-qcow2.c \
+	src/import/qcow2-util.c \
+	src/import/qcow2-util.h
+
+test_qcow2_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(ZLIB_CFLAGS)
+
+test_qcow2_LDADD = \
+	libsystemd-internal.la \
+	libsystemd-shared.la \
+	$(ZLIB_LIBS)
 endif
 
 endif
@@ -5516,6 +5552,11 @@ test_network_tables_LDADD = \
 	libsystemd-networkd-core.la \
 	libudev-core.la
 
+if HAVE_LIBIPTC
+test_network_tables_LDADD += \
+	libsystemd-fw.la
+endif
+
 tests += \
 	test-network \
 	test-network-tables