diff options
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2015-08-20 03:41:45 +0100 |
|---|---|---|
| committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2015-08-20 03:41:45 +0100 |
| commit | e6bdaa6d46fcd7f4a732eef922f88b890f647fda (patch) | |
| tree | 66fade2d9bb84a9b73751a680c2242e3735bbb74 | |
| parent | 1f7a4b1f0727b2d8a29498d78e57309f0bd87a6c (diff) | |
| download | classpath-e6bdaa6d46fcd7f4a732eef922f88b890f647fda.tar.gz | |
Make gjdoc depend on CREATE_WRAPPERS and remove unneeded Automake 1.11 dependencies.
2015-08-07 Uros Bizjak <ubizjak@gmail.com>
* configure.ac:
(tools/gjdoc): Depend on CREATE_WRAPPERS.
* tools/Makefile.am: Remove unneeded
dependencies for Automake 1.11.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rwxr-xr-x | tools/Makefile.am | 17 |
3 files changed, 10 insertions, 18 deletions
@@ -1,3 +1,10 @@ +2015-08-07 Uros Bizjak <ubizjak@gmail.com> + + * configure.ac: + (tools/gjdoc): Depend on CREATE_WRAPPERS. + * tools/Makefile.am: Remove unneeded + dependencies for Automake 1.11. + 2015-06-19 Andrew John Hughes <gnu_andrew@member.fsf.org> * NEWS: Mention PR66376. diff --git a/configure.ac b/configure.ac index 547ca1dcc..03138331c 100644 --- a/configure.ac +++ b/configure.ac @@ -1180,8 +1180,10 @@ AC_CONFIG_COMMANDS([gjavah], [chmod 755 tools/gjavah]) if test "x${COMPILE_GJDOC}" = xyes then -AC_CONFIG_FILES([tools/gjdoc]) +CLASSPATH_COND_IF([CREATE_WRAPPERS], [test "x${COMPILE_WRAPPERS}" = xyes], [], +[AC_CONFIG_FILES([tools/gjdoc]) AC_CONFIG_COMMANDS([gjdoc], [chmod 755 tools/gjdoc]) +]) fi AC_CONFIG_COMMANDS([gen-classlist],[chmod 755 lib/gen-classlist.sh]) diff --git a/tools/Makefile.am b/tools/Makefile.am index 7633f869c..b04dffc52 100755 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -117,23 +117,6 @@ if CREATE_GJDOC bin_SCRIPTS += gjdoc endif bin_PROGRAMS = -## FIXME: remove these unneeded dependency lines once we can -## require Automake 1.11. -gappletviewer: gappletviewer.in -gjarsigner: gjarsigner.in -gkeytool: gkeytool.in -gjar: gjar.in -gnative2ascii: gnative2ascii.in -gserialver: gserialver.in -gjavah: gjavah.in -grmiregistry: grmiregistry.in -gtnameserv: gtnameserv.in -gorbd: gorbd.in -grmid: grmid.in -grmic: grmic.in -if CREATE_GJDOC -gjdoc: gjdoc.in -endif endif EXTRA_DIST = toolwrapper.c gappletviewer.in gjarsigner.in gkeytool.in \ gjar.in gnative2ascii.in gserialver.in gjavah.in grmiregistry.in \ |