[syslinux:pathbased] MCONFIG: add MCONFIG.devel for use from git, removed in tarballs
syslinux-bot for H. Peter Anvin
hpa at linux.intel.com
Wed May 12 16:12:22 PDT 2010
Commit-ID: 8c7b081a0a01eef5dbba5e86802558dbd9733d3e
Gitweb: http://syslinux.zytor.com/commit/8c7b081a0a01eef5dbba5e86802558dbd9733d3e
Author: H. Peter Anvin <hpa at linux.intel.com>
AuthorDate: Wed, 12 May 2010 16:09:01 -0700
Committer: H. Peter Anvin <hpa at linux.intel.com>
CommitDate: Wed, 12 May 2010 16:09:01 -0700
MCONFIG: add MCONFIG.devel for use from git, removed in tarballs
Add an MCONFIG.devel file which is present in git, but removed in
tarballs. This lets us set -Werror there and still not break users
who are using a different compiler.
Signed-off-by: H. Peter Anvin <hpa at linux.intel.com>
---
MCONFIG | 4 ++++
MCONFIG.devel | 2 ++
Makefile.private | 3 ++-
3 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/MCONFIG b/MCONFIG
index 87079a5..c76b591 100644
--- a/MCONFIG
+++ b/MCONFIG
@@ -74,5 +74,9 @@ MAKEDEPS = -Wp,-MT,$@,-MD,$(dir $@).$(notdir $@).d
# header files from the platform.
UMAKEDEPS = -Wp,-MT,$@,-MMD,$(dir $@).$(notdir $@).d
+# Items that are only appropriate during development; this file is
+# removed when tarballs are generated.
+-include $(topdir)/MCONFIG.devel
+
# Local additions, like -DDEBUG can go here
-include $(topdir)/MCONFIG.local
diff --git a/MCONFIG.devel b/MCONFIG.devel
new file mode 100644
index 0000000..104207f
--- /dev/null
+++ b/MCONFIG.devel
@@ -0,0 +1,2 @@
+# Useful while doing development, but not for production.
+GCCWARN += -Wno-clobbered -Werror
diff --git a/Makefile.private b/Makefile.private
index ab9fee2..c70c204 100644
--- a/Makefile.private
+++ b/Makefile.private
@@ -17,7 +17,8 @@
#
.PHONY: official release
-PRIVATE = Makefile.private
+# These files are removed when tarballs are generated.
+PRIVATE = Makefile.private MCONFIG.devel
GIT_DIR ?= .git
ABS_GIT_DIR := $(shell cd '$(GIT_DIR)' 2>/dev/null && pwd)
More information about the Syslinux-commits
mailing list