--- Makefile.am.nonlibtool	2004-09-29 10:03:55.000000000 -0400
+++ Makefile.am.libtool	2004-09-29 10:07:50.000000000 -0400
@@ -2,6 +2,10 @@
 
 AM_GCJFLAGS = --classpath=$(CLASSPATH) -fassume-compiled -I$(srcdir)/src
 
+LIBGCJCOMPILE = $(LIBTOOL) --tag=GCJ --mode=compile $(GCJ) $(AM_GCJFLAGS) $(GCJFLAGS) -c -MD -MT $@
+GCJCOMPILE = $(LIBGCJCOMPILE) -MF $(@:.o=.d)
+LTGCJCOMPILE = $(LIBGCJCOMPILE) -MF $(@:.lo=.d)
+
 data_JARS = com-sun-javadoc-$(VERSION).jar \
 	com-sun-tools-doclets-Taglet-$(VERSION).jar \
 	gnu-classpath-tools-gjdoc-$(VERSION).jar
@@ -146,12 +150,12 @@
 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))
 gnu_classpath_tools_gjdoc_jar_CLASSES = $(patsubst src/%.java,classes/%.class,$(lib_gnu_classpath_tools_gjdoc_la_SOURCES))
-lib_gnu_classpath_tools_gjdoc_la_CSS = $(patsubst %.css,%.o,$(gnu_classpath_tools_gjdoc_jar_CSS))
-lib_gnu_classpath_tools_gjdoc_la_DTDS = $(patsubst %.dtd,%.o,$(gnu_classpath_tools_gjdoc_jar_DTDS))
-lib_gnu_classpath_tools_gjdoc_la_ENTS = $(patsubst %.ent,%.o,$(gnu_classpath_tools_gjdoc_jar_ENTS))
-lib_gnu_classpath_tools_gjdoc_la_MODS = $(patsubst %.mod,%.o,$(gnu_classpath_tools_gjdoc_jar_MODS))
-lib_gnu_classpath_tools_gjdoc_la_RNGS = $(patsubst %.rng,%.o,$(gnu_classpath_tools_gjdoc_jar_RNGS))
-lib_gnu_classpath_tools_gjdoc_la_XSLS = $(patsubst %.xsl,%.o,$(gnu_classpath_tools_gjdoc_jar_XSLS))
+lib_gnu_classpath_tools_gjdoc_la_CSS = $(patsubst %.css,%.lo,$(gnu_classpath_tools_gjdoc_jar_CSS))
+lib_gnu_classpath_tools_gjdoc_la_DTDS = $(patsubst %.dtd,%.lo,$(gnu_classpath_tools_gjdoc_jar_DTDS))
+lib_gnu_classpath_tools_gjdoc_la_ENTS = $(patsubst %.ent,%.lo,$(gnu_classpath_tools_gjdoc_jar_ENTS))
+lib_gnu_classpath_tools_gjdoc_la_MODS = $(patsubst %.mod,%.lo,$(gnu_classpath_tools_gjdoc_jar_MODS))
+lib_gnu_classpath_tools_gjdoc_la_RNGS = $(patsubst %.rng,%.lo,$(gnu_classpath_tools_gjdoc_jar_RNGS))
+lib_gnu_classpath_tools_gjdoc_la_XSLS = $(patsubst %.xsl,%.lo,$(gnu_classpath_tools_gjdoc_jar_XSLS))
 
 com-sun-javadoc-$(VERSION).jar: classes $(com_sun_javadoc_jar_CLASSES)
 	$(JAR) cf $@ -C classes com/sun/javadoc
@@ -173,24 +177,24 @@
 	$(gnu_classpath_tools_gjdoc_jar_ENTS) $(gnu_classpath_tools_gjdoc_jar_MODS) \
 	$(gnu_classpath_tools_gjdoc_jar_RNGS) $(gnu_classpath_tools_gjdoc_jar_XSLS)
 
-$(lib_gnu_classpath_tools_gjdoc_la_CSS): %.o: $(srcdir)/src/resources/%.css
-	$(GCJ) $(AM_GCJFLAGS) $(GCJFLAGS) -c -o $@ --resource=$*.dtd $<
+$(lib_gnu_classpath_tools_gjdoc_la_CSS): %.lo: $(srcdir)/src/resources/%.css
+	$(LTGCJCOMPILE) -c -o $@ --resource=$*.dtd $<
 
-$(lib_gnu_classpath_tools_gjdoc_la_DTDS): %.o: $(srcdir)/src/resources/%.dtd
-	$(GCJ) $(AM_GCJFLAGS) $(GCJFLAGS) -c -o $@ --resource=$*.dtd $<
+$(lib_gnu_classpath_tools_gjdoc_la_DTDS): %.lo: $(srcdir)/src/resources/%.dtd
+	$(LTGCJCOMPILE) -c -o $@ --resource=$*.dtd $<
 
-$(lib_gnu_classpath_tools_gjdoc_la_ENTS): %.o: $(srcdir)/src/resources/%.ent
+$(lib_gnu_classpath_tools_gjdoc_la_ENTS): %.lo: $(srcdir)/src/resources/%.ent
 	test -d dtd/ent || mkdir -p dtd/ent
-	$(GCJ) $(AM_GCJFLAGS) $(GCJFLAGS) -c -o $@ --resource=$*.ent $<
+	$(LTGCJCOMPILE) -c -o $@ --resource=$*.ent $<
 
-$(lib_gnu_classpath_tools_gjdoc_la_MODS): %.o: $(srcdir)/src/resources/%.mod
-	$(GCJ) $(AM_GCJFLAGS) $(GCJFLAGS) -c -o $@ --resource=$*.mod $<
+$(lib_gnu_classpath_tools_gjdoc_la_MODS): %.lo: $(srcdir)/src/resources/%.mod
+	$(LTGCJCOMPILE) -c -o $@ --resource=$*.mod $<
 
-$(lib_gnu_classpath_tools_gjdoc_la_RNGS): %.o: $(srcdir)/src/resources/%.rng
-	$(GCJ) $(AM_GCJFLAGS) $(GCJFLAGS) -c -o $@ --resource=$*.rng $<
+$(lib_gnu_classpath_tools_gjdoc_la_RNGS): %.lo: $(srcdir)/src/resources/%.rng
+	$(LTGCJCOMPILE) -c -o $@ --resource=$*.rng $<
 
-$(lib_gnu_classpath_tools_gjdoc_la_XSLS): %.o: $(srcdir)/src/resources/%.xsl
-	$(GCJ) $(AM_GCJFLAGS) $(GCJFLAGS) -c -o $@ --resource=$*.xsl $<
+$(lib_gnu_classpath_tools_gjdoc_la_XSLS): %.lo: $(srcdir)/src/resources/%.xsl
+	$(LTGCJCOMPILE) -c -o $@ --resource=$*.xsl $<
 
 classes:
 	mkdir classes