From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Fri, 2 Oct 2020 19:26:50 +0000 (+0200)
Subject: dnsdist make: two fixes
X-Git-Tag: auth-4.4.0-alpha2~54^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F9583%2Fhead;p=thirdparty%2Fpdns.git

dnsdist make: two fixes

* make sure dnsdist-lua-ffi-interface.inc is built before dnsdist-lua-ffi.o
* cleaner output while building that .inc

by Pieter Lexis
---

diff --git a/pdns/dnsdistdist/Makefile.am b/pdns/dnsdistdist/Makefile.am
index 8471bea6d3..5761ec3349 100644
--- a/pdns/dnsdistdist/Makefile.am
+++ b/pdns/dnsdistdist/Makefile.am
@@ -26,10 +26,9 @@ htmlfiles.h: $(srcdir)/html/*
 	@mv $@.tmp $@
 
 dnsdist-lua-ffi-interface.inc: dnsdist-lua-ffi-interface.h
-	echo 'R"FFIContent(' > $@
-	cat $< >> $@
-	echo ')FFIContent"' >> $@
-
+	$(AM_V_GEN)echo 'R"FFIContent(' > $@
+	@cat $< >> $@
+	@echo ')FFIContent"' >> $@
 SRC_JS_FILES := $(wildcard src_js/*.js)
 MIN_JS_FILES := $(patsubst src_js/%.js,html/js/%.min.js,$(SRC_JS_FILES))
 
@@ -113,6 +112,7 @@ check-local:
 endif
 
 dnsdist-web.$(OBJEXT): htmlfiles.h
+dnsdist-lua-ffi.$(OBJEXT): dnsdist-lua-ffi-interface.inc
 
 dnsdist_SOURCES = \
 	ascii.hh \