ETICS cleanup (on HEAD using branch configurations),

fixed and enabled build of lb-plugin.

diff --git a/org.glite.lb.proxy/Makefile b/org.glite.lb.proxy/Makefile
index 282052f..ecfbbc3 100644 (file)
--- a/org.glite.lb.proxy/Makefile
+++ b/org.glite.lb.proxy/Makefile
@@ -1,7 +1,5 @@
 # defaults
 top_srcdir=.
-builddir=build
-top_builddir=${top_srcdir}/${builddir}
 stagedir=.
 distdir=.
 globalprefix=glite
@@ -15,7 +13,6 @@ globus_prefix=/opt/globus
 nothrflavour=gcc32
 thrflavour=gcc32pthr
 expat_prefix=/opt/expat
-gsoap_prefix=/opt/gsoap
 
 -include Makefile.inc
 -include ../project/version.properties
@@ -50,7 +47,6 @@ CFLAGS:= ${DEBUG} \
        -DVERSION=\"${version}\" \
        -I${stagedir}/include -I${top_srcdir}/src -I. \
        -I${expat_prefix}/include \
-       -I${gsoap_prefix}/include \
        ${COVERAGE_FLAGS} \
        -I${mysql_prefix}/include -I${mysql_prefix}/include/mysql \
        -I${globus_prefix}/include/${nothrflavour} \

diff --git a/org.glite.lb.server/Makefile b/org.glite.lb.server/Makefile
index b4d9407..c11d4bd 100644 (file)
--- a/org.glite.lb.server/Makefile
+++ b/org.glite.lb.server/Makefile
@@ -1,7 +1,5 @@
 # defaults
 top_srcdir=.
-builddir=build
-top_builddir=${top_srcdir}/${builddir}
 stagedir=.
 distdir=.
 globalprefix=glite

diff --git a/org.glite.lb.server/src/lb_plugin.c b/org.glite.lb.server/src/lb_plugin.c
index 2727228..6630fa6 100644 (file)
--- a/org.glite.lb.server/src/lb_plugin.c
+++ b/org.glite.lb.server/src/lb_plugin.c
@@ -50,7 +50,7 @@ typedef struct _lb_historyStatus {
 typedef struct _lb_handle {
        edg_wll_Event                   **events;
        edg_wll_JobStat                 status;
-       lb_historyStatus                **fullStatusHistory, **lastStatusHistory*finalStatus;
+       lb_historyStatus                **fullStatusHistory, **lastStatusHistory, *finalStatus;
        glite_jpps_fplug_data_t*        classad_plugin;
 } lb_handle;
 
@@ -335,7 +335,7 @@ static int lb_query(void *fpctx,void *handle, const char *attr,glite_jp_attrval_
        glite_jp_context_t      ctx = (glite_jp_context_t) fpctx;
        glite_jp_error_t        err; 
        glite_jp_attrval_t      *av = NULL;
-       int                     i, n_tags;
+       int                     i, j, n_tags;
        char                    *ns = glite_jpps_get_namespace(attr);
        char                    *tag;
 

diff --git a/org.glite.lb.utils/Makefile b/org.glite.lb.utils/Makefile
index f6f05b4..234e8c5 100644 (file)
--- a/org.glite.lb.utils/Makefile
+++ b/org.glite.lb.utils/Makefile
@@ -1,7 +1,5 @@
 # defaults
 top_srcdir=.
-builddir=build
-top_builddir=${top_srcdir}/${builddir}
 stagedir=.
 distdir=.
 globalprefix=glite
@@ -36,7 +34,6 @@ CFLAGS:= \
        ${COVERAGE_FLAGS} \
        -I${mysql_prefix}/include -I${mysql_prefix}/include/mysql \
        -I${globus_prefix}/include/${nothrflavour} \
-       $(GRIDSITE_CFLAGS) \
        -D_GNU_SOURCE
 LDFLAGS:=-L${stagedir}/lib
 
@@ -48,10 +45,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} \
-
 ifneq (${mysql_prefix},/usr)
        ifeq ($(shell echo ${mysql_version} | cut -d. -f1,2),4.1)
                mysqlib := -L${mysql_prefix}/lib/mysql
@@ -67,7 +60,6 @@ endif
 EXT_LIBS:= \
        ${mysqlib} -lmysqlclient -lz\
        ${expatlib} -lexpat \
-       ${GRIDSITE_LIBS} \
        ${GLOBUS_LIBS}
 COMMON_LIB:=-lglite_lb_common_${nothrflavour}
 CLIENT_LIB:=-lglite_lb_client_${nothrflavour}