Make: Tidy up distribution and cleaning of generated makefiles

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>

diff --git a/Make.mk b/Make.mk
index 29cd347276589e20d14c241b5cf0578d351bd4cd..0e572861f0d4f47aeb130f40637b954ea58e5bf5 100644 (file)
--- a/Make.mk
+++ b/Make.mk
@@ -101,10 +101,8 @@ subst.in = sed \
 
 # Generated files
 # See `Cleanliness' below
-mk :=
-ifeq ($(revctrl),git)
-mk += $(srcdir)/sources.mk
-endif
+# Generated makefiles, distributed by dist-source from $(srcdir):
+mk := sources.mk
 # Generated by Autoconf, not distributed:
 ac := config.h config.log config.status info.html info.nr lib stamp-h
 ac += $(basename $(filter %.in, $(src)))
@@ -157,9 +155,12 @@ endif
 clean := $(obj) $(deps) $(libs) $(util) $(client) $(server) $(tsubj)   \
 info/toc info/TOP.t $(info.all) $(empth_obj) $(empth_lib) sandbox
 # Removed by distclean:
-distclean := $(ac) $(mk)
+distclean := $(ac)
+ifeq ($(revctrl),git)
+distclean += $(addprefix $(srcdir)/, $(mk))
+endif
 # Distributed by dist-source from $(srcdir):
-src_distgen := $(acdist)
+src_distgen := $(acdist) $(mk)
 # Distributed by dist-client from $(srcdir)/src/client; removed by distclean:
 cli_distgen := $(acdistcli)
 
@@ -366,10 +367,13 @@ info.ps: info/TROFF.MAC info/INFO.MAC info/TOP.t $(tsubj) $(tsrc)
 
 .PHONY: dist-source
 dist-source: $(src_distgen)
+       $(tarball) $(TARNAME)-$(VERSION) -C $(srcdir) $(src_distgen) $(src)
+
 ifeq ($(revctrl),git)
-       echo "src := $(src)" >$(srcdir)/sources.mk
+.PHONY: $(srcdir)/sources.mk
+$(srcdir)/sources.mk:
+       $(call quiet-command,echo "src := $(src)" >$@,GEN $@)
 endif
-       $(tarball) $(TARNAME)-$(VERSION) -C $(srcdir) $(src_distgen) $(src) sources.mk
 
 .PHONY: dist-client
 dist-client: $(cli_distgen)