From 67df27b3ac862acd270cb4641e3a5a71a76c6ea5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ale=C5=A1=20K=C5=99enek?= Date: Tue, 15 Sep 2009 10:07:41 +0000 Subject: [PATCH] build clean and speedup --- org.glite.lb.client-java/Makefile | 59 +- org.glite.lb.client-java/build.xml | 80 --- org.glite.lb.client-java/examples/CreamTest.java | 7 +- org.glite.lb.client-java/examples/QueryDemo.java | 2 +- org.glite.lb.client-java/nbproject/build-impl.xml | 631 --------------------- .../nbproject/genfiles.properties | 8 - .../nbproject/private/config.properties | 0 .../nbproject/private/private.properties | 7 - .../nbproject/project.properties | 68 --- org.glite.lb.client-java/nbproject/project.xml | 26 - .../src/org/glite/lb/Context.java | 28 +- .../src/org/glite/lb/ContextLL.java | 2 + .../src/org/glite/lb/Event.java | 2 + .../src/org/glite/lb/EventConvertor.java | 2 +- .../src/org/glite/lb/ILFileWriter.java | 2 +- .../src/org/glite/lb/ServerConnectionExample.java | 249 -------- org.glite.lb.client-java/src_c/Makefile | 4 +- 17 files changed, 68 insertions(+), 1109 deletions(-) delete mode 100755 org.glite.lb.client-java/build.xml delete mode 100755 org.glite.lb.client-java/nbproject/build-impl.xml delete mode 100755 org.glite.lb.client-java/nbproject/genfiles.properties delete mode 100644 org.glite.lb.client-java/nbproject/private/config.properties delete mode 100755 org.glite.lb.client-java/nbproject/private/private.properties delete mode 100755 org.glite.lb.client-java/nbproject/project.properties delete mode 100755 org.glite.lb.client-java/nbproject/project.xml delete mode 100644 org.glite.lb.client-java/src/org/glite/lb/ServerConnectionExample.java diff --git a/org.glite.lb.client-java/Makefile b/org.glite.lb.client-java/Makefile index d95eb01..8a3f542 100644 --- a/org.glite.lb.client-java/Makefile +++ b/org.glite.lb.client-java/Makefile @@ -1,24 +1,54 @@ -include Makefile.inc -EXAMPLES := SimpleLLTest.class SSLClient.class SSLServer.class QueryDemo.class ProducerTestIL.class ProducerTestLL.class NotificationExample.class CreamTest.class +# broken +# SimpleLLTest.class ProducerTestLL.class ProducerTestIL.class + +EXAMPLES := SSLClient.class SSLServer.class QueryDemo.class NotificationExample.class CreamTest.class VPATH := examples -all compile: - JAVA_HOME=${jdk_prefix} \ - ${ant_prefix}/bin/ant -Dno.deps=yes -DstageDir=${stagedir} \ - -Dfile.reference.commons-lang.jar=${commons-lang_jar} \ - -Dreference.jobid-api-java.jar=${stagedir}/share/java/jobid-api-java.jar \ - -Dreference.trustmanager.jar=${trustmanager_prefix}/share/java/glite-security-trustmanager.jar \ - -Daxis.classpath=`ls ${axis_prefix}/lib/*.jar | tr '\012' :` - javah -classpath build/classes -jni org.glite.lb.ContextIL - cd src_c && make PREFIX=${PREFIX} JAVA_HOME=${jdk_prefix} topdir=.. +JAVAC:=${jdk_prefix}/bin/javac +JAVAH:=${jdk_prefix}/bin/javah +JAVA:=${jdk_prefix}/bin/java + +all compile: genevents genws compile-java build-jar build-c + +compile-java: + ${JAVAC} \ + -classpath ${commons-lang_jar}:${stagedir}/share/java/jobid-api-java.jar:${trustmanager_prefix}/share/java/glite-security-trustmanager.jar:`ls ${axis_prefix}/lib/*.jar | tr '\012' :` \ + -d build \ + src/org/glite/lb/*.java \ + build/gen/*.java \ + build/axis/org/glite/wsdl/services/lb/*.java \ + build/axis/org/glite/wsdl/types/lb/*.java \ + build/axis/org/glite/wsdl/types/lb/holders/*.java \ + build/axis/holders/StringArrayHolder.java + +build-jar: + cd build && ${jdk_prefix}/bin/jar cf lb-client-java.jar holders org + + +build-c: + ${JAVAH} -classpath build -jni -d build org.glite.lb.ContextIL + -mkdir -p build/c + -ln -s ../../src_c/Makefile build/c + cd build/c && make PREFIX=${PREFIX} JAVA_HOME=${jdk_prefix} topdir=../.. examples: ${EXAMPLES} +GEN:=${stagedir}/sbin/glite-lb-at3 project/genEventTypes.pl +AT3DIR:=${stagedir}/share/lb/at3 +axis_classpath:=`ls ${axis_prefix}/lib/*.jar | tr '\012' :` + +genevents: + -mkdir -p build/gen + ${GEN} build/gen + +genws: + ${JAVA} -classpath ${axis_classpath} org.apache.axis.wsdl.WSDL2Java -o build/axis ${stagedir}/interface/LB.wsdl ${EXAMPLES}: %.class: %.java - ${jdk_prefix}/bin/javac -cp build/classes/:${stagedir}/share/java/jobid-api-java.jar:`ls ${axis_prefix}/lib/*.jar | tr '\012' :` $< + ${jdk_prefix}/bin/javac -d build -cp build:build/classes/:${stagedir}/share/java/jobid-api-java.jar:`ls ${axis_prefix}/lib/*.jar | tr '\012' :` $< check: @@ -26,12 +56,11 @@ check: install: mkdir -p ${PREFIX}/share/java - cp dist/lb-client-java.jar ${PREFIX}/share/java - cd src_c && make install PREFIX=${PREFIX} + cp build/lb-client-java.jar ${PREFIX}/share/java + cd build/c && make install PREFIX=${PREFIX} clean: - rm -rf dist - find . -name \*.class -exec rm {} \; + rm -rf build cd src_c && make clean diff --git a/org.glite.lb.client-java/build.xml b/org.glite.lb.client-java/build.xml deleted file mode 100755 index 483d39b..0000000 --- a/org.glite.lb.client-java/build.xml +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - Builds, tests, and runs the project lb-client-java. - - - - - - - - - - - - - - diff --git a/org.glite.lb.client-java/examples/CreamTest.java b/org.glite.lb.client-java/examples/CreamTest.java index 3a28c5e..32b4631 100644 --- a/org.glite.lb.client-java/examples/CreamTest.java +++ b/org.glite.lb.client-java/examples/CreamTest.java @@ -30,10 +30,11 @@ public static void main(String[] args) ctxd.setJobid(job); ctxd.setSeqCode(new SeqCode(SeqCode.CREAM,"no_seqcodes_with_cream")); + +/* initial registration goes directly */ EventRegJob reg = new EventRegJob(); reg.setNs("https://where.is.cream:1234"); reg.setJobtype(EventRegJob.Jobtype.JOBTYPE_CREAM); - ctxd.log(reg); System.out.println("JOBID="+job); @@ -44,8 +45,12 @@ public static void main(String[] args) ctx.setSeqCode(new SeqCode(SeqCode.CREAM,"no_seqcodes_with_cream")); ctx.setUser(ctxd.getUser()); +/* 2nd registration with JDL, via IL */ reg.setJdl("[\n\ttest = \"hellow, world\";\n]"); ctx.log(reg); + + Event e = new EventCREAMStart(); + ctx.log(e); } catch (Exception e) diff --git a/org.glite.lb.client-java/examples/QueryDemo.java b/org.glite.lb.client-java/examples/QueryDemo.java index 0c48e84..1b4c779 100644 --- a/org.glite.lb.client-java/examples/QueryDemo.java +++ b/org.glite.lb.client-java/examples/QueryDemo.java @@ -175,7 +175,7 @@ public class QueryDemo { List events = myJob.getEvents(); System.out.println("Found "+events.size()+" events:"); for (int i=0;i - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set src.dir - Must set test.src.dir - Must set build.dir - Must set dist.dir - Must set build.classes.dir - Must set dist.javadoc.dir - Must set build.test.classes.dir - Must set build.test.results.dir - Must set build.classes.excludes - Must set dist.jar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set javac.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - To run this application from the command line without Ant, try: - - - - - - - java -cp "${run.classpath.with.dist.jar}" ${main.class} - - - - - - - - - - - - - - - - - - - - - - - To run this application from the command line without Ant, try: - - java -jar "${dist.jar.resolved}" - - - - - - - - - - - - - - - - - - - Must select one file in the IDE or set run.class - - - - - - - - - - - - - - - - - - - - Must select one file in the IDE or set debug.class - - - - - Must set fix.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - - - - - Some tests failed; see details above. - - - - - - - - - Must select some files in the IDE or set test.includes - - - - Some tests failed; see details above. - - - - - Must select one file in the IDE or set test.class - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select one file in the IDE or set applet.url - - - - - - - - - Must select one file in the IDE or set applet.url - - - - - - - - - - - - - - - - - - - - - diff --git a/org.glite.lb.client-java/nbproject/genfiles.properties b/org.glite.lb.client-java/nbproject/genfiles.properties deleted file mode 100755 index 9a7491e..0000000 --- a/org.glite.lb.client-java/nbproject/genfiles.properties +++ /dev/null @@ -1,8 +0,0 @@ -build.xml.data.CRC32=2a7fa1fb -build.xml.script.CRC32=584b0e83 -build.xml.stylesheet.CRC32=be360661 -# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. -# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=2a7fa1fb -nbproject/build-impl.xml.script.CRC32=1298608d -nbproject/build-impl.xml.stylesheet.CRC32=f1d9da08 diff --git a/org.glite.lb.client-java/nbproject/private/config.properties b/org.glite.lb.client-java/nbproject/private/config.properties deleted file mode 100644 index e69de29..0000000 diff --git a/org.glite.lb.client-java/nbproject/private/private.properties b/org.glite.lb.client-java/nbproject/private/private.properties deleted file mode 100755 index 6a0a467..0000000 --- a/org.glite.lb.client-java/nbproject/private/private.properties +++ /dev/null @@ -1,7 +0,0 @@ -do.depend=false -do.jar=true -javac.debug=true -javadoc.preview=true -jaxws.endorsed.dir=/home/pavel/netbeans-6.0.1/java1/modules/ext/jaxws21/api -project.jobid-api-java=/home/pavel/Desktop/bakalarka/org.glite.jobid.api-java -user.properties.file=/home/pavel/.netbeans/6.0/build.properties diff --git a/org.glite.lb.client-java/nbproject/project.properties b/org.glite.lb.client-java/nbproject/project.properties deleted file mode 100755 index 1ebbb91..0000000 --- a/org.glite.lb.client-java/nbproject/project.properties +++ /dev/null @@ -1,68 +0,0 @@ -application.title=locallogger -application.vendor=pavel -build.classes.dir=${build.dir}/classes -build.classes.excludes=**/*.java,**/*.form -# This directory is removed when the project is cleaned: -build.dir=build -build.generated.dir=${build.dir}/generated -# Only compile against the classpath explicitly listed here: -build.sysclasspath=ignore -build.test.classes.dir=${build.dir}/test/classes -build.test.results.dir=${build.dir}/test/results -debug.classpath=\ - ${run.classpath} -debug.test.classpath=\ - ${run.test.classpath} -# This directory is removed when the project is cleaned: -dist.dir=dist -dist.jar=${dist.dir}/lb-client-java.jar -dist.javadoc.dir=${dist.dir}/javadoc -excludes= -includes=** -jar.compress=false -javac.classpath=\ - ${file.reference.commons-lang.jar}:\ - ${axis.classpath}:\ - ${reference.jobid-api-java.jar}:\ - ${reference.trustmanager.jar}:\ -# Space-separated list of extra javac options -javac.compilerargs= -javac.deprecation=false -javac.source= -javac.target= -javac.test.classpath=\ - ${javac.classpath}:\ - ${build.classes.dir}:\ - ${libs.junit.classpath}:\ - ${libs.junit_4.classpath} -javadoc.additionalparam= -javadoc.author=false -javadoc.encoding=${source.encoding} -javadoc.noindex=false -javadoc.nonavbar=false -javadoc.notree=false -javadoc.private=false -javadoc.splitindex=true -javadoc.use=true -javadoc.version=false -javadoc.windowtitle= -main.class=org.glite.test.Test -manifest.file=manifest.mf -meta.inf.dir=${src.dir}/META-INF -platform.active=default_platform -project.jobid-api-java=../jobid-api-java -reference.jobid-api-java.jar=${project.jobid-api-java}/dist/jobid-api-java.jar -run.classpath=\ - ${javac.classpath}:\ - ${build.classes.dir} -# Space-separated list of JVM arguments used when running the project -# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value -# or test-sys-prop.name=value to set system properties for unit tests): -run.jvmargs=-Djava.library.path=/media/f/skola/bakalarka/locallogger/build/classes/org/glite/lb/ -run.test.classpath=\ - ${javac.test.classpath}:\ - ${build.test.classes.dir} -source.encoding=UTF-8 -src.dir=src -test.src.dir=test -javac.compilerargs.jaxws= diff --git a/org.glite.lb.client-java/nbproject/project.xml b/org.glite.lb.client-java/nbproject/project.xml deleted file mode 100755 index 7152d94..0000000 --- a/org.glite.lb.client-java/nbproject/project.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - org.netbeans.modules.java.j2seproject - - - lb-client-java - 1.6.5 - - - - - - - - - - jobid-api-java - jar - - jar - clean - jar - - - - diff --git a/org.glite.lb.client-java/src/org/glite/lb/Context.java b/org.glite.lb.client-java/src/org/glite/lb/Context.java index 87af110..a41c15d 100644 --- a/org.glite.lb.client-java/src/org/glite/lb/Context.java +++ b/org.glite.lb.client-java/src/org/glite/lb/Context.java @@ -1,5 +1,7 @@ package org.glite.lb; +import java.text.SimpleDateFormat; + import java.net.UnknownHostException; import java.util.Calendar; import java.util.Random; @@ -184,28 +186,14 @@ public abstract class Context { srcInstance = new String(""); } - String output; - String date = ""; - String tmp; - date = String.valueOf(Calendar.getInstance().get(Calendar.YEAR)); - tmp = String.valueOf(Calendar.getInstance().get(Calendar.MONTH) + 1); - date += "00".substring(0, 2 - tmp.length()) + tmp; - tmp = String.valueOf(Calendar.getInstance().get(Calendar.DATE)); - date += "00".substring(0, 2 - tmp.length()) + tmp; - tmp = String.valueOf(Calendar.getInstance().get(Calendar.HOUR)); - date += "00".substring(0, 2 - tmp.length()) + tmp; - tmp = String.valueOf(Calendar.getInstance().get(Calendar.MINUTE)); - date += "00".substring(0, 2 - tmp.length()) + tmp; - tmp = String.valueOf(Calendar.getInstance().get(Calendar.SECOND)); - date += "00".substring(0, 2 - tmp.length()) + tmp; - date += "."; - tmp = String.valueOf(Calendar.getInstance().get(Calendar.MILLISECOND)); - String tmp2 = "000".substring(0, 3 - tmp.length()) + tmp; - date += tmp2 + "000000".substring(tmp.length(), 6); - + Calendar cal = Calendar.getInstance(); + cal.set(Calendar.ZONE_OFFSET,0); + SimpleDateFormat df = new SimpleDateFormat("yyyyMMddHHmmssSSS"); + String date = df.format(cal.getTime()) + "000"; + if (seqCode != null) seqCode.incrementSeqCode(source); - output = (" DG.USER=\"" + Escape.ulm(user) + "\"" + + String output = (" DG.USER=\"" + Escape.ulm(user) + "\"" + " DATE=" + date + " HOST=\"" + Escape.ulm(host) + "\"" + " PROG=" + Escape.ulm(prog) + diff --git a/org.glite.lb.client-java/src/org/glite/lb/ContextLL.java b/org.glite.lb.client-java/src/org/glite/lb/ContextLL.java index 8fe35a0..8e8276b 100644 --- a/org.glite.lb.client-java/src/org/glite/lb/ContextLL.java +++ b/org.glite.lb.client-java/src/org/glite/lb/ContextLL.java @@ -26,6 +26,7 @@ public class ContextLL extends Context { this.port = port; } +/* XXX public ContextLL(int id, int source, int flag, @@ -54,6 +55,7 @@ public class ContextLL extends Context { this.address = address; } +*/ @Override public void log(Event event) throws LBException { if (event == null) { diff --git a/org.glite.lb.client-java/src/org/glite/lb/Event.java b/org.glite.lb.client-java/src/org/glite/lb/Event.java index 334dac9..c4f0fc8 100644 --- a/org.glite.lb.client-java/src/org/glite/lb/Event.java +++ b/org.glite.lb.client-java/src/org/glite/lb/Event.java @@ -51,6 +51,7 @@ public abstract class Event { */ public abstract String getEventType(); +/* public String info() { String date = ""; if (arrived != null) { @@ -65,6 +66,7 @@ public abstract class Event { "DG.EVNT=\""+getEventType()+"\" "+"DG.JOBID=\""+jobId+"\" "+ "DG.SEQCODE=\""+seqcode+"\" "+"DG.USER=\""+user+"\""+ulm(); } +*/ /** * Get and set methods for Event attributes. diff --git a/org.glite.lb.client-java/src/org/glite/lb/EventConvertor.java b/org.glite.lb.client-java/src/org/glite/lb/EventConvertor.java index 04aaf2c..76080ea 100644 --- a/org.glite.lb.client-java/src/org/glite/lb/EventConvertor.java +++ b/org.glite.lb.client-java/src/org/glite/lb/EventConvertor.java @@ -95,7 +95,7 @@ public class EventConvertor { if (jobId != null) event.setJobId(new Jobid(jobId)); if (level != null) event.setLevel(getLevelFromString(level.getValue())); if (priority != null) event.setPriority(priority); - if (seqcode != null) event.setSeqcode(new SeqCode(seqcode)); + if (seqcode != null) event.setSeqcode(new SeqCode(SeqCode.NORMAL,seqcode)); /* XXX */ if (source != null) event.setSource(getSourceFromString(source.getValue())); if (srcInstance != null) event.setSrcInstance(srcInstance); if (timestamp != null) event.setTimestamp(new Timeval(timestamp.getTvSec(), timestamp.getTvUsec())); diff --git a/org.glite.lb.client-java/src/org/glite/lb/ILFileWriter.java b/org.glite.lb.client-java/src/org/glite/lb/ILFileWriter.java index 28cb84d..026b41b 100644 --- a/org.glite.lb.client-java/src/org/glite/lb/ILFileWriter.java +++ b/org.glite.lb.client-java/src/org/glite/lb/ILFileWriter.java @@ -50,7 +50,7 @@ public class ILFileWriter { BufferedWriter bufferedFileWriter = new BufferedWriter(fileWriter); - bufferedFileWriter.write(message + '\n'); + bufferedFileWriter.write(message); bufferedFileWriter.flush(); if (file.exists()) { diff --git a/org.glite.lb.client-java/src/org/glite/lb/ServerConnectionExample.java b/org.glite.lb.client-java/src/org/glite/lb/ServerConnectionExample.java deleted file mode 100644 index 78ef777..0000000 --- a/org.glite.lb.client-java/src/org/glite/lb/ServerConnectionExample.java +++ /dev/null @@ -1,249 +0,0 @@ -package org.glite.lb; - -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.GregorianCalendar; -import java.util.Iterator; -import java.util.List; -import org.glite.jobid.Jobid; -import org.glite.lb.Event; -import org.glite.wsdl.types.lb.JobStatus; -import org.glite.wsdl.types.lb.QueryAttr; -import org.glite.wsdl.types.lb.QueryConditions; -import org.glite.wsdl.types.lb.QueryOp; -import org.glite.wsdl.types.lb.QueryRecValue; -import org.glite.wsdl.types.lb.QueryRecord; -import org.glite.wsdl.types.lb.StatName; -import org.glite.wsdl.types.lb.Timeval; - - - -/** - * This is a demonstration class for query API. - * It contains all possible methodes that can be called on ServerConnection - * and Job objects. - * @author Tomas Kramec, 207545@mail.muni.cz - */ -public class ServerConnectionExample { - - - /** - * This method serves for formating output information about given job status. - * It is only an example of how the data can be presented. It can be changed - * by user's needs. - * - * @param status Job status - * @return text representation of the given status - */ - private static String jobStatusToString(JobStatus status) { - StringBuilder sb = new StringBuilder(); - sb.append("State: "+status.getState()+"\n"); - sb.append("Job ID: "+status.getJobId()+"\n"); - sb.append("Owner: "+status.getOwner()+"\n"); - sb.append("Job type: "+status.getJobtype()+"\n"); - sb.append("Destination: "+status.getLocation()+"\n"); - sb.append("Done code: "+status.getDoneCode()+"\n"); - sb.append("User tags: "); - //if there are some user tags write it out. - if (status.getUserTags() != null) { - for (int i=0;i idx = sc.getIndexedAttrs(); - for (int i=0;i jobs = sc.userJobs(); - //get their states - List js = sc.userJobStates(); - Iterator it = jobs.iterator(); - Iterator itJs = js.iterator(); - while (it.hasNext()) { - System.out.println(it.next()); - System.out.println(jobStatusToString(itJs.next())); - } - - //Demonstration of Job class - System.out.println(); - System.out.println("----------------JOB----------------"); - - //create new Job - Job myJob = new Job(args[7], sc); - //print job state info - System.out.println(); - System.out.println("Status: " + jobStatusToString(myJob.getStatus(null))); - - //print info about job's events - System.out.println(); - List events = myJob.getEvents(); - System.out.println("Found "+events.size()+" events:"); - for (int i=0;i recList = new ArrayList(); - int port = Integer.parseInt((args[6].split(":"))[2]); - for (int i=0;i interval) - QueryConditions condOnTime = new QueryConditions(QueryAttr.TIME, null, StatName.SUBMITTED, timeRec); - - //create QueryConditions list representing this formula: - //(JOBID='jobId1' or JOBID='jobId2 or ...) AND (TIME is in interval) - //where jobId1,... are ids of user's jobs - List condList = new ArrayList(); - condList.add(condOnJobid); - condList.add(condOnTime); - - //get all jobs matching the given conditions - List jobResult = sc.queryJobs(condList); - //get all their states - List jobStatesResult = sc.queryJobStates(condList, null); - - //Print information about results - Calendar calendar = new GregorianCalendar(); - DateFormat df = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); - System.out.println(); - System.out.print("Jobs registered "); - calendar.setTimeInMillis(timeFrom.getT().getTvSec()*1000); - System.out.print("from "+ df.format(calendar.getTime())+" "); - calendar.setTimeInMillis(timeTo.getT().getTvSec()*1000); - System.out.print("to "+ df.format(calendar.getTime())+"\n"); - Iterator jobsit = jobResult.iterator(); - Iterator statusit = jobStatesResult.iterator(); - while (jobsit.hasNext()) { - System.out.println(jobsit.next()); - System.out.println(jobStatusToString(statusit.next())); - } - } - - } - } -} diff --git a/org.glite.lb.client-java/src_c/Makefile b/org.glite.lb.client-java/src_c/Makefile index f17d815..ea08cc3 100755 --- a/org.glite.lb.client-java/src_c/Makefile +++ b/org.glite.lb.client-java/src_c/Makefile @@ -4,13 +4,15 @@ PATH_TO_JAVA=${JAVA_HOME} LIB=libglite_lb_sendviasocket.la OBJ=send_via_socket.lo +VPATH=${topdir}/src_c + compile: ${LIB} ${LIB}: ${OBJ} libtool --mode=link ${CC} -rpath ${PREFIX}/lib -o $@ ${OBJ} %.lo: %.c - libtool --mode=compile ${CC} -I${topdir} -I${PATH_TO_JAVA}/include -I${PATH_TO_JAVA}/include/linux -c $< + libtool --mode=compile ${CC} -I.. -I${PATH_TO_JAVA}/include -I${PATH_TO_JAVA}/include/linux -c $< install: compile -mkdir -p ${PREFIX}/lib -- 1.8.2.3