From: Chris Hofstaedtler <chris.hofstaedtler@deduktiva.com>
Date: Tue, 3 Apr 2018 09:53:59 +0000 (+0200)
Subject: make clean: rm generated .service and .conf-dist files
X-Git-Tag: dnsdist-1.3.1~178^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F6438%2Fhead;p=thirdparty%2Fpdns.git

make clean: rm generated .service and .conf-dist files
---

diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index b2b2903557..ab2f39874f 100644
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -1369,6 +1369,10 @@ systemdsystemunit_DATA = \
 	pdns.service \
 	pdns@.service
 
+CLEANFILES += \
+	pdns.service \
+	pdns@.service
+
 if TOOLS
 ixfrdist.service: ixfrdist.service.in
 	$(AM_V_GEN)sed -e 's![@]bindir[@]!$(bindir)!' < $< > $@
@@ -1377,4 +1381,7 @@ systemdsystemunit_DATA += \
 	ixfrdist.service
 endif # TOOLS
 
+CLEANFILES += \
+	ixfrdist.service
+
 endif # HAVE_SYSTEMD
diff --git a/pdns/dnsdistdist/Makefile.am b/pdns/dnsdistdist/Makefile.am
index cc7853186e..78f7b7aba0 100644
--- a/pdns/dnsdistdist/Makefile.am
+++ b/pdns/dnsdistdist/Makefile.am
@@ -4,7 +4,13 @@ ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS=ext/yahttp
 
-CLEANFILES = dnsmessage.pb.cc dnsmessage.pb.h htmlfiles.h.tmp htmlfiles.h dnstap.pb.cc dnstap.pb.h
+CLEANFILES = \
+	dnsmessage.pb.cc \
+	dnsmessage.pb.h \
+	htmlfiles.h.tmp \
+	htmlfiles.h \
+	dnstap.pb.cc \
+	dnstap.pb.h
 
 dnslabeltext.cc: dnslabeltext.rl
 	$(AM_V_GEN)$(RAGEL) $< -o dnslabeltext.cc
@@ -310,6 +316,10 @@ systemdsystemunitdir = $(SYSTEMD_DIR)
 systemdsystemunit_DATA = \
 	dnsdist.service \
 	dnsdist@.service
+
+CLEANFILES += \
+	dnsdist.service \
+	dnsdist@.service
 endif
 
 if !HAVE_LUA_HPP
diff --git a/pdns/recursordist/Makefile.am b/pdns/recursordist/Makefile.am
index e9ec0ee57e..387e3cd809 100644
--- a/pdns/recursordist/Makefile.am
+++ b/pdns/recursordist/Makefile.am
@@ -23,7 +23,8 @@ BUILT_SOURCES=htmlfiles.h \
 
 CLEANFILES = htmlfiles.h \
 	dnsmessage.pb.cc \
-	dnsmessage.pb.h
+	dnsmessage.pb.h \
+	recursor.conf-dist
 
 htmlfiles.h: html/*
 	./incfiles > $@
@@ -429,6 +430,11 @@ systemdsystemunitdir = $(SYSTEMD_DIR)
 systemdsystemunit_DATA = \
 	pdns-recursor.service \
 	pdns-recursor@.service
+
+CLEANFILES += \
+	pdns-recursor.service \
+	pdns-recursor@.service
+
 endif
 
 if !HAVE_LUA_HPP