chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus-proxy: refactor bus-creation
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 9d07a2b6eb2c33faaa5a6c2fef9a6a4eadd6240b..f91c78658d12c064f77f3feae55cda97a0462618 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-1352,8
+1352,12
@@
manual_tests += \
test-watchdog \
test-log \
test-ipcrm \
test-watchdog \
test-log \
test-ipcrm \
- test-btrfs \
+ test-btrfs
+
+if HAVE_LIBIPTC
+manual_tests += \
test-fw-util
test-fw-util
+endif
if HAVE_KMOD
manual_tests += \
if HAVE_KMOD
manual_tests += \
@@
-1834,6
+1838,7
@@
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_SOURCES = \
src/test/test-fw-util.c
@@
-1845,6
+1850,7
@@
test_fw_util_LDADD = \
libsystemd-fw.la \
libsystemd-shared.la \
$(LIBIPTC_LIBS)
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
@@
-2658,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
@@
-2671,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 \
@@
-3509,7
+3524,6
@@
dist_udevrules_DATA += \
rules/42-usb-hid-pm.rules \
rules/50-udev-default.rules \
rules/60-drm.rules \
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 \
rules/60-keyboard.rules \
rules/70-mouse.rules \
rules/60-persistent-storage-tape.rules \
@@
-3593,7
+3607,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.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 \
src/udev/udev-builtin-input_id.c \
src/udev/udev-builtin-keyboard.c \
src/udev/udev-builtin-net_id.c \
@@
-5213,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
@@
-5511,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