PatchSet 7384
Date: 2006/08/13 19:19:29
Author: robilad
Branch: HEAD
Tag: (none)
Log:
replaced gjdoc build system
2006-08-13 Dalibor Topic <[EMAIL PROTECTED]>
* tools/gjdoc/javalib/Makefile.am:
Replaced by new build system.
Members:
ChangeLog:1.4886->1.4887
tools/gjdoc/javalib/Makefile.am:1.23->1.24
tools/gjdoc/javalib/Makefile.in:1.90->1.91
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4886 kaffe/ChangeLog:1.4887
--- kaffe/ChangeLog:1.4886 Sun Aug 13 14:13:41 2006
+++ kaffe/ChangeLog Sun Aug 13 19:19:29 2006
@@ -1,5 +1,10 @@
2006-08-13 Dalibor Topic <[EMAIL PROTECTED]>
+ * tools/gjdoc/javalib/Makefile.am:
+ Replaced by new build system.
+
+2006-08-13 Dalibor Topic <[EMAIL PROTECTED]>
+
* libraries/javalib/awt-implementations/kaffe/Makefile.am:
Replaced by new build system.
Index: kaffe/tools/gjdoc/javalib/Makefile.am
diff -u kaffe/tools/gjdoc/javalib/Makefile.am:1.23
kaffe/tools/gjdoc/javalib/Makefile.am:1.24
--- kaffe/tools/gjdoc/javalib/Makefile.am:1.23 Tue Feb 7 21:49:00 2006
+++ kaffe/tools/gjdoc/javalib/Makefile.am Sun Aug 13 19:19:34 2006
@@ -1,85 +1,103 @@
-#
-# Javadoc library component.
-#
-# Copyright (c) 2004
-# Kaffe.org contributors. All rights reserved. See ChageLog for details.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file.
-
CLASSFILE = gjdoc.jar
-SRCDIRS = antlr com gnu
-
+SRCDIRS = antlr
toolslib_DATA = $(CLASSFILE)
+LIBDIR = lib
+JAR_CMD1 = ($(FASTJAR) cf $(CLASSFILE) -C $(LIBDIR) $(SRCDIRS))
+JAR_CMD2 = ($(FASTJAR) uf $(CLASSFILE) -C $(LIBDIR) gnu)
+JAR_CMD3 = ($(FASTJAR) uf $(CLASSFILE) -C $(LIBDIR) com)
+JAR_CMD4 = (PWD=`pwd` && cd $(srcdir) && $(FASTJAR) uf $(PWD)/$(CLASSFILE)
$(gjdoc_ressources))
+JAR_CMD5 = ($(FASTJAR) uf $(CLASSFILE) version.properties)
+
+CPATH =
.:$(srcdir):$(LIBDIR):$(top_builddir)/libraries/javalib/vmspecific/kaffe-vminterface.jar:$(top_builddir)/libraries/javalib/external/classpath/lib/glibj.zip
+AM_JAVACFLAGS = -classpath $(CPATH)
+JAVAC = $(JAVA_COMPILER)
+JAVAROOT = $(LIBDIR)
+
+$(CLASSFILE): classdist_gjdoc.stamp
+ rm -f $(CLASSFILE)
+ $(JAR_CMD1)
+ $(JAR_CMD2)
+ $(JAR_CMD3)
+ $(JAR_CMD4)
+ $(JAR_CMD5)
+
+clean-local:
+ rm -rf $(LIBDIR) $(CLASSFILE)
+
+# Use a fake install class and dir to keep automake's JAVA (un)install tasks
happy.
+FAKE=fakeinstall
+install-data-local:
+ touch $(FAKE).class
+uninstall-local:
+ rm $(FAKE).class
+gjdocdir = $(FAKE)
-antlr_SRCS = \
+dist_gjdoc_JAVA = \
antlr/collections/impl/ASTArray.java \
+ antlr/collections/impl/ASTEnumerator.java \
antlr/collections/impl/BitSet.java \
- antlr/collections/impl/Vector.java \
antlr/collections/impl/IntRange.java \
+ antlr/collections/impl/Vector.java \
antlr/collections/impl/VectorEnumerator.java \
- antlr/collections/impl/ASTEnumerator.java \
antlr/collections/AST.java \
antlr/collections/ASTEnumeration.java \
antlr/collections/Enumerator.java \
antlr/ANTLRException.java \
antlr/ANTLRHashString.java \
+ antlr/ANTLRStringBuffer.java \
antlr/ASTFactory.java \
+ antlr/ASTNULLType.java \
antlr/ASTPair.java \
+ antlr/BaseAST.java \
antlr/ByteBuffer.java \
antlr/CharBuffer.java \
+ antlr/CharFormatter.java \
+ antlr/CharQueue.java \
antlr/CharScanner.java \
antlr/CharStreamException.java \
antlr/CharStreamIOException.java \
+ antlr/CommonAST.java \
antlr/CommonToken.java \
+ antlr/DefaultFileLineFormatter.java \
+ antlr/FileLineFormatter.java \
antlr/InputBuffer.java \
- antlr/LexerSharedInputState.java \
antlr/LLkParser.java \
+ antlr/LexerSharedInputState.java \
antlr/MismatchedCharException.java \
antlr/MismatchedTokenException.java \
antlr/NoViableAltException.java \
antlr/NoViableAltForCharException.java \
+ antlr/Parser.java \
antlr/ParserSharedInputState.java \
antlr/RecognitionException.java \
antlr/SemanticException.java \
+ antlr/StringUtils.java \
antlr/Token.java \
antlr/TokenBuffer.java \
+ antlr/TokenQueue.java \
antlr/TokenStream.java \
antlr/TokenStreamException.java \
antlr/TokenStreamIOException.java \
antlr/TokenStreamRecognitionException.java \
- antlr/CharFormatter.java \
- antlr/CharQueue.java \
- antlr/ANTLRStringBuffer.java \
- antlr/CommonAST.java \
- antlr/Parser.java \
- antlr/TokenQueue.java \
- antlr/FileLineFormatter.java \
- antlr/BaseAST.java \
+ antlr/TreeParser.java \
+ antlr/TreeParserSharedInputState.java \
antlr/Utils.java \
+ antlr/debug/Event.java \
+ antlr/debug/GuessingEvent.java \
+ antlr/debug/ListenerBase.java \
+ antlr/debug/MessageEvent.java \
antlr/debug/MessageListener.java \
antlr/debug/ParserListener.java \
+ antlr/debug/ParserMatchEvent.java \
antlr/debug/ParserMatchListener.java \
+ antlr/debug/ParserTokenEvent.java \
antlr/debug/ParserTokenListener.java \
+ antlr/debug/SemanticPredicateEvent.java \
antlr/debug/SemanticPredicateListener.java \
+ antlr/debug/SyntacticPredicateEvent.java \
antlr/debug/SyntacticPredicateListener.java \
- antlr/debug/TraceListener.java \
- antlr/debug/ListenerBase.java \
antlr/debug/TraceEvent.java \
- antlr/debug/SyntacticPredicateEvent.java \
- antlr/debug/SemanticPredicateEvent.java \
- antlr/debug/ParserTokenEvent.java \
- antlr/debug/ParserMatchEvent.java \
- antlr/debug/MessageEvent.java \
- antlr/debug/Event.java \
- antlr/debug/GuessingEvent.java \
- antlr/DefaultFileLineFormatter.java \
- antlr/StringUtils.java \
- antlr/TreeParser.java \
- antlr/ASTNULLType.java \
- antlr/TreeParserSharedInputState.java
-
-gjdoc_jar_SRCS = \
+ antlr/debug/TraceListener.java \
com/sun/javadoc/ClassDoc.java \
com/sun/javadoc/ConstructorDoc.java \
com/sun/javadoc/Doc.java \
@@ -96,42 +114,48 @@
com/sun/javadoc/RootDoc.java \
com/sun/javadoc/SeeTag.java \
com/sun/javadoc/SerialFieldTag.java \
+ com/sun/javadoc/SourcePosition.java \
com/sun/javadoc/Tag.java \
com/sun/javadoc/ThrowsTag.java \
com/sun/javadoc/Type.java \
com/sun/javadoc/TypeVariable.java \
- com/sun/javadoc/SourcePosition.java \
com/sun/tools/doclets/Taglet.java \
- gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTranslet.java \
-
gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletConfigurationException.java
\
-
gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletException.java \
- gnu/classpath/tools/doclets/xmldoclet/doctranslet/JarClassLoader.java \
- gnu/classpath/tools/doclets/xmldoclet/doctranslet/OutputFileInfo.java \
-
gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletOptions.java \
- gnu/classpath/tools/doclets/xmldoclet/Driver.java \
- gnu/classpath/tools/doclets/xmldoclet/Driver1_4.java \
- gnu/classpath/tools/doclets/xmldoclet/HtmlRepairer.java \
- gnu/classpath/tools/doclets/xmldoclet/TargetContext.java \
- gnu/classpath/tools/doclets/htmldoclet/CssClass.java \
- gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java \
- gnu/classpath/tools/doclets/htmldoclet/HtmlPage.java \
- gnu/classpath/tools/doclets/htmldoclet/ExternalDocSet.java \
- gnu/classpath/tools/doclets/htmldoclet/HtmlTagletContext.java \
+ gnu/classpath/tools/doclets/debugdoclet/DebugDoclet.java \
gnu/classpath/tools/doclets/AbstractDoclet.java \
gnu/classpath/tools/doclets/DocletConfigurationException.java \
gnu/classpath/tools/doclets/DocletOption.java \
gnu/classpath/tools/doclets/DocletOptionColonSeparated.java \
gnu/classpath/tools/doclets/DocletOptionFile.java \
gnu/classpath/tools/doclets/DocletOptionFlag.java \
+ gnu/classpath/tools/doclets/DocletOptionPackageWildcard.java \
gnu/classpath/tools/doclets/DocletOptionString.java \
+ gnu/classpath/tools/doclets/InlineTagRenderer.java \
gnu/classpath/tools/doclets/InvalidPackageWildcardException.java \
gnu/classpath/tools/doclets/PackageGroup.java \
gnu/classpath/tools/doclets/PackageMatcher.java \
gnu/classpath/tools/doclets/StandardTaglet.java \
gnu/classpath/tools/doclets/TagletPrinter.java \
- gnu/classpath/tools/doclets/debugdoclet/DebugDoclet.java \
- gnu/classpath/tools/doclets/DocletOptionPackageWildcard.java \
- gnu/classpath/tools/doclets/InlineTagRenderer.java \
+ gnu/classpath/tools/doclets/htmldoclet/CssClass.java \
+ gnu/classpath/tools/doclets/htmldoclet/ExternalDocSet.java \
+ gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java \
+ gnu/classpath/tools/doclets/htmldoclet/HtmlPage.java \
+ gnu/classpath/tools/doclets/htmldoclet/HtmlTagletContext.java \
+ gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTranslet.java \
+
gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletConfigurationException.java
\
+
gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletException.java \
+
gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletOptions.java \
+ gnu/classpath/tools/doclets/xmldoclet/doctranslet/JarClassLoader.java \
+ gnu/classpath/tools/doclets/xmldoclet/doctranslet/OutputFileInfo.java \
+ gnu/classpath/tools/doclets/xmldoclet/Driver.java \
+ gnu/classpath/tools/doclets/xmldoclet/Driver1_4.java \
+ gnu/classpath/tools/doclets/xmldoclet/HtmlRepairer.java \
+ gnu/classpath/tools/doclets/xmldoclet/TargetContext.java \
+ gnu/classpath/tools/FileSystemClassLoader.java \
+ gnu/classpath/tools/IOToolkit.java \
+ gnu/classpath/tools/MalformedInputEvent.java \
+ gnu/classpath/tools/MalformedInputListener.java \
+ gnu/classpath/tools/NotifyingInputStreamReader.java \
+ gnu/classpath/tools/StringToolkit.java \
gnu/classpath/tools/gjdoc/expr/AdditionExpression.java \
gnu/classpath/tools/gjdoc/expr/AndExpression.java \
gnu/classpath/tools/gjdoc/expr/BinaryBitwiseExpression.java \
@@ -158,8 +182,8 @@
gnu/classpath/tools/gjdoc/expr/Context.java \
gnu/classpath/tools/gjdoc/expr/DivisionExpression.java \
gnu/classpath/tools/gjdoc/expr/EqualExpression.java \
- gnu/classpath/tools/gjdoc/expr/EvaluatorEnvironment.java \
gnu/classpath/tools/gjdoc/expr/Evaluator.java \
+ gnu/classpath/tools/gjdoc/expr/EvaluatorEnvironment.java \
gnu/classpath/tools/gjdoc/expr/ExclusiveOrExpression.java \
gnu/classpath/tools/gjdoc/expr/Expression.java \
gnu/classpath/tools/gjdoc/expr/GreaterThanExpression.java \
@@ -167,6 +191,9 @@
gnu/classpath/tools/gjdoc/expr/IdentifierExpression.java \
gnu/classpath/tools/gjdoc/expr/IllegalExpressionException.java \
gnu/classpath/tools/gjdoc/expr/InclusiveOrExpression.java \
+ gnu/classpath/tools/gjdoc/expr/JavaLexer.java \
+ gnu/classpath/tools/gjdoc/expr/JavaRecognizer.java \
+ gnu/classpath/tools/gjdoc/expr/JavaTokenTypes.java \
gnu/classpath/tools/gjdoc/expr/LessThanExpression.java \
gnu/classpath/tools/gjdoc/expr/LessThanOrEqualExpression.java \
gnu/classpath/tools/gjdoc/expr/LogicalAndExpression.java \
@@ -180,17 +207,15 @@
gnu/classpath/tools/gjdoc/expr/ShiftLeftExpression.java \
gnu/classpath/tools/gjdoc/expr/ShiftRightExpression.java \
gnu/classpath/tools/gjdoc/expr/SubtractionExpression.java \
- gnu/classpath/tools/gjdoc/expr/TypeCastExpression.java \
gnu/classpath/tools/gjdoc/expr/Type.java \
+ gnu/classpath/tools/gjdoc/expr/TypeCastExpression.java \
gnu/classpath/tools/gjdoc/expr/UnaryExpression.java \
gnu/classpath/tools/gjdoc/expr/UnknownIdentifierException.java \
- gnu/classpath/tools/gjdoc/expr/JavaLexer.java \
- gnu/classpath/tools/gjdoc/expr/JavaRecognizer.java \
- gnu/classpath/tools/gjdoc/expr/JavaTokenTypes.java \
gnu/classpath/tools/gjdoc/AbstractTagImpl.java \
gnu/classpath/tools/gjdoc/ArrayCharacterIterator.java \
gnu/classpath/tools/gjdoc/ClassDocImpl.java \
gnu/classpath/tools/gjdoc/ClassDocProxy.java \
+ gnu/classpath/tools/gjdoc/ClassDocReflectedImpl.java \
gnu/classpath/tools/gjdoc/ConstructorDocImpl.java \
gnu/classpath/tools/gjdoc/Debug.java \
gnu/classpath/tools/gjdoc/DirectoryTree.java \
@@ -198,6 +223,9 @@
gnu/classpath/tools/gjdoc/ErrorReporter.java \
gnu/classpath/tools/gjdoc/ExecutableMemberDocImpl.java \
gnu/classpath/tools/gjdoc/FieldDocImpl.java \
+ gnu/classpath/tools/gjdoc/GjdocPackageDoc.java \
+ gnu/classpath/tools/gjdoc/GjdocRootDoc.java \
+ gnu/classpath/tools/gjdoc/InheritDocTagImpl.java \
gnu/classpath/tools/gjdoc/JavadocWrapper.java \
gnu/classpath/tools/gjdoc/LinkTagImpl.java \
gnu/classpath/tools/gjdoc/Main.java \
@@ -212,6 +240,8 @@
gnu/classpath/tools/gjdoc/RootDocImpl.java \
gnu/classpath/tools/gjdoc/SeeTagImpl.java \
gnu/classpath/tools/gjdoc/SerialFieldTagImpl.java \
+ gnu/classpath/tools/gjdoc/SourcePositionImpl.java \
+ gnu/classpath/tools/gjdoc/TagContainer.java \
gnu/classpath/tools/gjdoc/TagImpl.java \
gnu/classpath/tools/gjdoc/TemporaryStore.java \
gnu/classpath/tools/gjdoc/TextTagImpl.java \
@@ -220,33 +250,19 @@
gnu/classpath/tools/gjdoc/TimerDoclet.java \
gnu/classpath/tools/gjdoc/TypeImpl.java \
gnu/classpath/tools/gjdoc/TypeVariableImpl.java \
- gnu/classpath/tools/gjdoc/WritableType.java \
- gnu/classpath/tools/gjdoc/GjdocPackageDoc.java \
- gnu/classpath/tools/gjdoc/GjdocRootDoc.java \
- gnu/classpath/tools/gjdoc/SourcePositionImpl.java \
- gnu/classpath/tools/gjdoc/InheritDocTagImpl.java \
- gnu/classpath/tools/gjdoc/TagContainer.java \
gnu/classpath/tools/gjdoc/ValueTagImpl.java \
- gnu/classpath/tools/gjdoc/ClassDocReflectedImpl.java \
+ gnu/classpath/tools/gjdoc/WritableType.java \
+ gnu/classpath/tools/java2xhtml/Java2xhtml.java \
+ gnu/classpath/tools/taglets/AuthorTaglet.java \
gnu/classpath/tools/taglets/CodeTaglet.java \
gnu/classpath/tools/taglets/CopyrightTaglet.java \
- gnu/classpath/tools/taglets/AuthorTaglet.java \
gnu/classpath/tools/taglets/DeprecatedTaglet.java \
gnu/classpath/tools/taglets/GenericTaglet.java \
+ gnu/classpath/tools/taglets/GnuExtendedTaglet.java \
gnu/classpath/tools/taglets/SinceTaglet.java \
gnu/classpath/tools/taglets/TagletContext.java \
- gnu/classpath/tools/taglets/VersionTaglet.java \
- gnu/classpath/tools/taglets/GnuExtendedTaglet.java \
gnu/classpath/tools/taglets/ValueTaglet.java \
- gnu/classpath/tools/java2xhtml/Java2xhtml.java \
- gnu/classpath/tools/FileSystemClassLoader.java \
- gnu/classpath/tools/IOToolkit.java \
- gnu/classpath/tools/StringToolkit.java \
- gnu/classpath/tools/MalformedInputEvent.java \
- gnu/classpath/tools/MalformedInputListener.java \
- gnu/classpath/tools/NotifyingInputStreamReader.java
-
-## Do not delete the previous blank line; update-class-list depends on it
+ gnu/classpath/tools/taglets/VersionTaglet.java
gjdoc_ressources = \
dtd/gjdoc-alphaindex.dtd \
@@ -321,39 +337,3 @@
gnu/classpath/tools/doclets/xmldoclet/doctranslet/package.html \
gnu/classpath/tools/gjdoc/expr/java-expression.g
-JAR_CMD1 = (cd $(LIBDIR) && $(FASTJAR) -cf $(CURDIR)/[EMAIL PROTECTED]
$(SRCDIRS))
-JAR_CMD2 = (cd $(srcdir) && $(FASTJAR) -uf $(CURDIR)/[EMAIL PROTECTED]
$(gjdoc_ressources))
-JAR_CMD3 = ($(FASTJAR) -uf $(CURDIR)/[EMAIL PROTECTED] version.properties)
-
-LIBDIR = lib
-
-clean-local:
- rm -rf $(LIBDIR)
-
-.PHONY: new-classes
-new-classes: $(top_srcdir)/developers/update-class-list
- cd $(srcdir) && $(SHELL) $(top_srcdir)/developers/update-class-list
-
-rebuildLib = $(top_builddir)/libraries/javalib/rebuildLib
-real_builddir = $(shell cd $(top_builddir) && pwd)
-Klasses_jar =
$(real_builddir)/libraries/javalib/external/classpath/lib/glibj.zip
-
-.PHONY: compile-classes classes
-## classes is provided for backward compatibility; use compile-classes
-compile-classes $(LIBDIR)/stamp classes: $(rebuildLib) $(antlr_SRCS)
$(gjdoc_jar_SRCS) $(gjdoc_jar_GENSOURCES)
- rm -rf $(LIBDIR)
- mkdir $(LIBDIR)
- echo $(SHELL) $(rebuildLib)
- BOOTCLASSPATH=$(Klasses_jar) $(SHELL) $(rebuildLib) $(antlr_SRCS)
$(gjdoc_jar_SRCS) $(gjdoc_jar_GENSOURCES)
- echo timestamp > $(LIBDIR)/stamp
-
-.PHONY: jar-classes
-jar-classes: $(CLASSFILE)
-$(CLASSFILE): $(LIBDIR)/stamp
- rm -f $@ [EMAIL PROTECTED]
- $(JAR_CMD1)
- $(JAR_CMD2)
- $(JAR_CMD3)
- mv [EMAIL PROTECTED] $@
-
-export JAVA_COMPILER top_builddir LIBDIR srcdir
Index: kaffe/tools/gjdoc/javalib/Makefile.in
diff -u kaffe/tools/gjdoc/javalib/Makefile.in:1.90
kaffe/tools/gjdoc/javalib/Makefile.in:1.91
--- kaffe/tools/gjdoc/javalib/Makefile.in:1.90 Wed Aug 9 21:28:10 2006
+++ kaffe/tools/gjdoc/javalib/Makefile.in Sun Aug 13 19:19:34 2006
@@ -14,15 +14,6 @@
@SET_MAKE@
-#
-# Javadoc library component.
-#
-# Copyright (c) 2004
-# Kaffe.org contributors. All rights reserved. See ChageLog for details.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file.
-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
@@ -46,8 +37,8 @@
build_triplet = @build@
host_triplet = @host@
subdir = tools/gjdoc/javalib
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(srcdir)/version.properties.in
+DIST_COMMON = $(dist_gjdoc_JAVA) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in $(srcdir)/version.properties.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c_bigendian_cross.m4 \
$(top_srcdir)/m4/acx_pthread.m4 $(top_srcdir)/m4/alsa.m4 \
@@ -76,13 +67,14 @@
CONFIG_CLEAN_FILES = version.properties
SOURCES =
DIST_SOURCES =
+CLASSPATH_ENV = CLASSPATH=$(JAVAROOT):$(srcdir)/$(JAVAROOT):$$CLASSPATH
+am__installdirs = "$(DESTDIR)$(gjdocdir)" "$(DESTDIR)$(toolslibdir)"
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
*) f=$$p;; \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(toolslibdir)"
toolslibDATA_INSTALL = $(INSTALL_DATA)
DATA = $(toolslib_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -356,76 +348,88 @@
toolslibdir = @toolslibdir@
with_engine = @with_engine@
CLASSFILE = gjdoc.jar
-SRCDIRS = antlr com gnu
+SRCDIRS = antlr
toolslib_DATA = $(CLASSFILE)
-antlr_SRCS = \
+LIBDIR = lib
+JAR_CMD1 = ($(FASTJAR) cf $(CLASSFILE) -C $(LIBDIR) $(SRCDIRS))
+JAR_CMD2 = ($(FASTJAR) uf $(CLASSFILE) -C $(LIBDIR) gnu)
+JAR_CMD3 = ($(FASTJAR) uf $(CLASSFILE) -C $(LIBDIR) com)
+JAR_CMD4 = (PWD=`pwd` && cd $(srcdir) && $(FASTJAR) uf $(PWD)/$(CLASSFILE)
$(gjdoc_ressources))
+JAR_CMD5 = ($(FASTJAR) uf $(CLASSFILE) version.properties)
+CPATH =
.:$(srcdir):$(LIBDIR):$(top_builddir)/libraries/javalib/vmspecific/kaffe-vminterface.jar:$(top_builddir)/libraries/javalib/external/classpath/lib/glibj.zip
+AM_JAVACFLAGS = -classpath $(CPATH)
+JAVAC = $(JAVA_COMPILER)
+JAVAROOT = $(LIBDIR)
+
+# Use a fake install class and dir to keep automake's JAVA (un)install tasks
happy.
+FAKE = fakeinstall
+gjdocdir = $(FAKE)
+dist_gjdoc_JAVA = \
antlr/collections/impl/ASTArray.java \
+ antlr/collections/impl/ASTEnumerator.java \
antlr/collections/impl/BitSet.java \
- antlr/collections/impl/Vector.java \
antlr/collections/impl/IntRange.java \
+ antlr/collections/impl/Vector.java \
antlr/collections/impl/VectorEnumerator.java \
- antlr/collections/impl/ASTEnumerator.java \
antlr/collections/AST.java \
antlr/collections/ASTEnumeration.java \
antlr/collections/Enumerator.java \
antlr/ANTLRException.java \
antlr/ANTLRHashString.java \
+ antlr/ANTLRStringBuffer.java \
antlr/ASTFactory.java \
+ antlr/ASTNULLType.java \
antlr/ASTPair.java \
+ antlr/BaseAST.java \
antlr/ByteBuffer.java \
antlr/CharBuffer.java \
+ antlr/CharFormatter.java \
+ antlr/CharQueue.java \
antlr/CharScanner.java \
antlr/CharStreamException.java \
antlr/CharStreamIOException.java \
+ antlr/CommonAST.java \
antlr/CommonToken.java \
+ antlr/DefaultFileLineFormatter.java \
+ antlr/FileLineFormatter.java \
antlr/InputBuffer.java \
- antlr/LexerSharedInputState.java \
antlr/LLkParser.java \
+ antlr/LexerSharedInputState.java \
antlr/MismatchedCharException.java \
antlr/MismatchedTokenException.java \
antlr/NoViableAltException.java \
antlr/NoViableAltForCharException.java \
+ antlr/Parser.java \
antlr/ParserSharedInputState.java \
antlr/RecognitionException.java \
antlr/SemanticException.java \
+ antlr/StringUtils.java \
antlr/Token.java \
antlr/TokenBuffer.java \
+ antlr/TokenQueue.java \
antlr/TokenStream.java \
antlr/TokenStreamException.java \
antlr/TokenStreamIOException.java \
antlr/TokenStreamRecognitionException.java \
- antlr/CharFormatter.java \
- antlr/CharQueue.java \
- antlr/ANTLRStringBuffer.java \
- antlr/CommonAST.java \
- antlr/Parser.java \
- antlr/TokenQueue.java \
- antlr/FileLineFormatter.java \
- antlr/BaseAST.java \
+ antlr/TreeParser.java \
+ antlr/TreeParserSharedInputState.java \
antlr/Utils.java \
+ antlr/debug/Event.java \
+ antlr/debug/GuessingEvent.java \
+ antlr/debug/ListenerBase.java \
+ antlr/debug/MessageEvent.java \
antlr/debug/MessageListener.java \
antlr/debug/ParserListener.java \
+ antlr/debug/ParserMatchEvent.java \
antlr/debug/ParserMatchListener.java \
+ antlr/debug/ParserTokenEvent.java \
antlr/debug/ParserTokenListener.java \
+ antlr/debug/SemanticPredicateEvent.java \
antlr/debug/SemanticPredicateListener.java \
+ antlr/debug/SyntacticPredicateEvent.java \
antlr/debug/SyntacticPredicateListener.java \
- antlr/debug/TraceListener.java \
- antlr/debug/ListenerBase.java \
antlr/debug/TraceEvent.java \
- antlr/debug/SyntacticPredicateEvent.java \
- antlr/debug/SemanticPredicateEvent.java \
- antlr/debug/ParserTokenEvent.java \
- antlr/debug/ParserMatchEvent.java \
- antlr/debug/MessageEvent.java \
- antlr/debug/Event.java \
- antlr/debug/GuessingEvent.java \
- antlr/DefaultFileLineFormatter.java \
- antlr/StringUtils.java \
- antlr/TreeParser.java \
- antlr/ASTNULLType.java \
- antlr/TreeParserSharedInputState.java
-
-gjdoc_jar_SRCS = \
+ antlr/debug/TraceListener.java \
com/sun/javadoc/ClassDoc.java \
com/sun/javadoc/ConstructorDoc.java \
com/sun/javadoc/Doc.java \
@@ -442,42 +446,48 @@
com/sun/javadoc/RootDoc.java \
com/sun/javadoc/SeeTag.java \
com/sun/javadoc/SerialFieldTag.java \
+ com/sun/javadoc/SourcePosition.java \
com/sun/javadoc/Tag.java \
com/sun/javadoc/ThrowsTag.java \
com/sun/javadoc/Type.java \
com/sun/javadoc/TypeVariable.java \
- com/sun/javadoc/SourcePosition.java \
com/sun/tools/doclets/Taglet.java \
- gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTranslet.java \
-
gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletConfigurationException.java
\
-
gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletException.java \
- gnu/classpath/tools/doclets/xmldoclet/doctranslet/JarClassLoader.java \
- gnu/classpath/tools/doclets/xmldoclet/doctranslet/OutputFileInfo.java \
-
gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletOptions.java \
- gnu/classpath/tools/doclets/xmldoclet/Driver.java \
- gnu/classpath/tools/doclets/xmldoclet/Driver1_4.java \
- gnu/classpath/tools/doclets/xmldoclet/HtmlRepairer.java \
- gnu/classpath/tools/doclets/xmldoclet/TargetContext.java \
- gnu/classpath/tools/doclets/htmldoclet/CssClass.java \
- gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java \
- gnu/classpath/tools/doclets/htmldoclet/HtmlPage.java \
- gnu/classpath/tools/doclets/htmldoclet/ExternalDocSet.java \
- gnu/classpath/tools/doclets/htmldoclet/HtmlTagletContext.java \
+ gnu/classpath/tools/doclets/debugdoclet/DebugDoclet.java \
gnu/classpath/tools/doclets/AbstractDoclet.java \
gnu/classpath/tools/doclets/DocletConfigurationException.java \
gnu/classpath/tools/doclets/DocletOption.java \
gnu/classpath/tools/doclets/DocletOptionColonSeparated.java \
gnu/classpath/tools/doclets/DocletOptionFile.java \
gnu/classpath/tools/doclets/DocletOptionFlag.java \
+ gnu/classpath/tools/doclets/DocletOptionPackageWildcard.java \
gnu/classpath/tools/doclets/DocletOptionString.java \
+ gnu/classpath/tools/doclets/InlineTagRenderer.java \
gnu/classpath/tools/doclets/InvalidPackageWildcardException.java \
gnu/classpath/tools/doclets/PackageGroup.java \
gnu/classpath/tools/doclets/PackageMatcher.java \
gnu/classpath/tools/doclets/StandardTaglet.java \
gnu/classpath/tools/doclets/TagletPrinter.java \
- gnu/classpath/tools/doclets/debugdoclet/DebugDoclet.java \
- gnu/classpath/tools/doclets/DocletOptionPackageWildcard.java \
- gnu/classpath/tools/doclets/InlineTagRenderer.java \
+ gnu/classpath/tools/doclets/htmldoclet/CssClass.java \
+ gnu/classpath/tools/doclets/htmldoclet/ExternalDocSet.java \
+ gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java \
+ gnu/classpath/tools/doclets/htmldoclet/HtmlPage.java \
+ gnu/classpath/tools/doclets/htmldoclet/HtmlTagletContext.java \
+ gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTranslet.java \
+
gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletConfigurationException.java
\
+
gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletException.java \
+
gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletOptions.java \
+ gnu/classpath/tools/doclets/xmldoclet/doctranslet/JarClassLoader.java \
+ gnu/classpath/tools/doclets/xmldoclet/doctranslet/OutputFileInfo.java \
+ gnu/classpath/tools/doclets/xmldoclet/Driver.java \
+ gnu/classpath/tools/doclets/xmldoclet/Driver1_4.java \
+ gnu/classpath/tools/doclets/xmldoclet/HtmlRepairer.java \
+ gnu/classpath/tools/doclets/xmldoclet/TargetContext.java \
+ gnu/classpath/tools/FileSystemClassLoader.java \
+ gnu/classpath/tools/IOToolkit.java \
+ gnu/classpath/tools/MalformedInputEvent.java \
+ gnu/classpath/tools/MalformedInputListener.java \
+ gnu/classpath/tools/NotifyingInputStreamReader.java \
+ gnu/classpath/tools/StringToolkit.java \
gnu/classpath/tools/gjdoc/expr/AdditionExpression.java \
gnu/classpath/tools/gjdoc/expr/AndExpression.java \
gnu/classpath/tools/gjdoc/expr/BinaryBitwiseExpression.java \
@@ -504,8 +514,8 @@
gnu/classpath/tools/gjdoc/expr/Context.java \
gnu/classpath/tools/gjdoc/expr/DivisionExpression.java \
gnu/classpath/tools/gjdoc/expr/EqualExpression.java \
- gnu/classpath/tools/gjdoc/expr/EvaluatorEnvironment.java \
gnu/classpath/tools/gjdoc/expr/Evaluator.java \
+ gnu/classpath/tools/gjdoc/expr/EvaluatorEnvironment.java \
gnu/classpath/tools/gjdoc/expr/ExclusiveOrExpression.java \
gnu/classpath/tools/gjdoc/expr/Expression.java \
gnu/classpath/tools/gjdoc/expr/GreaterThanExpression.java \
@@ -513,6 +523,9 @@
gnu/classpath/tools/gjdoc/expr/IdentifierExpression.java \
gnu/classpath/tools/gjdoc/expr/IllegalExpressionException.java \
gnu/classpath/tools/gjdoc/expr/InclusiveOrExpression.java \
+ gnu/classpath/tools/gjdoc/expr/JavaLexer.java \
+ gnu/classpath/tools/gjdoc/expr/JavaRecognizer.java \
+ gnu/classpath/tools/gjdoc/expr/JavaTokenTypes.java \
gnu/classpath/tools/gjdoc/expr/LessThanExpression.java \
gnu/classpath/tools/gjdoc/expr/LessThanOrEqualExpression.java \
gnu/classpath/tools/gjdoc/expr/LogicalAndExpression.java \
@@ -526,17 +539,15 @@
gnu/classpath/tools/gjdoc/expr/ShiftLeftExpression.java \
gnu/classpath/tools/gjdoc/expr/ShiftRightExpression.java \
gnu/classpath/tools/gjdoc/expr/SubtractionExpression.java \
- gnu/classpath/tools/gjdoc/expr/TypeCastExpression.java \
gnu/classpath/tools/gjdoc/expr/Type.java \
+ gnu/classpath/tools/gjdoc/expr/TypeCastExpression.java \
gnu/classpath/tools/gjdoc/expr/UnaryExpression.java \
gnu/classpath/tools/gjdoc/expr/UnknownIdentifierException.java \
- gnu/classpath/tools/gjdoc/expr/JavaLexer.java \
- gnu/classpath/tools/gjdoc/expr/JavaRecognizer.java \
- gnu/classpath/tools/gjdoc/expr/JavaTokenTypes.java \
gnu/classpath/tools/gjdoc/AbstractTagImpl.java \
gnu/classpath/tools/gjdoc/ArrayCharacterIterator.java \
gnu/classpath/tools/gjdoc/ClassDocImpl.java \
gnu/classpath/tools/gjdoc/ClassDocProxy.java \
+ gnu/classpath/tools/gjdoc/ClassDocReflectedImpl.java \
gnu/classpath/tools/gjdoc/ConstructorDocImpl.java \
gnu/classpath/tools/gjdoc/Debug.java \
gnu/classpath/tools/gjdoc/DirectoryTree.java \
@@ -544,6 +555,9 @@
gnu/classpath/tools/gjdoc/ErrorReporter.java \
gnu/classpath/tools/gjdoc/ExecutableMemberDocImpl.java \
gnu/classpath/tools/gjdoc/FieldDocImpl.java \
+ gnu/classpath/tools/gjdoc/GjdocPackageDoc.java \
+ gnu/classpath/tools/gjdoc/GjdocRootDoc.java \
+ gnu/classpath/tools/gjdoc/InheritDocTagImpl.java \
gnu/classpath/tools/gjdoc/JavadocWrapper.java \
gnu/classpath/tools/gjdoc/LinkTagImpl.java \
gnu/classpath/tools/gjdoc/Main.java \
@@ -558,6 +572,8 @@
gnu/classpath/tools/gjdoc/RootDocImpl.java \
gnu/classpath/tools/gjdoc/SeeTagImpl.java \
gnu/classpath/tools/gjdoc/SerialFieldTagImpl.java \
+ gnu/classpath/tools/gjdoc/SourcePositionImpl.java \
+ gnu/classpath/tools/gjdoc/TagContainer.java \
gnu/classpath/tools/gjdoc/TagImpl.java \
gnu/classpath/tools/gjdoc/TemporaryStore.java \
gnu/classpath/tools/gjdoc/TextTagImpl.java \
@@ -566,31 +582,19 @@
gnu/classpath/tools/gjdoc/TimerDoclet.java \
gnu/classpath/tools/gjdoc/TypeImpl.java \
gnu/classpath/tools/gjdoc/TypeVariableImpl.java \
- gnu/classpath/tools/gjdoc/WritableType.java \
- gnu/classpath/tools/gjdoc/GjdocPackageDoc.java \
- gnu/classpath/tools/gjdoc/GjdocRootDoc.java \
- gnu/classpath/tools/gjdoc/SourcePositionImpl.java \
- gnu/classpath/tools/gjdoc/InheritDocTagImpl.java \
- gnu/classpath/tools/gjdoc/TagContainer.java \
gnu/classpath/tools/gjdoc/ValueTagImpl.java \
- gnu/classpath/tools/gjdoc/ClassDocReflectedImpl.java \
+ gnu/classpath/tools/gjdoc/WritableType.java \
+ gnu/classpath/tools/java2xhtml/Java2xhtml.java \
+ gnu/classpath/tools/taglets/AuthorTaglet.java \
gnu/classpath/tools/taglets/CodeTaglet.java \
gnu/classpath/tools/taglets/CopyrightTaglet.java \
- gnu/classpath/tools/taglets/AuthorTaglet.java \
gnu/classpath/tools/taglets/DeprecatedTaglet.java \
gnu/classpath/tools/taglets/GenericTaglet.java \
+ gnu/classpath/tools/taglets/GnuExtendedTaglet.java \
gnu/classpath/tools/taglets/SinceTaglet.java \
gnu/classpath/tools/taglets/TagletContext.java \
- gnu/classpath/tools/taglets/VersionTaglet.java \
- gnu/classpath/tools/taglets/GnuExtendedTaglet.java \
gnu/classpath/tools/taglets/ValueTaglet.java \
- gnu/classpath/tools/java2xhtml/Java2xhtml.java \
- gnu/classpath/tools/FileSystemClassLoader.java \
- gnu/classpath/tools/IOToolkit.java \
- gnu/classpath/tools/StringToolkit.java \
- gnu/classpath/tools/MalformedInputEvent.java \
- gnu/classpath/tools/MalformedInputListener.java \
- gnu/classpath/tools/NotifyingInputStreamReader.java
+ gnu/classpath/tools/taglets/VersionTaglet.java
gjdoc_ressources = \
dtd/gjdoc-alphaindex.dtd \
@@ -665,13 +669,6 @@
gnu/classpath/tools/doclets/xmldoclet/doctranslet/package.html \
gnu/classpath/tools/gjdoc/expr/java-expression.g
-JAR_CMD1 = (cd $(LIBDIR) && $(FASTJAR) -cf $(CURDIR)/[EMAIL PROTECTED]
$(SRCDIRS))
-JAR_CMD2 = (cd $(srcdir) && $(FASTJAR) -uf $(CURDIR)/[EMAIL PROTECTED]
$(gjdoc_ressources))
-JAR_CMD3 = ($(FASTJAR) -uf $(CURDIR)/[EMAIL PROTECTED] version.properties)
-LIBDIR = lib
-rebuildLib = $(top_builddir)/libraries/javalib/rebuildLib
-real_builddir = $(shell cd $(top_builddir) && pwd)
-Klasses_jar =
$(real_builddir)/libraries/javalib/external/classpath/lib/glibj.zip
all: all-am
.SUFFIXES:
@@ -716,6 +713,31 @@
distclean-libtool:
-rm -f libtool
uninstall-info-am:
+
+classdist_gjdoc.stamp: $(dist_gjdoc_JAVA)
+ @if test -n "$?"; then \
+ echo '$(CLASSPATH_ENV) $(JAVAC) -d $(JAVAROOT) $(AM_JAVACFLAGS)
$(JAVACFLAGS) $?' ; \
+ $(CLASSPATH_ENV) $(JAVAC) -d $(JAVAROOT) \
+ $(AM_JAVACFLAGS) $(JAVACFLAGS) $?; \
+ else :; fi
+ echo timestamp > classdist_gjdoc.stamp
+install-dist_gjdocJAVA: classdist_gjdoc.stamp
+ @$(NORMAL_INSTALL)
+ test -z "$(gjdocdir)" || $(mkdir_p) "$(DESTDIR)$(gjdocdir)"
+ @test -z "$(dist_gjdoc_JAVA)" || for p in *.class; do \
+ echo " $(INSTALL_DATA) '$$p' '$(DESTDIR)$(gjdocdir)/$$p'"; \
+ $(INSTALL_DATA) "$$p" "$(DESTDIR)$(gjdocdir)/$$p"; \
+ done
+
+uninstall-dist_gjdocJAVA:
+ @$(NORMAL_UNINSTALL)
+ @test -z "$(dist_gjdoc_JAVA)" || for p in *.class; do \
+ echo " rm -f '$(DESTDIR)$(gjdocdir)/$$p'"; \
+ rm -f "$(DESTDIR)$(gjdocdir)/$$p"; \
+ done
+
+clean-dist_gjdocJAVA:
+ -rm -f *.class classdist_gjdoc.stamp
install-toolslibDATA: $(toolslib_DATA)
@$(NORMAL_INSTALL)
test -z "$(toolslibdir)" || $(mkdir_p) "$(DESTDIR)$(toolslibdir)"
@@ -770,9 +792,9 @@
done
check-am: all-am
check: check-am
-all-am: Makefile $(DATA)
+all-am: Makefile classdist_gjdoc.stamp $(DATA)
installdirs:
- for dir in "$(DESTDIR)$(toolslibdir)"; do \
+ for dir in "$(DESTDIR)$(gjdocdir)" "$(DESTDIR)$(toolslibdir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-am
@@ -801,7 +823,8 @@
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
-clean-am: clean-generic clean-libtool clean-local mostlyclean-am
+clean-am: clean-dist_gjdocJAVA clean-generic clean-libtool clean-local \
+ mostlyclean-am
distclean: distclean-am
-rm -f Makefile
@@ -817,7 +840,8 @@
info-am:
-install-data-am: install-toolslibDATA
+install-data-am: install-data-local install-dist_gjdocJAVA \
+ install-toolslibDATA
install-exec-am:
@@ -843,45 +867,37 @@
ps-am:
-uninstall-am: uninstall-info-am uninstall-toolslibDATA
+uninstall-am: uninstall-dist_gjdocJAVA uninstall-info-am \
+ uninstall-local uninstall-toolslibDATA
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
- clean-local distclean distclean-generic distclean-libtool \
- distdir dvi dvi-am html html-am info info-am install \
- install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
- install-strip install-toolslibDATA installcheck \
+.PHONY: all all-am check check-am clean clean-dist_gjdocJAVA \
+ clean-generic clean-libtool clean-local distclean \
+ distclean-generic distclean-libtool distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-data-local install-dist_gjdocJAVA \
+ install-exec install-exec-am install-info install-info-am \
+ install-man install-strip install-toolslibDATA installcheck \
installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
- uninstall-info-am uninstall-toolslibDATA
-
+ uninstall-dist_gjdocJAVA uninstall-info-am uninstall-local \
+ uninstall-toolslibDATA
-clean-local:
- rm -rf $(LIBDIR)
-.PHONY: new-classes
-new-classes: $(top_srcdir)/developers/update-class-list
- cd $(srcdir) && $(SHELL) $(top_srcdir)/developers/update-class-list
-
-.PHONY: compile-classes classes
-compile-classes $(LIBDIR)/stamp classes: $(rebuildLib) $(antlr_SRCS)
$(gjdoc_jar_SRCS) $(gjdoc_jar_GENSOURCES)
- rm -rf $(LIBDIR)
- mkdir $(LIBDIR)
- echo $(SHELL) $(rebuildLib)
- BOOTCLASSPATH=$(Klasses_jar) $(SHELL) $(rebuildLib) $(antlr_SRCS)
$(gjdoc_jar_SRCS) $(gjdoc_jar_GENSOURCES)
- echo timestamp > $(LIBDIR)/stamp
-
-.PHONY: jar-classes
-jar-classes: $(CLASSFILE)
-$(CLASSFILE): $(LIBDIR)/stamp
- rm -f $@ [EMAIL PROTECTED]
+$(CLASSFILE): classdist_gjdoc.stamp
+ rm -f $(CLASSFILE)
$(JAR_CMD1)
$(JAR_CMD2)
$(JAR_CMD3)
- mv [EMAIL PROTECTED] $@
+ $(JAR_CMD4)
+ $(JAR_CMD5)
-export JAVA_COMPILER top_builddir LIBDIR srcdir
+clean-local:
+ rm -rf $(LIBDIR) $(CLASSFILE)
+install-data-local:
+ touch $(FAKE).class
+uninstall-local:
+ rm $(FAKE).class
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
_______________________________________________
kaffe mailing list
[email protected]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
