chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
import: support importing qcow2 images
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 2d45a7b6c57f54380296803f4e6e4f5f7bf4c3ee..f91c78658d12c064f77f3feae55cda97a0462618 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-982,6
+982,24
@@
libsystemd_label_la_LIBADD = \
# -----------------------------------------------------------------------------
# -----------------------------------------------------------------------------
+if HAVE_LIBIPTC
+noinst_LTLIBRARIES += \
+ libsystemd-fw.la
+
+libsystemd_fw_la_SOURCES = \
+ src/shared/fw-util.h \
+ src/shared/fw-util.c
+
+libsystemd_fw_la_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(LIBIPTC_CFLAGS)
+
+libsystemd_fw_la_LIBADD = \
+ $(LIBIPTC_LIBS)
+endif
+
+# -----------------------------------------------------------------------------
+
if ENABLE_LDCONFIG
dist_systemunit_DATA += \
units/ldconfig.service
if ENABLE_LDCONFIG
dist_systemunit_DATA += \
units/ldconfig.service
@@
-1336,6
+1354,11
@@
manual_tests += \
test-ipcrm \
test-btrfs
test-ipcrm \
test-btrfs
+if HAVE_LIBIPTC
+manual_tests += \
+ test-fw-util
+endif
+
if HAVE_KMOD
manual_tests += \
test-rtnl-manual
if HAVE_KMOD
manual_tests += \
test-rtnl-manual
@@
-1815,6
+1838,20
@@
test_btrfs_LDADD = \
libsystemd-label.la \
libsystemd-shared.la
libsystemd-label.la \
libsystemd-shared.la
+if HAVE_LIBIPTC
+test_fw_util_SOURCES = \
+ src/test/test-fw-util.c
+
+test_fw_util_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(LIBIPTC_CFLAGS)
+
+test_fw_util_LDADD = \
+ libsystemd-fw.la \
+ libsystemd-shared.la \
+ $(LIBIPTC_LIBS)
+endif
+
test_rtnl_manual_SOURCES = \
src/test/test-rtnl-manual.c
test_rtnl_manual_SOURCES = \
src/test/test-rtnl-manual.c
@@
-2627,6
+2664,11
@@
systemd_nspawn_LDADD += \
$(SECCOMP_LIBS)
endif
$(SECCOMP_LIBS)
endif
+if HAVE_LIBIPTC
+systemd_nspawn_LDADD += \
+ libsystemd-fw.la
+endif
+
# ------------------------------------------------------------------------------
systemd_run_SOURCES = \
src/run/run.c
# ------------------------------------------------------------------------------
systemd_run_SOURCES = \
src/run/run.c
@@
-2640,7
+2682,11
@@
systemd_run_LDADD = \
systemd_bus_proxyd_SOURCES = \
src/bus-proxyd/bus-proxyd.c \
src/bus-proxyd/bus-xml-policy.c \
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/synthesize.c \
+ src/bus-proxyd/synthesize.h
systemd_bus_proxyd_LDADD = \
libsystemd-internal.la \
systemd_bus_proxyd_LDADD = \
libsystemd-internal.la \
@@
-5180,24
+5226,50
@@
bin_PROGRAMS += \
systemd_import_SOURCES = \
src/import/import.c \
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/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) \
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 \
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
endif
endif
@@
-5370,6
+5442,11
@@
systemd_networkd_SOURCES = \
systemd_networkd_LDADD = \
libsystemd-networkd-core.la
systemd_networkd_LDADD = \
libsystemd-networkd-core.la
+if HAVE_LIBIPTC
+systemd_networkd_LDADD += \
+ libsystemd-fw.la
+endif
+
noinst_LTLIBRARIES += \
libsystemd-networkd-core.la
noinst_LTLIBRARIES += \
libsystemd-networkd-core.la
@@
-5460,6
+5537,11
@@
test_network_SOURCES = \
test_network_LDADD = \
libsystemd-networkd-core.la
test_network_LDADD = \
libsystemd-networkd-core.la
+if HAVE_LIBIPTC
+test_network_LDADD += \
+ libsystemd-fw.la
+endif
+
test_network_tables_SOURCES = \
src/network/test-network-tables.c \
src/shared/test-tables.h
test_network_tables_SOURCES = \
src/network/test-network-tables.c \
src/shared/test-tables.h
@@
-5468,6
+5550,11
@@
test_network_tables_LDADD = \
libsystemd-networkd-core.la \
libudev-core.la
libsystemd-networkd-core.la \
libudev-core.la
+if HAVE_LIBIPTC
+test_network_tables_LDADD += \
+ libsystemd-fw.la
+endif
+
tests += \
test-network \
test-network-tables
tests += \
test-network \
test-network-tables