]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
dnsdist make: two fixes 9583/head
authorPeter van Dijk <peter.van.dijk@powerdns.com>
Fri, 2 Oct 2020 19:26:50 +0000 (21:26 +0200)
committerPeter van Dijk <peter.van.dijk@powerdns.com>
Fri, 2 Oct 2020 19:26:50 +0000 (21:26 +0200)
* 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

index 8471bea6d3a5bfd4f88b2ce60603ead0499937a2..5761ec334996d8bc98cb9276fb58e1492f9e1629 100644 (file)
@@ -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 \