aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2010-05-12 16:09:01 -0700
committerH. Peter Anvin <hpa@linux.intel.com>2010-05-12 16:09:01 -0700
commit8c7b081a0a01eef5dbba5e86802558dbd9733d3e (patch)
treeb314e208887993172d2afc539663616719191037
parentd7eb569f092913018934dc702ba22af295557cc9 (diff)
downloadsyslinux-8c7b081a0a01eef5dbba5e86802558dbd9733d3e.tar.gz
syslinux-8c7b081a0a01eef5dbba5e86802558dbd9733d3e.tar.xz
syslinux-8c7b081a0a01eef5dbba5e86802558dbd9733d3e.zip
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@linux.intel.com>
-rw-r--r--MCONFIG4
-rw-r--r--MCONFIG.devel2
-rw-r--r--Makefile.private3
3 files changed, 8 insertions, 1 deletions
diff --git a/MCONFIG b/MCONFIG
index 87079a5f..c76b5917 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 00000000..104207f5
--- /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 ab9fee21..c70c204d 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)