builds after merge

diff --git a/org.glite.jp.index/Makefile b/org.glite.jp.index/Makefile
index 871e9a7..b918109 100644 (file)
--- a/org.glite.jp.index/Makefile
+++ b/org.glite.jp.index/Makefile
@@ -58,27 +58,27 @@ is_prefix:=jpis_
 is_client_prefix:=jpis_client_
 ps_prefix:=jpps_
 
+#<<<<<<< Makefile
+#      ${is_prefix}Server.c ${is_prefix}C.c\
+#      ${ps_prefix}ClientLib.c
+#=======
 SRCS:= conf.c bones_server.c soap_ops.c soap_ps_calls.c \
        ws_ps_typeref.c ws_is_typeref.c db_ops.c context.c common_server.c \
-<<<<<<< Makefile
-       ${is_prefix}Server.c ${is_prefix}C.c\
-       ${ps_prefix}ClientLib.c
-=======
        ${is_prefix}ServerLib.c \
        ${ps_prefix}ClientLib.c ${ps_prefix}C.c
->>>>>>> 1.32.2.3
+#>>>>>>> 1.32.2.3
 
-<<<<<<< Makefile
+#<<<<<<< Makefile
 EXA_TEST_SRCS:=jpis-test.c ${is_prefix}C.c ${is_prefix}Client.c context.c db_ops.c conf.c ws_is_typeref.c
 EXA_DB_SRCS:=jpis-db-internal.c db_ops.c conf.c context.c ws_is_typeref.c
 EXA_CLIENT_SRCS:=jpis-client.c common.c \
        ${is_client_prefix}C.c ${is_client_prefix}Client.c
-=======
-EXA_TEST_SRCS:=jpis-test.c ${is_prefix}C.c ${is_prefix}Client.c context.c db_ops.c conf.c
-EXA_DB_SRCS:=jpis-db-internal.c db_ops.c conf.c context.c
-EXA_CLIENT_SRCS:=jpis-client.c common.c \
-       ${is_client_prefix}C.c ${is_client_prefix}Client.c
->>>>>>> 1.32.2.3
+#=======
+#EXA_TEST_SRCS:=jpis-test.c ${is_prefix}C.c ${is_prefix}Client.c context.c db_ops.c conf.c
+#EXA_DB_SRCS:=jpis-db-internal.c db_ops.c conf.c context.c
+#EXA_CLIENT_SRCS:=jpis-client.c common.c \
+#      ${is_client_prefix}C.c ${is_client_prefix}Client.c
+#>>>>>>> 1.32.2.3
 #                ${is_prefix}C.c
 
 OBJS:=${SRCS:.c=.o}

diff --git a/org.glite.jp.index/src/conf.c b/org.glite.jp.index/src/conf.c
index 4797579..3d29aac 100644 (file)
--- a/org.glite.jp.index/src/conf.c
+++ b/org.glite.jp.index/src/conf.c
@@ -9,6 +9,10 @@
 #include <getopt.h>
 #include <unistd.h>
 
+/* XXX: makes the stuff build, together with #include "jpis_C.h" 
+ *      but I have no idea whether it works */
+#define SOAP_FMAC3 static
+#define WITH_NOGLOBAL
 
 #include <glite/jp/types.h>
 #include <glite/jp/context.h>
@@ -16,9 +20,11 @@
 #include "db_ops.h"
 #include "ws_is_typeref.h"
 
-#include <stdsoap2.h>
-#include "soap_version.h"
-#include "jpis_H.h"
+//#include <stdsoap2.h>
+//#include "soap_version.h"
+// #include "jpis_H.h"
+
+#include "jpis_C.c"
 
 extern SOAP_NMAC struct Namespace jpis__namespaces[];