Re: [PATCH 4/4] Have Makefile import config.mak if it exists.

[Christopher Li <sparse@chrisli.org>]

[-- Attachment #1: Type: text/plain, Size: 338 bytes --]

On Mon, Jun 1, 2009 at 11:37 AM, Samuel Bronson <naesten@gmail.com> wrote:
> This will allow users to override build settings without dirtying their
> trees, making life with `git stash' a bit easier.
>
I modify the patch to use "local.mk" and add it in .gitignore.

If that works for you, I am going to apply it as yours.

Thanks

Chris

[-- Attachment #2: 4-4-Have-Makefile-import-config.mak-if-it-exists..patch --]
[-- Type: application/octet-stream, Size: 1582 bytes --]

From patchwork Mon Jun  1 18:37:25 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [4/4] Have Makefile import config.mak if it exists.
Date: Mon, 01 Jun 2009 18:37:25 -0000
From: Samuel Bronson <naesten@gmail.com>
X-Patchwork-Id: 27264

This will allow users to override build settings without dirtying their
trees, making life with `git stash' a bit easier.

Signed-off-by: Samuel Bronson <naesten@gmail.com>

---
Makefile |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

Index: sparse.chrisl/Makefile
===================================================================
--- sparse.chrisl.orig/Makefile
+++ sparse.chrisl/Makefile
@@ -10,9 +10,10 @@ LDFLAGS += -g
 AR = ar
 
 #
-# For debugging, uncomment the next one
+# For debugging, put this in local.mk:
+#
+#     CFLAGS += -O0 -DDEBUG -g3 -gdwarf-2
 #
-#CFLAGS += -O0 -DDEBUG -g3 -gdwarf-2
 
 HAVE_LIBXML=$(shell pkg-config --exists libxml-2.0 && echo 'yes')
 HAVE_GCC_DEP=$(shell touch .gcc-test.c && 				\
@@ -89,6 +90,11 @@ SED_PC_CMD = 's|@version@|$(VERSION)|g;	
 	      s|@includedir@|$(INCLUDEDIR)|g'
 
 
+
+# Allow users to override build settings without dirtying their trees
+-include local.mk
+
+
 all: $(PROGRAMS) sparse.pc
 
 install: $(INST_PROGRAMS) $(LIBS) $(LIB_H) sparse.pc
Index: sparse.chrisl/.gitignore
===================================================================
--- sparse.chrisl.orig/.gitignore
+++ sparse.chrisl/.gitignore
@@ -33,3 +33,7 @@ patches-*
 # quilt's files
 patches
 series
+
+# local makefile
+local.mk
+