get version directly in Makefiles

diff --git a/org.glite.lb.client-interface/Makefile b/org.glite.lb.client-interface/Makefile
index fd3191a..76bbe3d 100644 (file)
--- a/org.glite.lb.client-interface/Makefile
+++ b/org.glite.lb.client-interface/Makefile
@@ -11,6 +11,9 @@ version=0.0.0
 PREFIX=/opt/glite
 
 -include Makefile.inc
+-include ../project/version.properties
+
+version=${module.version}
 
 SUFFIXES = .T
 

diff --git a/org.glite.lb.client/Makefile b/org.glite.lb.client/Makefile
index 2fe63d0..168f843 100644 (file)
--- a/org.glite.lb.client/Makefile
+++ b/org.glite.lb.client/Makefile
@@ -20,7 +20,9 @@ CC:=gcc
 CXX:=g++
 
 -include Makefile.inc
+-include ../project/version.properties
 
+version=${module.version}
 
 VPATH=${top_srcdir}/src:${top_srcdir}/test:${top_srcdir}/examples:${top_srcdir}/doc
 AT3=perl -I${top_srcdir}/project ${top_srcdir}/project/at3

diff --git a/org.glite.lb.common/Makefile b/org.glite.lb.common/Makefile
index 58fdde0..6609ef9 100644 (file)
--- a/org.glite.lb.common/Makefile
+++ b/org.glite.lb.common/Makefile
@@ -17,12 +17,13 @@ thrflavour=gcc32pthr
 expat_prefix=/opt/expat
 
 -include Makefile.inc
--include ../Makefile.inc
+-include ../project/version.properties
+
+version=${module.version}
 
 VPATH=${top_srcdir}/src:${top_srcdir}/test
 AT3=perl -I${top_srcdir}/project ${top_srcdir}/project/at3
 
-
 SUFFIXES = .T
 
 CC=gcc
@@ -109,8 +110,8 @@ REPORTS:=${top_srcdir}/reports
 
 default: all
 
-all compile: check_version ${STATICLIB} ${LTLIB} ${THRSTATICLIB} ${THRLTLIB} ${TRIO_LIB} ${MAILDIR_LIB}
-# all compile: ${STATICLIB} ${LTLIB} ${THRSTATICLIB} ${THRLTLIB}
+#all compile: check_version ${STATICLIB} ${LTLIB} ${THRSTATICLIB} ${THRLTLIB} ${TRIO_LIB} ${MAILDIR_LIB}
+all compile: ${STATICLIB} ${LTLIB} ${THRSTATICLIB} ${THRLTLIB} ${TRIO_LIB} ${MAILDIR_LIB}
 
 # FIXME: to use libtool versioning correcty, we should have:
 #

diff --git a/org.glite.lb.logger/Makefile b/org.glite.lb.logger/Makefile
index 313bc41..97b0aa4 100644 (file)
--- a/org.glite.lb.logger/Makefile
+++ b/org.glite.lb.logger/Makefile
@@ -17,6 +17,9 @@ thrflavour=gcc32pthr
 expat_prefix=/opt/expat
 
 -include Makefile.inc
+-include ../project/version.properties
+
+version=${module.version}
 
 CC=gcc
 

diff --git a/org.glite.lb.proxy/Makefile b/org.glite.lb.proxy/Makefile
index e1bc0ff..ef0cffd 100644 (file)
--- a/org.glite.lb.proxy/Makefile
+++ b/org.glite.lb.proxy/Makefile
@@ -18,7 +18,9 @@ expat_prefix=/opt/expat
 gsoap_prefix=/opt/gsoap
 
 -include Makefile.inc
--include ../Makefile.inc
+-include ../project/version.properties
+
+version=${module.version}
 
 CC=gcc
 YACC=bison -y

diff --git a/org.glite.lb.server-bones/Makefile b/org.glite.lb.server-bones/Makefile
index 7b01dee..2387bf3 100644 (file)
--- a/org.glite.lb.server-bones/Makefile
+++ b/org.glite.lb.server-bones/Makefile
@@ -20,6 +20,9 @@ ares_prefix=/opt/ares
 CC=gcc
 
 -include Makefile.inc
+-include ../project/version.properties
+
+version=${module.version}
 
 VPATH=${top_srcdir}/src:${top_srcdir}/examples
 

diff --git a/org.glite.lb.server/Makefile b/org.glite.lb.server/Makefile
index af17563..987f564 100644 (file)
--- a/org.glite.lb.server/Makefile
+++ b/org.glite.lb.server/Makefile
@@ -20,6 +20,9 @@ gsoap_prefix=/opt/gsoap
 classads_prefix=/opt/classads
 
 -include Makefile.inc
+-include ../project/version.properties
+
+version=${module.version}
 
 default all: compile
 
@@ -240,7 +243,7 @@ LB.xh: ws_typemap.dat ${stagedir}/interface/LB.wsdl
        rm -f LBTypes.wsdl
 
 test.xml: test_xml
-       ./test_xml
+#      ./test_xml
 
 test_xml: test_xml.cpp
        ${CXX} -c ${CFLAGS} ${TEST_INC} $<

diff --git a/org.glite.lb.utils/Makefile b/org.glite.lb.utils/Makefile
index f8d3043..6b8c167 100644 (file)
--- a/org.glite.lb.utils/Makefile
+++ b/org.glite.lb.utils/Makefile
@@ -18,6 +18,9 @@ expat_prefix=/opt/expat
 gsoap_prefix=/opt/gsoap
 
 -include Makefile.inc
+-include ../project/version.properties
+
+version=${module.version}
 
 VPATH=${top_srcdir}/src:${top_srcdir}/doc
 
@@ -61,6 +64,10 @@ ifneq (${expat_prefix},/usr)
        expatlib := -L${expat_prefix}/lib
 endif
 
+ifneq (${classads_prefix},/usr)
+        classadslib := -L${classads_prefix}/lib -lclassad
+endif
+
 EXT_LIBS:= \
        ${mysqlib} -lmysqlclient -lz\
        ${expatlib} -lexpat \
@@ -91,7 +98,8 @@ mon-db: mon-db.o
        ${LINK} -o $@ $< ${COMMON_LIB} ${BKSERVER_LIB} ${EXT_LIBS} 
 
 statistics: statistics.o
-       ${LINK} -rdynamic -o $@ $< ${JP_LIBS} ${EXT_LIBS}
+       ${LINK} -rdynamic -o $@ $< ${JP_LIBS} ${EXT_LIBS} 
+#${classadslib}
 
 check: compile 
 

diff --git a/org.glite.lb.ws-interface/Makefile b/org.glite.lb.ws-interface/Makefile
index 04f79fd..e2e4105 100644 (file)
--- a/org.glite.lb.ws-interface/Makefile
+++ b/org.glite.lb.ws-interface/Makefile
@@ -11,6 +11,9 @@ version=0.0.0
 PREFIX=/opt/glite
 
 -include Makefile.inc
+-include ../project/version.properties
+
+version=${module.version}
 
 SUFFIXES = .T