Index: Makefile.am
===================================================================
RCS file: /cvsroot/classpath/gjdoc/Makefile.am,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile.am
--- Makefile.am	1 Feb 2005 15:32:37 -0000	1.16
+++ Makefile.am	1 Feb 2005 22:26:33 -0000
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in.
 
-AM_GCJFLAGS = --classpath=$(CLASSPATH) -fassume-compiled -I$(srcdir)/src -I$(ANTLR_JAR) -I.
+AM_GCJFLAGS = --classpath=$(CLASSPATH) -fassume-compiled -I$(srcdir)/src -I$(srcdir) -I$(ANTLR_JAR) -I.
 
 LIBGCJCOMPILE = $(LIBTOOL) --tag=GCJ --mode=compile $(GCJ) $(AM_GCJFLAGS) $(GCJFLAGS) -c -MD -MT $@
 GCJCOMPILE = $(LIBGCJCOMPILE) -MF $(@:.o=.d)
@@ -76,6 +76,8 @@ lib_gnu_classpath_tools_gjdoc_la_SOURCES
 	gnu/classpath/tools/gjdoc/expr/JavaTokenTypes.java \
 	$(XML_SRC)
 
+EXTRA_DIST = src/gnu/classpath/tools/gjdoc/expr/java-expression.g
+
 noinst_DATA = \
 	antlr.jar
 
@@ -258,8 +260,6 @@ gnu_classpath_tools_gjdoc_jar_ENTS = \
 	dtd/ent/iso-pub.ent \
 	dtd/ent/iso-tech.ent
 
-EXTRA_DIST = java-expression.g
-
 gnu_classpath_tools_gjdoc_jar_HTML = doctranslets/html/res/default_help_en.html
 
 gnu_classpath_tools_gjdoc_jar_JS = \
@@ -345,7 +345,7 @@ gnu-classpath-tools-gjdoc-$(VERSION).jar
 	$(gnu_classpath_tools_gjdoc_jar_PROPERTIES) $(gnu_classpath_tools_gjdoc_jar_RNGS) \
 	$(gnu_classpath_tools_gjdoc_jar_TXTS) $(gnu_classpath_tools_gjdoc_jar_XHTML) \
 	$(gnu_classpath_tools_gjdoc_jar_XSLS) ; \
-	do  cp $(srcdir)/src/resources/$$res $$res ; done
+	do  cp -u $(srcdir)/src/resources/$$res $$res ; done
 	$(JAR) cfm $@ gjdoc.mf -C classes gnu \
 	$(gnu_classpath_tools_gjdoc_jar_CSS) $(gnu_classpath_tools_gjdoc_jar_DTDS) \
 	$(gnu_classpath_tools_gjdoc_jar_ENTS) $(gnu_classpath_tools_gjdoc_jar_MODS) \
@@ -420,14 +420,25 @@ $(gnu_classpath_tools_gjdoc_jar_GENCLASS
 	$(GCJ) $(AM_GCJFLAGS) -g -C -d genclasses $<
 
 clean-local:
-	rm -rf classes $(data_JARS) antlr.jar
+	rm -rf classes $(data_JARS) antlr.jar $(datadir)
+	for res in $(gnu_classpath_tools_gjdoc_jar_CSS) $(gnu_classpath_tools_gjdoc_jar_DTDS) \
+	$(gnu_classpath_tools_gjdoc_jar_ENTS) $(gnu_classpath_tools_gjdoc_jar_MODS) \
+	$(gnu_classpath_tools_gjdoc_jar_PROPERTIES) $(gnu_classpath_tools_gjdoc_jar_RNGS) \
+	$(gnu_classpath_tools_gjdoc_jar_TXTS) $(gnu_classpath_tools_gjdoc_jar_XHTML) \
+	$(gnu_classpath_tools_gjdoc_jar_XSLS) ; \
+	do rm -f $$res; done
+	rm -rf htmldoclet doctranslets genclasses rng dtd
+	rm -f gjdoc.mf antlr.so java.lang-classes-1.{2,3,4,5}.d
+
+uninstall-hook:
+	rm -rf classes $(data_JARS) antlr.jar $(datadir)
 
 dist-hook:
 	test -d $(distdir)/src/ || mkdir $(distdir)/src
 	cp -R $(srcdir)/src/resources $(distdir)/src
 	-find $(distdir)/src/resources -name CVS -exec rm -rf {} \;
 
-install-data-hook:
+install-hook:
 	$(INSTALL) -d $(datadir)/java
 	$(INSTALL) -d $(datadir)/java/ext
 	$(INSTALL) --mode 644 $(data_JARS) $(datadir)/java