produce threaded and non-threaded flavours

diff --git a/org.glite.lb.client/Makefile b/org.glite.lb.client/Makefile
index e675257..2a99d3c 100644 (file)
--- a/org.glite.lb.client/Makefile
+++ b/org.glite.lb.client/Makefile
@@ -12,7 +12,8 @@ PREFIX=/opt/glite
 
 glite_location=/opt/glite
 globus_prefix=/opt/globus
-globusflavour=gcc32
+nothrflavour=gcc32
+thrflavour=gcc32pthr
 expat_prefix=/opt/expat
 ares_prefix=/opt/ares
 
@@ -23,13 +24,16 @@ AT3=perl -I${top_srcdir}/project ${top_srcdir}/project/at3
 
 SUFFIXES = .T 
 
+GLOBUSINC:= -I${globus_prefix}/include/${nothrflavour} \
+       -I${globus_prefix}/include/${nothrflavour}/openssl
+GLOBUSTHRINC:= -I${globus_prefix}/include/${thrflavour} \
+       -I${globus_prefix}/include/${thrflavour}/openssl
+
 DEBUG:=-g -O0 
 CFLAGS:=${DEBUG} \
        -I${top_srcdir}/src -I${top_srcdir}/interface \
        -I${stagedir}/include \
        -I${glite_location}/include \
-       -I${globus_prefix}/include/${globusflavour} \
-    -I${globus_prefix}/include/${globusflavour}/openssl \
        -I${expat_prefix}/include \
        -I${ares_prefix}/include
 
@@ -38,8 +42,12 @@ CXXFLAGS:=${CFLAGS}
 HELPERS:=-L${glite_location}/lib -lglite_wms_tls_ssl_helpers
 
 GLOBUS_LIBS:=-L${globus_prefix}/lib \
-       -lglobus_common_${globusflavour} \
-       -lssl_${globusflavour}
+       -lglobus_common_${nothrflavour} \
+       -lssl_${nothrflavour}
+
+GLOBUS_THRLIBS:=-L${globus_prefix}/lib \
+       -lglobus_common_${thrflavour} \
+       -lssl_${thrflavour}
 
 EXPAT_LIBS:=-L${expat_prefix}/lib \
        -lexpat
@@ -49,8 +57,7 @@ ARES_LIBS:=-L${ares_prefix}/lib \
 
 LDFLAGS:=-L${stagedir}/lib
 
-EXT_LIB:=${GLOBUS_LIBS} \
-    ${EXPAT_LIBS} \
+EXT_LIB:= ${EXPAT_LIBS} \
     ${ARES_LIBS}
 
 COMPILE:=libtool --mode=compile ${CC} ${CFLAGS}
@@ -64,32 +71,45 @@ PLUSOBJS:=Event.o Job.o JobStatus.o Notification.o ServerConnection.o
 PUB_HDRS:=CountRef.h Event.h JobJobStatus.h Notification.h ServerConnection.h \
        LoggingExceptions.h
 
+LIBTHROBJS:=${LIBOBJS:.o=.thr.o}
 LIBLOBJS:=${LIBOBJS:.o=.lo}
+LIBTHRLOBJS:=${LIBOBJS:.o=.thr.lo}
+
 PLUSLOBJS:=${PLUSOBJS:.o=.lo}
 
-LIB:=libglite_lb_client.la
+LIB:=libglite_lb_client_${nothrflavour}.la
+THRLIB:=libglite_lb_client_${thrflavour}.la
+
 PLUSLIB:=libglite_lb_clientpp.la
 
 TOOLS:=dump load purge
 
 ${LIB}: ${LIBOBJS}
-       ${LINK} -o $@ ${LIBLOBJS} -rpath ${glite_location}/lib -lglite_lb_common ${HELPERS}
+       ${LINK} -o $@ ${LIBLOBJS} -rpath ${glite_location}/lib -lglite_lb_common_${nothrflavour} ${HELPERS}
+
+${THRLIB}: ${LIBTHROBJS}
+       ${LINK} -o $@ ${LIBTHRLOBJS} -rpath ${glite_location}/lib -lglite_lb_common_${thrflavour} ${HELPERS}
 
 ${PLUSLIB}: ${PLUSOBJS}
        ${LINK} -o $@ ${PLUSLOBJS} -rpath ${glite_location}/lib ${LIB}
+
 logevent: logevent.o args.o
-       ${LINK} -o $@ logevent.o args.o ${LIB} ${EXT_LIB}
+       ${LINK} -o $@ logevent.o args.o ${LIB} ${EXT_LIB} ${GLOBUS_LIBS}
 
 ${TOOLS}: %: %.o
-       ${LINK} -o $@ $< ${LIB} ${EXT_LIB}
+       ${LINK} -o $@ $< ${LIB} ${EXT_LIB} ${GLOBUS_LIBS}
 
 ${TOOLS}: ${LIB}
 
 ${LIBOBJS}: %.o: %.c
-       ${COMPILE} -c $<
+       ${COMPILE} ${GLOBUSINC} -c $<
+
+${LIBTHROBJS}: %.thr.o: %.c
+       ${COMPILE} ${GLOBUSTHRINC} -o $@ -c $<
 
+# catches $TOOLS and logevent compilation
 %.o: %.c 
-       ${CC} ${CFLAGS} -c $<
+       ${CC} ${CFLAGS} ${GLOBUSINC} -c $<
 
 %.c: %.c.T
        rm -f $@
@@ -103,7 +123,7 @@ ${LIBOBJS}: %.o: %.c
 
 default: all
 
-compile all: ${LIB} ${TOOLS} logevent
+compile all: ${LIB} ${THRLIB} ${TOOLS} logevent
 
 check:
        echo No unit tests so far.

diff --git a/org.glite.lb.client/project/configure-options.xml b/org.glite.lb.client/project/configure-options.xml
index 2bb457d..c0999ff 100644 (file)
--- a/org.glite.lb.client/project/configure-options.xml
+++ b/org.glite.lb.client/project/configure-options.xml
@@ -20,6 +20,9 @@
 
        Revision history:
        $Log$
+       Revision 1.1  2004/06/23 02:08:44  dimeglio
+       First version of this file
+       
 -->
 
        <!-- ======================================================
@@ -43,7 +46,8 @@ PREFIX=${install.dir}
 version=${module.version}
 glite_location=${with.glite.location}
 globus_prefix=${with.globus.prefix}
-globusflavour=${with.globus.dbg.nothr.flavor}
+thrflavour=${with.globus.thr.flavor}
+nothrflavour=${with.globus.nothr.flavor}
 expat_prefix=${with.expat.prefix}
 ares_prefix=${with.ares.prefix}
                        </echo>

diff --git a/org.glite.lb.common/Makefile b/org.glite.lb.common/Makefile
index 3bdd102..c54f820 100644 (file)
--- a/org.glite.lb.common/Makefile
+++ b/org.glite.lb.common/Makefile
@@ -12,7 +12,8 @@ PREFIX=/opt/glite
 
 glite_location=/opt/glite
 globus_prefix=/opt/globus
-globus_flavour=gcc32
+nothrflavour=gcc32
+thrflavour=gcc32pthr
 expat_prefix=/opt/expat
 ares_prefix=/opt/ares
 
@@ -24,11 +25,14 @@ AT3=perl -I${top_srcdir}/project ${top_srcdir}/project/at3
 SUFFIXES = .T
 
 DEBUG:=-g -O0 -Wall
+GLOBUSINC:= -I${globus_prefix}/include/${nothrflavour} \
+       -I${globus_prefix}/include/${nothrflavour}/openssl
+GLOBUSTHRINC:= -I${globus_prefix}/include/${thrflavour} \
+       -I${globus_prefix}/include/${thrflavour}/openssl
+
 CFLAGS:=${DEBUG} -I${top_srcdir}/src -I${top_srcdir}/interface \
        -I${stagedir}/include \
        -I${glite_location}/include \
-    -I${globus_prefix}/include/${globusflavour} \
-       -I${globus_prefix}/include/${globusflavour}/openssl \
        -I${expat_prefix}/include \
        -I${ares_prefix}/include \
        -DDATAGRID_EXTENSION
@@ -51,28 +55,42 @@ OBJS:=dgssl.o escape.o events.o mini_http.o query_rec.o status.o \
        xml_conversions.o xml_parse.o ulm_parse.o param.o \
        events_parse.o il_string.o il_int.o notifid.o \
        il_log.o il_msg.o context.o trio.o strio.o
-LOBJS:=`echo ${OBJS} | sed 's/\.o/\.lo/g'`
+LOBJS:=${OBJS:.o=.lo}
+
+THROBJS:=${OBJS:.o=.thr.o}
+THRLOBJS:=${OBJS:.o=.thr.lo}
 
 HDRS:=context-int.h  dgssl.h  mini_http.h authz.h xml_parse.h \
        xml_conversions.h log_proto.h events_parse.h il_string.h escape.h \
        ulm_parse.h trio.h
 
-STATICLIB:=libglite_lb_common.a
-LTLIB:=libglite_lb_common.la
+STATICLIB:=libglite_lb_common_${nothrflavour}.a
+THRSTATICLIB:=libglite_lb_common_${thrflavour}.a
+LTLIB:=libglite_lb_common_${nothrflavour}.la
+THRLTLIB:=libglite_lb_common_${thrflavour}.la
 
 default: all
 
-all compile: ${STATICLIB} ${LTLIB}
+all compile: ${STATICLIB} ${LTLIB} ${THRSTATICLIB} ${THRLTLIB}
 
 ${STATICLIB}: ${OBJS}
        ar crv $@ ${OBJS}
        ranlib $@
 
+${THRSTATICLIB}: ${THROBJS}
+       ar crv $@ ${THROBJS}
+       ranlib $@
+
 ${LTLIB}: ${OBJS}
        ${LINK} -o $@ ${LOBJS} \
                -lglobus_ssl_utils -lglite_wms_cjobid \
                -lm
 
+${THRLTLIB}: ${THROBJS}
+       ${LINK} -o $@ ${THRLOBJS} \
+               -lglobus_ssl_utils -lglite_wms_cjobid \
+               -lm
+
 stage: compile
        $(MAKE) install PREFIX=${stagedir}
 
@@ -95,16 +113,18 @@ distbin:
 install:
        mkdir -p ${PREFIX}/include/${globalprefix}/${lbprefix}
        mkdir -p ${PREFIX}/lib
-       ${INSTALL} -m 644 ${STATICLIB} ${PREFIX}/lib
-       ${INSTALL} -m 644 ${LTLIB} ${PREFIX}/lib
+       ${INSTALL} -m 644 ${STATICLIB} ${THRSTATICLIB} ${PREFIX}/lib
+       ${INSTALL} -m 644 ${LTLIB} ${THRLTLIB} ${PREFIX}/lib
        cd ${top_srcdir}/interface && install -m 644 ${HDRS} ${PREFIX}/include/${globalprefix}/${lbprefix}
 
 clean:
 
 
 %.o: %.c
-       ${COMPILE} -c $<
+       ${COMPILE} ${GLOBUSINC} -c $<
 
+%.thr.o: %.c
+       ${COMPILE} ${GLOBUSTHRINC} -o $@ -c $<
 
 %.h: %.h.T
        rm -f $@

diff --git a/org.glite.lb.common/project/configure-options.xml b/org.glite.lb.common/project/configure-options.xml
index ccbb520..351b59d 100644 (file)
--- a/org.glite.lb.common/project/configure-options.xml
+++ b/org.glite.lb.common/project/configure-options.xml
@@ -20,6 +20,9 @@
 
        Revision history:
        $Log$
+       Revision 1.3  2004/06/23 00:33:21  dimeglio
+       Added globalprefix and lbprefix
+       
        Revision 1.2  2004/06/22 22:49:08  dimeglio
        Use of stage.abs.dir is required by -rpath
        
@@ -49,9 +52,10 @@ PREFIX=${install.dir}
 version=${module.version}
 glite_location=${with.glite.location}
 globus_prefix=${with.globus.prefix}
-globusflavour=${with.globus.dbg.nothr.flavor}
 expat_prefix=${with.expat.prefix}
 ares_prefix=${with.ares.prefix}
+thrflavour=${with.globus.thr.flavor}
+nothrflavour=${with.globus.nothr.flavor}
                        </echo>
            </target>
        </project>