mirror of
https://github.com/systemd/systemd
synced 2024-07-21 10:17:21 +00:00
libsystemd-dns: merge into libsystemd
Also rename sd-dns -> sd-resolv.
This commit is contained in:
parent
0b54473e9b
commit
5681d7fb8b
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -134,7 +134,7 @@
|
|||
/test-device-nodes
|
||||
/test-dhcp-client
|
||||
/test-dhcp-option
|
||||
/test-dns
|
||||
/test-resolv
|
||||
/test-ellipsize
|
||||
/test-engine
|
||||
/test-env-replace
|
||||
|
|
52
Makefile.am
52
Makefile.am
|
@ -639,35 +639,6 @@ EXTRA_DIST += \
|
|||
make-directive-index.py \
|
||||
xml_helper.py
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
noinst_LTLIBRARIES += \
|
||||
libsystemd-dns.la
|
||||
|
||||
libsystemd_dns_la_SOURCES = \
|
||||
src/systemd/sd-dns.h \
|
||||
src/libsystemd/sd-dns.c \
|
||||
src/libsystemd/dns-util.h
|
||||
|
||||
libsystemd_dns_la_LIBADD = \
|
||||
libsystemd-shared.la
|
||||
|
||||
libsystemd_dns_la_CFLAGS = \
|
||||
-pthread
|
||||
|
||||
test_dns_SOURCES = \
|
||||
src/libsystemd/test-dns.c \
|
||||
src/systemd/sd-dns.h
|
||||
|
||||
test_dns_LDADD = \
|
||||
libsystemd-dns.la
|
||||
|
||||
test_dns_LDFLAGS = \
|
||||
-lresolv \
|
||||
-pthread
|
||||
|
||||
tests += \
|
||||
test-dns
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
noinst_LTLIBRARIES += \
|
||||
libsystemd-shared.la
|
||||
|
@ -2011,6 +1982,7 @@ libsystemd_la_SOURCES = \
|
|||
src/systemd/sd-event.h \
|
||||
src/systemd/sd-dhcp-client.h \
|
||||
src/systemd/sd-rtnl.h \
|
||||
src/systemd/sd-resolv.h \
|
||||
src/libsystemd/sd-bus.c \
|
||||
src/libsystemd/bus-control.c \
|
||||
src/libsystemd/bus-control.h \
|
||||
|
@ -2060,7 +2032,9 @@ libsystemd_la_SOURCES = \
|
|||
src/libsystemd/rtnl-internal.h \
|
||||
src/libsystemd/rtnl-message.c \
|
||||
src/libsystemd/rtnl-util.h \
|
||||
src/libsystemd/rtnl-util.c
|
||||
src/libsystemd/rtnl-util.c \
|
||||
src/libsystemd/sd-resolv.c \
|
||||
src/libsystemd/resolv-util.h
|
||||
|
||||
nodist_libsystemd_la_SOURCES = \
|
||||
src/libsystemd/bus-error-mapping.c
|
||||
|
@ -2072,7 +2046,8 @@ libsystemd_la_LIBADD = \
|
|||
|
||||
libsystemd_la_CFLAGS = \
|
||||
$(AM_CFLAGS) \
|
||||
-pthread
|
||||
-pthread \
|
||||
-lresolv
|
||||
|
||||
libsystemd_la_LDFLAGS = \
|
||||
$(AM_LDFLAGS) \
|
||||
|
@ -2136,7 +2111,8 @@ tests += \
|
|||
test-event \
|
||||
test-dhcp-option \
|
||||
test-dhcp-client \
|
||||
test-rtnl
|
||||
test-rtnl \
|
||||
test-resolv
|
||||
|
||||
bin_PROGRAMS += \
|
||||
busctl
|
||||
|
@ -2361,6 +2337,18 @@ test_rtnl_LDADD = \
|
|||
libsystemd-id128-internal.la \
|
||||
libsystemd-shared.la
|
||||
|
||||
test_resolv_SOURCES = \
|
||||
src/systemd/sd-resolv.h \
|
||||
src/libsystemd/test-resolv.c
|
||||
|
||||
test_resolv_LDADD = \
|
||||
libsystemd-internal.la \
|
||||
libsystemd-shared.la
|
||||
|
||||
test_resolv_CFLAGS = \
|
||||
$(AM_CFLAGS) \
|
||||
-pthread
|
||||
|
||||
busctl_SOURCES = \
|
||||
src/libsystemd/busctl.c
|
||||
|
||||
|
|
|
@ -41,7 +41,7 @@
|
|||
#include <pthread.h>
|
||||
#include <sys/prctl.h>
|
||||
|
||||
#include "sd-dns.h"
|
||||
#include "sd-resolv.h"
|
||||
#include "util.h"
|
||||
|
||||
#define MAX_WORKERS 16
|
|
@ -31,8 +31,8 @@
|
|||
#include <signal.h>
|
||||
#include <errno.h>
|
||||
|
||||
#include "sd-dns.h"
|
||||
#include "dns-util.h"
|
||||
#include "sd-resolv.h"
|
||||
#include "resolv-util.h"
|
||||
#include "macro.h"
|
||||
|
||||
int main(int argc, char *argv[]) {
|
|
@ -1,7 +1,7 @@
|
|||
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
|
||||
|
||||
#ifndef foosddnshfoo
|
||||
#define foosddnshfoo
|
||||
#ifndef foosdresolvhfoo
|
||||
#define foosdresolvhfoo
|
||||
|
||||
/***
|
||||
This file is part of systemd.
|
Loading…
Reference in a new issue