Make distributed tarball from Git file list

This removes the requirement of having a GNUmakefile
in each and every directory of the source tree; this commit
also deletes GNUmakefiles made unnecessary this way.

dist-toplevel-txt-files toplevel target is also removed,
because it is unneeded outside of dist target and it
prevents linking of toplevel generated txt docs to
distdir when these docs are already generated.

In addition, on suggestions from Han-Wen, if dist is made with a
source directory tracked by Git, then
* the source directory is required to have no uncommitted changes nor
non-ignored untracked files,
* the time stamp of all files in the tarball is set to the time stamp
of the head of the checked-out branch.

9 files changed, 5 insertions, 41 deletions

diff --git a/stepmake/stepmake/documentation-vars.make b/stepmake/stepmake/documentation-vars.make
index b22da2e9f5..2ca0bb97bd 100644
--- a/stepmake/stepmake/documentation-vars.make
+++ b/stepmake/stepmake/documentation-vars.make
@@ -1,4 +1,2 @@
 at-dir = $(doc-dir)
 at-ext = .in
-
-EXTRA_DIST_FILES += $(call src-wildcard,*.ihtml)
diff --git a/stepmake/stepmake/generic-targets.make b/stepmake/stepmake/generic-targets.make
index 9a51aaa728..45e9e8bfc7 100644
--- a/stepmake/stepmake/generic-targets.make
+++ b/stepmake/stepmake/generic-targets.make
@@ -81,20 +81,14 @@ help: generic-help local-help
 	@echo "  lib          update all libraries"
 	@echo "  TAGS         generate tagfiles"
 	@echo
-	@echo "\`make' may be invoked from any subdirectory."
+	@echo "\`make' may be invoked from any subdirectory that contains a GNUmakefile."
 
 local-help:
 
-local-dist: $(DIST_FILES) $(OUT_DIST_FILES) $(NON_ESSENTIAL_DIST_FILES)
-	mkdir -p $(distdir)/$(localdir)
-	$(LN) $(DIST_FILES:%=$(src-dir)/%) $(distdir)/$(localdir)
-
-	case "$(NON_ESSENTIAL_DIST_FILES)x" in x) ;; *) \
-		$(LN) $(NON_ESSENTIAL_DIST_FILES:%=$(src-dir)/%) $(distdir)/$(localdir);; \
-	esac
-	case "$(OUT_DIST_FILES)x" in x) ;; *) \
-		mkdir -p $(distdir)/$(localdir)/$(outdir); \
-		$(LN) $(OUT_DIST_FILES) $(distdir)/$(localdir)/$(outdir);; \
+local-dist: $(OUT_DIST_FILES)
+	case "$(OUT_DIST_FILES)x" in x) ;; \
+	     *) mkdir -p $(distdir)/$(localdir)/$(outdir) && \
+	        $(LN) $(OUT_DIST_FILES) $(distdir)/$(localdir)/$(outdir);; \
 	esac
 	$(foreach i, $(SUBDIRS), $(MAKE) top-src-dir=$(top-src-dir) distdir=$(distdir) localdir=$(localdir)/$(notdir $(i)) -C $(i) local-dist &&) true
 
diff --git a/stepmake/stepmake/generic-vars.make b/stepmake/stepmake/generic-vars.make
index 5eba1cc214..da7d704756 100644
--- a/stepmake/stepmake/generic-vars.make
+++ b/stepmake/stepmake/generic-vars.make
@@ -83,7 +83,6 @@ INCLUDES = $(src-dir)/include $(outdir) $($(PACKAGE)_INCLUDES) $(MODULE_INCLUDES
 
 M4 = m4
 
-DIST_FILES=$(EXTRA_DIST_FILES) GNUmakefile $(ALL_SOURCES) $(call src-wildcard,SConscript)
 DOCDIR=$(depth)/$(outdir)
 
 #?
diff --git a/stepmake/stepmake/makedir-vars.make b/stepmake/stepmake/makedir-vars.make
index ac5d1b6e87..7847928593 100644
--- a/stepmake/stepmake/makedir-vars.make
+++ b/stepmake/stepmake/makedir-vars.make
@@ -7,12 +7,8 @@ OUTLSM_FILES=$(addprefix $(outdir)/,$(basename $(LSM_FILES)))
 OUTSPEC_FILES=$(addprefix $(outdir)/,$(basename $(SPEC_FILES)))
 OUT_DIST_FILES= $(strip $(OUTLSM_FILES) $(OUTSPEC_FILES))
 
-EXTRA_DIST_FILES += $(MAKE_FILES)
-
 # these two outdir FILES are distributed, since they make sense to have
 # without running configure and make.
 
 at-dir = $(doc-dir)
 at-ext = .in
-
-
diff --git a/stepmake/stepmake/metafont-vars.make b/stepmake/stepmake/metafont-vars.make
index f4d5332a92..aeb75c5f00 100644
--- a/stepmake/stepmake/metafont-vars.make
+++ b/stepmake/stepmake/metafont-vars.make
@@ -1,6 +1,4 @@
-
 MF_FILES := $(call src-wildcard,*.mf)
-EXTRA_DIST_FILES += $(MF_FILES)
 MF_TFM_FILES = $(addprefix $(outdir)/, $(FONT_FILES:.mf=.tfm))
 MF_DVI_FILES = $(addprefix $(outdir)/, $(FONT_FILES:.mf=.dvi))
 MF_LOG_FILES = $(addprefix $(outdir)/, $(FONT_FILES:.mf=.log))
diff --git a/stepmake/stepmake/podir-vars.make b/stepmake/stepmake/podir-vars.make
index b8e53f4b2c..cdb95a45e8 100644
--- a/stepmake/stepmake/podir-vars.make
+++ b/stepmake/stepmake/podir-vars.make
@@ -6,6 +6,3 @@ MO_FILES = $(addprefix $(outdir)/, $(PO_FILES:.po=.mo))
 
 HELP_CATALOGS = $(PO_FILES:%.po=%)
 CATALOGS = $(HELP_CATALOGS:$(DOMAIN)=)
-
-DIST_FILES += $(POT_FILES) $(PO_FILES)
-
diff --git a/stepmake/stepmake/python-module-vars.make b/stepmake/stepmake/python-module-vars.make
index 5d0e06c127..fc6ea3fb8a 100644
--- a/stepmake/stepmake/python-module-vars.make
+++ b/stepmake/stepmake/python-module-vars.make
@@ -17,5 +17,3 @@ ifneq ($(DARWIN_BUILD),)
 SHARED_FLAGS = -bundle -flat_namespace -undefined suppress
 endif
 OUT_SO_MODULES = $(addprefix $(outdir)/, $(C_FILES:.c=$(SHARED_MODULE_SUFFIX)))
-EXTRA_DIST_FILES += $(PY_MODULES_IN)
-
diff --git a/stepmake/stepmake/toplevel-targets.make b/stepmake/stepmake/toplevel-targets.make
index d2748a97a3..b1a05f0d0b 100644
--- a/stepmake/stepmake/toplevel-targets.make
+++ b/stepmake/stepmake/toplevel-targets.make
@@ -2,8 +2,6 @@
 install-doc:
 uninstall-doc:
 
-local-dist: configure
-
 local-distclean:
 	rm -f config.hh config.make Makefile GNUmakefile \
 		config.cache config.status config.log index.html \
@@ -44,16 +42,6 @@ ifeq ($(strip $(SRCMAKE)),)
 	$(MAKE) final-install
 endif
 
-local-dist: top-doc
-
-dist:
-	rm -rf $(distdir)
-	$(MAKE) local-dist $(distdir)
-	chmod -R a+r $(distdir)
-	chmod  a+x `find $(distdir) -type d -print`
-	(cd ./$(depth)/$(outdir); $(TAR) -cf -  --owner=0 --group=0 $(DIST_NAME) | gzip -9 > $(DIST_NAME).tar.gz)
-	rm -rf $(distdir)
-
 local-help:
 	@echo "  config          rerun configure"
 	@echo "  dist            roll tarball: $(depth)/$(outdir)/$(distname).tar.gz"
diff --git a/stepmake/stepmake/toplevel-vars.make b/stepmake/stepmake/toplevel-vars.make
index e260f4b97b..c8c34a4e5e 100644
--- a/stepmake/stepmake/toplevel-vars.make
+++ b/stepmake/stepmake/toplevel-vars.make
@@ -1,7 +1,3 @@
-
-# override Generic_vars.make:
-DIST_FILES := $(EXTRA_DIST_FILES)
-
 # urg?
 include $(stepdir)/documentation-vars.make