diff options
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-06-11 21:33:23 +0000 |
|---|---|---|
| committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-06-11 21:33:23 +0000 |
| commit | 7b24a05308b7b7c04d3bb82dad3a61bc066331a4 (patch) | |
| tree | 85707181127fe4a676bfd384589362c988e3d214 | |
| parent | c62dc61301c0721603c49045dfeb3e34ab3a52bc (diff) | |
| download | classpath-7b24a05308b7b7c04d3bb82dad3a61bc066331a4.tar.gz | |
Forward port native-only build fix #01
2008-06-01 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Makefile.am: Use default makedistcheck
flags that test all optional dependencies.
* 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 | 8 | ||||
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | include/Makefile.am | 2 | ||||
| -rw-r--r-- | lib/Makefile.am | 3 |
4 files changed, 14 insertions, 2 deletions
@@ -1,3 +1,11 @@ +2008-06-01 Andrew John Hughes <gnu_andrew@member.fsf.org> + + * Makefile.am: Use default makedistcheck + flags that test all optional dependencies. + * 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-06-11 Andrew John Hughes <gnu_andrew@member.fsf.org> * doc/www.gnu.org/announce/20080606.wml, diff --git a/Makefile.am b/Makefile.am index 15ec47fe7..2483509fd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,7 +14,8 @@ EXTRA_DIST = HACKING BUGS THANKYOU mauve-classpath LICENSE ChangeLog-2007 \ 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/include/Makefile.am b/include/Makefile.am index 6ae67827a..4191f7d27 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -158,6 +158,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 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 |