From: František Dvořák <valtri@civ.zcu.cz>
Date: Fri, 20 Aug 2010 16:55:36 +0000 (+0000)
Subject: Adopt compilation and linking flags from the environment.
X-Git-Tag: merge_21_head_after~14
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=d83b21f9abdd17eb10af886db0657c34414002a9;p=jra1mw.git

Adopt compilation and linking flags from the environment.
---

diff --git a/org.glite.security.gsoap-plugin/Makefile b/org.glite.security.gsoap-plugin/Makefile
index 6b1976d..d1ce72e 100644
--- a/org.glite.security.gsoap-plugin/Makefile
+++ b/org.glite.security.gsoap-plugin/Makefile
@@ -75,14 +75,14 @@ endif
 #	DEBUG:=${DEBUG} -DCHECK_GSOAP_VERSION
 #endif
 
-CFLAGS:= ${DEBUG} \
+CFLAGS:= ${CFLAGS} ${DEBUG} \
 	-DVERSION=\"${version}\" \
 	-DWITH_NONAMESPACES \
 	-I. -I${top_srcdir}/interface \
 	-I${stagedir}/include \
 	${COVERAGE_FLAGS} -D_GNU_SOURCE -DDATAGRID_EXTENSION -DWITH_IPV6
 
-LDFLAGS:=${COVERAGE_FLAGS}
+LDFLAGS:=${LDFLAGS} ${COVERAGE_FLAGS}
 
 COMPILE:=libtool --mode=compile ${CC} ${CFLAGS}
 COMPILEXX:=libtool --mode=compile ${CXX} ${CFLAGS}
diff --git a/org.glite.security.gss/Makefile b/org.glite.security.gss/Makefile
index dc8b50b..78d41a1 100644
--- a/org.glite.security.gss/Makefile
+++ b/org.glite.security.gss/Makefile
@@ -46,13 +46,13 @@ default: all
 DEBUG:=-g -O0 -W -Wall -Wno-unused-parameter
 # not for globus, gsoap: -Werror
 
-CFLAGS:= ${DEBUG} \
+CFLAGS:= ${CFLAGS} ${DEBUG} \
 	-DVERSION=\"${version}\" \
 	-I. -I${top_srcdir}/interface \
 	-I${stagedir}/include \
 	${COVERAGE_FLAGS} -D_GNU_SOURCE -DDATAGRID_EXTENSION
 
-LDFLAGS:=${COVERAGE_FLAGS}
+LDFLAGS:=${LDFLAGS} ${COVERAGE_FLAGS}
 
 COMPILE:=libtool --mode=compile ${CC} ${CFLAGS}
 LINK:=libtool --mode=link ${CC} -rpath ${stagedir}/${libdir} ${LDFLAGS}