From 601e64c2b716b550ef5ced439581fcbbdb40e350 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Tue, 24 Jul 2012 11:18:27 +0000 Subject: [PATCH] Building and packaging on Fedora: - lb.client-java: - axis jars in /usr/share/java/axis - 'apache-' prefix added to some jar names - disable it in metapackage anyway - more strict linking: - added missing libraries - remove unused libraries - fix build of lb.logger-msg - using C++ - detect and use classad namespace if necessary - missing files in clean targets --- org.glite.lb.client-java/Makefile | 2 +- .../project/glite-lb-client-java.spec | 4 +++ org.glite.lb.client-java/project/list-jars.sh | 2 +- org.glite.lb.client/Makefile | 10 +++--- org.glite.lb.common/Makefile | 1 + org.glite.lb.emi-lb/project/debian.control | 4 +-- org.glite.lb.emi-lb/project/emi-lb.spec | 2 ++ org.glite.lb.logger-msg/Makefile | 4 +-- org.glite.lb.logger/Makefile | 20 ++++++++---- org.glite.lb.server/Makefile | 37 ++++++++++++++++------ org.glite.lb.server/src/pretty_print_wrapper.cpp | 6 ++-- org.glite.lb.utils/Makefile | 29 ++++++++++------- org.glite.lb.utils/src/dump_exporter.c | 1 + org.glite.lb.ws-test/Makefile | 2 +- org.glite.lbjp-common.trio/Makefile | 4 +-- 15 files changed, 83 insertions(+), 45 deletions(-) diff --git a/org.glite.lb.client-java/Makefile b/org.glite.lb.client-java/Makefile index 59c86cb..6d18cc6 100644 --- a/org.glite.lb.client-java/Makefile +++ b/org.glite.lb.client-java/Makefile @@ -18,7 +18,7 @@ JAVA:=${jdk_prefix}/bin/java GEN:=${stagedir}${prefix}/sbin/glite-lb-at3 ${top_srcdir}/project/genEventTypes.pl AT3DIR:=${stagedir}${prefix}/share/glite-lb/at3 -axis_classpath:=$(shell ${top_srcdir}/project/list-jars.sh ${axis_prefix}/lib ${axis_prefix}/share/java /usr/share/java /usr/lib/java) +axis_classpath:=$(shell ${top_srcdir}/project/list-jars.sh ${axis_prefix}/lib ${axis_prefix}/share/java ${axis_prefix}/share/java/axis /usr/share/java /usr/lib/java /usr/lib/java/axis) trustmanager_classpath:=$(shell ls -1 ${trustmanager_prefix}/share/java/glite-security-trustmanager.jar ${trustmanager_prefix}/share/java/trustmanager.jar ${trustmanager_prefix}/share/java/trustmanager-axis.jar ${stagedir}${prefix}/share/java/trustmanager.jar ${stagedir}${prefix}/share/java/trustmanager-axis.jar 2>/dev/null | tr '\012' :) all compile: compile-java-axis compile-java-lb compile-java-gen compile-java-lb2 build-jar examples build-c diff --git a/org.glite.lb.client-java/project/glite-lb-client-java.spec b/org.glite.lb.client-java/project/glite-lb-client-java.spec index 563212f..3e8109d 100644 --- a/org.glite.lb.client-java/project/glite-lb-client-java.spec +++ b/org.glite.lb.client-java/project/glite-lb-client-java.spec @@ -9,7 +9,11 @@ License: ASL 2.0 Vendor: EMI Group: System Environment/Libraries BuildRequires: ant +%if 0%{?fedora} +BuildRequires: axis +%else BuildRequires: axis1.4 +%endif BuildRequires: chrpath BuildRequires: emi-trustmanager BuildRequires: emi-trustmanager-axis diff --git a/org.glite.lb.client-java/project/list-jars.sh b/org.glite.lb.client-java/project/list-jars.sh index 5f4fff4..4536505 100755 --- a/org.glite.lb.client-java/project/list-jars.sh +++ b/org.glite.lb.client-java/project/list-jars.sh @@ -11,7 +11,7 @@ for prefix in $PREFIXES; do #echo $prefix >&2 for pkgid in $LIST; do #echo $pkgid >&2 - for pkg in `ls -1 ${prefix}/${pkgid}*.jar 2>/dev/null`; do + for pkg in `ls -1 ${prefix}/${pkgid}*.jar ${prefix}/apache-${pkgid}*.jar 2>/dev/null`; do if ! test -h ${pkg}; then CP="$CP:${pkg}" fi diff --git a/org.glite.lb.client/Makefile b/org.glite.lb.client/Makefile index 0d371e7..7e7032d 100644 --- a/org.glite.lb.client/Makefile +++ b/org.glite.lb.client/Makefile @@ -237,19 +237,19 @@ ${THRPLUSLIB}: ${PLUSTHROBJS} ${THRLIB} endif logevent: logevent.o args.o - ${LINK} -o $@ logevent.o args.o ${default_clientlib} ${EXT_LIB} + ${LINK} -o $@ logevent.o args.o ${default_clientlib} ${EXT_LIB} ${PLUS_EXTRA_LIB} -lm notify: notify.o - ${LINKXX} -o $@ notify.o ${default_clientpluslib} ${EXT_LIB} ${PLUS_EXTRA_LIB} + ${LINK} -o $@ notify.o ${default_clientpluslib} ${EXT_LIB} ${PLUS_EXTRA_LIB} register_sandbox: %: %.o - ${LINK} -o $@ $@.o ${default_clientlib} ${EXT_LIB} + ${LINK} -o $@ $@.o ${default_clientlib} ${EXT_LIB} ${PLUS_EXTRA_LIB} ${TOOLS} ${EXAMPLES} ${EXAMPLES_CL}: %: %.o - ${LINK} -o $@ $< ${default_clientlib} ${default_commonlib} ${EXT_LIB} + ${LINK} -o $@ $< ${default_clientlib} ${default_commonlib} ${EXT_LIB} ${PLUS_EXTRA_LIB} ${EXAMPLES_CL_THR}: %: %.o - ${LINK} -o $@ $< ${default_clientlib_thr} ${default_commonlib_thr} ${EXT_LIB} -lpthread + ${LINK} -o $@ $< ${default_clientlib_thr} ${default_commonlib_thr} ${EXT_LIB} ${PLUS_EXTRA_LIB} -lpthread ${TOOLS}: ${default_clientlib} diff --git a/org.glite.lb.common/Makefile b/org.glite.lb.common/Makefile index 432c878..f443a1c 100644 --- a/org.glite.lb.common/Makefile +++ b/org.glite.lb.common/Makefile @@ -240,6 +240,7 @@ install: clean: rm -rvf *.o *.lo .libs lib* *.c *.h *.dox C/ CPP/ test_parse il_test parse.cpp events.tex status.tex + rm -rvf ${REPORTS} distclean: rm -rvf Makefile.inc *.spec debian/ diff --git a/org.glite.lb.emi-lb/project/debian.control b/org.glite.lb.emi-lb/project/debian.control index 0cc7819..b5d29ca 100644 --- a/org.glite.lb.emi-lb/project/debian.control +++ b/org.glite.lb.emi-lb/project/debian.control @@ -12,7 +12,7 @@ DM-Upload-Allowed: yes Package: emi-lb Section: net Architecture: any -Depends: ${misc:Depends}, bdii, emi-version, fetch-crl, glite-lb-client-java, glite-lb-client-progs, glite-lb-doc, glite-lb-harvester, glite-lb-logger, glite-lb-logger-msg, glite-lb-server, glite-lb-utils, glite-lb-ws-test, glite-lb-yaim, glue-schema -Recommends: glite-info-provider-service +Depends: ${misc:Depends}, bdii, emi-version, fetch-crl, glite-lb-client-progs, glite-lb-doc, glite-lb-harvester, glite-lb-logger, glite-lb-logger-msg, glite-lb-server, glite-lb-utils, glite-lb-ws-test, glue-schema +Recommends: glite-info-provider-service glite-lb-client-java glite-lb-yaim Description: @SUMMARY@ @DEBIAN_DESCRIPTION@ diff --git a/org.glite.lb.emi-lb/project/emi-lb.spec b/org.glite.lb.emi-lb/project/emi-lb.spec index 066e057..f64bcc6 100644 --- a/org.glite.lb.emi-lb/project/emi-lb.spec +++ b/org.glite.lb.emi-lb/project/emi-lb.spec @@ -9,7 +9,9 @@ Group: System Environment/Base Requires: bdii Requires: emi-version Requires: fetch-crl +%if ! 0%{?fedora} Requires: glite-lb-client-java +%endif Requires: glite-lb-client-progs Requires: glite-lb-doc Requires: glite-lb-harvester diff --git a/org.glite.lb.logger-msg/Makefile b/org.glite.lb.logger-msg/Makefile index 6fe72d8..20460aa 100644 --- a/org.glite.lb.logger-msg/Makefile +++ b/org.glite.lb.logger-msg/Makefile @@ -17,7 +17,7 @@ thrflavour=gcc32pthr version=${module.version} CC=gcc -CXX=gcc +CXX=g++ VPATH:=${top_srcdir}/src:${top_srcdir}/interface:${top_srcdir}/test:${top_srcdir}/doc:${top_srcdir}/examples:${top_srcdir}/config @@ -90,7 +90,7 @@ ${MAN_GZ}: ${MAN} gzip -f $(notdir $?) glite-lb-cmsclient: cmsclient.o - $(CC) $< ${EXT_LIB} -o $@ + $(CXX) $< ${EXT_LIB} -o $@ man: ${MAN_GZ} diff --git a/org.glite.lb.logger/Makefile b/org.glite.lb.logger/Makefile index 9078137..3380ee4 100644 --- a/org.glite.lb.logger/Makefile +++ b/org.glite.lb.logger/Makefile @@ -48,6 +48,12 @@ default_thrflavour=_${thrflavour} default_nothrflavour=_${nothrflavour} endif +os=${shell uname} +DL_LIBS= +ifeq (${os},Linux) + DL_LIBS=-ldl +endif + DEBUG:=-g -O0 CFLAGS:=${CFLAGS} ${DEBUG} \ -I${stagedir}${prefix}/include -I${top_srcdir}/src -I${top_srcdir}/interface \ @@ -73,11 +79,10 @@ INSTALL:=libtool --mode=install install HDRS:=interlogd.h il_error.h COMMON_LIB:=-lglite_lb_common - -EXT_LIB:=-lglite_lbu_trio -lglite_lbu_log - GLITE_GSS_LIB:=-lglite_security_gss +EXT_LIB:=-lglite_lbu_trio -lglite_lbu_log ${GLITE_GSS_LIB} -lglite_jobid + CPPUNIT_LIBS?=-L${cppunit_prefix}/${libdir} -lcppunit CPPUNIT_CFLAGS?=-I${cppunit_prefix}/include @@ -147,10 +152,10 @@ glite-lb-logd-perf-nofile: ${LOGD_NOBJS} ${LINK} -o $@ ${LOGD_NOBJS} ${COMMON_LIB}${default_nothrflavour} ${EXT_LIB} glite-lb-interlogd: ${INTERLOG_OBJS} - ${LINK} -o $@ ${INTERLOG_OBJS} ${COMMON_LIB}${default_thrflavour} ${EXT_LIB} -lpthread + ${LINK} -o $@ ${INTERLOG_OBJS} ${COMMON_LIB}${default_thrflavour} ${EXT_LIB} -lpthread ${DL_LIBS} glite-lb-notif-interlogd: ${INTERLOG_NOTIF_OBJS} - ${LINK} -export-dynamic -o $@ ${INTERLOG_NOTIF_OBJS} ${COMMON_LIB}${default_thrflavour} ${EXT_LIB} -lpthread + ${LINK} -export-dynamic -o $@ ${INTERLOG_NOTIF_OBJS} ${COMMON_LIB}${default_thrflavour} ${EXT_LIB} -lpthread ${DL_LIBS} glite-lb-interlogd-perf: ${INTERLOG_PERF_OBJS} ${LINK} -o $@ ${INTERLOG_PERF_OBJS} ${COMMON_LIB}${default_thrflavour} ${EXT_LIB} -lpthread @@ -187,7 +192,7 @@ check.ll: -echo commented out -- fix needed check.il: ${INTERLOG_TEST_OBJS} - ${LINKXX} -o $@ ${COMMON_LIB}${default_thrflavour} ${CPPUNIT_LIBS} ${EXT_LIB} -lpthread $+ + ${LINKXX} -o $@ ${COMMON_LIB}${default_thrflavour} ${CPPUNIT_LIBS} ${GLITE_GSS_LIB} -lglite_jobid -lpthread ${DL_LIBS} $+ install: -mkdir -p ${DESTDIR}${PREFIX}${prefix}/bin @@ -244,6 +249,9 @@ il_test.o IlTestBase.o server_msgTest.o event_queueTest.o input_queue_socketTest clean: rm -rvf .libs/ *.o *.lo *.no ${LOGD} ${INTERLOGD} ${NOTIF_INTERLOGD} ${MAN_GZ} startup + rm -rvf check.ll check.il distclean: rm -rvf Makefile.inc *.spec debian/ + +.PHONY: default all compile man stage check install clean distclean dist distcheck diff --git a/org.glite.lb.server/Makefile b/org.glite.lb.server/Makefile index 4091e3a..98fde12 100644 --- a/org.glite.lb.server/Makefile +++ b/org.glite.lb.server/Makefile @@ -89,6 +89,12 @@ ifneq (${classads_prefix},/usr) endif CLASSADS_CFLAGS?=-I${classads_prefix}/include -I${classads_prefix}/include/classad CLASSADS_LIBS?=${classads_libs} -lclassad +classad_namespace:=${shell if ${classads_prefix}/bin/classad_version | grep -i 'classad namespace.*yes' >/dev/null; then echo yes; fi} +ifeq (${classad_namespace},yes) +CLASSADS_CFLAGS+=-DCLASSAD_NAMESPACE=classad:: +else +CLASSADS_CFLAGS+=-DCLASSAD_NAMESPACE= +endif ifneq (${cares_prefix},/usr) cares_libs := -L${cares_prefix}/${libdir} -L${cares_prefix}/lib @@ -97,7 +103,13 @@ LIBCARES_CFLAGS?=-I${cares_prefix}/include LIBCARES_LIBS?=${cares_libs} -lcares GSOAP_CFLAGS?=-I${gsoap_prefix}/include -I${gsoap_prefix}/ +ifeq (${expat_prefix},/usr) +EXPAT_CFLAGS?= +EXPAT_LIBS?=-lexpat +else EXPAT_CFLAGS?=-I${expat_prefix}/include +EXPAT_LIBS?=-L${expat_prefix}/${libdir} -lexpat +endif GLOBUS_GSSAPI_GSI_CFLAGS?=-I${globus_prefix}/include/${nothrflavour} CPPUNIT_LIBS?=-L${cppunit_prefix}/${libdir} -lcppunit @@ -154,7 +166,6 @@ XSLTPROC:=xsltproc --novalid gsoap_bin_prefix:=${shell if [ -x ${gsoap_prefix}/bin/soapcpp2 ]; then echo ${gsoap_prefix}/bin; else echo ${gsoap_prefix}; fi } EXT_LIBS:= \ - -lz \ ${GRIDSITE_LIBS} \ ${CLASSADS_LIBS} \ ${LIBCARES_LIBS} \ @@ -178,7 +189,7 @@ dotless_gsoap_ver:=${shell echo ${gsoap_version} | tr -d . } ifeq ($(shell test -f ${stagedir}${prefix}/${libdir}/libglite_security_gsoap_plugin_${dotless_gsoap_ver}${default_flavour}_c.so && echo ok),ok) langflavour:=_c endif -GSOAP_LIB:=-L${stagedir}${prefix}/${libdir} -lglite_security_gsoap_plugin_${dotless_gsoap_ver}${default_flavour}${langflavour} +GSOAP_LIB:=-L${stagedir}${prefix}/${libdir} -lglite_security_gsoap_plugin_${dotless_gsoap_ver}${default_flavour}${langflavour} -lglite_security_gss${default_flavour} ${GSOAP_LIBS} ifeq ($(GLITE_LB_SERVER_WITH_WS),yes) BKSERVER_OBJS:= \ @@ -193,9 +204,11 @@ ifeq ($(GLITE_LB_SERVER_WITH_WS),yes) ${LB_UTILS_DB_LIB} \ ${GSOAP_LIB} \ ${EXT_LIBS} \ - ${classadslib} \ + ${EXPAT_LIBS} \ -lglite_lbu_maildir \ - -lglite_lbu_log + -lglite_lbu_log \ + -lglite_lbu_trio \ + -lglite_jobid else BKSERVER_OBJS:= ${BKSERVER_BASE_OBJS} @@ -206,9 +219,11 @@ else ${LB_UTILS_DB_LIB} \ -lglite_security_gss${default_flavour} \ ${EXT_LIBS} \ - ${classadslib} \ + ${EXPAT_LIBS} \ -lglite_lbu_maildir \ - -lglite_lbu_log + -lglite_lbu_log \ + -lglite_lbu_trio \ + -lglite_jobid endif INDEX_OBJS:= index.o index_parse.o jobstat_supp.o openserver.o \ @@ -216,7 +231,8 @@ INDEX_OBJS:= index.o index_parse.o jobstat_supp.o openserver.o \ lb_authz.o store.o bkindex.o stats.o server_stats.o\ request.o db_store.o srv_purge.o notif_match.o il_lbproxy.o dump.o lb_xml_parse.o il_notification.o lb_proto.o lb_text.o server_state.o lb_xml_parse_V21.o lb_html.o cond_dump.o notification.o seqcode.o userjobs.o load.o db_calls.o db_supp.o lb_rss.o pretty_print_wrapper.o authz_policy.o crypto.o -INDEX_LIBS:= ${SRVBONES_LIB} ${COMMON_LIBS} ${LB_MACHINE_LIB} ${EXT_LIBS} ${LB_UTILS_DB_LIB} +INDEX_LIBS:= ${SRVBONES_LIB} ${COMMON_LIBS} ${LB_MACHINE_LIB} ${EXT_LIBS} \ + ${EXPAT_LIBS} ${LB_UTILS_DB_LIB} -lglite_lbu_trio -lglite_jobid WS_CLIENT_OBJS:= $(GSOAP_FILES_PREFIX)C.o $(GSOAP_FILES_PREFIX)Client.o ws_fault.o ws_typeref.o WS_CLIENT_LIBS:= ${GSOAP_LIB} -lglite_lb_common${default_flavour} \ @@ -240,7 +256,8 @@ LIB_OBJS_BK:= \ crypto.o MONDB_OBJS:=mon-db.o ${LIB_OBJS_BK} -MONDB_LIBS:=${COMMON_LIBS} ${LB_MACHINE_LIB} ${LB_UTILS_DB_LIB} ${EXT_LIBS} +MONDB_LIBS:=${COMMON_LIBS} ${LB_MACHINE_LIB} ${LB_UTILS_DB_LIB} ${EXT_LIBS} \ + ${EXPAT_LIBS} -lglite_lbu_trio -lglite_jobid LCAS_PLUGIN_OBJS:=lcas_lb.o LCAS_PLUGIN_LOBJS:=${LCAS_PLUGIN_OBJS:.o=.lo} @@ -305,7 +322,7 @@ test.xml: test_xml test_xml: test_xml.cpp ${CXX} -c ${CFLAGS} ${CPPUNIT_CFLAGS} $< - ${LINKXX} -o $@ test_xml.o lb_xml_parse.o ${LB_COMMON_LIB} ${CPPUNIT_LIBS} + ${LINKXX} -o $@ test_xml.o lb_xml_parse.o ${LB_COMMON_LIB} ${CPPUNIT_LIBS} ${EXPAT_LIBS} -lglite_lbu_trio -lglite_jobid test.query: test_query_events # XXX coredumps ./test_query_events @@ -316,7 +333,7 @@ query_events_objs := test_query_events.o query.o get_events.o jobstat_supp.o ind test_query_events: ${query_events_objs} ${LINKXX} -o $@ ${query_events_objs} \ - ${CPPUNIT_LIBS} ${LB_COMMON_LIB} ${LB_MACHINE_LIB} ${classadslib} -lglite_lbu_log + ${CPPUNIT_LIBS} ${LB_COMMON_LIB} ${LB_MACHINE_LIB} ${CLASSADS_LIBS} -lglite_lbu_log -lglite_lbu_trio -lglite_security_gss${default_flavour} -lglite_jobid test.soapconv: test_soap_conv LD_LIBRARY_PATH=${cares_prefix}/${libdir}:${classads_prefix}/${libdir}:${LD_LIBRARY_PATH} ./test_soap_conv diff --git a/org.glite.lb.server/src/pretty_print_wrapper.cpp b/org.glite.lb.server/src/pretty_print_wrapper.cpp index 8acd280..d8968d6 100644 --- a/org.glite.lb.server/src/pretty_print_wrapper.cpp +++ b/org.glite.lb.server/src/pretty_print_wrapper.cpp @@ -22,8 +22,8 @@ limitations under the License. #include int pretty_print(char *jdl, char **formated_print){ - ClassAd *classad; - ClassAdParser parser; + CLASSAD_NAMESPACE ClassAd *classad; + CLASSAD_NAMESPACE ClassAdParser parser; classad = parser.ParseClassAd(std::string(jdl), true); if (! classad){ @@ -31,7 +31,7 @@ int pretty_print(char *jdl, char **formated_print){ return -1; // not ClassAd data } - PrettyPrint pp; + CLASSAD_NAMESPACE PrettyPrint pp; std::string buf; pp.Unparse(buf, classad); *formated_print = strdup(buf.c_str()); diff --git a/org.glite.lb.utils/Makefile b/org.glite.lb.utils/Makefile index 79d1758..8b57cd1 100644 --- a/org.glite.lb.utils/Makefile +++ b/org.glite.lb.utils/Makefile @@ -8,7 +8,6 @@ version=0.0.0 PREFIX=/opt/glite prefix= -expat_prefix=/opt/expat gsoap_prefix=/opt/gsoap -include Makefile.inc @@ -25,11 +24,6 @@ SUFFIXES = .T DEBUG:=-g -O0 -Wall -ifneq (${expat_prefix},/usr) - expatlib := -L${expat_prefix}/${libdir} -L${expat_prefix}/lib -endif -EXPAT_CFLAGS?=-I${expat_prefix}/include -EXPAT_LIB?=${expatlib} -lexpat GSOAP_CFLAGS?=-I${gsoap_prefix}/include -I${gsoap_prefix}/ CFLAGS:= ${CFLAGS} \ @@ -37,7 +31,6 @@ CFLAGS:= ${CFLAGS} \ -DVERSION=\"${version}\" \ -I${stagedir}${prefix}/include -I${top_srcdir}/src -I. \ -I${top_srcdir}/interface \ - ${EXPAT_CFLAGS} \ ${GSOAP_CFLAGS} \ ${COVERAGE_FLAGS} \ -D_GNU_SOURCE @@ -51,7 +44,7 @@ INSTALL:=libtool --mode=install install LINKXX:=libtool --mode=link ${CXX} -rpath ${stagedir}${prefix}/${libdir} ${LDFLAGS} XSLTPROC:=xsltproc --novalid -EXT_LIBS:= ${EXPAT_LIBS} +EXT_LIBS:= ifeq (${thrflavour},) COMMON_LIB:=-lglite_lb_common @@ -65,8 +58,14 @@ PLUS_LIB:=-lglite_lb_clientpp_${nothrflavour} JP_LIBS:=-lglite_jp_common_${nothrflavour} endif -UTILS:=mon purge dump load dump_exporter -ALLUTILS:=${UTILS} state_history statistics +os=${shell uname} +DL_LIBS= +ifeq (${os},Linux) + DL_LIBS=-ldl +endif + +UTILS:=purge dump load +ALLUTILS:=${UTILS} mon dump_exporter state_history statistics STATISTICS_OBJS:=statistics.o process_attrs.o process_attrs2.o MAN_GZ:=glite-lb-mon.1.gz @@ -81,11 +80,17 @@ compile all: ${ALLUTILS} ${MAN_GZ} ${MAN8_GZ} ${UTILS}: %: %.o ${LINK} -o $@ $< ${COMMON_LIB} ${CLIENT_LIB} ${EXT_LIBS} -lglite_lbu_maildir +mon: %: %.o + ${LINK} -o $@ $< ${COMMON_LIB} ${CLIENT_LIB} ${EXT_LIBS} -lglite_jobid + +dump_exporter: %: %.o + ${LINK} -o $@ $< ${COMMON_LIB} ${CLIENT_LIB} ${EXT_LIBS} -lglite_jobid -lglite_lbu_maildir + statistics: ${STATISTICS_OBJS} - ${LINK} -rdynamic -o $@ ${STATISTICS_OBJS} ${COMMON_LIB} ${JP_LIBS} ${EXT_LIBS} + ${LINK} -rdynamic -o $@ ${STATISTICS_OBJS} ${COMMON_LIB} ${JP_LIBS} ${EXT_LIBS} -lglite_lbu_trio ${DL_LIBS} state_history: state_history.o - ${LINK} -o $@ state_history.o -lglite_lb_statemachine ${PLUS_LIB} + ${LINK} -o $@ state_history.o -lglite_jobid ${COMMON_LIB} ${CLIENT_LIB} -lglite_lb_statemachine ${PLUS_LIB} check: compile diff --git a/org.glite.lb.utils/src/dump_exporter.c b/org.glite.lb.utils/src/dump_exporter.c index 81d21f4..38eacc6 100644 --- a/org.glite.lb.utils/src/dump_exporter.c +++ b/org.glite.lb.utils/src/dump_exporter.c @@ -29,6 +29,7 @@ limitations under the License. #include +#include "glite/jobid/cjobid.h" #include "glite/lbu/maildir.h" #include "glite/lb/context.h" #include "glite/lb/events.h" diff --git a/org.glite.lb.ws-test/Makefile b/org.glite.lb.ws-test/Makefile index a21624e..e78995d 100644 --- a/org.glite.lb.ws-test/Makefile +++ b/org.glite.lb.ws-test/Makefile @@ -49,7 +49,7 @@ dotless_gsoap_ver:=${shell echo ${gsoap_default_version} | tr -d . } ifeq ($(shell test -f ${stagedir}${prefix}/${libdir}/libglite_security_gsoap_plugin_${dotless_gsoap_ver}${default_flavour}_c.so && echo ok),ok) langflavour:=_c endif -GSOAP_LIB:=-L${stagedir}${prefix}/${libdir} -lglite_security_gsoap_plugin_${dotless_gsoap_ver}${default_flavour}${langflavour} +GSOAP_LIB:=-L${stagedir}${prefix}/${libdir} -lglite_security_gsoap_plugin_${dotless_gsoap_ver}${default_flavour}${langflavour} ${GSOAP_LIBS} WS_CLIENT_OBJS:= $(GSOAP_FILES_PREFIX)C.o $(GSOAP_FILES_PREFIX)Client.o ws_fault.o # ws_typeref.o diff --git a/org.glite.lbjp-common.trio/Makefile b/org.glite.lbjp-common.trio/Makefile index b703d3f..37b2ce2 100644 --- a/org.glite.lbjp-common.trio/Makefile +++ b/org.glite.lbjp-common.trio/Makefile @@ -115,8 +115,8 @@ install: all clean: rm -rvf *.o *.lo .libs lib* *.c *.h *.dox C/ CPP/ - rm -vf trio_test - + rm -rvf trio_test ${REPORTS} + distclean: rm -rvf Makefile.inc *.spec debian/ -- 1.8.2.3