From 9f4fac45b8e87d81f2f67ad6ae82b3ddbd32cce3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Fri, 20 Aug 2010 16:55:34 +0000 Subject: [PATCH] Adopt compilation and linking flags from the environment. --- org.glite.lb.client/Makefile | 4 ++-- org.glite.lb.common/Makefile | 4 ++-- org.glite.lb.logger/Makefile | 4 ++-- org.glite.lb.server/Makefile | 4 ++-- org.glite.lb.state-machine/Makefile | 2 +- org.glite.lb.utils/Makefile | 4 ++-- org.glite.lb.ws-test/Makefile | 2 +- org.glite.lbjp-common.db/Makefile | 4 ++-- org.glite.lbjp-common.jp-interface/Makefile | 2 +- org.glite.lbjp-common.log/Makefile | 4 ++-- org.glite.lbjp-common.maildir/Makefile | 4 ++-- org.glite.lbjp-common.server-bones/Makefile | 4 ++-- org.glite.lbjp-common.trio/Makefile | 2 +- 13 files changed, 22 insertions(+), 22 deletions(-) diff --git a/org.glite.lb.client/Makefile b/org.glite.lb.client/Makefile index 1adf674..700e01f 100644 --- a/org.glite.lb.client/Makefile +++ b/org.glite.lb.client/Makefile @@ -93,7 +93,7 @@ COMMON_LIB:=-lglite_lb_common_${nothrflavour} COMMON_LIB_THR:=-lglite_lb_common_${thrflavour} TRIO_LIB:=-lglite_lbu_trio -CFLAGS:=${DEBUG} \ +CFLAGS:=${CFLAGS} ${DEBUG} \ -I. \ -I${top_srcdir}/src -I${top_srcdir}/interface \ -I${stagedir}/include \ @@ -108,7 +108,7 @@ EXT_LIB:= TEST_LIBS:=-L${cppunit_prefix}/${libdir} -lcppunit TEST_INC:=-I${cppunit_prefix}/include -LDFLAGS:=-L${stagedir}/${libdir} ${COVERAGE_FLAGS} +LDFLAGS:=${LDFLAGS} -L${stagedir}/${libdir} ${COVERAGE_FLAGS} COMPILE:=libtool --mode=compile ${CC} ${CFLAGS} CXXCOMPILE:=libtool --mode=compile ${CXX} ${CXXFLAGS} diff --git a/org.glite.lb.common/Makefile b/org.glite.lb.common/Makefile index 0e12bc0..4c90e7c 100644 --- a/org.glite.lb.common/Makefile +++ b/org.glite.lb.common/Makefile @@ -39,7 +39,7 @@ TRIO_LIB:=-lglite_lbu_trio PERF_HDRS:=lb_perftest.h PERF_OBJS:=lb_perftest.o -CFLAGS:=${DEBUG} -I${top_srcdir}/src -I${top_srcdir}/interface \ +CFLAGS:=${CFLAGS} ${DEBUG} -I${top_srcdir}/src -I${top_srcdir}/interface \ -I. \ -I${top_srcdir}/test \ -I${stagedir}/include \ @@ -64,7 +64,7 @@ endif classadslib := ${classadslib} -lclassad -LDFLAGS:=-L${stagedir}/${libdir} -L${stagedir}/lib \ +LDFLAGS:=${LDFLAGS} -L${stagedir}/${libdir} -L${stagedir}/lib \ ${COVERAGE_FLAGS} EXT_LIBS:= ${EXPAT_LIBS} ${JOBID_LIB} ${TRIO_LIB} ${classadslib} diff --git a/org.glite.lb.logger/Makefile b/org.glite.lb.logger/Makefile index 138dd3a..097219e 100644 --- a/org.glite.lb.logger/Makefile +++ b/org.glite.lb.logger/Makefile @@ -42,13 +42,13 @@ else endif DEBUG:=-g -O0 -CFLAGS:=${DEBUG} \ +CFLAGS:=${CFLAGS} ${DEBUG} \ -I${stagedir}/include -I${top_srcdir}/src \ -D_GNU_SOURCE \ ${COVERAGE_FLAGS} \ ${VERSION} ${LB_STANDALONE_FLAGS} ${LB_PERF_FLAGS} -LDFLAGS:=-L${stagedir}/${libdir} \ +LDFLAGS:=${LDFLAGS} -L${stagedir}/${libdir} \ ${COVERAGE_FLAGS} LINK:=libtool --mode=link ${CC} ${LDFLAGS} diff --git a/org.glite.lb.server/Makefile b/org.glite.lb.server/Makefile index 5ff084e..7a88202 100644 --- a/org.glite.lb.server/Makefile +++ b/org.glite.lb.server/Makefile @@ -69,7 +69,7 @@ GRIDSITE_LIBS = -L${gridsite_prefix}/${libdir} -L${gridsite_prefix}/lib -lgridsi LCAS_CFLAGS=-I${lcas_prefix}/include -CFLAGS:= \ +CFLAGS:= ${CFLAGS} \ ${WS_CFLAGS} ${DEBUG} \ -DVERSION=\"${version}\" \ -I${gsoap_prefix}/include -I${gsoap_prefix}/ \ @@ -96,7 +96,7 @@ else SRVBONES_LIB:= -L${stagedir}/${libdir} -lglite_lbu_server_bones LB_COMMON_LIB:=-L${stagedir}/${libdir} -lglite_lb_common_${nothrflavour} LB_UTILS_DB_LIB:=-L${stagedir}/${libdir} -lglite_lbu_db - LDFLAGS:= -L${stagedir}/${libdir} + LDFLAGS:=${LDFLAGS} -L${stagedir}/${libdir} endif # LB_MACHINE_LIB:=${stagedir}/${libdir}/libglite_lb_statemachine.a diff --git a/org.glite.lb.state-machine/Makefile b/org.glite.lb.state-machine/Makefile index 926b3b9..de3b47d 100644 --- a/org.glite.lb.state-machine/Makefile +++ b/org.glite.lb.state-machine/Makefile @@ -22,7 +22,7 @@ SUFFIXES = .T DEBUG:=-g -O0 -Wall -CFLAGS:= \ +CFLAGS:= ${CFLAGS} \ ${DEBUG} \ -I${classads_prefix}/include -I${classads_prefix}/include/classad \ -I${stagedir}/include -I${top_srcdir}/src -I. \ diff --git a/org.glite.lb.utils/Makefile b/org.glite.lb.utils/Makefile index c59f3fe..6583a49 100644 --- a/org.glite.lb.utils/Makefile +++ b/org.glite.lb.utils/Makefile @@ -26,7 +26,7 @@ SUFFIXES = .T DEBUG:=-g -O0 -Wall -CFLAGS:= \ +CFLAGS:= ${CFLAGS} \ ${WS_CFLAGS} ${DEBUG} \ -DVERSION=\"${version}\" \ -I${stagedir}/include -I${top_srcdir}/src -I. \ @@ -35,7 +35,7 @@ CFLAGS:= \ -I${gsoap_prefix}/include -I${gsoap_prefix}/ \ ${COVERAGE_FLAGS} \ -D_GNU_SOURCE -LDFLAGS:=-L${stagedir}/${libdir} +LDFLAGS:=${LDFLAGS} -L${stagedir}/${libdir} COMPILE:=libtool --mode=compile ${CC} ${CFLAGS} LINK:=libtool --mode=link ${CC} -rpath ${stagedir}/${libdir} ${LDFLAGS} diff --git a/org.glite.lb.ws-test/Makefile b/org.glite.lb.ws-test/Makefile index 40099c1..e419693 100644 --- a/org.glite.lb.ws-test/Makefile +++ b/org.glite.lb.ws-test/Makefile @@ -26,7 +26,7 @@ default all: ${CEXAMPLES} VPATH=${top_srcdir}/examples CC=gcc DEBUG:=-g -O0 -Wall -CFLAGS=-I${gsoap_prefix}/include -I${gsoap_prefix}/ \ +CFLAGS:=${CFLAGS} -I${gsoap_prefix}/include -I${gsoap_prefix}/ \ -I${stagedir}/include -I${top_srcdir}/src -I. \ -I${globus_prefix}/include/${nothrflavour} \ ${DEBUG} diff --git a/org.glite.lbjp-common.db/Makefile b/org.glite.lbjp-common.db/Makefile index 3aef263..1d9b3ee 100644 --- a/org.glite.lbjp-common.db/Makefile +++ b/org.glite.lbjp-common.db/Makefile @@ -38,7 +38,7 @@ MYSQL_CPPFLAGS:=-I${mysql-devel_prefix}/include -I${mysql-devel_prefix}/include/ PSQL_CPPFLAGS:=-I${postgresql_prefix}/include -I${postgresql_prefix}/include/postgresql -CFLAGS:= \ +CFLAGS:= ${CFLAGS} \ ${DEBUG} \ -DVERSION=\"${version}\" \ -I${stagedir}/include -I${top_srcdir}/src -I. \ @@ -62,7 +62,7 @@ endif TEST_LIBS:=-L${cppunit_prefix}/${libdir} -lcppunit TEST_INC:=-I${cppunit_prefix}/include -LDFLAGS:=-L${stagedir}/${libdir} ${COVERAGE_FLAGS} +LDFLAGS:=${LDFLAGS} -L${stagedir}/${libdir} ${COVERAGE_FLAGS} COMPILE:=libtool --mode=compile ${CC} ${CFLAGS} COMPILEXX:=libtool --mode=compile ${CXX} ${CFLAGS} diff --git a/org.glite.lbjp-common.jp-interface/Makefile b/org.glite.lbjp-common.jp-interface/Makefile index c5e5322..310ff8d 100644 --- a/org.glite.lbjp-common.jp-interface/Makefile +++ b/org.glite.lbjp-common.jp-interface/Makefile @@ -25,7 +25,7 @@ version=${module.version} VPATH=${top_srcdir}/src:${top_srcdir}/test:${top_srcdir}/project:${jpproject} DEBUG:=-g -O0 -W -Wno-sign-compare -CFLAGS:=${DEBUG} -D_GNU_SOURCE -I. -I${top_srcdir}/interface -I${stagedir}/include +CFLAGS:=${CFLAGS} ${DEBUG} -D_GNU_SOURCE -I. -I${top_srcdir}/interface -I${stagedir}/include # In order to use libtool versioning correcty, we must have: # diff --git a/org.glite.lbjp-common.log/Makefile b/org.glite.lbjp-common.log/Makefile index e14aa48..80846d0 100644 --- a/org.glite.lbjp-common.log/Makefile +++ b/org.glite.lbjp-common.log/Makefile @@ -23,13 +23,13 @@ LOG4C_LIBS:=-L${log4c_prefix}/${libdir} -L${log4c_prefix}/lib -llog4c DEBUG:=-g -O0 -W -Wall -CFLAGS:= \ +CFLAGS:= ${CFLAGS} \ ${DEBUG} \ -I${stagedir}/include -I${top_srcdir}/src \ -I${top_srcdir}/interface \ ${LOG4C_CFLAGS} -LDFLAGS:=-L${stagedir}/${libdir} +LDFLAGS:=${LDFLAGS} -L${stagedir}/${libdir} COMPILE:=libtool --mode=compile ${CC} ${CFLAGS} LINK:=libtool --mode=link ${CC} -rpath ${stagedir}/${libdir} ${LDFLAGS} diff --git a/org.glite.lbjp-common.maildir/Makefile b/org.glite.lbjp-common.maildir/Makefile index 83e7c40..c8f9ece 100644 --- a/org.glite.lbjp-common.maildir/Makefile +++ b/org.glite.lbjp-common.maildir/Makefile @@ -26,7 +26,7 @@ VPATH=${top_srcdir}/interface:${top_srcdir}/src:${top_srcdir}/examples DEBUG:=-g -O0 -W -Wall -CFLAGS:= \ +CFLAGS:= ${CFLAGS} \ ${DEBUG} \ -DVERSION=\"${version}\" \ -I${stagedir}/include -I${top_srcdir}/src -I. \ @@ -34,7 +34,7 @@ CFLAGS:= \ ${COVERAGE_FLAGS} \ -D_GNU_SOURCE -LDFLAGS:=-L${stagedir}/${libdir} ${COVERAGE_FLAGS} +LDFLAGS:=${LDFLAGS} -L${stagedir}/${libdir} ${COVERAGE_FLAGS} COMPILE:=libtool --mode=compile ${CC} ${CFLAGS} LINK:=libtool --mode=link ${CC} -rpath ${stagedir}/${libdir} ${LDFLAGS} diff --git a/org.glite.lbjp-common.server-bones/Makefile b/org.glite.lbjp-common.server-bones/Makefile index 9f2c514..9d8dce5 100644 --- a/org.glite.lbjp-common.server-bones/Makefile +++ b/org.glite.lbjp-common.server-bones/Makefile @@ -17,11 +17,11 @@ version=${module.version} VPATH=${top_srcdir}/src:${top_srcdir}/examples DEBUG:=-g -O0 -Wall -CFLAGS:= ${DEBUG} \ +CFLAGS:= ${CFLAGS} ${DEBUG} \ -I${top_srcdir}/interface \ -I${stagedir}/include \ -D_GNU_SOURCE -LDFLAGS:=-L${stagedir}/${libdir} +LDFLAGS:=${LDFLAGS} -L${stagedir}/${libdir} ifdef LB_PROF CFLAGS:= ${CFLAGS} -pg -g diff --git a/org.glite.lbjp-common.trio/Makefile b/org.glite.lbjp-common.trio/Makefile index 884a79b..838de1e 100644 --- a/org.glite.lbjp-common.trio/Makefile +++ b/org.glite.lbjp-common.trio/Makefile @@ -21,7 +21,7 @@ CC=gcc DEBUG:=-g -O0 -Wall -CFLAGS:=${DEBUG} -I${top_srcdir}/src -I${top_srcdir}/interface -I. -DDATAGRID_EXTENSION +CFLAGS:=${CFLAGS} ${DEBUG} -I${top_srcdir}/src -I${top_srcdir}/interface -I. -DDATAGRID_EXTENSION COMPILE:=libtool --mode=compile ${CC} LINK:=libtool --mode=link ${CC} -rpath ${stagedir}/${libdir} ${LDFLAGS} -- 1.8.2.3