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

diff --git a/org.glite.lb.common/Makefile b/org.glite.lb.common/Makefile
index 265ef60..478af39 100644 (file)
--- a/org.glite.lb.common/Makefile
+++ b/org.glite.lb.common/Makefile
@@ -130,6 +130,10 @@ endif
 default: all
 
 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
 
 all compile: generate ${STATICLIB} ${LTLIB} ${THRSTATICLIB} ${THRLTLIB} ${TRIO_LIB} ${MAILDIR_LIB}
 
@@ -242,6 +246,7 @@ install:
 
 clean:
        rm -rvf *.o *.lo .libs lib* *.c *.h test_parse il_test parse.cpp events.tex status.tex
+       rm -vf ${globalprefix} ${lbprefix}
        rm -rvf log.xml project/ rpmbuild/ RPMS/ tgz/
 
 %.o: %.c

diff --git a/org.glite.lb.common/interface/Event.h.T b/org.glite.lb.common/interface/Event.h.T
index 8777d32..2a53264 100644 (file)
--- a/org.glite.lb.common/interface/Event.h.T
+++ b/org.glite.lb.common/interface/Event.h.T
@@ -20,8 +20,8 @@
 #include "glite/wmsutils/jobid/JobId.h"
 #include "glite/lb/CountRef.h"
 
-#include "events.h"
-#include "notifid.h"
+#include "glite/lb/events.h"
+#include "glite/lb/notifid.h"
 
 EWL_BEGIN_NAMESPACE
 

diff --git a/org.glite.lb.common/interface/connpool.h b/org.glite.lb.common/interface/connpool.h
index 6d1cc54..e29f185 100644 (file)
--- a/org.glite.lb.common/interface/connpool.h
+++ b/org.glite.lb.common/interface/connpool.h
@@ -2,9 +2,9 @@
 #define __GLITE_LB_CONNPOOL_H__
 
 #include "glite/security/glite_gss.h"
-#include "context.h"
-#include "lb_plain_io.h"
-#include "authz.h"
+#include "glite/lb/context.h"
+#include "glite/lb/lb_plain_io.h"
+#include "glite/lb/authz.h"
 #ifdef GLITE_LB_THREADED
   #include <pthread.h>
 #endif

diff --git a/org.glite.lb.common/interface/context-int.h b/org.glite.lb.common/interface/context-int.h
index 72e8627..fdaef85 100644 (file)
--- a/org.glite.lb.common/interface/context-int.h
+++ b/org.glite.lb.common/interface/context-int.h
@@ -4,11 +4,11 @@
 #ident "$Header$"
 
 #include "glite/security/glite_gss.h"
-#include "jobstat.h"
-#include "query_rec.h"
-#include "lb_plain_io.h"
-#include "authz.h"
-#include "connpool.h"
+#include "glite/lb/jobstat.h"
+#include "glite/lb/query_rec.h"
+#include "glite/lb/lb_plain_io.h"
+#include "glite/lb/authz.h"
+#include "glite/lb/connpool.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/org.glite.lb.common/interface/events.h.T b/org.glite.lb.common/interface/events.h.T
index de1a51c..ffdb97f 100644 (file)
--- a/org.glite.lb.common/interface/events.h.T
+++ b/org.glite.lb.common/interface/events.h.T
@@ -16,8 +16,8 @@
 #include <inttypes.h>
 
 #include "glite/wmsutils/jobid/cjobid.h"
-#include "context.h"
-#include "notifid.h"
+#include "glite/lb/context.h"
+#include "glite/lb/notifid.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/org.glite.lb.common/interface/events_parse.h b/org.glite.lb.common/interface/events_parse.h
index 957dd7e..35e2d89 100644 (file)
--- a/org.glite.lb.common/interface/events_parse.h
+++ b/org.glite.lb.common/interface/events_parse.h
@@ -3,7 +3,7 @@
 
 #ident "$Header$"
 
-#include "events.h"
+#include "glite/lb/events.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/org.glite.lb.common/interface/il_msg.h b/org.glite.lb.common/interface/il_msg.h
index b4aee62..73d4c12 100644 (file)
--- a/org.glite.lb.common/interface/il_msg.h
+++ b/org.glite.lb.common/interface/il_msg.h
@@ -1,7 +1,7 @@
 #ifndef __GLITE_LB_IL_MSG_H__
 #define __GLITE_LB_IL_MSG_H__
 
-#include "il_string.h"
+#include "glite/lb/il_string.h"
 
 #ident "$Header$"
 

diff --git a/org.glite.lb.common/interface/lb_perftest.h b/org.glite.lb.common/interface/lb_perftest.h
index 77cc627..d40bf53 100644 (file)
--- a/org.glite.lb.common/interface/lb_perftest.h
+++ b/org.glite.lb.common/interface/lb_perftest.h
@@ -5,7 +5,7 @@
 
 #include "glite/wmsutils/jobid/cjobid.h"
 #include "glite/wmsutils/jobid/strmd5.h"
-#include "events.h"
+#include "glite/lb/events.h"
 
 #define PERFTEST_END_TAG_NAME "lb_perftest"
 #define PERFTEST_END_TAG_VALUE "+++ konec testu +++"

diff --git a/org.glite.lb.common/interface/log_proto.h b/org.glite.lb.common/interface/log_proto.h
index d2a3889..cd67dfe 100644 (file)
--- a/org.glite.lb.common/interface/log_proto.h
+++ b/org.glite.lb.common/interface/log_proto.h
@@ -14,7 +14,7 @@ extern "C" {
 #endif
 
 
-#include "context.h"
+#include "glite/lb/context.h"
 
 /**
  * default (noauth) user name

diff --git a/org.glite.lb.common/interface/mini_http.h b/org.glite.lb.common/interface/mini_http.h
index f57b377..4ceed7c 100644 (file)
--- a/org.glite.lb.common/interface/mini_http.h
+++ b/org.glite.lb.common/interface/mini_http.h
@@ -4,8 +4,8 @@
 #ident "$Header$"
 
 // #include "glite/lb/consumer.h"
-#include "context.h"
-#include "connpool.h"
+#include "glite/lb/context.h"
+#include "glite/lb/connpool.h"
 
 /* XXX: not a good place for the folowing #def's but we ain't got better currently */
 /** protocol version */

diff --git a/org.glite.lb.common/interface/query_rec.h b/org.glite.lb.common/interface/query_rec.h
index 28608d0..3a78172 100644 (file)
--- a/org.glite.lb.common/interface/query_rec.h
+++ b/org.glite.lb.common/interface/query_rec.h
@@ -8,10 +8,10 @@
 
 #ident "$Header$"
 
-#include <glite/wmsutils/jobid/cjobid.h>
-#include "context.h"
-#include "events.h"
-#include "jobstat.h"
+#include "glite/wmsutils/jobid/cjobid.h"
+#include "glite/lb/context.h"
+#include "glite/lb/events.h"
+#include "glite/lb/jobstat.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/org.glite.lb.common/interface/xml_conversions.h b/org.glite.lb.common/interface/xml_conversions.h
index c6c0df6..257aeea 100644 (file)
--- a/org.glite.lb.common/interface/xml_conversions.h
+++ b/org.glite.lb.common/interface/xml_conversions.h
@@ -4,10 +4,10 @@
 #ident "$Header$"
 
 #include "glite/wmsutils/jobid/cjobid.h"
-#include "events.h"
-#include "query_rec.h"
-#include "notifid.h"
-#include "notif_rec.h"
+#include "glite/lb/events.h"
+#include "glite/lb/query_rec.h"
+#include "glite/lb/notifid.h"
+#include "glite/lb/notif_rec.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/org.glite.lb.common/interface/xml_parse.h b/org.glite.lb.common/interface/xml_parse.h
index 6d01731..1e77374 100644 (file)
--- a/org.glite.lb.common/interface/xml_parse.h
+++ b/org.glite.lb.common/interface/xml_parse.h
@@ -4,11 +4,11 @@
 #ident "$Header$"
 
 #include "glite/wmsutils/jobid/cjobid.h"
-#include "events.h"
-#include "context.h"
-#include "query_rec.h"
-#include "notifid.h"
-#include "notif_rec.h"
+#include "glite/lb/events.h"
+#include "glite/lb/context.h"
+#include "glite/lb/query_rec.h"
+#include "glite/lb/notifid.h"
+#include "glite/lb/notif_rec.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/org.glite.lb.common/src/connpool.c b/org.glite.lb.common/src/connpool.c
index fb84222..729fb5b 100644 (file)
--- a/org.glite.lb.common/src/connpool.c
+++ b/org.glite.lb.common/src/connpool.c
@@ -1,4 +1,4 @@
-#include "connpool.h"
+#include "glite/lb/connpool.h"
 
 #ifdef GLITE_LB_THREADED
 edg_wll_Connections connectionsHandle = 

diff --git a/org.glite.lb.common/src/context.c b/org.glite.lb.common/src/context.c
index 097eb6c..0b156c1 100644 (file)
--- a/org.glite.lb.common/src/context.c
+++ b/org.glite.lb.common/src/context.c
@@ -10,7 +10,7 @@
 
 #include "glite/wmsutils/jobid/strmd5.h"
 #include "glite/wmsutils/jobid/cjobid.h"
-#include "context-int.h"
+#include "glite/lb/context-int.h"
 // #include "glite/lb/producer.h"
 
 static void free_voms_groups(edg_wll_VomsGroups *);

diff --git a/org.glite.lb.common/src/escape.c b/org.glite.lb.common/src/escape.c
index 09285ad..ee58f17 100644 (file)
--- a/org.glite.lb.common/src/escape.c
+++ b/org.glite.lb.common/src/escape.c
@@ -5,7 +5,7 @@
 #include <stdio.h>
 #include <ctype.h>
 
-#include "escape.h"
+#include "glite/lb/escape.h"
 
 #define ULM_QM  '"'
 #define ULM_BS  '\\'

diff --git a/org.glite.lb.common/src/events.c.T b/org.glite.lb.common/src/events.c.T
index ee082be..9053e3b 100644 (file)
--- a/org.glite.lb.common/src/events.c.T
+++ b/org.glite.lb.common/src/events.c.T
@@ -10,8 +10,8 @@
 #include <errno.h>
 
 #include "glite/wmsutils/jobid/cjobid.h"
-#include "events.h"
-#include "ulm_parse.h"
+#include "glite/lb/events.h"
+#include "glite/lb/ulm_parse.h"
 
 static const struct timeval null_timeval = {0,0};
 

diff --git a/org.glite.lb.common/src/events_parse.c.T b/org.glite.lb.common/src/events_parse.c.T
index e292175..174dd79 100644 (file)
--- a/org.glite.lb.common/src/events_parse.c.T
+++ b/org.glite.lb.common/src/events_parse.c.T
@@ -9,14 +9,13 @@
 #include <time.h>
 #include <errno.h>
 
-#include "events.h"
-#include "events_parse.h"
-#include "ulm_parse.h"
-#include "context-int.h"
-#include "escape.h"
 #include "glite/wmsutils/jobid/cjobid.h"
-
-#include "trio.h"
+#include "glite/lb/events.h"
+#include "glite/lb/events_parse.h"
+#include "glite/lb/ulm_parse.h"
+#include "glite/lb/context-int.h"
+#include "glite/lb/escape.h"
+#include "glite/lb/trio.h"
 
 static const struct timeval null_timeval = {0,0};
 

diff --git a/org.glite.lb.common/src/il_int.c b/org.glite.lb.common/src/il_int.c
index 7d4bdf5..999bb25 100644 (file)
--- a/org.glite.lb.common/src/il_int.c
+++ b/org.glite.lb.common/src/il_int.c
@@ -5,7 +5,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "il_string.h"
+#include "glite/lb/il_string.h"
 
 char *
 _put_int(char *p, int d)

diff --git a/org.glite.lb.common/src/il_msg.c b/org.glite.lb.common/src/il_msg.c
index 39c1f9e..74e8c20 100644 (file)
--- a/org.glite.lb.common/src/il_msg.c
+++ b/org.glite.lb.common/src/il_msg.c
@@ -1,6 +1,6 @@
 #ident "$Header$"
 
-#include "il_string.h"
+#include "glite/lb/il_string.h"
 
 #include <stdlib.h>
 #include <stdio.h>

diff --git a/org.glite.lb.common/src/il_string.c b/org.glite.lb.common/src/il_string.c
index 8006aff..0261484 100644 (file)
--- a/org.glite.lb.common/src/il_string.c
+++ b/org.glite.lb.common/src/il_string.c
@@ -4,7 +4,7 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include "il_string.h"
+#include "glite/lb/il_string.h"
 
 char *
 put_string(char *p, il_octet_string_t *s)

diff --git a/org.glite.lb.common/src/lb_maildir.c b/org.glite.lb.common/src/lb_maildir.c
index 2b4cc5b..2784305 100644 (file)
--- a/org.glite.lb.common/src/lb_maildir.c
+++ b/org.glite.lb.common/src/lb_maildir.c
@@ -10,7 +10,7 @@
 #include <errno.h>
 #include <string.h>
 
-#include "lb_maildir.h"
+#include "glite/lb/lb_maildir.h"
 
 #define DEFAULT_ROOT   "/tmp/lb_maildir"
 

diff --git a/org.glite.lb.common/src/lb_perftest.c b/org.glite.lb.common/src/lb_perftest.c
index 7e2e531..078c52c 100644 (file)
--- a/org.glite.lb.common/src/lb_perftest.c
+++ b/org.glite.lb.common/src/lb_perftest.c
@@ -13,9 +13,9 @@
 #include <unistd.h>
 #include <ctype.h>
 
-#include "lb_perftest.h"
-#include "trio.h"
-#include "il_msg.h"
+#include "glite/lb/lb_perftest.h"
+#include "glite/lb/trio.h"
+#include "glite/lb/il_msg.h"
 
 static pthread_mutex_t perftest_lock = PTHREAD_MUTEX_INITIALIZER;
 static struct timeval endtime;

diff --git a/org.glite.lb.common/src/lb_plain_io.c b/org.glite.lb.common/src/lb_plain_io.c
index 1de8e37..b8d80e5 100644 (file)
--- a/org.glite.lb.common/src/lb_plain_io.c
+++ b/org.glite.lb.common/src/lb_plain_io.c
@@ -18,7 +18,7 @@
 #define INFTIM (-1)
 #endif
 
-#include "lb_plain_io.h"
+#include "glite/lb/lb_plain_io.h"
 
 #define tv_sub(a,b) {\
        (a).tv_usec -= (b).tv_usec;\

diff --git a/org.glite.lb.common/src/log_msg.c b/org.glite.lb.common/src/log_msg.c
index 9d01165..16af14b 100644 (file)
--- a/org.glite.lb.common/src/log_msg.c
+++ b/org.glite.lb.common/src/log_msg.c
@@ -9,7 +9,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "context-int.h"
+#include "glite/lb/context-int.h"
 
 #define tv_sub(a, b) {\
        (a).tv_usec -= (b).tv_usec;\

diff --git a/org.glite.lb.common/src/mini_http.c b/org.glite.lb.common/src/mini_http.c
index 29aa3fc..a3381e2 100644 (file)
--- a/org.glite.lb.common/src/mini_http.c
+++ b/org.glite.lb.common/src/mini_http.c
@@ -14,9 +14,9 @@
 
 #include "globus_config.h"
 
-#include "mini_http.h"
-#include "lb_plain_io.h"
-#include "context-int.h"
+#include "glite/lb/mini_http.h"
+#include "glite/lb/lb_plain_io.h"
+#include "glite/lb/context-int.h"
 
 #define min(x,y)       ((x) < (y) ? (x) : (y))
 #define CONTENT_LENGTH "Content-Length:"

diff --git a/org.glite.lb.common/src/notifid.c b/org.glite.lb.common/src/notifid.c
index 1ee60d4..ee3c162 100644 (file)
--- a/org.glite.lb.common/src/notifid.c
+++ b/org.glite.lb.common/src/notifid.c
@@ -3,7 +3,7 @@
 #include <string.h>
 
 #include "glite/wmsutils/jobid/cjobid.h"
-#include "notifid.h"
+#include "glite/lb/notifid.h"
 
 int edg_wll_NotifIdParse(const char *s,edg_wll_NotifId *n)
 {

diff --git a/org.glite.lb.common/src/param.c b/org.glite.lb.common/src/param.c
index f2f1bb6..35ace18 100644 (file)
--- a/org.glite.lb.common/src/param.c
+++ b/org.glite.lb.common/src/param.c
@@ -7,10 +7,10 @@
 #include <globus_common.h>
 
 #include "glite/wmsutils/jobid/cjobid.h"
-#include "context-int.h"
+#include "glite/lb/context-int.h"
 // XXX:
-#include "log_proto.h" // for default log host and port
-#include "timeouts.h" // for timeouts
+#include "glite/lb/log_proto.h" // for default log host and port
+#include "glite/lb/timeouts.h" // for timeouts
 
 /* XXX: must match edg_wll_ContextParam */
 static const char *myenv[] = {

diff --git a/org.glite.lb.common/src/query_rec.c b/org.glite.lb.common/src/query_rec.c
index 8a80529..cc0598d 100644 (file)
--- a/org.glite.lb.common/src/query_rec.c
+++ b/org.glite.lb.common/src/query_rec.c
@@ -7,7 +7,7 @@
 #include <assert.h>
 
 #include "glite/wmsutils/jobid/cjobid.h"
-#include "query_rec.h"
+#include "glite/lb/query_rec.h"
 
 /*
  * edg_wll_QueryRec manipulation routines

diff --git a/org.glite.lb.common/src/status.c.T b/org.glite.lb.common/src/status.c.T
index 6cd9065..52b89e3 100644 (file)
--- a/org.glite.lb.common/src/status.c.T
+++ b/org.glite.lb.common/src/status.c.T
@@ -3,7 +3,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "jobstat.h"
+#include "glite/lb/jobstat.h"
 
 static const struct timeval null_timeval = {0,0};
 

diff --git a/org.glite.lb.common/src/trio.c b/org.glite.lb.common/src/trio.c
index 439a709..fa34a7f 100644 (file)
--- a/org.glite.lb.common/src/trio.c
+++ b/org.glite.lb.common/src/trio.c
@@ -47,13 +47,13 @@ static const char rcsid[] = "@(#)$Id$";
 /*************************************************************************
  * Trio include files
  */
-#include "trio.h"
+#include "glite/lb/trio.h"
 #include "triop.h"
 #include "strio.h"
 
 #ifdef DATAGRID_EXTENSION
-#include "events.h"
-#include "escape.h"
+#include "glite/lb/events.h"
+#include "glite/lb/escape.h"
 #endif
 
 /*

diff --git a/org.glite.lb.common/src/ulm_parse.c b/org.glite.lb.common/src/ulm_parse.c
index 855c26b..a1fea45 100644 (file)
--- a/org.glite.lb.common/src/ulm_parse.c
+++ b/org.glite.lb.common/src/ulm_parse.c
@@ -9,7 +9,7 @@
 
 /*========= DATA =====================================================*/
 
-#include "ulm_parse.h"
+#include "glite/lb/ulm_parse.h"
 
 /*========= FUNCTIONS ================================================*/
 

diff --git a/org.glite.lb.common/src/xml_conversions.c b/org.glite.lb.common/src/xml_conversions.c
index 34d2191..2b27501 100644 (file)
--- a/org.glite.lb.common/src/xml_conversions.c
+++ b/org.glite.lb.common/src/xml_conversions.c
@@ -4,11 +4,11 @@
 #include <stdlib.h>
 #include <expat.h>
 
-#include "trio.h"
+#include "glite/lb/trio.h"
 
-#include "xml_conversions.h"
-#include "escape.h"
-#include "jobstat.h"
+#include "glite/lb/xml_conversions.h"
+#include "glite/lb/escape.h"
+#include "glite/lb/jobstat.h"
 
 
 

diff --git a/org.glite.lb.common/src/xml_parse.c.T b/org.glite.lb.common/src/xml_parse.c.T
index 9a6d9ae..30cd743 100644 (file)
--- a/org.glite.lb.common/src/xml_parse.c.T
+++ b/org.glite.lb.common/src/xml_parse.c.T
@@ -9,13 +9,13 @@
 
 #include "globus_config.h"
 
-#include "trio.h"
+#include "glite/lb/trio.h"
 #include "glite/wmsutils/jobid/cjobid.h"
 
-#include "escape.h"
-#include "context-int.h"
-#include "xml_parse.h"
-#include "xml_conversions.h"    
+#include "glite/lb/escape.h"
+#include "glite/lb/context-int.h"
+#include "glite/lb/xml_parse.h"
+#include "glite/lb/xml_conversions.h"    
 
 
 #ifdef __GNUC__ 

diff --git a/org.glite.lb.common/test/il_int_test.cpp b/org.glite.lb.common/test/il_int_test.cpp
index f00b4c6..9da319c 100644 (file)
--- a/org.glite.lb.common/test/il_int_test.cpp
+++ b/org.glite.lb.common/test/il_int_test.cpp
@@ -2,7 +2,7 @@
 
 
 extern "C" {
-#include "il_string.h"
+#include "glite/lb/il_string.h"
 }
 
 class IlIntTest: public CppUnit::TestFixture

diff --git a/org.glite.lb.common/test/il_msg_test.cpp b/org.glite.lb.common/test/il_msg_test.cpp
index 754e498..6ae5cb0 100644 (file)
--- a/org.glite.lb.common/test/il_msg_test.cpp
+++ b/org.glite.lb.common/test/il_msg_test.cpp
@@ -3,8 +3,8 @@
 
 extern "C" {
 #include <string.h>
-#include "il_string.h"
-#include "il_msg.h"
+#include "glite/lb/il_string.h"
+#include "glite/lb/il_msg.h"
 }
 
 class IlMsgTest : public CppUnit::TestFixture 

diff --git a/org.glite.lb.common/test/il_string_test.cpp b/org.glite.lb.common/test/il_string_test.cpp
index 1f138ac..e1217f5 100644 (file)
--- a/org.glite.lb.common/test/il_string_test.cpp
+++ b/org.glite.lb.common/test/il_string_test.cpp
@@ -2,7 +2,7 @@
 
 extern "C" {
 #include <string.h>
-#include "il_string.h"
+#include "glite/lb/il_string.h"
 }
 
 class IlStringTest : public CppUnit::TestFixture 

diff --git a/org.glite.lb.common/test/parse.cpp.T b/org.glite.lb.common/test/parse.cpp.T
index e863a70..df6c2aa 100644 (file)
--- a/org.glite.lb.common/test/parse.cpp.T
+++ b/org.glite.lb.common/test/parse.cpp.T
@@ -4,7 +4,7 @@
 #include <cppunit/TestFixture.h>
 
 
-#include "events_parse.h"
+#include "glite/lb/events_parse.h"
 
 class EventParseTest: public  CppUnit::TestFixture
 {