chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build-sys: add libsystemd-fw where needed
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 4fa454ed95bfcd96a475474b426ca1f5ac3edc40..7806a07e568503a3c9b5e03e3a08db9eff0e60ca 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
@@
-3518,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 \
@@
-3602,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 \
@@
-5520,6
+5524,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