diff options
Diffstat (limited to 'libjava/classpath/tools/Makefile.in')
| -rw-r--r-- | libjava/classpath/tools/Makefile.in | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/libjava/classpath/tools/Makefile.in b/libjava/classpath/tools/Makefile.in index 960dc6e0035..884658378af 100644 --- a/libjava/classpath/tools/Makefile.in +++ b/libjava/classpath/tools/Makefile.in @@ -220,6 +220,7 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ ECJ = @ECJ@ +ECJ_JAR = @ECJ_JAR@ EGREP = @EGREP@ ENABLE_LOCAL_SOCKETS_FALSE = @ENABLE_LOCAL_SOCKETS_FALSE@ ENABLE_LOCAL_SOCKETS_TRUE = @ENABLE_LOCAL_SOCKETS_TRUE@ @@ -231,6 +232,8 @@ FIND = @FIND@ FOUND_CACAO_FALSE = @FOUND_CACAO_FALSE@ FOUND_CACAO_TRUE = @FOUND_CACAO_TRUE@ FOUND_ECJ_FALSE = @FOUND_ECJ_FALSE@ +FOUND_ECJ_JAR_FALSE = @FOUND_ECJ_JAR_FALSE@ +FOUND_ECJ_JAR_TRUE = @FOUND_ECJ_JAR_TRUE@ FOUND_ECJ_TRUE = @FOUND_ECJ_TRUE@ FOUND_GCJX_FALSE = @FOUND_GCJX_FALSE@ FOUND_GCJX_TRUE = @FOUND_GCJX_TRUE@ @@ -395,6 +398,12 @@ GLIBJ_CLASSPATH = $(srcdir)/asm # Setup the compiler to use the GNU Classpath library we just build @FOUND_GCJ_TRUE@JCOMPILER = $(GCJ) -C -encoding UTF-8 -bootclasspath $(GLIBJ_BOOTCLASSPATH) -classpath $(GLIBJ_CLASSPATH):. +@FOUND_ECJ_JAR_FALSE@COM_SUN_TOOLS_JAVAC = +@FOUND_ECJ_JAR_TRUE@COM_SUN_TOOLS_JAVAC = com/sun/tools/javac +@FOUND_ECJ_JAR_FALSE@ABS_COM_SUN_TOOLS_JAVAC = +@FOUND_ECJ_JAR_TRUE@ABS_COM_SUN_TOOLS_JAVAC = $(srcdir)/$(COM_SUN_TOOLS_JAVAC) +@FOUND_ECJ_JAR_FALSE@ABS_COM_SUN_TOOLS_JAVAC_SRCS = +@FOUND_ECJ_JAR_TRUE@ABS_COM_SUN_TOOLS_JAVAC_SRCS = $(ABS_COM_SUN_TOOLS_JAVAC)/*.java @CREATE_WRAPPERS_TRUE@bin_SCRIPTS = @CREATE_WRAPPERS_TRUE@AM_CPPFLAGS = -Wall \ @CREATE_WRAPPERS_TRUE@ -I$(top_srcdir)/include \ @@ -472,6 +481,10 @@ EXTRA_DIST = toolwrapper.c gappletviewer.in gjarsigner.in gkeytool.in \ # All our example java source files TOOLS_JAVA_FILES = $(srcdir)/gnu/classpath/tools/*/*.java \ + $(srcdir)/com/sun/javadoc/*.java \ + $(srcdir)/com/sun/tools/doclets/*.java \ + $(ABS_COM_SUN_TOOLS_JAVAC_SRCS) \ + $(srcdir)/sun/rmi/rmic/*.java \ $(srcdir)/external/asm/org/objectweb/asm/*.java \ $(srcdir)/external/asm/org/objectweb/asm/attrs/*.java \ $(srcdir)/external/asm/org/objectweb/asm/commons/*.java \ @@ -1078,8 +1091,14 @@ dist-hook: # so they get also included. $(TOOLS_ZIP): $(TOOLS_JAVA_FILES) find $(srcdir)/external/asm -name '*.java' -print > asm.lst - find $(srcdir)/gnu/classpath/tools -name '*.java' -print > classes.lst + find $(srcdir)/gnu/classpath/tools \ + $(srcdir)/com/sun/javadoc \ + $(srcdir)/com/sun/tools/doclets \ + $(ABS_COM_SUN_TOOLS_JAVAC) \ + $(srcdir)/sun/rmi/rmic \ + -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 \ @@ -1090,7 +1109,9 @@ $(TOOLS_ZIP): $(TOOLS_JAVA_FILES) @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@ $(JCOMPILER) -g -w -d $(srcdir)/classes @classes.lst @vm-tools.lst -@JAVA_MAINTAINER_MODE_TRUE@ @list=`cd $(top_srcdir)/resource && find gnu/classpath/tools -name \*.properties -print`; \ +@JAVA_MAINTAINER_MODE_TRUE@ @list=`cd $(top_srcdir)/resource && find gnu/classpath/tools \ +@JAVA_MAINTAINER_MODE_TRUE@ com/sun/javadoc com/sun/tools/doclets $(COM_SUN_TOOLS_JAVAC) \ +@JAVA_MAINTAINER_MODE_TRUE@ sun/rmi/rmic -name \*.properties -print`; \ @JAVA_MAINTAINER_MODE_TRUE@ for p in $$list; do \ @JAVA_MAINTAINER_MODE_TRUE@ dirname=classes/`dirname $$p`; \ @JAVA_MAINTAINER_MODE_TRUE@ if ! test -d "$$dirname"; then mkdir -p "$$dirname"; fi; \ |