From 63f33cc71d6774057c6aef0944138cfb469204bc Mon Sep 17 00:00:00 2001
From: Mohammad Akhlaghi <mohammad@akhlaghi.org>
Date: Fri, 12 Apr 2019 19:05:17 +0100
Subject: Minor typo corrections in previous commits

Until now, even though `file' was a dependency of `gcc', it was still
listed as a `top-level-programs'. Also, we weren't including the new
`tex/dependencies' in the distribution tarball (with `make dist').

With this commit, both issues are solved and also, as a cosmetic change,
the GCC prerequisites of the same line-length were ordered alphabetically.
---
 reproduce/src/make/dependencies-basic.mk | 6 +++---
 reproduce/src/make/initialize.mk         | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'reproduce/src')

diff --git a/reproduce/src/make/dependencies-basic.mk b/reproduce/src/make/dependencies-basic.mk
index 9e277f7..81a17cd 100644
--- a/reproduce/src/make/dependencies-basic.mk
+++ b/reproduce/src/make/dependencies-basic.mk
@@ -67,7 +67,7 @@ export CPPFLAGS          := -I$(idir)/include $(CPPFLAGS)
 export LD_LIBRARY_PATH   := $(ildir):$(LD_LIBRARY_PATH)
 
 # Define the programs that don't depend on any other.
-top-level-programs = low-level-links wget gcc file
+top-level-programs = low-level-links wget gcc
 all: $(foreach p, $(top-level-programs), $(ibidir)/$(p))
 
 
@@ -815,9 +815,9 @@ $(ibidir)/gcc: $(gcc-prerequisites)   \
                $(ibidir)/grep         \
                $(ibidir)/which        \
                $(ibidir)/glibtool     \
-               $(ibidir)/findutils    \
+               $(ibidir)/coreutils    \
                $(ibidir)/diffutils    \
-               $(ibidir)/coreutils
+               $(ibidir)/findutils
 
         # GCC builds is own libraries in '$(idir)/lib64'. But all other
         # libraries are in '$(idir)/lib'. Since this pipeline is only for a
diff --git a/reproduce/src/make/initialize.mk b/reproduce/src/make/initialize.mk
index 286e64e..4e59712 100644
--- a/reproduce/src/make/initialize.mk
+++ b/reproduce/src/make/initialize.mk
@@ -252,6 +252,7 @@ $(packagecontents): | $(texdir)
 	cp tex/tikz/*.pdf                        $$dir/tex/tikz
 	cp -r reproduce/!(build)                 $$dir/reproduce
 	cp -r tex/pipeline/!($(packagebasename)) $$dir/tex/pipeline
+	cp -r tex/dependencies                   $$dir/tex/dependencies
 
         # Clean up un-necessary/local files: 1) the $(texdir)/build*
         # directories (when building in a group structure, there will be
-- 
cgit v1.2.1