- stage only one static library (libglite_lb_bkserver.a)

- remove use of external debug variable

diff --git a/org.glite.lb.server/Makefile b/org.glite.lb.server/Makefile
index 11a110c..e43ad94 100644 (file)
--- a/org.glite.lb.server/Makefile
+++ b/org.glite.lb.server/Makefile
@@ -146,17 +146,14 @@ WS_CLIENT_LIBS:= -L${stagedir}/lib \
 
 HDRS=index.h lb_authz.h lbs_db.h store.h
 
-LIB_OBJS_PS:=ws_fault.o lb_authz.o lbs_db.o
-L_LIB_OBJS_PS:=${LIB_OBJS_PS:.o=.lo}
-LIB_OBJS_BK:=lb_authz.o lbs_db.o query.o jobstat.o lb_xml_parse.o \
-       il_notification.o notif_match.o il_lbproxy.o lock.o \
-       jobstat_supp.o write2rgma.o get_events.o store.o \
-       db_store.o stats.o openserver.o index.o
-L_LIB_OBJS_BK:=${LIB_OBJS_BK:.o=.lo}
-STATIC_LIB_PS:=libglite_lb_server_misc_ps_${nothrflavour}.a
-LT_LIB_PS:=libglite_lb_server_misc_ps_${nothrflavour}.la
-STATIC_LIB_BK:=libglite_lb_server_misc_bk_${nothrflavour}.a
-LT_LIB_BK:=libglite_lb_server_misc_bk_${nothrflavour}.la
+LIB_OBJS_BK:= \
+       il_lbproxy.o get_events.o index.o jobstat.o jobstat_supp.o \
+       seqcode.o write2rgma.o lbs_db.o lb_html.o lb_http.o lb_proto.o lb_xml_parse.o \
+       lb_xml_parse_V21.o \
+       lock.o openserver.o query.o userjobs.o db_store.o request.o store.o \
+       stored_master.o srv_purge.o server_state.o dump.o lb_authz.o load.o \
+       notification.o il_notification.o notif_match.o stats.o
+STATIC_LIB_BK:=libglite_lb_bkserver.a
 
 glite_lb_bkserverd: LoggingAndBookkeeping.nsmap ${BKSERVER_OBJS}
        ${LINK} -o $@ ${BKSERVER_OBJS} ${BKSERVER_LIBS}
@@ -166,7 +163,7 @@ glite_lb_bkindex: ${INDEX_OBJS}
 
 default all: compile
 
-compile: glite_lb_bkserverd glite_lb_bkindex ${LT_LIB_PS} ${LT_LIB_BK}
+compile: glite_lb_bkserverd glite_lb_bkindex ${STATIC_LIB_BK}
 
 check: compile test.xml test.query
        -echo check.query not complete yet
@@ -224,15 +221,6 @@ ws_query_ex: ws_query_ex.o ${WS_CLIENT_OBJS}
 ws_query_ext: ws_query_ext.o ${WS_CLIENT_OBJS}
        ${LINK} -o $@ ws_query_ext.o ${WS_CLIENT_OBJS} ${WS_CLIENT_LIBS}
 
-${LT_LIB_PS}: ${LIB_OBJS_PS}
-       ${LINK} -o $@ ${L_LIB_OBJS_PS}
-
-${STATIC_LIB_PS}: ${LIB_OBJS_PS}
-       ar crv $@ ${LIB_OBJS_PS}
-       ranlib $@
-
-${LT_LIB_BK}: ${L_LIB_OBJS_BK}
-       ${LINK} -o $@ ${L_LIB_OBJS_BK}
 
 ${STATIC_LIB_BK}: ${LIB_OBJS_BK}
        ar crv $@ ${LIB_OBJS_BK}
@@ -277,10 +265,7 @@ install:
        if [ x${DOSTAGE} = xyes ]; then \
                mkdir -p ${PREFIX}/include/${globalprefix}/${lbprefix} ; \
                (cd ${top_srcdir}/interface && install -m 644 ${HDRS} ${PREFIX}/include/${globalprefix}/${lbprefix}) ; \
-       fi
-       if [ x${DOSTAGE} = xyes ]; then \
-               ${INSTALL} -m 644 ${LT_LIB_PS} ${PREFIX}/lib; \
-               ${INSTALL} -m 644 ${LT_LIB_BK} ${PREFIX}/lib; \
+               install -m 644 ${STATIC_LIB_BK} ${PREFIX}/lib; \
        fi
 
 clean:

diff --git a/org.glite.lb.server/src/db_store.c b/org.glite.lb.server/src/db_store.c
index 8ff5fb5..6887473 100644 (file)
--- a/org.glite.lb.server/src/db_store.c
+++ b/org.glite.lb.server/src/db_store.c
@@ -13,8 +13,6 @@
 #include "lock.h"
 #include "il_lbproxy.h"
 
-extern int debug;
-
 /* XXX */
 #define use_db 1
 
@@ -56,8 +54,6 @@ db_store(edg_wll_Context ctx,char *ucs, char *event)
       goto err;
   }
 
-  if (debug) { fputs(event,stderr); fputc('\n',stderr); }
-
   if (!ctx->strict_locking && edg_wll_LockJob(ctx,ev->any.jobId)) goto err;
 
   if ( ev->any.type == EDG_WLL_EVENT_CHANGEACL )

diff --git a/org.glite.lb.server/src/jobstat.c b/org.glite.lb.server/src/jobstat.c
index a5dbc56..00a8aa4 100644 (file)
--- a/org.glite.lb.server/src/jobstat.c
+++ b/org.glite.lb.server/src/jobstat.c
@@ -22,14 +22,8 @@
 #include "lb_authz.h"
 
 
-extern int debug;
-
 #define DAG_ENABLE     1
 
-#ifndef dprintf
-#define dprintf(x) { if (debug) printf x; }
-#endif
-
 /* TBD: share in whole logging or workload */
 #ifdef __GNUC__
 #define UNUSED_VAR __attribute__((unused))

diff --git a/org.glite.lb.server/src/jobstat_supp.c b/org.glite.lb.server/src/jobstat_supp.c
index b8f607d..3f4f3ad 100644 (file)
--- a/org.glite.lb.server/src/jobstat_supp.c
+++ b/org.glite.lb.server/src/jobstat_supp.c
@@ -22,12 +22,6 @@
 #include "get_events.h"
 
 
-extern int debug;
-#ifndef dprintf
-#define dprintf(x) { if (debug) printf x; }
-#endif
-
-
 /* TBD: share in whole logging or workload */
 #ifdef __GNUC__
 #define UNUSED_VAR __attribute__((unused))
@@ -624,7 +618,7 @@ int edg_wll_compare_seq(const char *a, const char *b)
                        &c[EDG_WLL_SOURCE_APPLICATION]);
        if (res != EDG_WLL_SOURCE__LAST-1) {
                syslog(LOG_ERR, "unparsable sequence code %s\n", a);
-               dprintf(( "unparsable sequence code %s\n", a));
+               fprintf(stderr, "unparsable sequence code %s\n", a);
                return -1;
        }
 
@@ -639,7 +633,7 @@ int edg_wll_compare_seq(const char *a, const char *b)
                        &d[EDG_WLL_SOURCE_APPLICATION]);
        if (res != EDG_WLL_SOURCE__LAST-1) {
                syslog(LOG_ERR, "unparsable sequence code %s\n", b);
-               dprintf(( "unparsable sequence code %s\n", b));
+               fprintf(stderr, "unparsable sequence code %s\n", b);
                return 1;
        }