X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=406910a3c2ff3561c5eb495b5d7029f7fc25e48c;hb=e28aa588f04ace17ca94e9e0667819bea265fbd9;hp=b6a4e3e4e5477bc766974c41fae3a6260a429c53;hpb=85dbc41dc67ff49fd8a843dbac5b8b5cb0b61155;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index b6a4e3e4e..406910a3c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -148,8 +148,9 @@ check_PROGRAMS =
 check_DATA =
 tests=
 manual_tests =
+TEST_EXTENSIONS = .py
+PY_LOG_COMPILER = $(PYTHON)
 if ENABLE_TESTS
-export PYTHON
 noinst_PROGRAMS = $(manual_tests) $(tests)
 TESTS = $(tests)
 else
@@ -3767,7 +3768,14 @@ endif
 # ------------------------------------------------------------------------------
 TESTS += \
 	test/udev-test.pl \
-	test/rules-test.sh
+	$(NULL)
+
+if HAVE_PYTHON
+TESTS += \
+	test/rule-syntax-check.py \
+	test/sysv-generator-test.py \
+	$(NULL)
+endif
 
 manual_tests += \
 	test-libudev \
@@ -3811,8 +3819,10 @@ DISTCLEAN_LOCAL_HOOKS += test-sys-distclean
 EXTRA_DIST += \
 	test/sys.tar.xz \
 	test/udev-test.pl \
-	test/rules-test.sh \
-	test/rule-syntax-check.py
+	test/rule-syntax-check.py \
+	test/sysv-generator-test.py \
+	$(NULL)
+
 
 # ------------------------------------------------------------------------------
 ata_id_SOURCES = \
@@ -5269,7 +5279,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 \
@@ -5297,6 +5309,9 @@ test_qcow2_LDADD = \
 	libsystemd-label.la \
 	libsystemd-shared.la \
 	$(ZLIB_LIBS)
+
+dist_rootlibexec_DATA = \
+	src/import/import-pubring.gpg
 endif
 endif
 endif
@@ -6662,3 +6677,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 -