This fixes the gjdoc build so the JAR file creation for com.sun.tools.javadoc is a one-liner. It also includes the manifest in 'make dist'.
Changelog:
2007-05-14 Michael Koch <[EMAIL PROTECTED]>
* Makefile.am:
Merge two JAR lines into one.
2007-05-14 Andrew John Hughes <[EMAIL PROTECTED]>
* Makefile.am:
Include javadoc.manifest in dist.
--
Andrew :-)
Escape the Java Trap with GNU Classpath!
http://www.gnu.org/philosophy/java-trap.html
public class gcj extends Freedom implements Java { ... }
Index: Makefile.am =================================================================== RCS file: /sources/classpath/gjdoc/Makefile.am,v retrieving revision 1.44 diff -u -3 -p -u -r1.44 Makefile.am --- Makefile.am 14 May 2007 11:40:08 -0000 1.44 +++ Makefile.am 14 May 2007 16:26:46 -0000 @@ -108,7 +108,7 @@ lib_gnu_classpath_tools_gjdoc_la_SOURCES gnu/classpath/tools/gjdoc/expr/JavaTokenTypes.java EXTRA_DIST = src/gnu/classpath/tools/gjdoc/expr/java-expression.g \ - gjdoc.manifest contrib/texi2pod.pl + gjdoc.manifest contrib/texi2pod.pl javadoc.manifest SUBDIRS = docs @@ -370,8 +370,7 @@ $(lib_gnu_classpath_tools_gjdoc_la_GENSO $(ANTLR) -o gnu/classpath/tools/gjdoc/expr $< com-sun-javadoc-$(VERSION).jar: classes $(com_sun_javadoc_jar_CLASSES) - $(JAR) cfm $@ $(srcdir)/javadoc.manifest -C classes com/sun/javadoc - $(JAR) uf $@ -C classes com/sun/tools/javadoc + $(JAR) cfm $@ $(srcdir)/javadoc.manifest -C classes com/sun/javadoc -C classes com/sun/tools/javadoc com-sun-tools-doclets-Taglet-$(VERSION).jar: classes $(com_sun_tools_doclets_Taglet_jar_CLASSES) $(JAR) cf $@ -C classes com/sun/tools/doclets
signature.asc
Description: Digital signature
