[osmpbf] 02/22: Allow overriding Makefile variables from the command line

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to tag v1.3.1
in repository osmpbf.

commit 705e60496b1ac336e4d932cfc3b6652a6804ae9e
Author: Thomas Friebel <yaron at codefreax.com>
Date:   Fri Mar 8 22:14:08 2013 +0100

    Allow overriding Makefile variables from the command line
---
 src/Makefile   | 6 +++---
 tools/Makefile | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 16c3e97..7996688 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,7 +1,7 @@
 
-CXX = g++
-CXXFLAGS = -O3
-AR = ar
+CXX ?= g++
+CXXFLAGS ?= -O3
+AR ?= ar
 
 all: libosmpbf.a ../include/osmpbf/fileformat.pb.h ../include/osmpbf/osmformat.pb.h
 
diff --git a/tools/Makefile b/tools/Makefile
index b9fc26b..db134fc 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,7 +1,7 @@
 
-CXX = g++
-CXXFLAGS = -g -I../include
-LDFLAGS = -L../src -lpthread -lz -lprotobuf-lite -losmpbf
+CXX ?= g++
+CXXFLAGS ?= -g -I../include
+LDFLAGS ?= -L../src -lpthread -lz -lprotobuf-lite -losmpbf
 
 all: osmpbf-outline
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmpbf.git