[osmpbf] 12/22: Make CXX/CXXFLAGS overridable
Bas Couwenberg
sebastic at xs4all.nl
Sun Mar 16 10:08:42 UTC 2014
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 2c281c9bf80212adcd2db52974c931870b0a3e1a
Author: Dmitry Marakasov <amdmi3 at amdmi3.ru>
Date: Tue Aug 27 22:16:22 2013 +0400
Make CXX/CXXFLAGS overridable
This makes it easier to support systemwide compiler settings.
While here, link with pthreads in a more correct way (-pthread instead
of -lpthread).
---
src/Makefile | 4 ++--
tools/Makefile | 7 ++++---
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/Makefile b/src/Makefile
index 16c3e97..ffb5464 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,6 +1,6 @@
-CXX = g++
-CXXFLAGS = -O3
+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..f09499b 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,7 +1,8 @@
-CXX = g++
-CXXFLAGS = -g -I../include
-LDFLAGS = -L../src -lpthread -lz -lprotobuf-lite -losmpbf
+CXX ?= g++
+CXXFLAGS ?= -g
+CXXFLAGS += -I../include
+LDFLAGS += -L../src -pthread -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
More information about the Pkg-grass-devel
mailing list