network: dhcp - split out the duid structure into a new header file

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b368e107e90145b29165e49db8268e71999adb1d..4f536ee4147e29a5903939e489d01f24f3e4a0f9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -3773,6 +3773,7 @@ TESTS += \
 if HAVE_PYTHON
 TESTS += \
        test/rule-syntax-check.py \
+       test/sysv-generator-test.py \
        $(NULL)
 endif
 
@@ -3818,7 +3819,10 @@ DISTCLEAN_LOCAL_HOOKS += test-sys-distclean
 EXTRA_DIST += \
        test/sys.tar.xz \
        test/udev-test.pl \
-       test/rule-syntax-check.py
+       test/rule-syntax-check.py \
+       test/sysv-generator-test.py \
+       $(NULL)
+
 
 # ------------------------------------------------------------------------------
 ata_id_SOURCES = \
@@ -5246,6 +5250,7 @@ lib_LTLIBRARIES += \
 if HAVE_LIBCURL
 if HAVE_XZ
 if HAVE_ZLIB
+if HAVE_BZIP2
 if HAVE_GCRYPT
 
 bin_PROGRAMS += \
@@ -5275,7 +5280,9 @@ systemd_import_CFLAGS = \
        $(LIBCURL_CFLAGS) \
        $(XZ_CFLAGS) \
        $(ZLIB_CFLAGS) \
-       $(GCRYPT_CFLAGS)
+       $(GCRYPT_CFLAGS) \
+       -D VENDOR_KEYRING_PATH=\"$(rootlibexecdir)/import-pubring.gpg\" \
+       -D USER_KEYRING_PATH=\"$(pkgsysconfdir)/import-pubring.gpg\"
 
 systemd_import_LDADD = \
        libsystemd-internal.la \
@@ -5284,6 +5291,7 @@ systemd_import_LDADD = \
        $(LIBCURL_LIBS) \
        $(XZ_LIBS) \
        $(ZLIB_LIBS) \
+       -lbz2 \
        $(GCRYPT_LIBS)
 
 manual_tests += \
@@ -5303,6 +5311,10 @@ test_qcow2_LDADD = \
        libsystemd-label.la \
        libsystemd-shared.la \
        $(ZLIB_LIBS)
+
+dist_rootlibexec_DATA = \
+       src/import/import-pubring.gpg
+endif
 endif
 endif
 endif
@@ -6668,3 +6680,9 @@ git-contrib:
 
 EXTRA_DIST += \
         tools/gdb-sd_dump_hashmaps.py
+
+list-keys:
+       gpg --verbose --no-options --no-default-keyring --no-auto-key-locate --batch --trust-model=always --keyring=$(srcdir)/src/import/import-pubring.gpg --list-keys
+
+add-key:
+       gpg --verbose --no-options --no-default-keyring --no-auto-key-locate --batch --trust-model=always --keyring=$(srcdir)/src/import/import-pubring.gpg --import -