From 71411593536c64f4bbfc5e1e3982232f80af830a Mon Sep 17 00:00:00 2001 From: Peter van Dijk Date: Fri, 2 Oct 2020 21:26:50 +0200 Subject: [PATCH] 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 --- pdns/dnsdistdist/Makefile.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 \ -- 2.47.2