build-sys: add missing HAVE_LIBIPTC

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 9d07a2b6eb2c33faaa5a6c2fef9a6a4eadd6240b..f69fc2ecbec40d93053b0afa2d129c2cbd55a1e2 100644 (file)
--- 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
@@ -2658,6 +2664,11 @@ systemd_nspawn_LDADD += \
        $(SECCOMP_LIBS)
 endif
 
+if HAVE_LIBIPTC
+systemd_nspawn_LDADD += \
+       libsystemd-fw.la
+endif
+
 # ------------------------------------------------------------------------------
 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 \
-       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 \
@@ -3509,7 +3524,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 \
@@ -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-evdev_id.c \
        src/udev/udev-builtin-input_id.c \
        src/udev/udev-builtin-keyboard.c \
        src/udev/udev-builtin-net_id.c \
@@ -5213,8 +5226,8 @@ 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 \