Globus headers and libraries aren't needed anymore to build the LB package

- the only exception is LB server due to the gridsite's dependency on openssl
  headers

diff --git a/org.glite.lb.client/Makefile b/org.glite.lb.client/Makefile
index 6081c9e..6f50e23 100644 (file)
--- a/org.glite.lb.client/Makefile
+++ b/org.glite.lb.client/Makefile
@@ -7,7 +7,6 @@ lbprefix=lb
 package=glite-lb-client
 version=0.0.0
 
-globus_prefix=/opt/globus
 nothrflavour=gcc32
 thrflavour=gcc32pthr
 
@@ -57,9 +56,6 @@ l_SRC = \
 
 sh_PROGS = $(l_SRC:.l=.sh)
 
-GLOBUSINC:= -I${globus_prefix}/include/${nothrflavour}
-GLOBUSTHRINC:= -I${globus_prefix}/include/${thrflavour}
-
 ifdef DEBUG
        DEBUG:=-g -O0 -Wall -DEDG_WLL_LOG_STUB
 else
@@ -211,22 +207,22 @@ ${FAKE_EXAMPLES}: %: %.o ${FAKELIB}
 ${TOOLS}: ${LIB}
 
 ${FAKE_EXAMPLES:=.o}: %.o: %.cpp
-       ${COMPILE} ${GLOBUSINC} ${TEST_INC} -c $< -o $@
+       ${COMPILE} ${TEST_INC} -c $< -o $@
 
 ${PLUSOBJS}: %.o: %.cpp
-       ${CXXCOMPILE} ${GLOBUSINC} -c $<
+       ${CXXCOMPILE} -c $<
 
 ${PLUSTHROBJS}: %.thr.o: %.cpp
-       ${CXXCOMPILE} ${GLOBUSTHRINC} -o $@ -c $<
+       ${CXXCOMPILE} -o $@ -c $<
 
 ${LIBOBJS} ${FAKELIBOBJS}: %.o: %.c
-       ${COMPILE} ${GLOBUSINC} -c $<
+       ${COMPILE} -c $<
 
 ${LIBTHROBJS} ${FAKELIBTHROBJS}: %.thr.o: %.c
-       ${COMPILE} ${GLOBUSTHRINC} -o $@ -c $<
+       ${COMPILE} -o $@ -c $<
 
 logevent_fake.o: logevent.c
-       ${COMPILE} ${GLOBUSINC} -c $< -o $@
+       ${COMPILE} -c $< -o $@
 
 ${MAN_GZ}: ${MAN}
        cp $? .
@@ -234,11 +230,11 @@ ${MAN_GZ}: ${MAN}
 
 
 perftest_logjobs.o: perftest_logjobs.c
-       ${CC} ${CFLAGS} -DLB_PERF_DROP ${GLOBUSINC} -c $<
+       ${CC} ${CFLAGS} -DLB_PERF_DROP -c $<
 
 # catches $TOOLS and logevent compilation
 %.o: %.c 
-       ${CC} ${CFLAGS} ${GLOBUSINC} -c $<
+       ${CC} ${CFLAGS} -c $<
 
 %.h: %.h.T
        rm -f $@
@@ -274,7 +270,7 @@ producer_test: producer_test.o prod_proto_test.o
        ${LINKXX} -o $@ ${LIB} ${TEST_LIBS} $+ ${EXT_LIB}
 
 producer_test.o: %.o: %.cpp
-       ${CXX} -c ${CXXFLAGS} ${TEST_INC} ${GLOBUSINC} $<
+       ${CXX} -c ${CXXFLAGS} ${TEST_INC} $<
 
 man: ${MAN_GZ}
 

diff --git a/org.glite.lb.common/Makefile b/org.glite.lb.common/Makefile
index 478af39..839308f 100644 (file)
--- a/org.glite.lb.common/Makefile
+++ b/org.glite.lb.common/Makefile
@@ -8,7 +8,6 @@ package=glite-lb-common
 version=0.0.0
 PREFIX=/opt/glite
 
-globus_prefix=/opt/globus
 nothrflavour=gcc32
 thrflavour=gcc32pthr
 expat_prefix=/opt/expat
@@ -28,8 +27,6 @@ SUFFIXES = .T
 CC=gcc
 
 DEBUG:=-g -O0 -Wall
-GLOBUSINC:= -I${globus_prefix}/include/${nothrflavour}
-GLOBUSTHRINC:= -I${globus_prefix}/include/${thrflavour}
 
 ifdef LB_STANDALONE
        JOBID_OBJS:=cjobid.o strmd5.o
@@ -58,14 +55,6 @@ CFLAGS:=${DEBUG} -I${top_srcdir}/src -I${top_srcdir}/interface \
 VERSION_AHEAD=3
 CHECK_VERSION:=VERSION=${version} VERSION_AHEAD=${VERSION_AHEAD} perl ${top_srcdir}/project/check_version.pl
 
-GLOBUS_LIBS:=-L${globus_prefix}/lib \
-        -lglobus_common_${nothrflavour} \
-        -lglobus_gssapi_gsi_${nothrflavour} \
-
-GLOBUS_THRLIBS:=-L${globus_prefix}/lib \
-        -lglobus_common_${thrflavour} \
-        -lglobus_gssapi_gsi_${thrflavour} \
-
 ifneq (${expat_prefix},/usr)
        EXPAT_LIBS:=-L${expat_prefix}/lib
 endif
@@ -74,8 +63,8 @@ EXPAT_LIBS:=${EXPAT_LIBS} -lexpat
 LDFLAGS:=-L${stagedir}/lib \
        ${COVERAGE_FLAGS}
 
-EXT_LIBS:= ${EXPAT_LIBS} ${GLOBUS_LIBS} ${JOBID_LIB}
-EXT_THRLIBS:= ${EXPAT_LIBS} ${GLOBUS_THRLIBS} ${JOBID_LIB}
+EXT_LIBS:= ${EXPAT_LIBS} ${JOBID_LIB}
+EXT_THRLIBS:= ${EXPAT_LIBS} ${JOBID_LIB}
 
 TEST_LIBS:=-L${cppunit_prefix}/lib -lcppunit
 TEST_INC:=-I${cppunit_prefix}/include
@@ -250,13 +239,13 @@ clean:
        rm -rvf log.xml project/ rpmbuild/ RPMS/ tgz/
 
 %.o: %.c
-       ${COMPILE} ${GLOBUSINC} ${CFLAGS} -c $<
+       ${COMPILE} ${CFLAGS} -c $<
 
 il_int_test.o il_string_test.o il_test.o il_msg_test.o parse.o: %.o: %.cpp
        ${CXX} -c ${CFLAGS} ${TEST_INC} $<
 
 %.thr.o: %.c
-       ${COMPILE} ${GLOBUSTHRINC} ${CFLAGS} -D_REENTRANT -DGLITE_LB_THREADED -o $@ -c $<
+       ${COMPILE} ${CFLAGS} -D_REENTRANT -DGLITE_LB_THREADED -o $@ -c $<
 
 %.h: %.h.T
        rm -f $@

diff --git a/org.glite.lb.logger/Makefile b/org.glite.lb.logger/Makefile
index f14f654..dac5ece 100644 (file)
--- a/org.glite.lb.logger/Makefile
+++ b/org.glite.lb.logger/Makefile
@@ -8,7 +8,6 @@ package=glite-lb-client
 version=0.0.0
 PREFIX=/opt/glite
 
-globus_prefix=/opt/globus
 nothrflavour=gcc32
 thrflavour=gcc32pthr
 
@@ -25,10 +24,6 @@ VERSION=-DVERSION=\"GLite-${version}\"
 
 SUFFIXES=.no
 
-GLOBUSINC=-I${globus_prefix}/include/${nothrflavour}
-
-GLOBUSTHRINC=-I${globus_prefix}/include/${thrflavour}
-
 ifdef LB_STANDALONE
        LB_STANDALONE_FLAGS:=-DLB_STANDALONE
 endif
@@ -59,14 +54,6 @@ LINK:=libtool --mode=link ${CC} ${LDFLAGS}
 LINKXX:=libtool --mode=link ${CXX} -rpath ${stagedir}/lib ${LDFLAGS} 
 INSTALL:=libtool --mode=install install
 
-GLOBUS_LIBS:= -L${globus_prefix}/lib \
-       -lglobus_common_${nothrflavour} \
-       -lglobus_gssapi_gsi_${nothrflavour}
-
-GLOBUS_THRLIBS:= -L${globus_prefix}/lib \
-       -lglobus_common_${thrflavour} \
-       -lglobus_gssapi_gsi_${thrflavour}
-
 #ifneq (${expat_prefix},/usr)
 #      EXPAT_LIBS:=-L${expat_prefix}/lib
 #endif
@@ -152,7 +139,7 @@ check:
 # check.ll check.il
 
 #check.ll: logd_proto_test.o ll_test.o
-#      ${LINKXX} -o $@ ${COMMON_LIB}_${nothrflavour} ${EXT_LIBS} ${GLOBUS_LIBS} ${TEST_LIBS} $+
+#      ${LINKXX} -o $@ ${COMMON_LIB}_${nothrflavour} ${EXT_LIBS} ${TEST_LIBS} $+
 #      ./check.ll
 
 check.ll:
@@ -191,34 +178,34 @@ endif
        ${INSTALL} -m 644 ${top_srcdir}/LICENSE ${PREFIX}/share/doc/${package}-${version}
 
 ${INTERLOG_NOBJS}: %.no: %.c
-       ${CC} ${CFLAGS} ${GLOBUSTHRINC} -DIL_NOTIFICATIONS -c $< -o $@
+       ${CC} ${CFLAGS} -DIL_NOTIFICATIONS -c $< -o $@
 
 ${INTERLOG_OBJS}: %.o: %.c
-       ${CC} ${CFLAGS} ${GLOBUSTHRINC} -c $< -o $@
+       ${CC} ${CFLAGS} -c $< -o $@
 
 ${INTERLOG_EMPTY_OBJS}: %.empty.o: %.c
-       ${CC} ${CFLAGS} ${GLOBUSTHRINC} -DPERF_EMPTY -c $< -o $@
+       ${CC} ${CFLAGS} -DPERF_EMPTY -c $< -o $@
 
 ${INTERLOG_PERF_OBJS}: %.perf.o: %.c
-       ${CC} ${CFLAGS} ${GLOBUSTHRINC} -c $< -o $@
+       ${CC} ${CFLAGS} -c $< -o $@
 
 #${INTERLOG_INLINE_EMPTY_OBJS}: %.io: %.c
-#      ${CC} ${CFLAGS} ${GLOBUSTHRINC} -DLB_PERF -DPERF_EMPTY -DPERF_EVENTS_INLINE -c $< -o $@
+#      ${CC} ${CFLAGS} -DLB_PERF -DPERF_EMPTY -DPERF_EVENTS_INLINE -c $< -o $@
 
 ${LOGD_NOBJS}: %.no: %.c
-       ${CC} ${CFLAGS} ${GLOBUSINC} -DLOGD_NOFILE -c $< -o $@
+       ${CC} ${CFLAGS} -DLOGD_NOFILE -c $< -o $@
 
 ${LOGD_OBJS}: %.o: %.c
-       ${CC} ${CFLAGS} ${GLOBUSINC} -c $< -o $@
+       ${CC} ${CFLAGS} -c $< -o $@
 
 logd_proto_test.o: %.o: %.c
-       ${CC} ${CFLAGS} ${GLOBUSINC} -c $< -o $@
+       ${CC} ${CFLAGS} -c $< -o $@
 
 ll_test.o: %.o: %.cpp
        ${CXX} ${CFLAGS} ${TEST_INC} -c $< -o $@
 
 il_test.o IlTestBase.o server_msgTest.o event_queueTest.o input_queue_socketTest.o event_storeTest.o: %.o: %.cpp
-       ${CXX} ${CFLAGS} ${GLOBUSTHRINC} ${TEST_INC} -c $< -o $@
+       ${CXX} ${CFLAGS} ${TEST_INC} -c $< -o $@
 
 clean:
        rm -rvf .libs/ *.o *.no ${LOGD} ${INTERLOGD} ${NOTIF_INTERLOGD} 

diff --git a/org.glite.lb.proxy/Makefile b/org.glite.lb.proxy/Makefile
index 0f1ab0a..b041460 100644 (file)
--- a/org.glite.lb.proxy/Makefile
+++ b/org.glite.lb.proxy/Makefile
@@ -8,7 +8,6 @@ package=glite-lb-server
 version=0.2.0
 PREFIX=/opt/glite
 
-globus_prefix=/opt/globus
 nothrflavour=gcc32
 thrflavour=gcc32pthr
 expat_prefix=/opt/expat
@@ -47,8 +46,7 @@ CFLAGS:= ${DEBUG} \
        -I${expat_prefix}/include \
        ${COVERAGE_FLAGS} \
        -I${mysql_prefix}/include -I${mysql_prefix}/include/mysql \
-       -I${globus_prefix}/include/${nothrflavour} \
-       -I${gridsite_prefix}/include -I${globus_prefix}/include/${nothrflavour}/openssl \
+       -I${gridsite_prefix}/include \
        -D_GNU_SOURCE ${LB_STANDALONE_FLAGS} ${LB_PERF_FLAGS}
 
 
@@ -57,10 +55,6 @@ LINKXX:=libtool --mode=link ${CXX} ${LDFLAGS}
 INSTALL:=libtool --mode=install install
 LINKXX:=libtool --mode=link  ${CXX} -rpath ${stagedir}/lib ${LDFLAGS}
 
-GLOBUS_LIBS:= -L${globus_prefix}/lib \
-       -lglobus_common_${nothrflavour} \
-       -lglobus_gssapi_gsi_${nothrflavour} \
-
 archlib:=lib
 host_cpu:=${shell uname -m}
 ifeq (${host_cpu},x86_64)
@@ -96,8 +90,7 @@ EXT_LIBS:= \
        ${mysqlib} -lmysqlclient -lz\
        ${expatlib} -lexpat \
        ${GRIDSITE_LIBS} \
-       ${VOMS_LIBS} \
-       ${GLOBUS_LIBS}
+       ${VOMS_LIBS}
 
 
 

diff --git a/org.glite.lb.server/Makefile b/org.glite.lb.server/Makefile
index a9938e0..79c5637 100644 (file)
--- a/org.glite.lb.server/Makefile
+++ b/org.glite.lb.server/Makefile
@@ -8,6 +8,7 @@ package=glite-lb-server
 version=0.2.0
 PREFIX=/opt/glite
 
+# gridsite requires openssl libraries, we want to include the ones from globus
 globus_prefix=/opt/globus
 nothrflavour=gcc32
 thrflavour=gcc32pthr
@@ -86,10 +87,10 @@ CFLAGS:= \
        -I${voms_prefix}/include \
        ${COVERAGE_FLAGS} \
        -I${mysql_prefix}/include -I${mysql_prefix}/include/mysql \
-       -I${globus_prefix}/include/${nothrflavour} \
        $(GRIDSITE_CFLAGS) \
        -D_GNU_SOURCE ${LB_STANDALONE_FLAGS} ${LB_PERF_FLAGS} ${LB_DAG_FLAGS} \
-       ${LB_BUF_FLAGS}
+       ${LB_BUF_FLAGS} \
+       -I${globus_prefix}/include/${nothrflavour} #gridsite needs this
 
 ifdef LB_PROF
        SRVBONES_LIB:= ${stagedir}/lib/libglite_lb_server_bones.la
@@ -117,10 +118,6 @@ INSTALL:=libtool --mode=install install
 LINKXX:=libtool --mode=link  ${CXX} -rpath ${stagedir}/lib ${LDFLAGS}
 XSLTPROC:=xsltproc --novalid
 
-GLOBUS_LIBS:= -L${globus_prefix}/lib \
-       -lglobus_common_${nothrflavour} \
-       -lglobus_gssapi_gsi_${nothrflavour} \
-
 #ifeq ($(shell ls ${gsoap_prefix}/bin/soapcpp2),${gsoap_prefix}/bin/soapcpp2)
 #      gsoap_bin_prefix := ${gsoap_prefix}/bin
 #else
@@ -161,7 +158,6 @@ VOMS_LIBS:=-L${voms_prefix}/lib -lvomsc${vomsflavour}
 #      ${expatlib} -lexpat \
 #      ${GRIDSITE_LIBS} \
 #      -lvomsc${vomsflavour} \
-#      ${GLOBUS_LIBS}
 
 ifneq (${classads_prefix},/usr)
        classadslib := -L${classads_prefix}/lib -lclassad
@@ -423,7 +419,7 @@ clean:
        ${COMPILE} -c $<
 
 test_query_events.o: %.o: %.cpp
-       ${CXX} -c ${CFLAGS} ${GLOBUSINC} ${TEST_INC} $<
+       ${CXX} -c ${CFLAGS} ${TEST_INC} $<
 
 
 %.lo: %.c

diff --git a/org.glite.lb.utils/Makefile b/org.glite.lb.utils/Makefile
index d4ae7fc..bd5fd57 100644 (file)
--- a/org.glite.lb.utils/Makefile
+++ b/org.glite.lb.utils/Makefile
@@ -8,7 +8,6 @@ package=glite-lb-utils
 version=0.0.0
 PREFIX=/opt/glite
 
-globus_prefix=/opt/globus
 nothrflavour=gcc32
 thrflavour=gcc32pthr
 expat_prefix=/opt/expat
@@ -32,7 +31,6 @@ CFLAGS:= \
        -I${gsoap_prefix}/include -I${gsoap_prefix}/ \
        ${COVERAGE_FLAGS} \
        -I${mysql_prefix}/include -I${mysql_prefix}/include/mysql \
-       -I${globus_prefix}/include/${nothrflavour} \
        -D_GNU_SOURCE
 LDFLAGS:=-L${stagedir}/lib
 
@@ -49,8 +47,7 @@ ifneq (${expat_prefix},/usr)
 endif
 
 EXT_LIBS:= \
-       ${expatlib} -lexpat \
-       ${GLOBUS_LIBS}
+       ${expatlib} -lexpat
 COMMON_LIB:=-lglite_lb_common_${nothrflavour}
 CLIENT_LIB:=-lglite_lb_client_${nothrflavour}
 JP_LIBS:=-lglite_jp_common_${nothrflavour} -lglite_jp_trio
@@ -66,7 +63,7 @@ default: all
 compile all: ${UTILS} ${MAN_GZ} statistics
 
 %.o: %.c 
-       ${CC} ${CFLAGS} ${GLOBUSINC} -c $<
+       ${CC} ${CFLAGS} -c $<
 
 ${UTILS}: %: %.o
        ${LINK} -o $@ $< ${COMMON_LIB} ${CLIENT_LIB} ${EXT_LIBS}