diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-10-27 00:50:56 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-10-27 00:50:56 -0400 |
| commit | 9cf3c290c9345409a9875dc1a7d17528abfcd916 (patch) | |
| tree | c7b391acb4c6e9c155eab28d5207e78bd23b2c0b | |
| parent | 4edbbb28e4419fc473d5675abd6abd0c450ca82c (diff) | |
| parent | 5d31f69302e974cd7c213b194c0bbbf11008c2de (diff) | |
Merge branch 'notsystemd/postmove' into notsystemd/master
# Conflicts:
# src/grp-resolve/systemd-resolved/Makefile
# src/libsystemd/Makefile
# src/libsystemd/src/Makefile
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | src/grp-resolve/libbasic-dns/src/Makefile | 6 | ||||
| -rw-r--r-- | src/libsystemd/Makefile | 10 |
3 files changed, 12 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am index 09beac93d3..915526fec9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4460,12 +4460,13 @@ tests += \ test-compress-benchmark endif # HAVE_COMPRESSION -#@src/libsystemd/src/Makefile +#@src/libsystemd/Makefile pkginclude_HEADERS += \ src/systemd/sd-journal.h \ src/systemd/sd-messages.h \ src/systemd/_sd-common.h +#@src/libsystemd/src/Makefile libsystemd_journal_internal_la_SOURCES = \ src/journal/sd-journal.c \ src/systemd/sd-journal.h \ @@ -5496,6 +5497,7 @@ EXTRA_DIST += \ #@auto/systemd-resolved/Makefile ----------------------------------------------- if ENABLE_RESOLVED +#@src/grp-resolve/libbasic-dns/src/Makefile basic_dns_sources = \ src/resolve/resolved-dns-dnssec.c \ src/resolve/resolved-dns-dnssec.h \ @@ -5510,6 +5512,7 @@ basic_dns_sources = \ src/resolve/dns-type.c \ src/resolve/dns-type.h +#@auto/systemd-resolved/Makefile systemd_resolved_SOURCES = \ src/resolve/resolved.c \ src/resolve/resolved-manager.c \ diff --git a/src/grp-resolve/libbasic-dns/src/Makefile b/src/grp-resolve/libbasic-dns/src/Makefile index 93d4c59345..ac3551fc1f 100644 --- a/src/grp-resolve/libbasic-dns/src/Makefile +++ b/src/grp-resolve/libbasic-dns/src/Makefile @@ -32,9 +32,6 @@ $(outdir)/dns_type-to-name.h: $(outdir)/dns_type-list.txt $(outdir)/dns_type-from-name.gperf: $(outdir)/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 }' <$< >$@ -gperf_txt_sources += \ - src/resolve/dns_type-list.txt - libbasic_dns_la_SOURCES = \ src/resolve/resolved-dns-dnssec.c \ src/resolve/resolved-dns-dnssec.h \ @@ -49,6 +46,9 @@ libbasic_dns_la_SOURCES = \ src/resolve/dns-type.c \ src/resolve/dns-type.h +gperf_txt_sources += \ + src/resolve/dns_type-list.txt + noinst_LTLIBRARIES = libbasic-dns.la libbasic_dns_la_LIBADD += \ libsystemd-gcrypt.la \ diff --git a/src/libsystemd/Makefile b/src/libsystemd/Makefile index e780b351c5..50396c278c 100644 --- a/src/libsystemd/Makefile +++ b/src/libsystemd/Makefile @@ -55,11 +55,6 @@ _pkginclude_HEADERS += \ src/systemd/sd-id128.h \ src/systemd/sd-daemon.h -_pkginclude_HEADERS += \ - src/systemd/sd-journal.h \ - src/systemd/sd-messages.h \ - src/systemd/_sd-common.h - rootlib_LTLIBRARIES += \ libsystemd.la @@ -86,6 +81,11 @@ tests += \ test-local-addresses \ test-resolve +_pkginclude_HEADERS += \ + src/systemd/sd-journal.h \ + src/systemd/sd-messages.h \ + src/systemd/_sd-common.h + $(outdir)/test-libsystemd-sym.c: \ $(srcdir)/include/systemd/sd-journal.h \ $(srcdir)/include/systemd/sd-daemon.h \ |