diff options
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | src/grp-resolve/libbasic-dns/Makefile | 3 | ||||
| -rw-r--r-- | src/grp-resolve/libbasic-dns/src/Makefile | 72 | ||||
| -rw-r--r-- | src/grp-resolve/libbasic-dns/test/Makefile | 71 | ||||
| -rw-r--r-- | src/libsystemd-firewall/src/Makefile | 6 | ||||
| -rw-r--r-- | src/libsystemd-shared/src/Makefile | 18 | ||||
| -rwxr-xr-x | tools/notsd-move | 10 |
7 files changed, 94 insertions, 91 deletions
diff --git a/Makefile.am b/Makefile.am index 8154394e84..09beac93d3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5650,7 +5650,7 @@ dist_bashcompletion_data += \ dist_zshcompletion_data += \ shell-completion/zsh/_systemd-resolve -#@src/grp-resolve/libbasic-dns/src/Makefile +#@src/grp-resolve/libbasic-dns/test/Makefile tests += \ test-dns-packet \ test-resolve-tables \ @@ -5728,7 +5728,7 @@ test_dnssec_complex_LDADD = \ #@auto/systemd-resolved/Makefile endif # ENABLE_RESOLVED -#@auto/libbasic-dns/Makefile +#@src/grp-resolve/libbasic-dns/src/Makefile gperf_txt_sources += \ src/resolve/dns_type-list.txt @@ -6829,7 +6829,6 @@ sd.CPPFLAGS += $(libsystemd-network.CPPFLAGS) #@src/grp-machine/libmachine-core/Makefile #@src/grp-resolve/Makefile #@src/grp-resolve/libbasic-dns/Makefile -#@src/grp-resolve/libbasic-dns/test/Makefile #@src/grp-system/Makefile #@src/grp-system/grp-utils/Makefile #@src/grp-system/libcore/Makefile diff --git a/src/grp-resolve/libbasic-dns/Makefile b/src/grp-resolve/libbasic-dns/Makefile index ab74e03f63..7c64e6af5f 100644 --- a/src/grp-resolve/libbasic-dns/Makefile +++ b/src/grp-resolve/libbasic-dns/Makefile @@ -23,9 +23,6 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk -gperf_txt_sources += \ - src/resolve/dns_type-list.txt - nested.subdirs += src nested.subdirs += test diff --git a/src/grp-resolve/libbasic-dns/src/Makefile b/src/grp-resolve/libbasic-dns/src/Makefile index b2532a81ab..667dedf6bc 100644 --- a/src/grp-resolve/libbasic-dns/src/Makefile +++ b/src/grp-resolve/libbasic-dns/src/Makefile @@ -32,75 +32,7 @@ $(outdir)/dns_type-to-name.h: src/resolve/dns_type-list.txt $(outdir)/dns_type-from-name.gperf: src/resolve/dns_type-list.txt $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct dns_type_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { s=$$1; sub(/_/, "-", s); printf "%s, ", $$s; printf "DNS_TYPE_%s\n", $$1 }' <$< >$@ -tests += \ - test-dns-packet \ - test-resolve-tables \ - test-dnssec - -manual_tests += \ - test-dnssec-complex - -test_resolve_tables_SOURCES = \ - src/resolve/test-resolve-tables.c \ - src/resolve/dns_type-from-name.h \ - src/resolve/dns_type-to-name.h \ - $(basic_dns_sources) \ - src/shared/test-tables.h - -test_resolve_tables_CFLAGS = \ - $(GCRYPT_CFLAGS) - -test_resolve_tables_LDADD = \ - libsystemd-shared.la \ - $(GCRYPT_LIBS) \ - -lm - -test_dns_packet_SOURCES = \ - src/resolve/test-dns-packet.c \ - $(basic_dns_sources) - -test_dns_packet_CPPFLAGS = \ - -DRESOLVE_TEST_DIR=\"$(abs_top_srcdir)/src/resolve/test-data\" - -test_dns_packet_CFLAGS = \ - $(GCRYPT_CFLAGS) - -test_dns_packet_LDADD = \ - libsystemd-shared.la \ - $(GCRYPT_LIBS) \ - -lm - -EXTRA_DIST += \ - src/resolve/test-data/_openpgpkey.fedoraproject.org.pkts \ - src/resolve/test-data/fedoraproject.org.pkts \ - src/resolve/test-data/gandi.net.pkts \ - src/resolve/test-data/google.com.pkts \ - src/resolve/test-data/root.pkts \ - src/resolve/test-data/sw1a1aa-sw1a2aa-sw1a2ab-sw1a2ac.find.me.uk.pkts \ - src/resolve/test-data/teamits.com.pkts \ - src/resolve/test-data/zbyszek@fedoraproject.org.pkts \ - src/resolve/test-data/_443._tcp.fedoraproject.org.pkts \ - src/resolve/test-data/kyhwana.org.pkts \ - src/resolve/test-data/fake-caa.pkts - -test_dnssec_SOURCES = \ - src/resolve/test-dnssec.c \ - $(basic_dns_sources) - -test_dnssec_CFLAGS = \ - $(GCRYPT_CFLAGS) - -test_dnssec_LDADD = \ - libsystemd-shared.la \ - $(GCRYPT_LIBS) \ - -lm - -test_dnssec_complex_SOURCES = \ - src/resolve/test-dnssec-complex.c \ - src/resolve/dns-type.c \ - src/resolve/dns-type.h - -test_dnssec_complex_LDADD = \ - libsystemd-shared.la +gperf_txt_sources += \ + src/resolve/dns_type-list.txt include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-resolve/libbasic-dns/test/Makefile b/src/grp-resolve/libbasic-dns/test/Makefile index 60150788d8..165f401d26 100644 --- a/src/grp-resolve/libbasic-dns/test/Makefile +++ b/src/grp-resolve/libbasic-dns/test/Makefile @@ -23,4 +23,75 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk +tests += \ + test-dns-packet \ + test-resolve-tables \ + test-dnssec + +manual_tests += \ + test-dnssec-complex + +test_resolve_tables_SOURCES = \ + src/resolve/test-resolve-tables.c \ + src/resolve/dns_type-from-name.h \ + src/resolve/dns_type-to-name.h \ + $(basic_dns_sources) \ + src/shared/test-tables.h + +test_resolve_tables_CFLAGS = \ + $(GCRYPT_CFLAGS) + +test_resolve_tables_LDADD = \ + libsystemd-shared.la \ + $(GCRYPT_LIBS) \ + -lm + +test_dns_packet_SOURCES = \ + src/resolve/test-dns-packet.c \ + $(basic_dns_sources) + +test_dns_packet_CPPFLAGS = \ + -DRESOLVE_TEST_DIR=\"$(abs_top_srcdir)/src/resolve/test-data\" + +test_dns_packet_CFLAGS = \ + $(GCRYPT_CFLAGS) + +test_dns_packet_LDADD = \ + libsystemd-shared.la \ + $(GCRYPT_LIBS) \ + -lm + +EXTRA_DIST += \ + src/resolve/test-data/_openpgpkey.fedoraproject.org.pkts \ + src/resolve/test-data/fedoraproject.org.pkts \ + src/resolve/test-data/gandi.net.pkts \ + src/resolve/test-data/google.com.pkts \ + src/resolve/test-data/root.pkts \ + src/resolve/test-data/sw1a1aa-sw1a2aa-sw1a2ab-sw1a2ac.find.me.uk.pkts \ + src/resolve/test-data/teamits.com.pkts \ + src/resolve/test-data/zbyszek@fedoraproject.org.pkts \ + src/resolve/test-data/_443._tcp.fedoraproject.org.pkts \ + src/resolve/test-data/kyhwana.org.pkts \ + src/resolve/test-data/fake-caa.pkts + +test_dnssec_SOURCES = \ + src/resolve/test-dnssec.c \ + $(basic_dns_sources) + +test_dnssec_CFLAGS = \ + $(GCRYPT_CFLAGS) + +test_dnssec_LDADD = \ + libsystemd-shared.la \ + $(GCRYPT_LIBS) \ + -lm + +test_dnssec_complex_SOURCES = \ + src/resolve/test-dnssec-complex.c \ + src/resolve/dns-type.c \ + src/resolve/dns-type.h + +test_dnssec_complex_LDADD = \ + libsystemd-shared.la + include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libsystemd-firewall/src/Makefile b/src/libsystemd-firewall/src/Makefile index 797c9b6819..b52d1fdad0 100644 --- a/src/libsystemd-firewall/src/Makefile +++ b/src/libsystemd-firewall/src/Makefile @@ -27,14 +27,14 @@ ifneq ($(HAVE_LIBIPTC),) noinst_LTLIBRARIES += \ libsystemd-firewall.la -libsystemd-firewall_la_SOURCES = \ +libsystemd_firewall_la_SOURCES = \ src/shared/firewall-util.h \ src/shared/firewall-util.c -libsystemd-firewall_la_CFLAGS = \ +libsystemd_firewall_la_CFLAGS = \ $(LIBIPTC_CFLAGS) -libsystemd-firewall_la_LIBADD = \ +libsystemd_firewall_la_LIBADD = \ $(LIBIPTC_LIBS) endif # HAVE_LIBIPTC diff --git a/src/libsystemd-shared/src/Makefile b/src/libsystemd-shared/src/Makefile index 5453bec630..292f6a27a6 100644 --- a/src/libsystemd-shared/src/Makefile +++ b/src/libsystemd-shared/src/Makefile @@ -26,7 +26,7 @@ include $(topsrcdir)/build-aux/Makefile.head.mk noinst_LTLIBRARIES += \ libsystemd-shared.la -libsystemd-shared_la_SOURCES = \ +libsystemd_shared_la_SOURCES = \ src/shared/output-mode.h \ src/shared/output-mode.c \ src/shared/gpt.h \ @@ -114,28 +114,28 @@ libsystemd-shared_la_SOURCES = \ src/shared/fdset.h ifneq ($(HAVE_UTMP),) -libsystemd-shared_la_SOURCES += \ +libsystemd_shared_la_SOURCES += \ src/shared/utmp-wtmp.c endif # HAVE_UTMP ifneq ($(HAVE_SECCOMP),) -libsystemd-shared_la_SOURCES += \ +libsystemd_shared_la_SOURCES += \ src/shared/seccomp-util.h \ src/shared/seccomp-util.c endif # HAVE_SECCOMP ifneq ($(HAVE_ACL),) -libsystemd-shared_la_SOURCES += \ +libsystemd_shared_la_SOURCES += \ src/shared/acl-util.c \ src/shared/acl-util.h endif # HAVE_ACL -libsystemd-shared_la_CFLAGS = \ +libsystemd_shared_la_CFLAGS = \ $(ACL_CFLAGS) \ $(LIBIDN_CFLAGS) \ $(SECCOMP_CFLAGS) -libsystemd-shared_la_LIBADD = \ +libsystemd_shared_la_LIBADD = \ libsystemd-internal.la \ libsystemd-basic.la \ libsystemd-journal-internal.la \ @@ -149,14 +149,14 @@ rootlibexec_LTLIBRARIES += \ libsystemd_shared_la_SOURCES = \ $(libsystemd_basic_la_SOURCES) \ - $(libsystemd-shared_la_SOURCES) \ + $(libsystemd_shared_la_SOURCES) \ $(libsystemd_internal_la_SOURCES) \ $(libsystemd_journal_internal_la_SOURCES) \ $(libudev_internal_la_SOURCES) libsystemd_shared_la_CFLAGS = \ $(libsystemd_basic_la_CFLAGS) \ - $(libsystemd-shared_la_CFLAGS) \ + $(libsystemd_shared_la_CFLAGS) \ $(libsystemd_internal_la_CFLAGS) \ $(libsystemd_journal_internal_la_CFLAGS) \ $(libudev_internal_la_CFLAGS) \ @@ -165,7 +165,7 @@ libsystemd_shared_la_CFLAGS = \ $(SECCOMP_CFLAGS) \ -fvisibility=default -# We can't use libsystemd-shared_la_LIBADD here because it would +# We can't use libsystemd_shared_la_LIBADD here because it would # pull in libsystemd*-internal.la libsystemd_shared_la_LIBADD = \ $(libsystemd_basic_la_LIBADD) \ diff --git a/tools/notsd-move b/tools/notsd-move index c7a9b99e0b..36ca546a63 100755 --- a/tools/notsd-move +++ b/tools/notsd-move @@ -780,19 +780,23 @@ fixup_makefile() { -e '#### Specific complete strings #####' \ -e 's|\$\(CPP\) \$\(CFLAGS\) \$\(AM_CPPFLAGS\) \$\(CPPFLAGS\)|$(CPP) $(sd.ALL_CPPFLAGS)|g' \ -e '/^ \$\(AM_V_at\)\$\(MKDIR_P\) \$\(dir \$@\)/d' \ + \ -e '#### General cases #################' \ -e '/^[^# ]*:/ { s|^(\s*)\S+/|\1$(outdir)/| }' \ -e 's|^if (.*)|ifneq ($(\1),)|' \ -e '/^\s*\$\(AM_(C|CPP|LD)FLAGS\b/d' \ -e 's|--version-script=.*/([^/]+)\.sym|--version-script=$(srcdir)/\1.sym|g' \ + \ -e '#### Rename helpers ################' \ -e 's|libbasic_la|libsystemd_basic_la|g' \ -e 's|libbasic|libsystemd-basic|g' \ - -e 's|libshared|libsystemd-shared|g' \ + -e 's|libsystemd-basic-dns|libbasic-dns|g' \ + \ -e 's|libshared_la|libsystemd_shared_la|g' \ - -e 's|libfirewall|libsystemd-firewall|g' \ + -e 's|libshared|libsystemd-shared|g' \ + \ -e 's|libfirewall_la|libsystemd_firewall_la|g' \ - -e 's|libsystemd-basic-dns|libbasic-dns|g' + -e 's|libfirewall|libsystemd-firewall|g' } breakup_zshcompletion() ( |