From 8f72537c4987df6fb6704bf492758b6bb85e7666 Mon Sep 17 00:00:00 2001 From: Patric Stout Date: Sat, 22 Feb 2020 23:44:36 +0100 Subject: [PATCH 1/2] Fix: [Makefile] make more clear what custom_tags.txt is While at it, parsetab.py is no longer left behind by NML. --- .gitignore | 1 - Makefile | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2d3db7a7..348d8f7c 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,6 @@ Makefile.local Makefile.vcs Makefile.gfx .version -parsetab.py custom_tags.txt docs/readme.txt .nmlcache diff --git a/Makefile b/Makefile index af76bc8b..2be7c3d7 100644 --- a/Makefile +++ b/Makefile @@ -301,8 +301,9 @@ endif grf: $(GFX_FILES) $(GRF_FILES) +# custom_tags.txt is used by NML to replace variables in LNG_FILES custom_tags.txt: Makefile.vcs - $(_E) "[LNG] $@" + $(_E) "[NML-LNG] $@" $(_V) echo "VERSION :$(REPO_VERSION)" > $@ $(_V) echo "VERSION_STRING :$(REPO_VERSION)" >> $@ $(_V) echo "TITLE :$(REPO_TITLE)" >> $@ @@ -338,7 +339,6 @@ clean:: $(_V)-rm -rf $(GRF_FILES) $(_V)-rm -rf $(GRF_FILES).cache $(_V)-rm -rf $(GRF_FILES).cacheindex - $(_V)-rm -rf parsetab.py $(_V)-rm -rf .nmlcache maintainer-clean:: From ddb258519a6c3507829dffada11bdc4bf3425cfa Mon Sep 17 00:00:00 2001 From: Patric Stout Date: Sat, 22 Feb 2020 23:52:49 +0100 Subject: [PATCH 2/2] Remove: [.gitignore] don't ignore things locally that should be ignored globally This list never ends. People keep finding local files to add for their specific editor, for their specific setup, etc. Please, learn to use the global git ignore, and lets keep these local gitignores for exactly that: local ignores. --- .gitignore | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/.gitignore b/.gitignore index 348d8f7c..ce3d925f 100644 --- a/.gitignore +++ b/.gitignore @@ -20,18 +20,3 @@ docs/readme.txt # Ignore directories from bundle creation / install: opengfx-* - -# Ignore frequent development left-overs like -# editor backups, patches, rejects etc. pp -*.orig -*.bak -*.log -*.rej -*.diff - -# Files created by Mac image preview and file browser: -.DS_Store -Thumbs.db - -archive/** -gimp-data/**