summaryrefslogtreecommitdiff
path: root/src/grp-resolve/systemd-resolve
diff options
context:
space:
mode:
Diffstat (limited to 'src/grp-resolve/systemd-resolve')
-rw-r--r--src/grp-resolve/systemd-resolve/Makefile52
l---------src/grp-resolve/systemd-resolve/gcrypt-util.c1
l---------src/grp-resolve/systemd-resolve/gcrypt-util.h1
-rw-r--r--src/grp-resolve/systemd-resolve/resolve-tool.c5
4 files changed, 57 insertions, 2 deletions
diff --git a/src/grp-resolve/systemd-resolve/Makefile b/src/grp-resolve/systemd-resolve/Makefile
new file mode 100644
index 0000000000..46322830ac
--- /dev/null
+++ b/src/grp-resolve/systemd-resolve/Makefile
@@ -0,0 +1,52 @@
+# -*- Mode: makefile; indent-tabs-mode: t -*-
+#
+# This file is part of systemd.
+#
+# Copyright 2010-2012 Lennart Poettering
+# Copyright 2010-2012 Kay Sievers
+# Copyright 2013 Zbigniew Jędrzejewski-Szmek
+# Copyright 2013 David Strauss
+# Copyright 2016 Luke Shumaker
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# systemd is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with systemd; If not, see <http://www.gnu.org/licenses/>.
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
+
+basic_dns_sources =
+
+systemd_resolve_SOURCES = \
+ src/resolve/resolve-tool.c \
+ $(basic_dns_sources) \
+ src/shared/gcrypt-util.c \
+ src/shared/gcrypt-util.h
+
+nodist_systemd_resolve_SOURCES = \
+ src/resolve/dns_type-from-name.h \
+ src/resolve/dns_type-to-name.h
+
+systemd_resolve_LDADD = \
+ libshared.la
+
+bin_PROGRAMS += \
+ systemd-resolve
+
+dist_bashcompletion_data += \
+ shell-completion/bash/systemd-resolve
+
+dist_zshcompletion_data += \
+ shell-completion/zsh/_systemd-resolve
+
+systemd_resolve_LDADD += libbasic-dns.la
+
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-resolve/systemd-resolve/gcrypt-util.c b/src/grp-resolve/systemd-resolve/gcrypt-util.c
new file mode 120000
index 0000000000..5b2fae92e2
--- /dev/null
+++ b/src/grp-resolve/systemd-resolve/gcrypt-util.c
@@ -0,0 +1 @@
+../../libshared/src/gcrypt-util.c \ No newline at end of file
diff --git a/src/grp-resolve/systemd-resolve/gcrypt-util.h b/src/grp-resolve/systemd-resolve/gcrypt-util.h
new file mode 120000
index 0000000000..e1ad70b84f
--- /dev/null
+++ b/src/grp-resolve/systemd-resolve/gcrypt-util.h
@@ -0,0 +1 @@
+../../libshared/include/shared/gcrypt-util.h \ No newline at end of file
diff --git a/src/grp-resolve/systemd-resolve/resolve-tool.c b/src/grp-resolve/systemd-resolve/resolve-tool.c
index dee23289b3..d9f28576b7 100644
--- a/src/grp-resolve/systemd-resolve/resolve-tool.c
+++ b/src/grp-resolve/systemd-resolve/resolve-tool.c
@@ -28,12 +28,13 @@
#include "basic/in-addr-util.h"
#include "basic/parse-util.h"
#include "basic/terminal-util.h"
-#include "resolved-def.h"
-#include "resolved-dns-packet.h"
#include "sd-bus/bus-error.h"
#include "shared/bus-util.h"
#include "shared/gcrypt-util.h"
+#include "resolved-def.h"
+#include "resolved-dns-packet.h"
+
#define DNS_CALL_TIMEOUT_USEC (45*USEC_PER_SEC)
static int arg_family = AF_UNSPEC;