Index: Makefile.am
===================================================================
RCS file: /cvsroot/classpath/gjdoc/Makefile.am,v
retrieving revision 1.4
diff -c -p -r1.4 Makefile.am
*** Makefile.am	25 Nov 2004 19:10:49 -0000	1.4
--- Makefile.am	29 Nov 2004 22:10:51 -0000
*************** gjdoc_LINK = $(GCJLINK)
*** 20,26 ****
  gjdoc_LDADD = -l-com-sun-javadoc -l-com-sun-tools-doclets-Taglet \
  	-l-gnu-classpath-tools-gjdoc \
  	-l-gnu-xml -lxmlj
! gjdoc_LDFLAGS = --main=gnu.classpath.tools.gjdoc.Main
  
  lib_com_sun_javadoc_la_SOURCES = \
  	src/com/sun/javadoc/ClassDoc.java \
--- 20,28 ----
  gjdoc_LDADD = -l-com-sun-javadoc -l-com-sun-tools-doclets-Taglet \
  	-l-gnu-classpath-tools-gjdoc \
  	-l-gnu-xml -lxmlj
! 
! gjdoc_LDFLAGS = --main=gnu.classpath.tools.gjdoc.Main -Djavax.xml.transform.TransformerFactory=gnu.xml.transform.TransformerFactoryImpl -Djavax.xml.parsers.DocumentBuilderFactory=gnu.xml.dom.DomDocumentBuilderFactory
! #lib_gnu_classpath_tools_gjdoc_la_LDFLAGS = --main=gnu.classpath.tools.gjdoc.Main -Djavax.xml.transform.TransformerFactory=gnu.xml.transform.TransformerFactoryImpl -Djavax.xml.parsers.DocumentBuilderFactory=gnu.xml.dom.DomDocumentBuilderFactory
  
  lib_com_sun_javadoc_la_SOURCES = \
  	src/com/sun/javadoc/ClassDoc.java \
*************** lib_gnu_classpath_tools_gjdoc_la_SOURCES
*** 59,64 ****
--- 61,70 ----
  	src/gnu/classpath/tools/doclets/xmldoclet/FileSystemClassLoader.java \
  	src/gnu/classpath/tools/doclets/xmldoclet/HtmlRepairer.java \
  	src/gnu/classpath/tools/doclets/xmldoclet/TargetContext.java \
+ 	src/gnu/classpath/tools/doclets/xmldoclet/StandardTaglet.java \
+ 	src/gnu/classpath/tools/doclets/xmldoclet/PackageMatcher.java \
+ 	src/gnu/classpath/tools/doclets/xmldoclet/PackageGroup.java \
+ 	src/gnu/classpath/tools/doclets/xmldoclet/InvalidPackageWildcardException.java \
  	src/gnu/classpath/tools/gjdoc/AbstractTagImpl.java \
  	src/gnu/classpath/tools/gjdoc/ArrayCharacterIterator.java \
  	src/gnu/classpath/tools/gjdoc/ClassDocImpl.java \
*************** lib_gnu_classpath_tools_gjdoc_la_LIBADD 
*** 114,119 ****
--- 120,127 ----
  	$(lib_gnu_classpath_tools_gjdoc_la_XSLS) \
  	$(lib_gnu_classpath_tools_gjdoc_la_TXTS)
  
+ #lib_gnu_classpath_tools_gjdoc_la_LDFLAGS = --main=gnu.classpath.tools.gjdoc.Main -Djavax.xml.transform.TransformerFactory=gnu.xml.transform.TransformerFactoryImpl -Djavax.xml.parsers.DocumentBuilderFactory=gnu.xml.dom.DomDocumentBuilderFactory
+ 
  gnu_classpath_tool_gjdoc_jar_CSS = \
  	doctranslets/html/res/gjdochtml-clean.css \
  	doctranslets/html/res/gjdochtml-fixed.css \
*************** gnu_classpath_tools_gjdoc_jar_XSLS = \
*** 182,188 ****
  	doctranslets/html/index_noframes.xsl \
  	doctranslets/html/index.xsl \
  	doctranslets/html/packageclasses.xsl \
! 	doctranslets/html/packagedoc.xsl
  
  com_sun_javadoc_jar_CLASSES = $(patsubst src/%.java,classes/%.class,$(lib_com_sun_javadoc_la_SOURCES))
  com_sun_tools_doclets_Taglet_jar_CLASSES = $(patsubst src/%.java,classes/%.class,$(lib_com_sun_tools_doclets_Taglet_la_SOURCES))
--- 190,197 ----
  	doctranslets/html/index_noframes.xsl \
  	doctranslets/html/index.xsl \
  	doctranslets/html/packageclasses.xsl \
! 	doctranslets/html/packagedoc.xsl \
! 	doctranslets/html/serialized.xsl
  
  com_sun_javadoc_jar_CLASSES = $(patsubst src/%.java,classes/%.class,$(lib_com_sun_javadoc_la_SOURCES))
  com_sun_tools_doclets_Taglet_jar_CLASSES = $(patsubst src/%.java,classes/%.class,$(lib_com_sun_tools_doclets_Taglet_la_SOURCES))