rec: allow out-of-tree builds

diff --git a/pdns/recursordist/Makefile.am b/pdns/recursordist/Makefile.am
index 08784dd64dcec2ec197c22c0763da37daaa226a5..b9b499c4417a027a8fe4092ade1df64907bc5b1a 100644 (file)
--- a/pdns/recursordist/Makefile.am
+++ b/pdns/recursordist/Makefile.am
@@ -1,7 +1,7 @@
-JSON11_LIBS = $(top_srcdir)/ext/json11/libjson11.la
-PROBDS_LIBS = $(top_srcdir)/ext/probds/libprobds.la
-ARC4RANDOM_LIBS = $(top_srcdir)/ext/arc4random/libarc4random.la
-RUST_LIBS = $(top_srcdir)/settings/rust/libsettings.a $(LIBDL)
+JSON11_LIBS = $(top_builddir)/ext/json11/libjson11.la
+PROBDS_LIBS = $(top_builddir)/ext/probds/libprobds.la
+ARC4RANDOM_LIBS = $(top_builddir)/ext/arc4random/libarc4random.la
+RUST_LIBS = $(top_builddir)/settings/rust/libsettings.a $(LIBDL)
 
 AM_CPPFLAGS = $(LUA_CFLAGS) $(YAHTTP_CFLAGS) $(BOOST_CPPFLAGS) $(LIBSODIUM_CFLAGS) $(NET_SNMP_CFLAGS) $(LIBCAP_CFLAGS) $(SANITIZER_FLAGS) -O3 -Wall -pthread -DSYSCONFDIR=\"${sysconfdir}\" $(SYSTEMD_CFLAGS)
 
@@ -12,6 +12,8 @@ endif
 AM_CPPFLAGS += \
        -I$(top_srcdir)/ext/json11 \
        -I$(top_srcdir)/ext/protozero/include \
+       -I$(top_srcdir)/settings \
+       -I$(top_builddir)/settings \
        $(YAHTTP_CFLAGS) \
        $(LIBCRYPTO_INCLUDES) \
        -DBOOST_CONTAINER_USE_STD_EXCEPTIONS
@@ -41,8 +43,9 @@ BUILT_SOURCES=htmlfiles.h \
 CLEANFILES = htmlfiles.h \
        recursor.conf-dist recursor.yml-dist
 
-htmlfiles.h: incfiles html/* html/js/*
-       ./incfiles > $@
+htmlfiles.h: incfiles ${srcdir}/html/* ${srcdir}/html/js/*
+       $(AM_V_GEN)$(srcdir)/incfiles > $@.tmp
+       @mv $@.tmp $@
 
 # We explicitly build settings in two steps, as settings modifies files in the settings/rust subdir
 SUBDIRS=ext settings settings/rust
@@ -525,7 +528,7 @@ $(srcdir)/effective_tld_names.dat:
        $(curl_verbose)if ! curl -s -S https://publicsuffix.org/list/public_suffix_list.dat > $@; then rm -f $@; exit 1; fi
 
 pubsuffix.cc: $(srcdir)/effective_tld_names.dat
-       $(AM_V_GEN)./mkpubsuffixcc
+       $(srcdir)/mkpubsuffixcc $< $@
 
 ## Config file
 sysconf_DATA = recursor.conf-dist recursor.yml-dist
@@ -545,13 +548,13 @@ dist_man_MANS=$(MANPAGES)
 if HAVE_VENV
 if !HAVE_MANPAGES
 $(MANPAGES): %: docs/manpages/%.rst .venv
-       .venv/bin/python -msphinx -b man docs . $<
+       $(builddir)/.venv/bin/python -msphinx -b man "$(srcdir)/docs" "$(builddir)" $<
 endif # if !HAVE_MANPAGES
 
 .venv: docs/requirements.txt
        $(PYTHON) -m venv .venv
        .venv/bin/pip install -U pip setuptools setuptools-git wheel
-       .venv/bin/pip install -r docs/requirements.txt
+       .venv/bin/pip install -r ${top_srcdir}/docs/requirements.txt
 
 html-docs: docs/** .venv
        .venv/bin/python -msphinx -b html docs html-docs

diff --git a/pdns/recursordist/mkpubsuffixcc b/pdns/recursordist/mkpubsuffixcc
index a65e97a6abc9b802a83461f52b1a4e8c1d8977b3..54e3e819eafa277e53cc2700fa451eeba7634164 100755 (executable)
--- a/pdns/recursordist/mkpubsuffixcc
+++ b/pdns/recursordist/mkpubsuffixcc
@@ -1,8 +1,12 @@
 #!/bin/sh
-
+if [ -z "$1" ] || [ -z "$2" ]; then
+  echo "Usage: $0 effective_tld_names.dat pubsuffix.cc"
+  exit 1
+fi
+set -e
 (echo "const char* g_pubsuffix[]={"; 
-       for a in $(grep -v "//" effective_tld_names.dat  | grep \\. | egrep "^[.0-9a-z-]*$")
+       for a in $(grep -v "//" "$1" | grep \\. | egrep "^[.0-9a-z-]*$")
        do 
                echo \"$a\",
        done 
-echo "0};") > pubsuffix.cc
+echo "0};") > "$2"

diff --git a/pdns/recursordist/settings/Makefile.am b/pdns/recursordist/settings/Makefile.am
index c22b081eebd0522551a4a48c1d008b19b8b23b0d..f7eca1cbe86c6316c1615280a50caf174fc40b7f 100644 (file)
--- a/pdns/recursordist/settings/Makefile.am
+++ b/pdns/recursordist/settings/Makefile.am
@@ -23,7 +23,7 @@ BUILT_SOURCES=cxxsettings-generated.cc rust/src/lib.rs
 # Use patterns to avoid having two instances of generate run simultaneously, a well-known hack for GNU make
 cxxsettings-generated%cc rust/src/lib%rs: table.py generate.py rust-preamble-in.rs rust-bridge-in.rs docs-old-preamble-in.rst docs-new-preamble-in.rst
        $(MAKE) -C rust clean
-       $(PYTHON) generate.py
+       (cd ${srcdir} && $(PYTHON) generate.py)
 
 clean-local:
        rm -f cxxsettings-generated.cc rust/src/lib.rs

diff --git a/pdns/recursordist/settings/rust/Makefile.am b/pdns/recursordist/settings/rust/Makefile.am
index 517ca56bac902ff0671e71c9826a54e38b6dc1a7..5d0f63741cc2e5b350862c469e1090a68711f752 100644 (file)
--- a/pdns/recursordist/settings/rust/Makefile.am
+++ b/pdns/recursordist/settings/rust/Makefile.am
@@ -11,7 +11,7 @@ EXTRA_DIST = \
 
 # should actually end up in a target specific dir...
 libsettings.a lib.rs.h: src/bridge.rs src/lib.rs src/helpers.rs Cargo.toml Cargo.lock build.rs
-       SYSCONFDIR=$(sysconfdir) NODCACHEDIRNOD=$(localstatedir)/nod NODCACHEDIRUDR=$(localstatedir)/udr $(CARGO) build --release $(RUST_TARGET)
+       SYSCONFDIR=$(sysconfdir) NODCACHEDIRNOD=$(localstatedir)/nod NODCACHEDIRUDR=$(localstatedir)/udr $(CARGO) build --release $(RUST_TARGET) --target-dir=$(builddir)/target --manifest-path ${srcdir}/Cargo.toml
        cp target/$(RUSTC_TARGET_ARCH)/release/libsettings.a libsettings.a
        cp target/$(RUSTC_TARGET_ARCH)/cxxbridge/settings/src/lib.rs.h lib.rs.h
        cp target/$(RUSTC_TARGET_ARCH)/cxxbridge/rust/cxx.h cxx.h