[kaffe] CVS kaffe (robilad): Make distcheck fixed again

[Kaffe CVS]

PatchSet 5596 
Date: 2005/03/24 01:44:32
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Make distcheck fixed again

2005-03-24  Dalibor Topic  <robilad at kaffe.org>

        * libraries/javalib/Makefile.am.in (EXTRA_DIST, dist-hook):
        Copy source code manually to avoid automake bugs. This fixes
        make distcheck again.

Members: 
	ChangeLog:1.3769->1.3770 
	libraries/javalib/Makefile.am:1.328->1.329 
	libraries/javalib/Makefile.am.in:1.36->1.37 
	libraries/javalib/Makefile.in:1.415->1.416 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3769 kaffe/ChangeLog:1.3770
--- kaffe/ChangeLog:1.3769	Thu Mar 24 01:07:38 2005
+++ kaffe/ChangeLog	Thu Mar 24 01:44:32 2005
@@ -1,5 +1,11 @@
 2005-03-24  Dalibor Topic  <robilad at kaffe.org>
 
+	* libraries/javalib/Makefile.am.in (EXTRA_DIST, dist-hook):
+	Copy source code manually to avoid automake bugs. This fixes
+	make distcheck again.
+
+2005-03-24  Dalibor Topic  <robilad at kaffe.org>
+
 	* config/sparc/atomic-sparc32.h: Removed glibc specific tags
 	that broke build on sparc.
 
Index: kaffe/libraries/javalib/Makefile.am
diff -u kaffe/libraries/javalib/Makefile.am:1.328 kaffe/libraries/javalib/Makefile.am:1.329
--- kaffe/libraries/javalib/Makefile.am:1.328	Mon Mar 21 19:16:19 2005
+++ kaffe/libraries/javalib/Makefile.am	Thu Mar 24 01:44:35 2005
@@ -5073,18 +5073,16 @@
 	META-INF \
 	all.files \
 	$(OMITTED_PACKAGES_SRCS) \
-	$(serialized_converters) \
-	$(gnu_regexp_message_bundles) \
-	$(gnu_getopt_message_bundles) \
-	$(installed_properties) \
-	com gnu java javax kaffe org
+	$(installed_properties)
 
 LIBDIR = lib
 
 dist-hook:
+	mkdir -p $(distdir)
+	cp -dfR $(srcdir)/com $(srcdir)/gnu $(srcdir)/java $(srcdir)/javax $(srcdir)/org $(srcdir)/kaffe $(distdir)
 	rm -rf `find $(distdir) -name CVS`
 	rm -rf `find $(distdir) -name *~`
-	rm $(distdir)/gnu/classpath/Configuration.java
+	rm -f  $(distdir)/gnu/classpath/Configuration.java
 
 clean-local:
 	rm -rf $(LIBDIR) rt.jar
Index: kaffe/libraries/javalib/Makefile.am.in
diff -u kaffe/libraries/javalib/Makefile.am.in:1.36 kaffe/libraries/javalib/Makefile.am.in:1.37
--- kaffe/libraries/javalib/Makefile.am.in:1.36	Sun Feb 13 21:56:30 2005
+++ kaffe/libraries/javalib/Makefile.am.in	Thu Mar 24 01:44:36 2005
@@ -161,18 +161,16 @@
 	META-INF \
 	all.files \
 	$(OMITTED_PACKAGES_SRCS) \
-	$(serialized_converters) \
-	$(gnu_regexp_message_bundles) \
-	$(gnu_getopt_message_bundles) \
-	$(installed_properties) \
-	com gnu java javax kaffe org
+	$(installed_properties)
 
 LIBDIR = lib
 
 dist-hook:
+	mkdir -p $(distdir)
+	cp -dfR $(srcdir)/com $(srcdir)/gnu $(srcdir)/java $(srcdir)/javax $(srcdir)/org $(srcdir)/kaffe $(distdir)
 	rm -rf `find $(distdir) -name CVS`
 	rm -rf `find $(distdir) -name *~`
-	rm $(distdir)/gnu/classpath/Configuration.java
+	rm -f  $(distdir)/gnu/classpath/Configuration.java
 
 clean-local:
 	rm -rf $(LIBDIR) rt.jar
Index: kaffe/libraries/javalib/Makefile.in
diff -u kaffe/libraries/javalib/Makefile.in:1.415 kaffe/libraries/javalib/Makefile.in:1.416
--- kaffe/libraries/javalib/Makefile.in:1.415	Mon Mar 21 19:16:19 2005
+++ kaffe/libraries/javalib/Makefile.in	Thu Mar 24 01:44:36 2005
@@ -5714,11 +5714,7 @@
 	META-INF \
 	all.files \
 	$(OMITTED_PACKAGES_SRCS) \
-	$(serialized_converters) \
-	$(gnu_regexp_message_bundles) \
-	$(gnu_getopt_message_bundles) \
-	$(installed_properties) \
-	com gnu java javax kaffe org
+	$(installed_properties)
 
 LIBDIR = lib
 rebuildLib = ./rebuildLib
@@ -5923,7 +5919,6 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/gnu/getopt $(distdir)/gnu/regexp $(distdir)/kaffe/io
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
@@ -6065,9 +6060,11 @@
 
 
 dist-hook:
+	mkdir -p $(distdir)
+	cp -dfR $(srcdir)/com $(srcdir)/gnu $(srcdir)/java $(srcdir)/javax $(srcdir)/org $(srcdir)/kaffe $(distdir)
 	rm -rf `find $(distdir) -name CVS`
 	rm -rf `find $(distdir) -name *~`
-	rm $(distdir)/gnu/classpath/Configuration.java
+	rm -f  $(distdir)/gnu/classpath/Configuration.java
 
 clean-local:
 	rm -rf $(LIBDIR) rt.jar