diff options
Diffstat (limited to 'libjava/classpath/tools/Makefile.in')
| -rw-r--r-- | libjava/classpath/tools/Makefile.in | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/libjava/classpath/tools/Makefile.in b/libjava/classpath/tools/Makefile.in index cf52853cc32..6a863425b01 100644 --- a/libjava/classpath/tools/Makefile.in +++ b/libjava/classpath/tools/Makefile.in @@ -447,14 +447,14 @@ target_vendor = @target_vendor@ toolexeclibdir = @toolexeclibdir@ uudecode = @uudecode@ vm_classes = @vm_classes@ +@CREATE_GJDOC_TRUE@gjdoc_gendir = ${top_srcdir}/tools/generated +@CREATE_GJDOC_TRUE@ANTLR_CLASSPATH = $(ANTLR_JAR):$(gjdoc_gendir) GLIBJ_BOOTCLASSPATH = '$(top_srcdir)/lib' GLIBJ_CLASSPATH = .:$(srcdir)/asm:$(ANTLR_CLASSPATH) @GCJ_JAVAC_FALSE@JCOMPILER = $(JAVAC) $(JAVACFLAGS) -source 1.5 -target 1.5 -encoding UTF-8 -bootclasspath $(GLIBJ_BOOTCLASSPATH) -classpath $(GLIBJ_CLASSPATH) # Setup the compiler to use the GNU Classpath library we just built. @GCJ_JAVAC_TRUE@JCOMPILER = $(JAVAC) $(JAVACFLAGS) -fsource=1.5 -ftarget=1.5 --encoding=UTF-8 --bootclasspath=$(GLIBJ_BOOTCLASSPATH) --classpath=$(GLIBJ_CLASSPATH) -@CREATE_GJDOC_TRUE@gjdoc_gendir = ${top_srcdir}/tools/generated -@CREATE_GJDOC_TRUE@ANTLR_CLASSPATH = $(ANTLR_JAR):$(gjdoc_gendir) @CREATE_WRAPPERS_TRUE@bin_SCRIPTS = @CREATE_WRAPPERS_TRUE@AM_CPPFLAGS = -Wall \ @CREATE_WRAPPERS_TRUE@ -I$(top_srcdir)/include \ @@ -1312,31 +1312,31 @@ dist-hook: # immediately. And copy the template files we use to the classes dir # so they get also included. $(TOOLS_ZIP): $(ALL_TOOLS_FILES) - find $(srcdir)/external/asm -name '*.java' -print > asm.lst - find $(srcdir)/gnu/classpath/tools \ - $(srcdir)/com/sun/javadoc \ - $(srcdir)/com/sun/tools/doclets \ - $(srcdir)/com/sun/tools/javadoc \ - $(srcdir)/com/sun/tools/javac \ - $(srcdir)/com/sun/tools/javah \ - $(srcdir)/sun/rmi/rmic \ - $(GJDOC_EX) \ - -name '*.java' -print > classes.lst - if [ -f $(top_builddir)/../vm-tools-packages ]; then \ - : > vm-tools.lst; \ - for pkg in `cat $(top_builddir)/../vm-tools-packages`; do \ - $(FIND) $(top_srcdir)/../$$pkg -follow -name '*.java' -print >> vm-tools.lst; \ - done \ - else \ - echo -n > vm-tools.lst; \ - fi - cat classes.lst asm.lst vm-tools.lst > all-classes.lst @CREATE_GJDOC_PARSER_TRUE@@CREATE_GJDOC_TRUE@@JAVA_MAINTAINER_MODE_TRUE@ @mkdir_p@ $(gjdoc_gendir)/gnu/classpath/tools/gjdoc/expr -@CREATE_GJDOC_PARSER_TRUE@@CREATE_GJDOC_TRUE@@JAVA_MAINTAINER_MODE_TRUE@ $(ANTLR) -o $(gjdoc_gendir)/gnu/classpath/tools/gjdoc/expr \ +@CREATE_GJDOC_PARSER_TRUE@@CREATE_GJDOC_TRUE@@JAVA_MAINTAINER_MODE_TRUE@ $(ANTLR) -o $(gjdoc_gendir)/gnu/classpath/tools/gjdoc/expr/ \ @CREATE_GJDOC_PARSER_TRUE@@CREATE_GJDOC_TRUE@@JAVA_MAINTAINER_MODE_TRUE@ $(srcdir)/gnu/classpath/tools/gjdoc/expr/java-expression.g +@JAVA_MAINTAINER_MODE_TRUE@ find $(srcdir)/external/asm -name '*.java' -print > asm.lst @JAVA_MAINTAINER_MODE_TRUE@ AC=`echo $(JCOMPILER) | sed -e 's/UTF-8/ISO-8859-1/g'`; \ @JAVA_MAINTAINER_MODE_TRUE@ $$AC -g -w -d $(srcdir)/asm @asm.lst +@JAVA_MAINTAINER_MODE_TRUE@ find $(srcdir)/gnu/classpath/tools \ +@JAVA_MAINTAINER_MODE_TRUE@ $(srcdir)/com/sun/javadoc \ +@JAVA_MAINTAINER_MODE_TRUE@ $(srcdir)/com/sun/tools/doclets \ +@JAVA_MAINTAINER_MODE_TRUE@ $(srcdir)/com/sun/tools/javadoc \ +@JAVA_MAINTAINER_MODE_TRUE@ $(srcdir)/com/sun/tools/javac \ +@JAVA_MAINTAINER_MODE_TRUE@ $(srcdir)/com/sun/tools/javah \ +@JAVA_MAINTAINER_MODE_TRUE@ $(srcdir)/sun/rmi/rmic \ +@JAVA_MAINTAINER_MODE_TRUE@ $(GJDOC_EX) \ +@JAVA_MAINTAINER_MODE_TRUE@ -name '*.java' -print > classes.lst +@JAVA_MAINTAINER_MODE_TRUE@ if [ -f $(top_builddir)/../vm-tools-packages ]; then \ +@JAVA_MAINTAINER_MODE_TRUE@ : > vm-tools.lst; \ +@JAVA_MAINTAINER_MODE_TRUE@ for pkg in `cat $(top_builddir)/../vm-tools-packages`; do \ +@JAVA_MAINTAINER_MODE_TRUE@ $(FIND) $(top_srcdir)/../$$pkg -follow -name '*.java' -print >> vm-tools.lst; \ +@JAVA_MAINTAINER_MODE_TRUE@ done \ +@JAVA_MAINTAINER_MODE_TRUE@ else \ +@JAVA_MAINTAINER_MODE_TRUE@ echo -n > vm-tools.lst; \ +@JAVA_MAINTAINER_MODE_TRUE@ fi @JAVA_MAINTAINER_MODE_TRUE@ $(JCOMPILER) $(USE_JAVAC_FLAGS) -g -d $(srcdir)/classes @classes.lst @vm-tools.lst +@JAVA_MAINTAINER_MODE_TRUE@ cat classes.lst asm.lst vm-tools.lst > all-classes.lst @list=`cd $(srcdir)/resource && find gnu/classpath/tools com/sun/tools/javac \ sun/rmi/rmic $(GJDOC_EX) -name \*.properties -print -o -name \*.jav -print`; \ for p in $$list; do \ |