From 32c845501767fe8b3c28c953ecf3be3c24b1675c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Lesimple?= Date: Wed, 19 Aug 2020 17:01:59 +0200 Subject: [PATCH] chore: build system adjustments Remove build.h and version.tex from versioning, they're autogenerated Make 'Makefile' the dummy makefile to instruct user to launch configure if no GNUmakefile is found Make GNUmakefile the generated makefile and exclude it from the versioning Update .gitignore accordingly --- .gitignore | 15 +++++++++++++++ GNUmakefile | 4 ---- GNUmakefile.template | 4 ---- Makefile | 5 +++-- build.h | 2 -- documentation/config/version.tex | 1 - 6 files changed, 18 insertions(+), 13 deletions(-) delete mode 100644 GNUmakefile delete mode 100644 build.h delete mode 100644 documentation/config/version.tex diff --git a/.gitignore b/.gitignore index e20b201..bb6a18c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,18 @@ .pc *.o *~ +*.gcno +*.gcda +*.gcov +Makefile.config +configure.log +locale/Makefile +GNUmakefile +.gitignore +simple-md5sum +inlined-icons.h +help-dialogs.h +dvdisaster +build.h +dvdisaster.mo +locale/messages.pot diff --git a/GNUmakefile b/GNUmakefile deleted file mode 100644 index bd0f978..0000000 --- a/GNUmakefile +++ /dev/null @@ -1,4 +0,0 @@ -all: - @echo - @echo "Please create a Makefile by entering \"bash configure\" first" - @echo diff --git a/GNUmakefile.template b/GNUmakefile.template index 77a57bf..3b8bf62 100644 --- a/GNUmakefile.template +++ b/GNUmakefile.template @@ -286,10 +286,6 @@ distclean: clean @echo "Removing configuration files" @rm -f configure.log Makefile.config GNUmakefile locale/Makefile @for i in locale/?? locale/??_??; do rm -rf $$i; done - @echo "all:" >>GNUmakefile - @echo -e "\t@echo" >>GNUmakefile - @echo -e "\t@echo \"Please create a Makefile by entering \\\"bash configure\\\" first\"" >>GNUmakefile - @echo -e "\t@echo" >>GNUmakefile # There might be a not executable simple-md5sum from a compiler run # under a different architecture, so make sure we have a working binary diff --git a/Makefile b/Makefile index 413a02f..95c8bc7 100644 --- a/Makefile +++ b/Makefile @@ -4,8 +4,9 @@ all: @echo - @echo "dvdisaster requires GNU make to build." - @echo "Please try your command again using gmake." + @echo "Please run \`bash configure' first." + @echo "Note that dvdisaster requires GNU make to build." + @echo "Under non-Linux systems, it might be known as \`gmake'." @echo show: all diff --git a/build.h b/build.h deleted file mode 100644 index 7ee7c64..0000000 --- a/build.h +++ /dev/null @@ -1,2 +0,0 @@ -#define BUILD 272 -#define BDATE "17.11.17 (Freitag, 09:57)" diff --git a/documentation/config/version.tex b/documentation/config/version.tex deleted file mode 100644 index cdc5693..0000000 --- a/documentation/config/version.tex +++ /dev/null @@ -1 +0,0 @@ -\newcommand{\projectversion}{0.79.6}