On pe, 2013-02-15 at 04:07 +0100, Diego Elio Pettenò wrote: > libbluray | branch: flameeyes | Diego Elio Pettenò <[email protected]> | > Thu Feb 14 18:29:43 2013 -0800| [0cc210c7a5407730002cd9dc1b45cfb1d956559a] | > committer: Diego Elio Pettenò > > build: make the java build a bit less obnoxious > > > http://git.videolan.org/gitweb.cgi/libbluray.git/?a=commit;h=0cc210c7a5407730002cd9dc1b45cfb1d956559a > --- > > .gitignore | 1 + > src/Makefile.am | 12 ++++++------ > src/libbluray/bdj/build.xml | 2 +- > 3 files changed, 8 insertions(+), 7 deletions(-) > > diff --git a/.gitignore b/.gitignore > index c269f63..f0de81c 100644 > --- a/.gitignore > +++ b/.gitignore > @@ -36,4 +36,5 @@ src/examples/bd_info > src/examples/hdmv_test > src/examples/*.exe > src/libbluray/bdj/build > +src/libbluray.jar > stamp-h1 > diff --git a/src/Makefile.am b/src/Makefile.am > index 562c455..5a9683f 100644 > --- a/src/Makefile.am > +++ b/src/Makefile.am > @@ -105,17 +105,17 @@ pkginclude_HEADERS = \ > if USING_BDJAVA > > jardir=$(libdir)/libbluray/ > -jar_DATA=$(top_builddir)/src/.libs/libbluray.jar > +jar_DATA=libbluray.jar > > -$(top_builddir)/src/.libs/libbluray.jar: all-local > +libbluray.jar: > + ant -f $(top_srcdir)/src/libbluray/bdj/build.xml \ > + -Dsrc_awt=:java-$(BDJ_TYPE) \ > + -Dbootclasspath="$(BDJ_BOOTCLASSPATH)" > > libbluray_la_SOURCES+=$(SOURCES_bdj) > AM_CFLAGS+=@BDJAVA_CFLAGS@ > > -all-local: > - ant -f $(top_srcdir)/src/libbluray/bdj/build.xml \ > - -Dsrc_awt=:java-$(BDJ_TYPE) \ > - -Dbootclasspath="$(BDJ_BOOTCLASSPATH)" > +all-local: libbluray.jar
ant is not anymore called every time when make is invoked. make does not detect changes in java files -> libbluray.jar is not updated after changes in java files > clean-local: > ant -f $(top_srcdir)/src/libbluray/bdj/build.xml clean > diff --git a/src/libbluray/bdj/build.xml b/src/libbluray/bdj/build.xml > index 7bf06b3..37cdc56 100644 > --- a/src/libbluray/bdj/build.xml > +++ b/src/libbluray/bdj/build.xml > @@ -5,7 +5,7 @@ > > <property name="src" location="java"/> > <property name="build" location="build"/> > - <property name="dist" location="../../.libs"/> > + <property name="dist" location="../.."/> > <property name="src_awt" value=""/> > <property name="bootclasspath" value=""/> > > > _______________________________________________ > libbluray-devel mailing list > [email protected] > http://mailman.videolan.org/listinfo/libbluray-devel _______________________________________________ libbluray-devel mailing list [email protected] http://mailman.videolan.org/listinfo/libbluray-devel
