[Automake-commit] [SCM] GNU Automake branch, java-work, created. v1.11-355-g0bf20ac

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=0bf20ac342d7d4e2eaede58e110faf356e34e167

The branch, java-work has been created
        at  0bf20ac342d7d4e2eaede58e110faf356e34e167 (commit)

- Log -----------------------------------------------------------------
commit 0bf20ac342d7d4e2eaede58e110faf356e34e167
Merge: d76b503 d53f5cd
Author: Stefano Lattarini <address@hidden>
Date:   Sat Apr 23 10:00:17 2011 +0200

    Merge branch 'maint' into java-work

commit d76b503883525aaab6048102cbfe96bbdd9a0a85
Author: Stefano Lattarini <address@hidden>
Date:   Mon Apr 18 15:18:08 2011 +0200

    java: allow both dist_JAVA and nodist_JAVA in the same Makefile.am
    
    Fixes automake bug#8434.
    
    * automake.in (handle_java): Strip `dist_' and `nodist_' from
    the given prefix.  Define a new internal Makefile variable
    `am__java_sources'.  Related adjustments.
    * lib/am/java.am (JAVAC, JAVAROOT, CLASSPATH_ENV): Define only the
    first time this am file is processed.
    (class%DIR%.stamp): Stamp file renamed ...
    (class%NDIR%.stamp): ... to this, so that the `dist_' and `nodist_'
    prefixes are stripped from the name of the stampfile.  Adjust
    declaration of dependencies by using the new automake-generated
    internal variable `$(am__java_sources)'.  In the rule, use `$@'
    as the name of the target, rather than hard-coding it.
    * tests/java.test: Update and extend.
    * tests/java-no-duplicate.test: New test.
    * tests/java-mix-dist-nodist.test: Likewise.
    * tests/java-compile-and-install.test: Likewise.
    * tests/java-clean.test: Likewise.
    * tests/java-sources.test: Likewise.
    * tests/Makefile.am (TESTS): Update.

commit 141f17ca87d007fdfde0da85475dea7556c636a0
Merge: df9b3bc 1d6b98c
Author: Stefano Lattarini <address@hidden>
Date:   Mon Apr 18 15:23:59 2011 +0200

    Merge branch 'java-coverage' into java-work

-----------------------------------------------------------------------


hooks/post-receive
-- 
GNU Automake