We need to allow for a native-only build to allow
bootstrapping on systems like arm, alpha and hppa
where no other Java environment (like GCJ) is available.
I'm going to roll out another minor release (0.97.2) to
fix this, so I'll first apply these patches to the release
branch and then merge over. This will allow Classpath 0.97 to
go into Debian.
ChangeLog:
2008-03-11 Andrew John Hughes <[EMAIL PROTECTED]>
* Makefile.am: Use default makedistcheck
flags that test all optional dependencies.
* configure.ac: Set version to 0.97.2-pre.
* include/Makefile.am: Add header files to dist.
* lib/Makefile.am: Trick class files into being
built for dist, so headers can be generated.
--
Andrew :)
Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8
Index: Makefile.am
===================================================================
RCS file: /sources/classpath/classpath/Makefile.am,v
retrieving revision 1.47
diff -u -u -r1.47 Makefile.am
--- Makefile.am 22 Apr 2007 22:48:20 -0000 1.47
+++ Makefile.am 1 Jun 2008 17:08:13 -0000
@@ -14,7 +14,8 @@
ChangeLog.gnujaxp.1 ChangeLog.gnujaxp.2 ChangeLog.libxmlj \
autogen.sh
-#DISTCHECK_CONFIGURE_FLAGS = --enable-gjdoc
+DISTCHECK_CONFIGURE_FLAGS = --with-gjdoc --enable-gstreamer-peer \
+ --enable-xmlj --enable-qt-peer
dist-hook:
-$(mkinstalldirs) $(distdir)/include
Index: configure.ac
===================================================================
RCS file: /sources/classpath/classpath/configure.ac,v
retrieving revision 1.225.2.1
diff -u -u -r1.225.2.1 configure.ac
--- configure.ac 11 Mar 2008 20:27:44 -0000 1.225.2.1
+++ configure.ac 1 Jun 2008 17:08:14 -0000
@@ -6,7 +6,7 @@
dnl define([AC_CACHE_LOAD], )dnl
dnl define([AC_CACHE_SAVE], )dnl
-AC_INIT([GNU Classpath],[0.97.1],[EMAIL PROTECTED],[classpath])
+AC_INIT([GNU Classpath],[0.97.2-pre],[EMAIL PROTECTED],[classpath])
AC_CONFIG_SRCDIR(java/lang/System.java)
AC_CANONICAL_TARGET
Index: include/Makefile.am
===================================================================
RCS file: /sources/classpath/classpath/include/Makefile.am,v
retrieving revision 1.85
diff -u -u -r1.85 Makefile.am
--- include/Makefile.am 10 Feb 2008 23:28:11 -0000 1.85
+++ include/Makefile.am 1 Jun 2008 17:08:21 -0000
@@ -157,6 +157,8 @@
if CREATE_JNI_HEADERS
+EXTRA_DIST=$(H_FILES)
+
all-local: $(H_FILES)
gnu_xml_libxmlj_dom_GnomeDocument.h:
$(top_srcdir)/gnu/xml/libxmlj/dom/GnomeDocument.java
Index: lib/Makefile.am
===================================================================
RCS file: /sources/classpath/classpath/lib/Makefile.am,v
retrieving revision 1.142
diff -u -u -r1.142 Makefile.am
--- lib/Makefile.am 12 Feb 2008 22:30:22 -0000 1.142
+++ lib/Makefile.am 1 Jun 2008 17:08:26 -0000
@@ -136,7 +136,7 @@
touch compile-classes
#endif
-EXTRA_DIST = standard.omit.in mkcollections.pl.in Makefile.gcj split-for-gcj.sh
+EXTRA_DIST = standard.omit.in mkcollections.pl.in Makefile.gcj
split-for-gcj.sh glibj.zip
CLEANFILES = compile-classes resources classes \
glibj.zip classes.1 classes.2 Makefile.deps \
$(top_builddir)/gnu/java/locale/LocaleData.java \
@@ -163,3 +163,4 @@
rm -f $(distdir)/../gnu/classpath/Configuration.java
rm -f $(distdir)/../gnu/java/security/Configuration.java
rm -f $(distdir)/../gnu/java/locale/LocaleData.java
+ rm -f $(distdir)/glibj.zip
