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

diff --git a/org.glite.lb.client/Makefile b/org.glite.lb.client/Makefile
index ea6c4c6..f8aa9cb 100644 (file)
--- a/org.glite.lb.client/Makefile
+++ b/org.glite.lb.client/Makefile
@@ -87,6 +87,7 @@ CFLAGS:=${DEBUG} \
        -I${top_srcdir}/src -I${top_srcdir}/interface \
        -I${stagedir}/include \
        ${COVERAGE_FLAGS} \
+       -DBUILDING_LB_CLIENT \
        -D_GNU_SOURCE ${LB_STANDALONE_FLAGS} ${LB_PERF_FLAGS}
 
 CXXFLAGS:=${CFLAGS}
@@ -262,6 +263,7 @@ perftest_logjobs.o: perftest_logjobs.c
 
 %.sh: %.l gen_begin gen_sample_job
        rm -f $@
+       -chmod +x ${GENSAM}
        $(GENSAM) $< >$@ || rm -f $@
        chmod -w,+x $@ > /dev/null
 

diff --git a/org.glite.lb.client/examples/abort_job.c b/org.glite.lb.client/examples/abort_job.c
index d8a293f..24e9d05 100644 (file)
--- a/org.glite.lb.client/examples/abort_job.c
+++ b/org.glite.lb.client/examples/abort_job.c
@@ -10,8 +10,8 @@
 #include <errno.h>
 
 #include "glite/lb/events_parse.h"
-#include "glite/lb/consumer.h"
-#include "glite/lb/producer.h"
+#include "consumer.h"
+#include "producer.h"
 #include "glite/jobid/cjobid.h"
 #include "glite/lb/context-int.h"
 

diff --git a/org.glite.lb.client/examples/change_acl.c b/org.glite.lb.client/examples/change_acl.c
index c48d06a..feb4ba4 100644 (file)
--- a/org.glite.lb.client/examples/change_acl.c
+++ b/org.glite.lb.client/examples/change_acl.c
@@ -4,7 +4,7 @@
 #include <unistd.h>
 
 #include "glite/jobid/cjobid.h"
-#include "glite/lb/producer.h"
+#include "producer.h"
 #include "glite/lb/authz.h"
 
 void

diff --git a/org.glite.lb.client/examples/dagids.c b/org.glite.lb.client/examples/dagids.c
index 9ca6c21..a710148 100644 (file)
--- a/org.glite.lb.client/examples/dagids.c
+++ b/org.glite.lb.client/examples/dagids.c
@@ -6,7 +6,7 @@
 #include <fcntl.h>
 
 #include "glite/jobid/cjobid.h"
-#include "glite/lb/producer.h"
+#include "producer.h"
 #include "glite/lb/events.h"
 
 extern char *optarg;

diff --git a/org.glite.lb.client/examples/feed_shark.c b/org.glite.lb.client/examples/feed_shark.c
index 824e781..63eafe1 100644 (file)
--- a/org.glite.lb.client/examples/feed_shark.c
+++ b/org.glite.lb.client/examples/feed_shark.c
@@ -7,7 +7,7 @@
 #include <errno.h>
 #include <sysexits.h>
 
-#include "glite/lb/notification.h"
+#include "notification.h"
 
 static void usage(const char *);
 static void printstat(edg_wll_JobStat, int);

diff --git a/org.glite.lb.client/examples/flood_proxy.c b/org.glite.lb.client/examples/flood_proxy.c
index 652c387..9f2a3aa 100644 (file)
--- a/org.glite.lb.client/examples/flood_proxy.c
+++ b/org.glite.lb.client/examples/flood_proxy.c
@@ -7,7 +7,7 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 
-#include "glite/lb/producer.h"
+#include "producer.h"
 #include "glite/jobid/cjobid.h"
 
 static void slave();

diff --git a/org.glite.lb.client/examples/job_log.c b/org.glite.lb.client/examples/job_log.c
index 26c9611..afa6558 100644 (file)
--- a/org.glite.lb.client/examples/job_log.c
+++ b/org.glite.lb.client/examples/job_log.c
@@ -10,10 +10,10 @@
 #include <errno.h>
 
 #include "glite/lb/events_parse.h"
-#include "glite/lb/consumer.h"
+#include "consumer.h"
 #include "glite/jobid/cjobid.h"
 #ifdef USE_CALLBACKS
-  #include "glite/lb/consumer_fake.h"
+  #include "consumer_fake.h"
 #endif
 
 static void free_events(edg_wll_Event *);

diff --git a/org.glite.lb.client/examples/job_reg.c b/org.glite.lb.client/examples/job_reg.c
index 7f0767b..2a411c3 100644 (file)
--- a/org.glite.lb.client/examples/job_reg.c
+++ b/org.glite.lb.client/examples/job_reg.c
@@ -6,7 +6,7 @@
 #include <fcntl.h>
 
 #include "glite/jobid/cjobid.h"
-#include "glite/lb/producer.h"
+#include "producer.h"
 #include "glite/lb/events.h"
 
 extern char *optarg;

diff --git a/org.glite.lb.client/examples/job_status.c b/org.glite.lb.client/examples/job_status.c
index 4f0601e..5ffa072 100644 (file)
--- a/org.glite.lb.client/examples/job_status.c
+++ b/org.glite.lb.client/examples/job_status.c
@@ -9,7 +9,7 @@
 #include <expat.h>
 
 #include "glite/lb/context-int.h"
-#include "glite/lb/consumer.h"
+#include "consumer.h"
 #include "glite/lb/xml_conversions.h"
 #include "glite/lb/jobstat.h"
 

diff --git a/org.glite.lb.client/examples/log_usertag_proxy.c b/org.glite.lb.client/examples/log_usertag_proxy.c
index 39c9a1c..3873460 100644 (file)
--- a/org.glite.lb.client/examples/log_usertag_proxy.c
+++ b/org.glite.lb.client/examples/log_usertag_proxy.c
@@ -9,7 +9,11 @@
 #include "glite/lb/notifid.h"
 #include "glite/lb/events.h"
 
-#include "glite/lb/producer.h"
+#ifdef BUILDING_LB_CLIENT
+#include "producer.h"
+#else
+#include "producer.h"
+#endif
 
 static struct option opts[] = {
        {"help",                0,      NULL,   'h'},

diff --git a/org.glite.lb.client/examples/multiple_user_jobs.c b/org.glite.lb.client/examples/multiple_user_jobs.c
index bb08981..80a350a 100644 (file)
--- a/org.glite.lb.client/examples/multiple_user_jobs.c
+++ b/org.glite.lb.client/examples/multiple_user_jobs.c
@@ -6,7 +6,7 @@
 
 #include "glite/lb/context.h"
 #include "glite/lb/xml_conversions.h"
-#include "glite/lb/consumer.h"
+#include "consumer.h"
 
 int use_proxy = 0;
 

diff --git a/org.glite.lb.client/examples/parse_eventsfile.c b/org.glite.lb.client/examples/parse_eventsfile.c
index 16e8019..83ee8f2 100644 (file)
--- a/org.glite.lb.client/examples/parse_eventsfile.c
+++ b/org.glite.lb.client/examples/parse_eventsfile.c
@@ -5,7 +5,7 @@
 #include <errno.h>
 #include <fcntl.h>
 
-#include "glite/lb/producer.h"
+#include "producer.h"
 #include "glite/lb/events.h"
 #include "glite/lb/events_parse.h"
 

diff --git a/org.glite.lb.client/examples/query_ext.c b/org.glite.lb.client/examples/query_ext.c
index 6fc5018..ac9b609 100644 (file)
--- a/org.glite.lb.client/examples/query_ext.c
+++ b/org.glite.lb.client/examples/query_ext.c
@@ -7,7 +7,7 @@
 #include <time.h>
 
 #include "glite/jobid/cjobid.h"
-#include "glite/lb/consumer.h"
+#include "consumer.h"
 
 #define BUFF_LEN               1024
 #define MAX_AND_CONDS  20

diff --git a/org.glite.lb.client/examples/query_seq_code.c b/org.glite.lb.client/examples/query_seq_code.c
index 85a0265..29e9de7 100644 (file)
--- a/org.glite.lb.client/examples/query_seq_code.c
+++ b/org.glite.lb.client/examples/query_seq_code.c
@@ -6,7 +6,7 @@
 #include <errno.h>
 
 #include "glite/jobid/cjobid.h"
-#include "glite/lb/consumer.h"
+#include "consumer.h"
 
 
 static struct option opts[] = {

diff --git a/org.glite.lb.client/examples/stats.c b/org.glite.lb.client/examples/stats.c
index 2f32cc6..af6dcb1 100644 (file)
--- a/org.glite.lb.client/examples/stats.c
+++ b/org.glite.lb.client/examples/stats.c
@@ -2,7 +2,7 @@
 #include <time.h>
 #include <string.h>
 
-#include "glite/lb/statistics.h"
+#include "statistics.h"
 
 
 int main(int argc,char **argv)

diff --git a/org.glite.lb.client/examples/stress_context.c b/org.glite.lb.client/examples/stress_context.c
index 1bfdf34..a551d30 100644 (file)
--- a/org.glite.lb.client/examples/stress_context.c
+++ b/org.glite.lb.client/examples/stress_context.c
@@ -5,7 +5,7 @@
 #include <limits.h>
 
 #include "glite/jobid/cjobid.h"
-#include "glite/lb/producer.h"
+#include "producer.h"
 #include "glite/lb/events.h"
 
 char   *outfile = "context_errors";

diff --git a/org.glite.lb.client/examples/stresslog.c b/org.glite.lb.client/examples/stresslog.c
index 506c62f..6034f0a 100644 (file)
--- a/org.glite.lb.client/examples/stresslog.c
+++ b/org.glite.lb.client/examples/stresslog.c
@@ -6,7 +6,7 @@
 #include <fcntl.h>
 
 #include "glite/jobid/cjobid.h"
-#include "glite/lb/producer.h"
+#include "producer.h"
 #include "glite/lb/events.h"
 
 #define        MAXMSGSIZE      10240

diff --git a/org.glite.lb.client/examples/user_jobs.c b/org.glite.lb.client/examples/user_jobs.c
index 151e8e5..a593e08 100644 (file)
--- a/org.glite.lb.client/examples/user_jobs.c
+++ b/org.glite.lb.client/examples/user_jobs.c
@@ -8,7 +8,7 @@
 
 #include "glite/lb/context.h"
 #include "glite/lb/xml_conversions.h"
-#include "glite/lb/consumer.h"
+#include "consumer.h"
 
 int use_proxy = 0;
 

diff --git a/org.glite.lb.client/examples/user_jobs_threaded.c b/org.glite.lb.client/examples/user_jobs_threaded.c
index 5283112..a144106 100644 (file)
--- a/org.glite.lb.client/examples/user_jobs_threaded.c
+++ b/org.glite.lb.client/examples/user_jobs_threaded.c
@@ -12,7 +12,7 @@
 
 #include "glite/lb/context.h"
 #include "glite/lb/xml_conversions.h"
-#include "glite/lb/consumer.h"
+#include "consumer.h"
 
 int use_proxy = 0;
 

diff --git a/org.glite.lb.client/interface/Job.h b/org.glite.lb.client/interface/Job.h
index 3bc10c8..d0df9ce 100644 (file)
--- a/org.glite.lb.client/interface/Job.h
+++ b/org.glite.lb.client/interface/Job.h
@@ -7,8 +7,13 @@
 
 #include "glite/lb/Event.h"
 
+#ifdef BUILDING_LB_CLIENT
+#include "JobStatus.h"
+#include "ServerConnection.h"
+#else
 #include "glite/lb/JobStatus.h"
 #include "glite/lb/ServerConnection.h"
+#endif
 
 
 /**

diff --git a/org.glite.lb.client/interface/Notification.h b/org.glite.lb.client/interface/Notification.h
index 536dad6..159096e 100644 (file)
--- a/org.glite.lb.client/interface/Notification.h
+++ b/org.glite.lb.client/interface/Notification.h
@@ -4,9 +4,15 @@
 
 #include "glite/jobid/JobId.h"
 
+#ifdef BUILDING_LB_CLIENT
+#include "consumer.h"
+#include "JobStatus.h"
+#include "notification.h"
+#else
 #include "glite/lb/consumer.h"
-#include "glite/lb/notification.h"
 #include "glite/lb/JobStatus.h"
+#include "glite/lb/notification.h"
+#endif
 
 
 EWL_BEGIN_NAMESPACE

diff --git a/org.glite.lb.client/interface/ServerConnection.h b/org.glite.lb.client/interface/ServerConnection.h
index 4e27cdd..6bc70c9 100644 (file)
--- a/org.glite.lb.client/interface/ServerConnection.h
+++ b/org.glite.lb.client/interface/ServerConnection.h
@@ -14,8 +14,14 @@
 #include "glite/jobid/JobId.h"
 
 #include "glite/lb/Event.h"
+
+#ifdef BUILDING_LB_CLIENT
+#include "JobStatus.h"
+#include "consumer.h"
+#else
 #include "glite/lb/JobStatus.h"
 #include "glite/lb/consumer.h"
+#endif
 
 EWL_BEGIN_NAMESPACE
 

diff --git a/org.glite.lb.client/interface/notification.h b/org.glite.lb.client/interface/notification.h
index 7b52973..13cd8be 100644 (file)
--- a/org.glite.lb.client/interface/notification.h
+++ b/org.glite.lb.client/interface/notification.h
@@ -8,7 +8,11 @@
 #include "glite/lb/notif_rec.h"
 #include "glite/lb/context.h"
 
+#ifdef BUILDING_LB_CLIENT
+#include "consumer.h"
+#else
 #include "glite/lb/consumer.h"
+#endif
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/org.glite.lb.client/interface/statistics.h b/org.glite.lb.client/interface/statistics.h
index d5539e6..3c193d6 100644 (file)
--- a/org.glite.lb.client/interface/statistics.h
+++ b/org.glite.lb.client/interface/statistics.h
@@ -1,7 +1,11 @@
 #ifndef GLITE_LB_STATISTICS_H
 #define GLITE_LB_STATISTICS_H
 
+#ifdef BUILDING_LB_CLIENT
+#include "consumer.h"
+#else
 #include "glite/lb/consumer.h"
+#endif
 
 #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 1ff517d..dabb049 100644 (file)
--- a/org.glite.lb.client/src/Event.cpp.T
+++ b/org.glite.lb.client/src/Event.cpp.T
@@ -16,7 +16,7 @@
 #include "glite/lb/notifid.h"
 #include "glite/lb/LoggingExceptions.h"
 
-#include "glite/lb/consumer.h"
+#include "consumer.h"
 
 EWL_BEGIN_NAMESPACE;
 

diff --git a/org.glite.lb.client/src/Job.cpp b/org.glite.lb.client/src/Job.cpp
index 826d2ac..fed330c 100644 (file)
--- a/org.glite.lb.client/src/Job.cpp
+++ b/org.glite.lb.client/src/Job.cpp
@@ -12,8 +12,8 @@
 
 #include <string>
 
-#include "glite/lb/Job.h"
-#include "glite/lb/consumer.h"
+#include "Job.h"
+#include "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 318667a..c84c7e6 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/jobid/JobId.h"
 #include "glite/lb/LoggingExceptions.h"
 
-#include "glite/lb/consumer.h"
-#include "glite/lb/JobStatus.h"
+#include "consumer.h"
+#include "JobStatus.h"
 
 
 EWL_BEGIN_NAMESPACE;

diff --git a/org.glite.lb.client/src/Notification.cpp b/org.glite.lb.client/src/Notification.cpp
index ad6a997..467f80f 100644 (file)
--- a/org.glite.lb.client/src/Notification.cpp
+++ b/org.glite.lb.client/src/Notification.cpp
@@ -12,13 +12,13 @@
 #include <string>
 #include <vector>
 
-#include "glite/lb/Notification.h"
-#include "glite/lb/JobStatus.h"
+#include "Notification.h"
+#include "JobStatus.h"
 #include "glite/lb/LoggingExceptions.h"
-#include "glite/lb/ServerConnection.h"
+#include "ServerConnection.h"
 
 #include "glite/lb/notifid.h"
-#include "glite/lb/notification.h"
+#include "notification.h"
 
 EWL_BEGIN_NAMESPACE;
 

diff --git a/org.glite.lb.client/src/ServerConnection.cpp b/org.glite.lb.client/src/ServerConnection.cpp
index 8108e52..d890cf5 100644 (file)
--- a/org.glite.lb.client/src/ServerConnection.cpp
+++ b/org.glite.lb.client/src/ServerConnection.cpp
@@ -18,7 +18,7 @@
 #include "glite/lb/context-int.h"
 #include "glite/lb/xml_conversions.h"
 
-#include "glite/lb/ServerConnection.h"
+#include "ServerConnection.h"
 #include "glite/lb/LoggingExceptions.h"
 
 EWL_BEGIN_NAMESPACE;

diff --git a/org.glite.lb.client/src/connection.c b/org.glite.lb.client/src/connection.c
index 1c43896..a066ae4 100644 (file)
--- a/org.glite.lb.client/src/connection.c
+++ b/org.glite.lb.client/src/connection.c
@@ -19,8 +19,8 @@
 #include "glite/lb/mini_http.h"
 #include "glite/lb/connpool.h"
 
-#include "glite/lb/consumer.h"
-#include "glite/lb/connection.h"
+#include "consumer.h"
+#include "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 3e1e1c5..37d95d3 100644 (file)
--- a/org.glite.lb.client/src/consumer.c
+++ b/org.glite.lb.client/src/consumer.c
@@ -15,8 +15,8 @@
 #include "glite/lb/xml_parse.h"
 #include "glite/lb/xml_conversions.h"
 
-#include "glite/lb/consumer.h"
-#include "glite/lb/connection.h"
+#include "consumer.h"
+#include "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 82fbcd6..2286b23 100644 (file)
--- a/org.glite.lb.client/src/logevent.c.T
+++ b/org.glite.lb.client/src/logevent.c.T
@@ -18,7 +18,7 @@
 #include "glite/lb/notifid.h"
 #include "glite/lb/events.h"
 
-#include "glite/lb/producer.h"
+#include "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 440ef61..e497381 100644 (file)
--- a/org.glite.lb.client/src/notification.c
+++ b/org.glite.lb.client/src/notification.c
@@ -21,8 +21,8 @@
 #include "glite/lb/events_parse.h"
 #include "glite/lb/il_msg.h"
 
-#include "glite/lb/notification.h"
-#include "glite/lb/connection.h"
+#include "notification.h"
+#include "connection.h"
 
 #define CON_QUEUE               10     /* listen() queue limit */
 

diff --git a/org.glite.lb.client/src/notify.c b/org.glite.lb.client/src/notify.c
index 8626c78..84b8ea5 100644 (file)
--- a/org.glite.lb.client/src/notify.c
+++ b/org.glite.lb.client/src/notify.c
@@ -8,7 +8,7 @@
 
 #include "glite/security/glite_gss.h"
 #include "glite/lb/context.h"
-#include "glite/lb/notification.h"
+#include "notification.h"
 
 #include "notify_supp.h"
 

diff --git a/org.glite.lb.client/src/notify_supp.cpp b/org.glite.lb.client/src/notify_supp.cpp
index 56596cd..1db10c6 100644 (file)
--- a/org.glite.lb.client/src/notify_supp.cpp
+++ b/org.glite.lb.client/src/notify_supp.cpp
@@ -4,8 +4,8 @@
 #include <vector>
 
 #include "glite/lb/LoggingExceptions.h"
-#include "glite/lb/JobStatus.h"
-#include "glite/lb/notification.h"
+#include "JobStatus.h"
+#include "notification.h"
 
 #include "notify_supp.h"
 

diff --git a/org.glite.lb.client/src/perftest_jobreg.c b/org.glite.lb.client/src/perftest_jobreg.c
index 912dbc9..13aa15c 100644 (file)
--- a/org.glite.lb.client/src/perftest_jobreg.c
+++ b/org.glite.lb.client/src/perftest_jobreg.c
@@ -7,7 +7,7 @@
 #include <sys/time.h>
 
 #include "glite/jobid/cjobid.h"
-#include "glite/lb/producer.h"
+#include "producer.h"
 #include "glite/lb/events.h"
 
 #define PROXY_SERVER "localhost:9000"

diff --git a/org.glite.lb.client/src/prod_proto.c b/org.glite.lb.client/src/prod_proto.c
index 27e765a..d161d7c 100644 (file)
--- a/org.glite.lb.client/src/prod_proto.c
+++ b/org.glite.lb.client/src/prod_proto.c
@@ -17,9 +17,9 @@
 #include "glite/lb/il_string.h"
 #include "glite/lb/connpool.h"
 
-#include "glite/lb/prod_proto.h"
-#include "glite/lb/producer.h"
-#include "glite/lb/connection.h"
+#include "prod_proto.h"
+#include "producer.h"
+#include "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 ac83c1b..7e66d06 100644 (file)
--- a/org.glite.lb.client/src/producer.c
+++ b/org.glite.lb.client/src/producer.c
@@ -16,9 +16,9 @@
 #include "glite/lb/ulm_parse.h"
 #include "glite/lb/context-int.h" 
 
-#include "glite/lb/producer.h"
-#include "glite/lb/prod_proto.h"
-#include "glite/lb/consumer.h" // for QuerySequenceCode
+#include "producer.h"
+#include "prod_proto.h"
+#include "consumer.h" // for QuerySequenceCode
 
 #ifdef FAKE_VERSION
 int edg_wll_DoLogEvent(edg_wll_Context ctx, edg_wll_LogLine logline);

diff --git a/org.glite.lb.client/src/statistics.c b/org.glite.lb.client/src/statistics.c
index 6b0fd16..b1cd79b 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 "glite/lb/statistics.h"
-#include "glite/lb/connection.h"
+#include "statistics.h"
+#include "connection.h"
 
 
 

diff --git a/org.glite.lb.client/src/uiwrap.c.T b/org.glite.lb.client/src/uiwrap.c.T
index d759b85..6ff0e64 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/jobid/cjobid.h"
-#include "glite/lb/producer.h"
+#include "producer.h"
 
 @@@{
 $PRINTPROTOTYPESONLY = 0;