Work around the need for symlinks {glite,lb} -> .

diff --git a/org.glite.lb.common/Makefile b/org.glite.lb.common/Makefile
index 956c63c..879d004 100644 (file)
--- a/org.glite.lb.common/Makefile
+++ b/org.glite.lb.common/Makefile
@@ -45,7 +45,8 @@ CFLAGS:=${DEBUG} -I${top_srcdir}/src -I${top_srcdir}/interface \
        -I${expat_prefix}/include \
        ${COVERAGE_FLAGS} \
        -D_GNU_SOURCE \
-       -DDATAGRID_EXTENSION ${LB_STANDALONE_FLAGS}
+       -DDATAGRID_EXTENSION ${LB_STANDALONE_FLAGS} \
+       -DBUILDING_LB_COMMON
 
 ifneq (${expat_prefix},/usr)
        EXPAT_LIBS:=-L${expat_prefix}/lib

diff --git a/org.glite.lb.common/interface/Event.h.T b/org.glite.lb.common/interface/Event.h.T
index 933a0e5..5d2a89c 100644 (file)
--- a/org.glite.lb.common/interface/Event.h.T
+++ b/org.glite.lb.common/interface/Event.h.T
@@ -18,10 +18,16 @@
 #include <string>
 
 #include "glite/jobid/JobId.h"
-#include "glite/lb/CountRef.h"
 
+#ifdef BUILDING_LB_COMMON
+#include "CountRef.h"
+#include "events.h"
+#include "notifid.h"
+#else
+#include "glite/lb/CountRef.h"
 #include "glite/lb/events.h"
 #include "glite/lb/notifid.h"
+#endif
 
 EWL_BEGIN_NAMESPACE
 

diff --git a/org.glite.lb.common/interface/connpool.h b/org.glite.lb.common/interface/connpool.h
index 8b786a6..3393349 100644 (file)
--- a/org.glite.lb.common/interface/connpool.h
+++ b/org.glite.lb.common/interface/connpool.h
@@ -1,11 +1,20 @@
 #ifndef GLITE_LB_CONNPOOL_H
 #define GLITE_LB_CONNPOOL_H
 
-#include "glite/lb/padstruct.h"
 #include "glite/security/glite_gss.h"
+
+#ifdef BUILDING_LB_COMMON
+#include "padstruct.h"
+#include "context.h"
+#include "lb_plain_io.h"
+#include "authz.h"
+#else
+#include "glite/lb/padstruct.h"
 #include "glite/lb/context.h"
 #include "glite/lb/lb_plain_io.h"
 #include "glite/lb/authz.h"
+#endif
+
 #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 7f4f685..6222591 100644 (file)
--- a/org.glite.lb.common/interface/context-int.h
+++ b/org.glite.lb.common/interface/context-int.h
@@ -4,12 +4,22 @@
 #ident "$Header$"
 
 #include "glite/security/glite_gss.h"
+
+#ifdef BUILDING_LB_COMMON
+#include "jobstat.h"
+#include "query_rec.h"
+#include "lb_plain_io.h"
+#include "authz.h"
+#include "connpool.h"
+#include "padstruct.h"
+#else
 #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"
 #include "glite/lb/padstruct.h"
+#endif
 
 #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 2014bb8..ed18766 100644 (file)
--- a/org.glite.lb.common/interface/events.h.T
+++ b/org.glite.lb.common/interface/events.h.T
@@ -16,10 +16,16 @@
 #include <inttypes.h>
 
 #include "glite/jobid/cjobid.h"
+
+#ifdef BUILDING_LB_COMMON
+#include "context.h"
+#include "notifid.h"
+#include "padstruct.h"
+#else
 #include "glite/lb/context.h"
 #include "glite/lb/notifid.h"
-
 #include "glite/lb/padstruct.h"
+#endif
 
 #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 acc147c..664856a 100644 (file)
--- a/org.glite.lb.common/interface/events_parse.h
+++ b/org.glite.lb.common/interface/events_parse.h
@@ -3,7 +3,11 @@
 
 #ident "$Header$"
 
+#ifdef BUILDING_LB_COMMON
+#include "events.h"
+#else
 #include "glite/lb/events.h"
+#endif
 
 #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 5ecd41e..ce4772f 100644 (file)
--- a/org.glite.lb.common/interface/il_msg.h
+++ b/org.glite.lb.common/interface/il_msg.h
@@ -1,7 +1,11 @@
 #ifndef GLITE_LB_IL_MSG_H
 #define GLITE_LB_IL_MSG_H
 
+#ifdef BUILDING_LB_COMMON
+#include "il_string.h"
+#else
 #include "glite/lb/il_string.h"
+#endif
 
 #ident "$Header$"
 

diff --git a/org.glite.lb.common/interface/lb_perftest.h b/org.glite.lb.common/interface/lb_perftest.h
index 763e723..313e921 100644 (file)
--- a/org.glite.lb.common/interface/lb_perftest.h
+++ b/org.glite.lb.common/interface/lb_perftest.h
@@ -5,7 +5,12 @@
 
 #include "glite/jobid/cjobid.h"
 #include "glite/jobid/strmd5.h"
+
+#ifdef BUILDING_LB_COMMON
+#include "events.h"
+#else
 #include "glite/lb/events.h"
+#endif
 
 #define PERFTEST_END_TAG_NAME "lb_perftest"
 #define PERFTEST_END_TAG_VALUE "+++ konec testu +++"

diff --git a/org.glite.lb.common/interface/lb_plain_io.h b/org.glite.lb.common/interface/lb_plain_io.h
index 0723159..f9ada81 100644 (file)
--- a/org.glite.lb.common/interface/lb_plain_io.h
+++ b/org.glite.lb.common/interface/lb_plain_io.h
@@ -1,7 +1,11 @@
 #ifndef GLITE_LB_PLAIN_IO_H
 #define GLITE_LB_PLAIN_IO_H
 
+#ifdef BUILDING_LB_COMMON
+#include "padstruct.h"
+#else
 #include "glite/lb/padstruct.h"
+#endif
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/org.glite.lb.common/interface/log_proto.h b/org.glite.lb.common/interface/log_proto.h
index a9646cc..95083ba 100644 (file)
--- a/org.glite.lb.common/interface/log_proto.h
+++ b/org.glite.lb.common/interface/log_proto.h
@@ -13,8 +13,11 @@
 extern "C" {
 #endif
 
-
+#ifdef BUILDING_LB_COMMON
+#include "context.h"
+#else
 #include "glite/lb/context.h"
+#endif
 
 /**
  * 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 92ee170..0096568 100644 (file)
--- a/org.glite.lb.common/interface/mini_http.h
+++ b/org.glite.lb.common/interface/mini_http.h
@@ -4,8 +4,13 @@
 #ident "$Header$"
 
 // #include "glite/lb/consumer.h"
+#ifdef BUILDING_LB_COMMON
+#include "context.h"
+#include "connpool.h"
+#else
 #include "glite/lb/context.h"
 #include "glite/lb/connpool.h"
+#endif
 
 /* 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 1522449..7fffc55 100644 (file)
--- a/org.glite.lb.common/interface/query_rec.h
+++ b/org.glite.lb.common/interface/query_rec.h
@@ -9,9 +9,16 @@
 #ident "$Header$"
 
 #include <glite/jobid/cjobid.h>
+
+#ifdef BUILDING_LB_COMMON
+#include "context.h"
+#include "events.h"
+#include "jobstat.h"
+#else
 #include "glite/lb/context.h"
 #include "glite/lb/events.h"
 #include "glite/lb/jobstat.h"
+#endif
 
 #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 aa3c2a7..783587f 100644 (file)
--- a/org.glite.lb.common/interface/xml_conversions.h
+++ b/org.glite.lb.common/interface/xml_conversions.h
@@ -4,10 +4,18 @@
 #ident "$Header$"
 
 #include "glite/jobid/cjobid.h"
+
+#ifdef BUILDING_LB_COMMON
+#include "events.h"
+#include "query_rec.h"
+#include "notifid.h"
+#include "notif_rec.h"
+#else
 #include "glite/lb/events.h"
 #include "glite/lb/query_rec.h"
 #include "glite/lb/notifid.h"
 #include "glite/lb/notif_rec.h"
+#endif
 
 #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 e9d8df4..862f6dc 100644 (file)
--- a/org.glite.lb.common/interface/xml_parse.h
+++ b/org.glite.lb.common/interface/xml_parse.h
@@ -4,11 +4,20 @@
 #ident "$Header$"
 
 #include "glite/jobid/cjobid.h"
+
+#ifdef BUILDING_LB_COMMON
+#include "events.h"
+#include "context.h"
+#include "query_rec.h"
+#include "notifid.h"
+#include "notif_rec.h"
+#else
 #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"
+#endif
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/org.glite.lb.common/src/connpool.c b/org.glite.lb.common/src/connpool.c
index e9547c4..e6f4089 100644 (file)
--- a/org.glite.lb.common/src/connpool.c
+++ b/org.glite.lb.common/src/connpool.c
@@ -1,4 +1,4 @@
-#include "glite/lb/connpool.h"
+#include "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 3d946f4..50af048 100644 (file)
--- a/org.glite.lb.common/src/context.c
+++ b/org.glite.lb.common/src/context.c
@@ -10,8 +10,8 @@
 
 #include "glite/jobid/strmd5.h"
 #include "glite/jobid/cjobid.h"
-#include "glite/lb/context-int.h"
-// #include "glite/lb/producer.h"
+#include "context-int.h"
+// #include "producer.h"
 
 static void free_voms_groups(edg_wll_VomsGroups *);
 

diff --git a/org.glite.lb.common/src/events.c.T b/org.glite.lb.common/src/events.c.T
index 0d9c69c..23febd0 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/jobid/cjobid.h"
-#include "glite/lb/events.h"
-#include "glite/lb/ulm_parse.h"
+#include "events.h"
+#include "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 40f92b5..b3a5788 100644 (file)
--- a/org.glite.lb.common/src/events_parse.c.T
+++ b/org.glite.lb.common/src/events_parse.c.T
@@ -10,10 +10,10 @@
 #include <errno.h>
 
 #include "glite/jobid/cjobid.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 "events.h"
+#include "events_parse.h"
+#include "ulm_parse.h"
+#include "context-int.h"
 #include "glite/lbu/escape.h"
 #include "glite/lbu/trio.h"
 

diff --git a/org.glite.lb.common/src/il_int.c b/org.glite.lb.common/src/il_int.c
index 999bb25..7d4bdf5 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 "glite/lb/il_string.h"
+#include "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 74e8c20..39c1f9e 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 "glite/lb/il_string.h"
+#include "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 0261484..8006aff 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 "glite/lb/il_string.h"
+#include "il_string.h"
 
 char *
 put_string(char *p, il_octet_string_t *s)

diff --git a/org.glite.lb.common/src/lb_perftest.c b/org.glite.lb.common/src/lb_perftest.c
index b6a7461..2c87459 100644 (file)
--- a/org.glite.lb.common/src/lb_perftest.c
+++ b/org.glite.lb.common/src/lb_perftest.c
@@ -13,9 +13,10 @@
 #include <unistd.h>
 #include <ctype.h>
 
-#include "glite/lb/lb_perftest.h"
 #include "glite/lbu/trio.h"
-#include "glite/lb/il_msg.h"
+
+#include "lb_perftest.h"
+#include "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 b8d80e5..1de8e37 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 "glite/lb/lb_plain_io.h"
+#include "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 1691eda..7964530 100644 (file)
--- a/org.glite.lb.common/src/log_msg.c
+++ b/org.glite.lb.common/src/log_msg.c
@@ -10,7 +10,7 @@
 #include <unistd.h>
 #include <errno.h>
 
-#include "glite/lb/context-int.h"
+#include "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 c299ec9..53332bd 100644 (file)
--- a/org.glite.lb.common/src/mini_http.c
+++ b/org.glite.lb.common/src/mini_http.c
@@ -12,9 +12,9 @@
 
 #include "glite/security/glite_gss.h"
 
-#include "glite/lb/mini_http.h"
-#include "glite/lb/lb_plain_io.h"
-#include "glite/lb/context-int.h"
+#include "mini_http.h"
+#include "lb_plain_io.h"
+#include "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 1d26d3d..e890051 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/jobid/cjobid.h"
-#include "glite/lb/notifid.h"
+#include "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 94d22e6..46dbafb 100644 (file)
--- a/org.glite.lb.common/src/param.c
+++ b/org.glite.lb.common/src/param.c
@@ -6,10 +6,10 @@
 #include <stdio.h>
 
 #include "glite/jobid/cjobid.h"
-#include "glite/lb/context-int.h"
+#include "context-int.h"
 // XXX:
-#include "glite/lb/log_proto.h" // for default log host and port
-#include "glite/lb/timeouts.h" // for timeouts
+#include "log_proto.h" // for default log host and port
+#include "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 d484e50..de78095 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/jobid/cjobid.h"
-#include "glite/lb/query_rec.h"
+#include "query_rec.h"
 
 /*
  * edg_wll_QueryRec manipulation routines

diff --git a/org.glite.lb.common/src/ulm_parse.c b/org.glite.lb.common/src/ulm_parse.c
index a1fea45..855c26b 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 "glite/lb/ulm_parse.h"
+#include "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 4befc08..36c2d22 100644 (file)
--- a/org.glite.lb.common/src/xml_conversions.c
+++ b/org.glite.lb.common/src/xml_conversions.c
@@ -7,8 +7,8 @@
 #include "glite/lbu/trio.h"
 #include "glite/lbu/escape.h"
 
-#include "glite/lb/xml_conversions.h"
-#include "glite/lb/jobstat.h"
+#include "xml_conversions.h"
+#include "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 a5d9e64..c69301d 100644 (file)
--- a/org.glite.lb.common/src/xml_parse.c.T
+++ b/org.glite.lb.common/src/xml_parse.c.T
@@ -12,9 +12,9 @@
 #include "glite/lbu/escape.h"
 #include "glite/jobid/cjobid.h"
 
-#include "glite/lb/context-int.h"
-#include "glite/lb/xml_parse.h"
-#include "glite/lb/xml_conversions.h"    
+#include "context-int.h"
+#include "xml_parse.h"
+#include "xml_conversions.h"    
 
 
 #ifdef __GNUC__