[kaffe] small make dist fix

[Dalibor Topic]

With that patch make dist creates useable distribution archives again, but ...
make distcheck fails with:

/bin/sh ./rebuildLib @essential.files
Compiling classes from @essential.files using 
/tmp/topic/build/kaffe-1.1.x-cvs/_build/kaffe/kaffe/kaffe-bin -verbosegc
at.dms.kjc.Main
Couldn't find or load essential class `java/lang/Object'
java.lang.ClassNotFoundException java/lang/Object
./rebuildLib: line 51:  5133 Aborted                 $JAVAC $VERBOSE
$JAVAC_FLAGS -d $LIBDIR $CPATH ${1+"$@"}

any ideas?

--- Dalibor Topic <robilad at yahoo.com> wrote:
> Hi.
> 
> attached you'll find a small fix for make dist.
> 
> 2003-06-05 Dalibor Topic <robilad at yahoo.com>
> 
> * Makefile.am:
> (EXTRA_DIST) added FAQ/FAQ.cross-compiling.
> 
> * libraries/extensions/Makefile.am:
> (DIST_SUBDIRS) new variable.
> 
> * Makefile.in, scripts/Makefile.in, scripts/compat/Makefile.in,
> libraries/extensions/Makefile.in: regenerated.
> 
> cheers,
> dalibor topic
> 
> __________________________________
> Do you Yahoo!?
> Yahoo! Calendar - Free online calendar with sync to Outlook(TM).
> http://calendar.yahoo.com> ? autom4te.cache
> ? libltdl/autom4te.cache
> Index: Makefile.am
> ===================================================================
> RCS file: /cvs/kaffe/kaffe/Makefile.am,v
> retrieving revision 1.34
> diff -u -r1.34 Makefile.am
> --- Makefile.am	2 Jun 2003 04:34:01 -0000	1.34
> +++ Makefile.am	5 Jun 2003 10:36:27 -0000
> @@ -35,6 +35,7 @@
>  	FAQ/FAQ.class-states \
>  	FAQ/FAQ.classlibrary-compile \
>  	FAQ/FAQ.coding-style \
> +	FAQ/FAQ.cross-compiling \
>  	FAQ/FAQ.debugging \
>  	FAQ/FAQ.depend \
>  	FAQ/FAQ.dmalloc \
> Index: Makefile.in
> ===================================================================
> RCS file: /cvs/kaffe/kaffe/Makefile.in,v
> retrieving revision 1.99
> diff -u -r1.99 Makefile.in
> --- Makefile.in	2 Jun 2003 04:34:01 -0000	1.99
> +++ Makefile.in	5 Jun 2003 10:36:27 -0000
> @@ -267,6 +267,7 @@
>  	FAQ/FAQ.class-states \
>  	FAQ/FAQ.classlibrary-compile \
>  	FAQ/FAQ.coding-style \
> +	FAQ/FAQ.cross-compiling \
>  	FAQ/FAQ.debugging \
>  	FAQ/FAQ.depend \
>  	FAQ/FAQ.dmalloc \
> Index: kaffe/scripts/Makefile.in
> ===================================================================
> RCS file: /cvs/kaffe/kaffe/kaffe/scripts/Makefile.in,v
> retrieving revision 1.80
> diff -u -r1.80 Makefile.in
> --- kaffe/scripts/Makefile.in	2 Jun 2003 04:34:03 -0000	1.80
> +++ kaffe/scripts/Makefile.in	5 Jun 2003 10:36:28 -0000
> @@ -252,8 +252,8 @@
>  
>  
>  @SUN_COMPAT_TRUE at SUBDIRS = compat
> - at SUN_COMPAT_TRUE@SCRIPTFILES_COMPAT = 
>  @SUN_COMPAT_FALSE at SCRIPTFILES_COMPAT = appletviewer javac javadoc
> + at SUN_COMPAT_TRUE@SCRIPTFILES_COMPAT = 
>  
>  @ENABLE_XPROF_TRUE at SCRIPTFILES_XPROF = kaffexprof nm2as.awk
>  @ENABLE_XPROF_FALSE at SCRIPTFILES_XPROF = 
> Index: kaffe/scripts/compat/Makefile.in
> ===================================================================
> RCS file: /cvs/kaffe/kaffe/kaffe/scripts/compat/Makefile.in,v
> retrieving revision 1.63
> diff -u -r1.63 Makefile.in
> --- kaffe/scripts/compat/Makefile.in	2 Jun 2003 04:34:04 -0000	1.63
> +++ kaffe/scripts/compat/Makefile.in	5 Jun 2003 10:36:28 -0000
> @@ -237,11 +237,11 @@
>  target_alias = @target_alias@
>  toolslibdir = @toolslibdir@
>  with_engine = @with_engine@
> + at SUN_COMPAT_FALSE@jrebin_SCRIPTS = 
>  
>  @SUN_COMPAT_TRUE at jrebin_SCRIPTS = java
> - at SUN_COMPAT_FALSE@jrebin_SCRIPTS = 
> - at SUN_COMPAT_TRUE@bin_SCRIPTS = appletviewer javac javadoc
>  @SUN_COMPAT_FALSE at bin_SCRIPTS = 
> + at SUN_COMPAT_TRUE@bin_SCRIPTS = appletviewer javac javadoc
>  subdir = kaffe/scripts/compat
>  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
> Index: libraries/extensions/Makefile.am
> ===================================================================
> RCS file: /cvs/kaffe/kaffe/libraries/extensions/Makefile.am,v
> retrieving revision 1.7
> diff -u -r1.7 Makefile.am
> --- libraries/extensions/Makefile.am	27 May 2003 18:14:33 -0000	1.7
> +++ libraries/extensions/Makefile.am	5 Jun 2003 10:36:28 -0000
> @@ -7,3 +7,5 @@
>  # of this file. 
>  
>  SUBDIRS = @INCLUDED_EXTENSIONS@
> +
> +DIST_SUBDIRS = comm microsoft pjava servlet sound
> Index: libraries/extensions/Makefile.in
> ===================================================================
> RCS file: /cvs/kaffe/kaffe/libraries/extensions/Makefile.in,v
> retrieving revision 1.53
> diff -u -r1.53 Makefile.in
> --- libraries/extensions/Makefile.in	29 May 2003 18:09:13 -0000	1.53
> +++ libraries/extensions/Makefile.in	5 Jun 2003 10:36:28 -0000
> @@ -239,6 +239,8 @@
>  with_engine = @with_engine@
>  
>  SUBDIRS = @INCLUDED_EXTENSIONS@
> +
> +DIST_SUBDIRS = comm microsoft pjava servlet sound
>  subdir = libraries/extensions
>  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
> @@ -253,7 +255,6 @@
>  	installdirs-recursive install-recursive uninstall-recursive \
>  	check-recursive installcheck-recursive
>  DIST_COMMON = Makefile.am Makefile.in
> -DIST_SUBDIRS = $(SUBDIRS)
>  all: all-recursive
>  
>  .SUFFIXES:
> @@ -428,7 +429,7 @@
>  	    || exit 1; \
>  	  fi; \
>  	done
> -	list='$(SUBDIRS)'; for subdir in $$list; do \
> +	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
>  	  if test "$$subdir" = .; then :; else \
>  	    test -d $(distdir)/$$subdir \
>  	    || mkdir $(distdir)/$$subdir \
> 


__________________________________
Do you Yahoo!?
Yahoo! Calendar - Free online calendar with sync to Outlook(TM).
http://calendar.yahoo.com