From cffed99afcb1c523417483f484a0483f7dae5606 Mon Sep 17 00:00:00 2001 From: uros Date: Tue, 11 Aug 2015 17:59:25 +0000 Subject: [PATCH] * configure.ac (tools/gjdoc): Depend on CREATE_WRAPPERS. * configure: Regenerate. * tools/Makefile.am: Remove unneeded dependencies for Automake 1.11. * tools/Makefile.in: Regenerate. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@226785 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/classpath/ChangeLog | 79 ++++++++++++++++++++----------------- libjava/classpath/configure | 6 ++- libjava/classpath/configure.ac | 4 +- libjava/classpath/tools/Makefile.am | 17 -------- libjava/classpath/tools/Makefile.in | 20 +--------- 5 files changed, 53 insertions(+), 73 deletions(-) diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog index c88532c..34dac38 100644 --- a/libjava/classpath/ChangeLog +++ b/libjava/classpath/ChangeLog @@ -1,3 +1,10 @@ +2015-08-11 Uros Bizjak + + * configure.ac (tools/gjdoc): Depend on CREATE_WRAPPERS. + * configure: Regenerate. + * tools/Makefile.am: Remove unneeded dependencies for Automake 1.11. + * tools/Makefile.in: Regenerate. + 2015-08-07 Uros Bizjak * doc/texi2pod.pl: Escape braces in regexp involving @strong{...}. @@ -14,42 +21,42 @@ 2015-05-13 Michael Haubenwallner - * Makefile.in: Regenerated with automake-1.11.6. - * aclocal.m4: Likewise. - * configure: Likewise. - * doc/Makefile.in: Likewise. - * doc/api/Makefile.in: Likewise. - * examples/Makefile.in: Likewise. - * external/Makefile.in: Likewise. - * external/jsr166/Makefile.in: Likewise. - * external/relaxngDatatype/Makefile.in: Likewise. - * external/sax/Makefile.in: Likewise. - * external/w3c_dom/Makefile.in: Likewise. - * include/Makefile.in: Likewise. - * lib/Makefile.in: Likewise. - * native/Makefile.in: Likewise. - * native/fdlibm/Makefile.in: Likewise. - * native/jawt/Makefile.in: Likewise. - * native/jni/Makefile.in: Likewise. - * native/jni/classpath/Makefile.in: Likewise. - * native/jni/gconf-peer/Makefile.in: Likewise. - * native/jni/gstreamer-peer/Makefile.in: Likewise. - * native/jni/gtk-peer/Makefile.in: Likewise. - * native/jni/java-io/Makefile.in: Likewise. - * native/jni/java-lang/Makefile.in: Likewise. - * native/jni/java-math/Makefile.in: Likewise. - * native/jni/java-net/Makefile.in: Likewise. - * native/jni/java-nio/Makefile.in: Likewise. - * native/jni/java-util/Makefile.in: Likewise. - * native/jni/midi-alsa/Makefile.in: Likewise. - * native/jni/midi-dssi/Makefile.in: Likewise. - * native/jni/native-lib/Makefile.in: Likewise. - * native/jni/qt-peer/Makefile.in: Likewise. - * native/jni/xmlj/Makefile.in: Likewise. - * native/plugin/Makefile.in: Likewise. - * resource/Makefile.in: Likewise. - * scripts/Makefile.in: Likewise. - * tools/Makefile.in: Likewise. + * Makefile.in: Regenerated with automake-1.11.6. + * aclocal.m4: Likewise. + * configure: Likewise. + * doc/Makefile.in: Likewise. + * doc/api/Makefile.in: Likewise. + * examples/Makefile.in: Likewise. + * external/Makefile.in: Likewise. + * external/jsr166/Makefile.in: Likewise. + * external/relaxngDatatype/Makefile.in: Likewise. + * external/sax/Makefile.in: Likewise. + * external/w3c_dom/Makefile.in: Likewise. + * include/Makefile.in: Likewise. + * lib/Makefile.in: Likewise. + * native/Makefile.in: Likewise. + * native/fdlibm/Makefile.in: Likewise. + * native/jawt/Makefile.in: Likewise. + * native/jni/Makefile.in: Likewise. + * native/jni/classpath/Makefile.in: Likewise. + * native/jni/gconf-peer/Makefile.in: Likewise. + * native/jni/gstreamer-peer/Makefile.in: Likewise. + * native/jni/gtk-peer/Makefile.in: Likewise. + * native/jni/java-io/Makefile.in: Likewise. + * native/jni/java-lang/Makefile.in: Likewise. + * native/jni/java-math/Makefile.in: Likewise. + * native/jni/java-net/Makefile.in: Likewise. + * native/jni/java-nio/Makefile.in: Likewise. + * native/jni/java-util/Makefile.in: Likewise. + * native/jni/midi-alsa/Makefile.in: Likewise. + * native/jni/midi-dssi/Makefile.in: Likewise. + * native/jni/native-lib/Makefile.in: Likewise. + * native/jni/qt-peer/Makefile.in: Likewise. + * native/jni/xmlj/Makefile.in: Likewise. + * native/plugin/Makefile.in: Likewise. + * resource/Makefile.in: Likewise. + * scripts/Makefile.in: Likewise. + * tools/Makefile.in: Likewise. 2014-11-09 H.J. Lu diff --git a/libjava/classpath/configure b/libjava/classpath/configure index a25317d..6d46403 100755 --- a/libjava/classpath/configure +++ b/libjava/classpath/configure @@ -25874,10 +25874,14 @@ fi if test "x${COMPILE_GJDOC}" = xyes then -ac_config_files="$ac_config_files tools/gjdoc" +if test -z "$CREATE_WRAPPERS_TRUE"; then : + else + ac_config_files="$ac_config_files tools/gjdoc" ac_config_commands="$ac_config_commands gjdoc" + +fi fi ac_config_commands="$ac_config_commands gen-classlist" diff --git a/libjava/classpath/configure.ac b/libjava/classpath/configure.ac index d120b5b..245e1df 100644 --- a/libjava/classpath/configure.ac +++ b/libjava/classpath/configure.ac @@ -1256,8 +1256,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/libjava/classpath/tools/Makefile.am b/libjava/classpath/tools/Makefile.am index a4d48aa..0233e19 100755 --- a/libjava/classpath/tools/Makefile.am +++ b/libjava/classpath/tools/Makefile.am @@ -118,23 +118,6 @@ if CREATE_GJDOC noinst_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 \ diff --git a/libjava/classpath/tools/Makefile.in b/libjava/classpath/tools/Makefile.in index ac39912..9411066 100644 --- a/libjava/classpath/tools/Makefile.in +++ b/libjava/classpath/tools/Makefile.in @@ -782,8 +782,8 @@ $(am__aclocal_m4_deps): @CREATE_WRAPPERS_FALSE@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ @CREATE_WRAPPERS_FALSE@gjavah: $(top_builddir)/config.status $(srcdir)/gjavah.in @CREATE_WRAPPERS_FALSE@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ -gjdoc: $(top_builddir)/config.status $(srcdir)/gjdoc.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +@CREATE_WRAPPERS_FALSE@gjdoc: $(top_builddir)/config.status $(srcdir)/gjdoc.in +@CREATE_WRAPPERS_FALSE@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ @@ -867,9 +867,6 @@ clean-noinstPROGRAMS: @CREATE_WRAPPERS_TRUE@gjavah$(EXEEXT): $(gjavah_OBJECTS) $(gjavah_DEPENDENCIES) $(EXTRA_gjavah_DEPENDENCIES) @CREATE_WRAPPERS_TRUE@ @rm -f gjavah$(EXEEXT) @CREATE_WRAPPERS_TRUE@ $(gjavah_LINK) $(gjavah_OBJECTS) $(gjavah_LDADD) $(LIBS) -@CREATE_GJDOC_FALSE@gjdoc$(EXEEXT): $(gjdoc_OBJECTS) $(gjdoc_DEPENDENCIES) $(EXTRA_gjdoc_DEPENDENCIES) -@CREATE_GJDOC_FALSE@ @rm -f gjdoc$(EXEEXT) -@CREATE_GJDOC_FALSE@ $(gjdoc_LINK) $(gjdoc_OBJECTS) $(gjdoc_LDADD) $(LIBS) @CREATE_WRAPPERS_TRUE@gjdoc$(EXEEXT): $(gjdoc_OBJECTS) $(gjdoc_DEPENDENCIES) $(EXTRA_gjdoc_DEPENDENCIES) @CREATE_WRAPPERS_TRUE@ @rm -f gjdoc$(EXEEXT) @CREATE_WRAPPERS_TRUE@ $(gjdoc_LINK) $(gjdoc_OBJECTS) $(gjdoc_LDADD) $(LIBS) @@ -1342,19 +1339,6 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS pdf pdf-am ps ps-am tags uninstall uninstall-am \ uninstall-binPROGRAMS uninstall-binSCRIPTS -@CREATE_WRAPPERS_FALSE@gappletviewer: gappletviewer.in -@CREATE_WRAPPERS_FALSE@gjarsigner: gjarsigner.in -@CREATE_WRAPPERS_FALSE@gkeytool: gkeytool.in -@CREATE_WRAPPERS_FALSE@gjar: gjar.in -@CREATE_WRAPPERS_FALSE@gnative2ascii: gnative2ascii.in -@CREATE_WRAPPERS_FALSE@gserialver: gserialver.in -@CREATE_WRAPPERS_FALSE@gjavah: gjavah.in -@CREATE_WRAPPERS_FALSE@grmiregistry: grmiregistry.in -@CREATE_WRAPPERS_FALSE@gtnameserv: gtnameserv.in -@CREATE_WRAPPERS_FALSE@gorbd: gorbd.in -@CREATE_WRAPPERS_FALSE@grmid: grmid.in -@CREATE_WRAPPERS_FALSE@grmic: grmic.in -@CREATE_GJDOC_TRUE@@CREATE_WRAPPERS_FALSE@gjdoc: gjdoc.in # Make sure everything is included in the distribution. dist-hook: -- 2.7.4