use strictly #include "glite/lb/<file>.h"

diff --git a/org.glite.lb.client/Makefile b/org.glite.lb.client/Makefile
index 6cfae71..6081c9e 100644 (file)
--- a/org.glite.lb.client/Makefile
+++ b/org.glite.lb.client/Makefile
@@ -107,7 +107,7 @@ FAKELIBOBJS:=consumer_fake.o producer_fake.o
 
 PLUSOBJS:=Event.o Job.o JobStatus.o Notification.o ServerConnection.o
 
-HDRS:=consumer.h notification.h statistics.h \
+HDRS:=consumer.h notification.h statistics.h prod_proto.h connection.h \
        Job.h Notification.h ServerConnection.h 
 FAKE_HDRS:=consumer_fake.h producer_fake.h
 GEN_HDRS:=JobStatus.h producer.h interface_version.h
@@ -159,6 +159,10 @@ compile all: generate ${LIB} ${THRLIB} ${TOOLS} logevent examples ${MAN_GZ}
 endif
 
 generate: ${GEN_HDRS}
+       rm -vf ${globalprefix} ${lbprefix} ${HDRS}
+       ln -vs . ${globalprefix}
+       ln -vs . ${lbprefix}
+       for i in ${HDRS}; do ln -vs ../interface/$$i $$i ; done
 
 interface_version.h: ${top_srcdir}/project/version.properties
        echo "#define GLITE_LB_CLIENT_INTERFACE \"${version}\"" >$@ 
@@ -337,6 +341,7 @@ clean:
        rm -rvf *.o *.lo .libs lib* *.c *.cpp *.h *.dox producer_test C/ CPP/
        rm -rvf ${LIB} ${THRLIB} ${TOOLS} logevent ${PLUSLIB} ${THRPLUSLIB} ${MAN_GZ}
        rm -rvf ${EXAMPLES} ${EXAMPLES_CL} ${EXAMPLES_CL_THR} ${sh_PROGS}
+       rm -vf ${globalprefix} ${lbprefix}
        rm -rvf log.xml project/ rpmbuild/ RPMS/ tgz/
 
 check_version:

diff --git a/org.glite.lb.client/interface/Job.h b/org.glite.lb.client/interface/Job.h
index 771036f..3b26139 100644 (file)
--- a/org.glite.lb.client/interface/Job.h
+++ b/org.glite.lb.client/interface/Job.h
@@ -7,8 +7,8 @@
 
 #include "glite/lb/Event.h"
 
-#include "JobStatus.h"
-#include "ServerConnection.h"
+#include "glite/lb/JobStatus.h"
+#include "glite/lb/ServerConnection.h"
 
 
 /**

diff --git a/org.glite.lb.client/interface/Notification.h b/org.glite.lb.client/interface/Notification.h
index 361a171..876372e 100644 (file)
--- a/org.glite.lb.client/interface/Notification.h
+++ b/org.glite.lb.client/interface/Notification.h
@@ -4,9 +4,9 @@
 
 #include "glite/wmsutils/jobid/JobId.h"
 
-#include "consumer.h"
-#include "notification.h"
-#include "JobStatus.h"
+#include "glite/lb/consumer.h"
+#include "glite/lb/notification.h"
+#include "glite/lb/JobStatus.h"
 
 
 EWL_BEGIN_NAMESPACE

diff --git a/org.glite.lb.client/interface/ServerConnection.h b/org.glite.lb.client/interface/ServerConnection.h
index 0efbed0..41112fb 100644 (file)
--- a/org.glite.lb.client/interface/ServerConnection.h
+++ b/org.glite.lb.client/interface/ServerConnection.h
@@ -14,8 +14,8 @@
 #include "glite/wmsutils/jobid/JobId.h"
 
 #include "glite/lb/Event.h"
-#include "JobStatus.h"
-#include "consumer.h"
+#include "glite/lb/JobStatus.h"
+#include "glite/lb/consumer.h"
 
 EWL_BEGIN_NAMESPACE
 

diff --git a/org.glite.lb.client/src/connection.h b/org.glite.lb.client/interface/connection.h
similarity index 82%
rename from org.glite.lb.client/src/connection.h
rename to org.glite.lb.client/interface/connection.h
index 3aab41d..ba23adf 100644 (file)
--- a/org.glite.lb.client/src/connection.h
+++ b/org.glite.lb.client/interface/connection.h
@@ -1,5 +1,5 @@
-#ifndef __EDG_WORKLOAD_LOGGING_CLIENT_CONNECTION_H__
-#define __EDG_WORKLOAD_LOGGING_CLIENT_CONNECTION_H__
+#ifndef __GLITE_LB_CONNECTION_H__
+#define __GLITE_LB_CONNECTION_H__
 
 #ident "$Header$"
 
@@ -21,4 +21,4 @@ int CloseConnection(edg_wll_Context ctx, int* conn_index);
 #define PROXY_CONNECT_RETRY 10 /* ms */
 
 
-#endif /* __EDG_WORKLOAD_LOGGING_CLIENT_CONNECTION_H__ */
+#endif /* __GLITE_LB_CONNECTION_H__ */

diff --git a/org.glite.lb.client/interface/notification.h b/org.glite.lb.client/interface/notification.h
index c874c73..24f6681 100644 (file)
--- a/org.glite.lb.client/interface/notification.h
+++ b/org.glite.lb.client/interface/notification.h
@@ -8,7 +8,7 @@
 #include "glite/lb/notif_rec.h"
 #include "glite/lb/context.h"
 
-#include "consumer.h"
+#include "glite/lb/consumer.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/org.glite.lb.client/src/prod_proto.h b/org.glite.lb.client/interface/prod_proto.h
similarity index 95%
rename from org.glite.lb.client/src/prod_proto.h
rename to org.glite.lb.client/interface/prod_proto.h
index 1ca80b6..f8f7350 100644 (file)
--- a/org.glite.lb.client/src/prod_proto.h
+++ b/org.glite.lb.client/interface/prod_proto.h
@@ -1,5 +1,5 @@
-#ifndef __EDG_WORKLOAD_LOGGING_CLIENT_PROD_PROTO_H__
-#define __EDG_WORKLOAD_LOGGING_CLIENT_PROD_PROTO_H__
+#ifndef __GLITE_LB_PROD_PROTO_H__
+#define __GLITE_LB_PROD_PROTO_H__
 
 #ident "$Header$"
 
@@ -118,4 +118,4 @@ int edg_wll_log_direct_read(edg_wll_Context ctx, edg_wll_GssConnection *conn);
 }
 #endif
 
-#endif /* __EDG_WORKLOAD_LOGGING_CLIENT_PROD_PROTO_H__ */
+#endif /* __GLITE_LB_PROD_PROTO_H__ */

diff --git a/org.glite.lb.client/interface/statistics.h b/org.glite.lb.client/interface/statistics.h
index f7bb4f2..4f26639 100644 (file)
--- a/org.glite.lb.client/interface/statistics.h
+++ b/org.glite.lb.client/interface/statistics.h
@@ -1,7 +1,7 @@
 #ifndef __GLITE_LB_STATISTICS_H__
 #define __GLITE_LB_STATISTICS_H__
 
-#include "consumer.h"
+#include "glite/lb/consumer.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/org.glite.lb.client/src/Event.cpp.T b/org.glite.lb.client/src/Event.cpp.T
index 43fc745..63adb38 100644 (file)
--- a/org.glite.lb.client/src/Event.cpp.T
+++ b/org.glite.lb.client/src/Event.cpp.T
@@ -17,7 +17,7 @@
 #include "glite/lb/notifid.h"
 #include "glite/lb/LoggingExceptions.h"
 
-#include "consumer.h"
+#include "glite/lb/consumer.h"
 
 EWL_BEGIN_NAMESPACE;
 

diff --git a/org.glite.lb.client/src/Job.cpp b/org.glite.lb.client/src/Job.cpp
index fafd513..7c77526 100644 (file)
--- a/org.glite.lb.client/src/Job.cpp
+++ b/org.glite.lb.client/src/Job.cpp
@@ -14,8 +14,8 @@
 
 #include "glite/wmsutils/jobid/JobIdExceptions.h"
 
-#include "Job.h"
-#include "consumer.h"
+#include "glite/lb/Job.h"
+#include "glite/lb/consumer.h"
 #include "glite/lb/LoggingExceptions.h"
 #include "glite/lb/context-int.h"
 

diff --git a/org.glite.lb.client/src/JobStatus.cpp.T b/org.glite.lb.client/src/JobStatus.cpp.T
index c13bae3..0038d32 100644 (file)
--- a/org.glite.lb.client/src/JobStatus.cpp.T
+++ b/org.glite.lb.client/src/JobStatus.cpp.T
@@ -7,8 +7,8 @@
 #include "glite/wmsutils/jobid/JobId.h"
 #include "glite/lb/LoggingExceptions.h"
 
-#include "consumer.h"
-#include "JobStatus.h"
+#include "glite/lb/consumer.h"
+#include "glite/lb/JobStatus.h"
 
 
 EWL_BEGIN_NAMESPACE;

diff --git a/org.glite.lb.client/src/Notification.cpp b/org.glite.lb.client/src/Notification.cpp
index b02c05b..0441626 100644 (file)
--- a/org.glite.lb.client/src/Notification.cpp
+++ b/org.glite.lb.client/src/Notification.cpp
@@ -18,7 +18,7 @@
 #include "glite/lb/ServerConnection.h"
 
 #include "glite/lb/notifid.h"
-#include "notification.h"
+#include "glite/lb/notification.h"
 
 EWL_BEGIN_NAMESPACE;
 

diff --git a/org.glite.lb.client/src/connection.c b/org.glite.lb.client/src/connection.c
index b5535ae..47d396e 100644 (file)
--- a/org.glite.lb.client/src/connection.c
+++ b/org.glite.lb.client/src/connection.c
@@ -17,8 +17,8 @@
 #include "glite/lb/mini_http.h"
 #include "glite/lb/connpool.h"
 
-#include "consumer.h"
-#include "connection.h"
+#include "glite/lb/consumer.h"
+#include "glite/lb/connection.h"
 
 
 int CloseConnection(edg_wll_Context ctx, int* conn_index)

diff --git a/org.glite.lb.client/src/consumer.c b/org.glite.lb.client/src/consumer.c
index df3099b..916cb0a 100644 (file)
--- a/org.glite.lb.client/src/consumer.c
+++ b/org.glite.lb.client/src/consumer.c
@@ -16,8 +16,8 @@
 #include "glite/lb/xml_parse.h"
 #include "glite/lb/xml_conversions.h"
 
-#include "consumer.h"
-#include "connection.h"
+#include "glite/lb/consumer.h"
+#include "glite/lb/connection.h"
 
 static const char* const request_headers[] = {
        "Cache-Control: no-cache",

diff --git a/org.glite.lb.client/src/logevent.c.T b/org.glite.lb.client/src/logevent.c.T
index 377c90c..1f7bff8 100644 (file)
--- a/org.glite.lb.client/src/logevent.c.T
+++ b/org.glite.lb.client/src/logevent.c.T
@@ -20,7 +20,7 @@
 #include "glite/lb/notifid.h"
 #include "glite/lb/events.h"
 
-#include "producer.h"
+#include "glite/lb/producer.h"
 #include "args.h"
 
     //"    %s -p -l 100000 -j https://localhost/First_JobIV?localhost:7771 -s UserInterface -e jobAbort DG.JOB.ABORT.REASON=\"oops\"\n\n",

diff --git a/org.glite.lb.client/src/notification.c b/org.glite.lb.client/src/notification.c
index 3d7709f..8542f77 100644 (file)
--- a/org.glite.lb.client/src/notification.c
+++ b/org.glite.lb.client/src/notification.c
@@ -20,8 +20,8 @@
 #include "glite/lb/il_msg.h"
 #include "glite/lb/escape.h"
 
-#include "notification.h"
-#include "connection.h"
+#include "glite/lb/notification.h"
+#include "glite/lb/connection.h"
 
 #define CON_QUEUE               10     /* listen() queue limit */
 

diff --git a/org.glite.lb.client/src/prod_proto.c b/org.glite.lb.client/src/prod_proto.c
index 76f8540..38a5643 100644 (file)
--- a/org.glite.lb.client/src/prod_proto.c
+++ b/org.glite.lb.client/src/prod_proto.c
@@ -13,9 +13,9 @@
 #include "glite/lb/il_string.h"
 #include "glite/lb/connpool.h"
 
-#include "prod_proto.h"
-#include "producer.h"
-#include "connection.h"
+#include "glite/lb/prod_proto.h"
+#include "glite/lb/producer.h"
+#include "glite/lb/connection.h"
 
 static const char* socket_path="/tmp/lb_proxy_store.sock";
 

diff --git a/org.glite.lb.client/src/producer.c b/org.glite.lb.client/src/producer.c
index 2a3cede..b3617a9 100644 (file)
--- a/org.glite.lb.client/src/producer.c
+++ b/org.glite.lb.client/src/producer.c
@@ -15,9 +15,9 @@
 #include "glite/lb/trio.h"
 #include "glite/lb/context-int.h" 
 
-#include "producer.h"
-#include "prod_proto.h"
-#include "consumer.h" // for QuerySequenceCode
+#include "glite/lb/producer.h"
+#include "glite/lb/prod_proto.h"
+#include "glite/lb/consumer.h" // for QuerySequenceCode
 
 /* XXX: paralel registration is disabled until the race condition (via proxy first)
  * job owner assignment is solved */

diff --git a/org.glite.lb.client/src/statistics.c b/org.glite.lb.client/src/statistics.c
index b8b7f62..de12ba9 100644 (file)
--- a/org.glite.lb.client/src/statistics.c
+++ b/org.glite.lb.client/src/statistics.c
@@ -11,8 +11,8 @@
 #include "glite/lb/xml_parse.h"
 #include "glite/lb/mini_http.h"
 
-#include "statistics.h"
-#include "connection.h"
+#include "glite/lb/statistics.h"
+#include "glite/lb/connection.h"
 
 
 

diff --git a/org.glite.lb.client/src/uiwrap.c.T b/org.glite.lb.client/src/uiwrap.c.T
index 1f5d8f6..8c57aa3 100644 (file)
--- a/org.glite.lb.client/src/uiwrap.c.T
+++ b/org.glite.lb.client/src/uiwrap.c.T
@@ -6,7 +6,7 @@
 
 #include <stdlib.h>
 #include "glite/wmsutils/jobid/cjobid.h"
-#include "producer.h"
+#include "glite/lb/producer.h"
 
 @@@{
 $PRINTPROTOTYPESONLY = 0;

diff --git a/org.glite.lb.client/test/prod_proto_test.c b/org.glite.lb.client/test/prod_proto_test.c
index 385a1cb..46a23b9 100644 (file)
--- a/org.glite.lb.client/test/prod_proto_test.c
+++ b/org.glite.lb.client/test/prod_proto_test.c
@@ -1,7 +1,7 @@
 #define edg_wll_gss_read_full(a,b,c,d,e,f)  test_edg_wll_gss_read_full(a,b,c,d,e,f)
 #define edg_wll_gss_write_full(a,b,c,d,e,f) test_edg_wll_gss_write_full(a,b,c,d,e,f)
 
-#include "prod_proto.h"
+#include "glite/lb/prod_proto.h"
 #include "glite/lb/producer.h"
 
 /* virtual read will return all zeroes (answer from logger always without error) */