diff options
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-06-01 17:16:46 +0000 |
|---|---|---|
| committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-06-01 17:16:46 +0000 |
| commit | b7a9629aac342c6381c8b8e93cb54d63dd0a322c (patch) | |
| tree | 545fd133e615de877b948eccc7d266465436da68 | |
| parent | 165dd5ea69e2905f52d8acaca902fa5c0aa09a45 (diff) | |
| download | classpath-b7a9629aac342c6381c8b8e93cb54d63dd0a322c.tar.gz | |
2008-06-01 Andrew John Hughes <gnu_andrew@member.fsf.org>
* 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.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | include/Makefile.am | 5 | ||||
| -rw-r--r-- | lib/Makefile.am | 3 |
5 files changed, 16 insertions, 6 deletions
@@ -1,3 +1,12 @@ +2008-06-01 Andrew John Hughes <gnu_andrew@member.fsf.org> + + * 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. + 2008-03-11 Andrew John Hughes <gnu_andrew@member.fsf.org> * configure.ac: Set version to 0.97.1 diff --git a/Makefile.am b/Makefile.am index d85e3075e..6c80d064d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,7 +14,8 @@ EXTRA_DIST = HACKING BUGS THANKYOU mauve-classpath LICENSE \ 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 diff --git a/configure.ac b/configure.ac index e9c04c294..78ef7fb76 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,7 @@ dnl ----------------------------------------------------------- dnl define([AC_CACHE_LOAD], )dnl dnl define([AC_CACHE_SAVE], )dnl -AC_INIT([GNU Classpath],[0.97.1],[classpath@gnu.org],[classpath]) +AC_INIT([GNU Classpath],[0.97.2-pre],[classpath@gnu.org],[classpath]) AC_CONFIG_SRCDIR(java/lang/System.java) AC_CANONICAL_TARGET diff --git a/include/Makefile.am b/include/Makefile.am index 6ae67827a..84a093f68 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -148,7 +148,6 @@ java_lang_VMMath.h \ java_lang_VMProcess.h \ java_lang_VMSystem.h \ java_lang_reflect_VMArray.h \ -java_math_VMBigInteger.h \ java_net_VMInetAddress.h \ java_net_VMNetworkInterface.h \ java_net_VMURLConnection.h \ @@ -158,6 +157,8 @@ java_util_VMTimeZone.h 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 @@ -394,8 +395,6 @@ java_lang_VMSystem.h: $(top_srcdir)/vm/reference/java/lang/VMSystem.java $(JAVAH) -o $@ java.lang.VMSystem java_lang_reflect_VMArray.h: $(top_srcdir)/vm/reference/java/lang/reflect/VMArray.java $(JAVAH) -o $@ java.lang.reflect.VMArray -java_math_VMBigInteger.h: $(top_srcdir)/vm/reference/java/math/VMBigInteger.java - $(JAVAH) -o $@ java.math.VMBigInteger java_net_VMInetAddress.h: $(top_srcdir)/vm/reference/java/net/VMInetAddress.java $(JAVAH) -o $@ java.net.VMInetAddress java_net_VMNetworkInterface.h: $(top_srcdir)/vm/reference/java/net/VMNetworkInterface.java diff --git a/lib/Makefile.am b/lib/Makefile.am index 429caf005..9ac7b5d00 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -136,7 +136,7 @@ compile-classes: classes $(JAVA_SRCS) Makefile 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 @@ dist-hook: 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 |