libsystemd-dns: merge into libsystemd

Also rename sd-dns -> sd-resolv.

diff --git a/.gitignore b/.gitignore
index 36483f134887c3312cd43d887e6a1c4bb7f0fa43..fb0509462f8aa9802cc8a3c1abd126ab6e861375 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -134,7 +134,7 @@
 /test-device-nodes
 /test-dhcp-client
 /test-dhcp-option
-/test-dns
+/test-resolv
 /test-ellipsize
 /test-engine
 /test-env-replace

diff --git a/Makefile.am b/Makefile.am
index a73a66d4a4c5037d7d9a05ac5be4efa380fb71c1..96695412a0c05bc7fa0d6775a6325a9886dc1710 100644 (file)
--- a/Makefile.am
+++ b/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
 

diff --git a/src/libsystemd/dns-util.h b/src/libsystemd/resolv-util.h
similarity index 100%
rename from src/libsystemd/dns-util.h
rename to src/libsystemd/resolv-util.h

diff --git a/src/libsystemd/sd-dns.c b/src/libsystemd/sd-resolv.c
similarity index 99%
rename from src/libsystemd/sd-dns.c
rename to src/libsystemd/sd-resolv.c
index 0f90d020ad19c423bfef2f58b5d1a8d6801505d8..2db66eb2ff70a2ea927dae03ca399fb55a4781e0 100644 (file)
--- a/src/libsystemd/sd-dns.c
+++ b/src/libsystemd/sd-resolv.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

diff --git a/src/libsystemd/test-dns.c b/src/libsystemd/test-resolv.c
similarity index 99%
rename from src/libsystemd/test-dns.c
rename to src/libsystemd/test-resolv.c
index b4f064f2fd943cd272ca36e7f4b1bd541b419d79..9365dd8e7b1d02754e5a0ac65dae5241c6c1cc5d 100644 (file)
--- a/src/libsystemd/test-dns.c
+++ b/src/libsystemd/test-resolv.c
@@ -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[]) {

diff --git a/src/systemd/sd-dns.h b/src/systemd/sd-resolv.h
similarity index 99%
rename from src/systemd/sd-dns.h
rename to src/systemd/sd-resolv.h
index 38972db5e2bed292c76a87a47746043b46fb4472..47608ce380bd51a5d7f946ab6857a7629060c34e 100644 (file)
--- a/src/systemd/sd-dns.h
+++ b/src/systemd/sd-resolv.h
@@ -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.