Merge GNU Classpath 0.99 into libjava.

[gcc.git] / libjava / classpath / Makefile.am

diff --git a/libjava/classpath/Makefile.am b/libjava/classpath/Makefile.am
index dc3373a190fc0d0cdf4db53e10329701f7031379..454b2e9602363c44be385ddaffb34e9e56ae338c 100644 (file)
--- a/libjava/classpath/Makefile.am
+++ b/libjava/classpath/Makefile.am
@@ -1,22 +1,23 @@
 ## Input file for automake to generate the Makefile.in used by configure
 
 # lib first, to compile .class files before native code, last examples
-## GCJ LOCAL: we remove 'tools' for the time being.
-## We don't build any of them into actual tools yet.
-SUBDIRS = lib doc external include native resource scripts $(EXAMPLESDIR)
-DIST_SUBDIRS = lib doc external include native resource scripts examples
+## GCJ LOCAL: unconditionally build tools subdur
+SUBDIRS = lib doc external include native resource scripts tools $(EXAMPLESDIR)
+DIST_SUBDIRS = lib doc external include native resource scripts tools examples
 
+# Allow users to pass site-specific flags to autoreconf via an env var. 
 ## GCJ LOCAL: we need an extra -I here.
-ACLOCAL_AMFLAGS = -I m4 -I ../.. -I ../../config
+ACLOCAL_AMFLAGS = -I m4 -I ../.. -I ../../config ${LOCAL_AUTORECONF_FLAGS}
 
 native: lib
 
-EXTRA_DIST = HACKING BUGS THANKYOU mauve-classpath LICENSE \
-             ChangeLog-2003 ChangeLog-2004 ChangeLog-2005 \
+EXTRA_DIST = HACKING BUGS THANKYOU mauve-classpath LICENSE ChangeLog-2007 \
+             ChangeLog-2003 ChangeLog-2004 ChangeLog-2005 ChangeLog-2006 \
              ChangeLog.gnujaxp.1 ChangeLog.gnujaxp.2 ChangeLog.libxmlj \
-            autogen.sh
+            autogen.sh ChangeLog-2008
 
-#DISTCHECK_CONFIGURE_FLAGS = --enable-gjdoc
+DISTCHECK_CONFIGURE_FLAGS = --with-gjdoc --enable-gstreamer-peer \
+       --enable-xmlj --enable-qt-peer
 
 dist-hook:
        -$(mkinstalldirs) $(distdir)/include