chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
impot: minor cleanups
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index b368e107e90145b29165e49db8268e71999adb1d..ca5d3ba173e4a62ba78ad312586ea8680a2e0aa6 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-3187,6
+3187,8
@@
libsystemd_network_la_SOURCES = \
src/libsystemd-network/dhcp6-option.c \
src/libsystemd-network/dhcp6-lease-internal.h \
src/libsystemd-network/sd-dhcp6-lease.c \
src/libsystemd-network/dhcp6-option.c \
src/libsystemd-network/dhcp6-lease-internal.h \
src/libsystemd-network/sd-dhcp6-lease.c \
+ src/libsystemd-network/dhcp-identifier.h \
+ src/libsystemd-network/dhcp-identifier.c \
src/libsystemd-network/lldp.h \
src/libsystemd-network/lldp-tlv.h \
src/libsystemd-network/lldp-tlv.c \
src/libsystemd-network/lldp.h \
src/libsystemd-network/lldp-tlv.h \
src/libsystemd-network/lldp-tlv.c \
@@
-3259,7
+3261,9
@@
test_icmp6_rs_SOURCES = \
src/systemd/sd-dhcp6-client.h \
src/systemd/sd-icmp6-nd.h \
src/libsystemd-network/dhcp6-internal.h \
src/systemd/sd-dhcp6-client.h \
src/systemd/sd-icmp6-nd.h \
src/libsystemd-network/dhcp6-internal.h \
- src/libsystemd-network/test-icmp6-rs.c
+ src/libsystemd-network/test-icmp6-rs.c \
+ src/libsystemd-network/dhcp-identifier.h \
+ src/libsystemd-network/dhcp-identifier.c
test_icmp6_rs_LDADD = \
libsystemd-network.la \
test_icmp6_rs_LDADD = \
libsystemd-network.la \
@@
-3269,7
+3273,9
@@
test_icmp6_rs_LDADD = \
test_dhcp6_client_SOURCES = \
src/systemd/sd-dhcp6-client.h \
src/libsystemd-network/dhcp6-internal.h \
test_dhcp6_client_SOURCES = \
src/systemd/sd-dhcp6-client.h \
src/libsystemd-network/dhcp6-internal.h \
- src/libsystemd-network/test-dhcp6-client.c
+ src/libsystemd-network/test-dhcp6-client.c \
+ src/libsystemd-network/dhcp-identifier.h \
+ src/libsystemd-network/dhcp-identifier.c
test_dhcp6_client_LDADD = \
libsystemd-network.la \
test_dhcp6_client_LDADD = \
libsystemd-network.la \
@@
-3773,6
+3779,7
@@
TESTS += \
if HAVE_PYTHON
TESTS += \
test/rule-syntax-check.py \
if HAVE_PYTHON
TESTS += \
test/rule-syntax-check.py \
+ test/sysv-generator-test.py \
$(NULL)
endif
$(NULL)
endif
@@
-3818,7
+3825,10
@@
DISTCLEAN_LOCAL_HOOKS += test-sys-distclean
EXTRA_DIST += \
test/sys.tar.xz \
test/udev-test.pl \
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 = \
# ------------------------------------------------------------------------------
ata_id_SOURCES = \
@@
-5246,6
+5256,7
@@
lib_LTLIBRARIES += \
if HAVE_LIBCURL
if HAVE_XZ
if HAVE_ZLIB
if HAVE_LIBCURL
if HAVE_XZ
if HAVE_ZLIB
+if HAVE_BZIP2
if HAVE_GCRYPT
bin_PROGRAMS += \
if HAVE_GCRYPT
bin_PROGRAMS += \
@@
-5275,7
+5286,9
@@
systemd_import_CFLAGS = \
$(LIBCURL_CFLAGS) \
$(XZ_CFLAGS) \
$(ZLIB_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 \
systemd_import_LDADD = \
libsystemd-internal.la \
@@
-5284,6
+5297,7
@@
systemd_import_LDADD = \
$(LIBCURL_LIBS) \
$(XZ_LIBS) \
$(ZLIB_LIBS) \
$(LIBCURL_LIBS) \
$(XZ_LIBS) \
$(ZLIB_LIBS) \
+ -lbz2 \
$(GCRYPT_LIBS)
manual_tests += \
$(GCRYPT_LIBS)
manual_tests += \
@@
-5303,6
+5317,10
@@
test_qcow2_LDADD = \
libsystemd-label.la \
libsystemd-shared.la \
$(ZLIB_LIBS)
libsystemd-label.la \
libsystemd-shared.la \
$(ZLIB_LIBS)
+
+dist_rootlibexec_DATA = \
+ src/import/import-pubring.gpg
+endif
endif
endif
endif
endif
endif
endif
@@
-6668,3
+6686,9
@@
git-contrib:
EXTRA_DIST += \
tools/gdb-sd_dump_hashmaps.py
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 -