diff mbox series

[01/78] Update makefile in preparation for Documentation/config/*.txt

Message ID 20181027062351.30446-2-pclouds@gmail.com (mailing list archive)
State New, archived
Headers show
Series nd/config-split reroll | expand

Commit Message

Duy Nguyen Oct. 27, 2018, 6:22 a.m. UTC 
config.txt is going to be broken down in smaller pieces and put under
Documentation/config directory. Update build rules to take these files
into account.

A dummy file is added to make sure wildcard expansion is predictable
(depending on shell setting it could expand to nothing or becomes a
path if config directory is empty). The file will be deleted once the
move is over.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
 Documentation/Makefile         | 2 +-
 Documentation/config/dummy.txt | 0
 Makefile                       | 2 +-
 generate-cmdlist.sh            | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 create mode 100644 Documentation/config/dummy.txt
diff mbox series

Patch

diff --git a/Documentation/Makefile b/Documentation/Makefile
index 95f6a321f2..48d261dc2c 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -285,7 +285,7 @@  docdep_prereqs = \
 	mergetools-list.made $(mergetools_txt) \
 	cmd-list.made $(cmds_txt)
 
-doc.dep : $(docdep_prereqs) $(wildcard *.txt) build-docdep.perl
+doc.dep : $(docdep_prereqs) $(wildcard *.txt) $(wildcard config/*.txt) build-docdep.perl
 	$(QUIET_GEN)$(RM) $@+ $@ && \
 	$(PERL_PATH) ./build-docdep.perl >$@+ $(QUIET_STDERR) && \
 	mv $@+ $@
diff --git a/Documentation/config/dummy.txt b/Documentation/config/dummy.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/Makefile b/Makefile
index b08d5ea258..e2ca83203f 100644
--- a/Makefile
+++ b/Makefile
@@ -2068,7 +2068,7 @@  $(BUILT_INS): git$X
 
 command-list.h: generate-cmdlist.sh command-list.txt
 
-command-list.h: $(wildcard Documentation/git*.txt) Documentation/*config.txt
+command-list.h: $(wildcard Documentation/git*.txt) Documentation/*config.txt Documentation/config/*.txt
 	$(QUIET_GEN)$(SHELL_PATH) ./generate-cmdlist.sh command-list.txt >$@+ && mv $@+ $@
 
 SCRIPT_DEFINES = $(SHELL_PATH_SQ):$(DIFF_SQ):$(GIT_VERSION):\
diff --git a/generate-cmdlist.sh b/generate-cmdlist.sh
index fa1e5475e8..709d67405b 100755
--- a/generate-cmdlist.sh
+++ b/generate-cmdlist.sh
@@ -80,7 +80,7 @@  print_config_list () {
 	cat <<EOF
 static const char *config_name_list[] = {
 EOF
-	grep -h '^[a-zA-Z].*\..*::$' Documentation/*config.txt |
+	grep -h '^[a-zA-Z].*\..*::$' Documentation/*config.txt Documentation/config/*.txt |
 	sed '/deprecated/d; s/::$//; s/,  */\n/g' |
 	sort |
 	while read line