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

diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index b2b29035573dfbd2bf90009e22014018881788b6..ab2f39874f499890b304898601df068e2e7efe95 100644 (file)
--- 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 cc7853186ed608e5655f215f70410edf72e3a95c..78f7b7aba02090632faf043dbe90b4880010e86c 100644 (file)
--- 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 e9ec0ee57e65341119e76ed5e85ef66611f7d542..387e3cd809dde348d97b279d2181a6c0294a5a7c 100644 (file)
--- 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