Enabled etics-less build.

diff --git a/org.glite.jp.client/Makefile b/org.glite.jp.client/Makefile
index 14a952f..1a9884c 100644 (file)
--- a/org.glite.jp.client/Makefile
+++ b/org.glite.jp.client/Makefile
@@ -1,5 +1,5 @@
 # defaults
-top_srcdir=.
+top_srcdir=..
 builddir=build
 top_builddir=${top_srcdir}/${builddir}
 stagedir=.
@@ -66,7 +66,7 @@ SRCS:=jpimporter.c ${wsprefix}ClientLib.c ${wsprefix}C.c
 OBJS:=${SRCS:.c=.o}
 
 gsoap_bin_prefix:=${shell if [ -x  ${gsoap_prefix}/bin/soapcpp2 ]; then echo ${gsoap_prefix}/bin; else echo ${gsoap_prefix}; fi }
-dotless_gsoap_ver:=${shell echo ${gsoap_version} | tr -d . }
+dotless_gsoap_ver:=${shell echo ${gsoap_default_version} | tr -d . }
 ifeq ($(shell test -f ${stagedir}/lib/libglite_security_gsoap_plugin_${dotless_gsoap_ver}_${nothrflavour}_c.la && echo ok),ok)
        langflavour:=_c
 endif
@@ -122,7 +122,7 @@ ${OBJS}: ${wsprefix}H.h soap_version.h
 
 soap_version.h:
        ${gsoap_bin_prefix}/soapcpp2 /dev/null
-       perl -ne '$$. == 2 && /.*([0-9]+)\.([0-9]+)\.([0-9]+).*/ && printf "#define GSOAP_VERSION %d%02d%02d\n",$$1,$$2,$$3' soapH.h >$@
+       perl -ne '$$. == 2 && /.*([0-9]+)\.([0-9]+)\.([0-9]+)([a-z]).*/ && printf "#define GSOAP_VERSION %d%02d%02d\n#define GSOAP_VERSION_LETTER '\''$$4'\''\n",$$1,$$2,$$3' soapH.h >$@
        -rm soapC.cpp soapH.h soapStub.h soapClient.cpp soapServer.cpp soapClientLib.cpp soapServerLib.cpp
 
 

diff --git a/org.glite.jp.index/Makefile b/org.glite.jp.index/Makefile
index ae71296..6a63cea 100644 (file)
--- a/org.glite.jp.index/Makefile
+++ b/org.glite.jp.index/Makefile
@@ -1,5 +1,5 @@
 # defaults
-top_srcdir=.
+top_srcdir=..
 builddir=build
 top_builddir=${top_srcdir}/${builddir}
 stagedir=.
@@ -27,7 +27,7 @@ CPPFLAGS:=-DDEBUG -D_GNU_SOURCE -I. -I${top_srcdir}/interface -I${top_srcdir}/sr
 CFLAGS:=${DEBUG} ${CFLAGS}
 LDFLAGS:=-L${stagedir}/lib
 
-dotless_gsoap_ver:=${shell echo ${gsoap_version} | tr -d . }
+dotless_gsoap_ver:=${shell echo ${gsoap_default_version} | tr -d . }
 ifeq ($(shell test -f ${stagedir}/lib/libglite_security_gsoap_plugin_${dotless_gsoap_ver}_${nothrflavour}_c.so && echo ok),ok)
        langflavour:=_c
 endif
@@ -147,7 +147,7 @@ soap_ops.o bones_server.o: soap_version.h
 
 soap_version.h:
        ${gsoap_bin_prefix}/soapcpp2 /dev/null
-       perl -ne '$$. == 2 && /.*([0-9]+)\.([0-9]+)\.([0-9]+).*/ && printf "#define GSOAP_VERSION %d%02d%02d\n",$$1,$$2,$$3' soapH.h >$@
+       perl -ne '$$. == 2 && /.*([0-9]+)\.([0-9]+)\.([0-9]+)([a-z]).*/ && printf "#define GSOAP_VERSION %d%02d%02d\n#define GSOAP_VERSION_LETTER '\''$$4'\''\n",$$1,$$2,$$3' soapH.h >$@
        -rm soapC.cpp soapH.h soapStub.h soapClient.cpp soapServer.cpp soapClientLib.cpp soapServerLib.cpp
 
 db_ops.h: context.h

diff --git a/org.glite.jp.primary/Makefile b/org.glite.jp.primary/Makefile
index c4e7949..329f2ec 100644 (file)
--- a/org.glite.jp.primary/Makefile
+++ b/org.glite.jp.primary/Makefile
@@ -1,5 +1,5 @@
 # defaults
-top_srcdir=.
+top_srcdir=..
 builddir=build
 top_builddir=${top_srcdir}/${builddir}
 stagedir=.
@@ -84,7 +84,7 @@ OBJS:=${SRCS:.c=.o}
 TEST_OBJS:=${TEST_SRCS:.c=.o}
 DAG_OBJS:=${DAG_SRCS:.c=.o}
 
-dotless_gsoap_ver:=${shell echo ${gsoap_version} | tr -d . }
+dotless_gsoap_ver:=${shell echo ${gsoap_default_version} | tr -d . }
 ifeq ($(shell test -f ${stagedir}/lib/libglite_security_gsoap_plugin_${dotless_gsoap_ver}_${nothrflavour}_c.so && echo ok),ok)
        langflavour:=_c
 endif
@@ -216,7 +216,7 @@ soap_ops.o bones_server.o: soap_version.h
 
 soap_version.h:
        ${gsoap_bin_prefix}/soapcpp2 /dev/null
-       perl -ne '$$. == 2 && /.*([0-9]+)\.([0-9]+)\.([0-9]+).*/ && printf "#define GSOAP_VERSION %d%02d%02d\n",$$1,$$2,$$3' soapH.h >$@
+       perl -ne '$$. == 2 && /.*([0-9]+)\.([0-9]+)\.([0-9]+)([a-z]).*/ && printf "#define GSOAP_VERSION %d%02d%02d\n#define GSOAP_VERSION_LETTER '\''$$4'\''\n",$$1,$$2,$$3' soapH.h >$@
        -rm soapC.cpp soapH.h soapStub.h soapClient.cpp soapServer.cpp soapClientLib.cpp soapServerLib.cpp 
 
 soap_env_ctx.c soap_env_ctx.h soap_switch.c: env_C.c mk_soap_switch.pl

diff --git a/org.glite.jp.server-common/Makefile b/org.glite.jp.server-common/Makefile
index 8b79e39..a65ac71 100644 (file)
--- a/org.glite.jp.server-common/Makefile
+++ b/org.glite.jp.server-common/Makefile
@@ -1,5 +1,5 @@
 # defaults
-top_srcdir=.
+top_srcdir=..
 builddir=build
 top_builddir=${top_srcdir}/${builddir}
 stagedir=.

diff --git a/org.glite.jp.ws-interface/Makefile b/org.glite.jp.ws-interface/Makefile
index 6463300..22c2898 100644 (file)
--- a/org.glite.jp.ws-interface/Makefile
+++ b/org.glite.jp.ws-interface/Makefile
@@ -1,5 +1,5 @@
 # Default values
-top_srcdir=.
+top_srcdir=..
 builddir=build
 top_builddir=${top_srcdir}/${builddir}
 stagedir=.