summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2014-01-13 21:03:28 +0100
committerTom Gundersen <teg@jklm.no>2014-01-13 21:06:13 +0100
commit5681d7fb8be37771c152d21ea6e95597d664e3f1 (patch)
treed4d1d48791060db2dfcd0d2b199fb576f64fcba0
parent0b54473e9b73d867ed7807507a0fb5adc8137b10 (diff)
libsystemd-dns: merge into libsystemd
Also rename sd-dns -> sd-resolv.
-rw-r--r--.gitignore2
-rw-r--r--Makefile.am52
-rw-r--r--src/libsystemd/resolv-util.h (renamed from src/libsystemd/dns-util.h)0
-rw-r--r--src/libsystemd/sd-resolv.c (renamed from src/libsystemd/sd-dns.c)2
-rw-r--r--src/libsystemd/test-resolv.c (renamed from src/libsystemd/test-dns.c)4
-rw-r--r--src/systemd/sd-resolv.h (renamed from src/systemd/sd-dns.h)4
6 files changed, 26 insertions, 38 deletions
diff --git a/.gitignore b/.gitignore
index 36483f1348..fb0509462f 100644
--- 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 a73a66d4a4..96695412a0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -641,35 +641,6 @@ EXTRA_DIST += \
# ------------------------------------------------------------------------------
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
libsystemd_shared_la_SOURCES = \
@@ -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
index e0284c81b1..e0284c81b1 100644
--- a/src/libsystemd/dns-util.h
+++ b/src/libsystemd/resolv-util.h
diff --git a/src/libsystemd/sd-dns.c b/src/libsystemd/sd-resolv.c
index 0f90d020ad..2db66eb2ff 100644
--- 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
index b4f064f2fd..9365dd8e7b 100644
--- 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
index 38972db5e2..47608ce380 100644
--- 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.