nspawn: work around kernel bug with partition table probing on loopback devices

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f5cb290d7fc40a0a9cf86c557377645fb235883a..b6a4e3e4e5477bc766974c41fae3a6260a429c53 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -149,6 +149,7 @@ check_DATA =
 tests=
 manual_tests =
 if ENABLE_TESTS
+export PYTHON
 noinst_PROGRAMS = $(manual_tests) $(tests)
 TESTS = $(tests)
 else
@@ -2692,6 +2693,10 @@ libsystemd_proxy_la_SOURCES = \
        src/bus-proxyd/synthesize.c \
        src/bus-proxyd/synthesize.h
 
+libsystemd_proxy_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       -pthread
+
 libsystemd_proxy_la_LIBADD = \
        libsystemd-internal.la \
        libsystemd-shared.la
@@ -5233,6 +5238,9 @@ lib_LTLIBRARIES += \
        libnss_mymachines.la
 
 if HAVE_LIBCURL
+if HAVE_XZ
+if HAVE_ZLIB
+if HAVE_GCRYPT
 
 bin_PROGRAMS += \
        systemd-import
@@ -5241,8 +5249,14 @@ systemd_import_SOURCES = \
        src/import/import.c \
        src/import/import-raw.c \
        src/import/import-raw.h \
+       src/import/import-tar.c \
+       src/import/import-tar.h \
        src/import/import-dkr.c \
        src/import/import-dkr.h \
+       src/import/import-job.c \
+       src/import/import-job.h \
+       src/import/import-util.c \
+       src/import/import-util.h \
        src/import/curl-util.c \
        src/import/curl-util.h \
        src/import/aufs-util.c \
@@ -5254,7 +5268,8 @@ systemd_import_CFLAGS = \
        $(AM_CFLAGS) \
        $(LIBCURL_CFLAGS) \
        $(XZ_CFLAGS) \
-       $(ZLIB_CFLAGS)
+       $(ZLIB_CFLAGS) \
+       $(GCRYPT_CFLAGS)
 
 systemd_import_LDADD = \
        libsystemd-internal.la \
@@ -5262,11 +5277,9 @@ systemd_import_LDADD = \
        libsystemd-shared.la \
        $(LIBCURL_LIBS) \
        $(XZ_LIBS) \
-       $(ZLIB_LIBS)
-
-endif
+       $(ZLIB_LIBS) \
+       $(GCRYPT_LIBS)
 
-if HAVE_ZLIB
 manual_tests += \
        test-qcow2
 
@@ -5281,9 +5294,13 @@ test_qcow2_CFLAGS = \
 
 test_qcow2_LDADD = \
        libsystemd-internal.la \
+       libsystemd-label.la \
        libsystemd-shared.la \
        $(ZLIB_LIBS)
 endif
+endif
+endif
+endif
 
 endif
 
@@ -5476,6 +5493,7 @@ libsystemd_networkd_core_la_SOURCES = \
        src/network/networkd-netdev-vxlan.h \
        src/network/networkd-netdev-vlan.h \
        src/network/networkd-netdev-macvlan.h \
+       src/network/networkd-netdev-ipvlan.h \
        src/network/networkd-netdev-dummy.h \
        src/network/networkd-netdev-tuntap.h \
        src/network/networkd-netdev-bond.h \
@@ -5486,6 +5504,7 @@ libsystemd_networkd_core_la_SOURCES = \
        src/network/networkd-netdev-vxlan.c \
        src/network/networkd-netdev-vlan.c \
        src/network/networkd-netdev-macvlan.c \
+       src/network/networkd-netdev-ipvlan.c \
        src/network/networkd-netdev-dummy.c \
        src/network/networkd-netdev-tuntap.c \
        src/network/networkd-netdev-bond.c \