[kaffe] [patch] auto* tools and misc make file changes
Timothy Stack
stack@cs.utah.edu
Mon Feb 3 11:52:01 2003
--%--multipart-mixed-boundary-1.79826.1044301979--%
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
oops, attached now...
tim
--%--multipart-mixed-boundary-1.79826.1044301979--%
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Description: ASCII M4 macro language pre-processor text
Content-Disposition: attachment; filename="kmk.diff"
Index: Makefile.am
===================================================================
RCS file: /cvs/kaffe/kaffe/Makefile.am,v
retrieving revision 1.23
diff -u -r1.23 Makefile.am
--- Makefile.am 20 Nov 2002 12:27:25 -0000 1.23
+++ Makefile.am 3 Feb 2003 18:37:05 -0000
@@ -10,6 +10,8 @@
SUBDIRS = . config include libltdl libraries/clib libraries/extensions kaffe libraries/javalib test
+DIST_SUBDIRS = . config include libltdl kaffe libraries test
+
EXTRA_DIST = \
ChangeLog.1 \
ChangeLog.2 \
Index: configure.in
===================================================================
RCS file: /cvs/kaffe/kaffe/configure.in,v
retrieving revision 1.178
diff -u -r1.178 configure.in
--- configure.in 3 Feb 2003 11:39:33 -0000 1.178
+++ configure.in 3 Feb 2003 18:37:05 -0000
@@ -1,4 +1,4 @@
-AC_INIT(kaffe)
+AC_INIT(kaffe, 1.1.x-cvs, "kaffe@kaffe.org")
AM_INIT_AUTOMAKE(kaffe, 1.1.x-cvs)
AC_PREFIX_DEFAULT(/usr/local/kaffe)
@@ -18,6 +18,7 @@
abssrcdir=`pwd`/$srcdir
;;
esac
+AC_SUBST(abssrcdir)
dnl Setup version number.
KVER=$VERSION
@@ -82,7 +83,7 @@
fi
fi
-AC_ARG_WITH(staticbin,[ --with-staticbin Force the the creation of a static virtual machine binary])
+AC_ARG_WITH(staticbin,[ --with-staticbin Force the creation of a static virtual machine binary])
if test x"$with_staticbin" = x"yes" ; then
vm_dynamic_binary=no
if test x"${with_staticvm+set}" != x"set"; then
@@ -432,9 +433,15 @@
dnl Use jikes instead of kjc?
dnl =========================================================================
-AC_ARG_WITH(jikes,[ --with-jikes[=JIKES] Define to use jikes compiler [default=no]],[JIKES="$withval"],[JIKES=""])
+AC_CHECK_PROG(JIKES, jikes, jikes)
+AC_ARG_WITH(jikes,[ --with-jikes[=JIKES] Define to use jikes compiler],[JIKES="$withval"],[JIKES="$JIKES"])
AC_MSG_CHECKING([whether to use jikes])
-if test x"$with_jikes" = x"" ; then
+if test x"$JIKES" != x"" ; then
+ use_jikes="yes ($JIKES)"
+elif test x"$with_jikes" = x"" ; then
+ use_jikes=no
+ JIKES=
+elif test x"$with_jikes" = x"no" ; then
use_jikes=no
JIKES=
elif test x"$with_jikes" = x"yes" ; then
@@ -793,7 +800,11 @@
dnl We need both getrusage and the header containing its decls.
have_rusage=no
-AC_CHECK_HEADERS(sys/resource.h, AC_CHECK_FUNCS(getrusage, have_rusage=yes))
+have_resource_h=no
+AC_CHECK_HEADERS(sys/resource.h, have_resource_h=yes)
+if test x"$have_resource_h" = x"yes"; then
+ AC_CHECK_FUNCS(getrusage, have_rusage=yes)
+fi
dnl =========================================================================
dnl Do we build a vm that collects statistics?
@@ -1213,6 +1224,10 @@
dnl Check for esd
+have_esd_h=no
+AC_CHECK_HEADER([esd.h],
+ [have_esd_h=yes],
+ [AC_MSG_RESULT([Warning: Could not find Enlightened Sound Daemon header file])])
AC_CHECK_LIB(
esd,
esd_open_sound,
@@ -1246,7 +1261,7 @@
no)
;;
*)
- if test "$have_esd" = "yes"; then
+ if test "$have_esd" = "yes" && test "$have_esd_h" = "yes"; then
ESD_DIR=esd
fi
;;
Index: config/Makefile.am
===================================================================
RCS file: /cvs/kaffe/kaffe/config/Makefile.am,v
retrieving revision 1.21
diff -u -r1.21 Makefile.am
--- config/Makefile.am 2 Jun 2002 06:15:57 -0000 1.21
+++ config/Makefile.am 3 Feb 2003 18:37:05 -0000
@@ -12,7 +12,13 @@
ENGINE_GEN_HDRS =
endif
-GEN_HDRS = md.h xprofile-md.h $(ENGINE_GEN_HDRS)
+if ENABLE_XPROF
+XPROF_HDRS = xprofile-md.h
+else
+XPROF_HDRS =
+endif
+
+GEN_HDRS = md.h $(XPROF_HDRS) $(ENGINE_GEN_HDRS)
DISTCLEANFILES = $(GEN_HDRS)
Index: developers/autogen.sh
===================================================================
RCS file: /cvs/kaffe/kaffe/developers/autogen.sh,v
retrieving revision 1.4
diff -u -r1.4 autogen.sh
--- developers/autogen.sh 14 Nov 2002 22:19:34 -0000 1.4
+++ developers/autogen.sh 3 Feb 2003 18:37:05 -0000
@@ -9,7 +9,7 @@
##
## ( cd libraries/javalib && ../../developers/update-class-list )
aclocal -I .
-autoheader -l config
+autoheader -I config
automake --add-missing --verbose
autoconf
Index: kaffe/kaffevm/Makefile.am
===================================================================
RCS file: /cvs/kaffe/kaffe/kaffe/kaffevm/Makefile.am,v
retrieving revision 1.37
diff -u -r1.37 Makefile.am
--- kaffe/kaffevm/Makefile.am 2 Jun 2002 05:54:46 -0000 1.37
+++ kaffe/kaffevm/Makefile.am 3 Feb 2003 18:37:05 -0000
@@ -47,8 +47,10 @@
gc-mem.c \
md.c
+nodist_libkaffevm_la_SOURCES = \
+ $(libkaffevm_la_GEN_SRCS)
+
libkaffevm_la_SOURCES = \
- $(libkaffevm_la_GEN_SRCS) \
baseClasses.c \
classMethod.c \
classPool.c \
@@ -122,6 +124,8 @@
thread.h \
utf8const.h
+$(libkaffevm_la_SOURCES): $(libkaffevm_la_GEN_SRCS)
+
gc-mem.c: stamp-h01
@if test ! -f $@; then rm -f stamp-h01; $(MAKE) stamp-h01; \
else :; fi
@@ -135,15 +139,9 @@
$(SHELL) $(REGEN_FORWARD) $(KAFFEVM_MD_C) md.c $@
CLEANFILES = so_locations
-DISTCLEANFILES = $(libkaffevm_la_GEN_SRCS)
## This avoids that dependencies produced by `make dist' in a jit
## configuration prevents intrp builds.
jit/icode.h:
include $(top_srcdir)/include/distclean-hack
-
-dist-hook:
- @for file in $(DISTCLEANFILES); do \
- rm -f $(distdir)/$$file; \
- done
Index: kaffe/scripts/compat/Makefile.am
===================================================================
RCS file: /cvs/kaffe/kaffe/kaffe/scripts/compat/Makefile.am,v
retrieving revision 1.2
diff -u -r1.2 Makefile.am
--- kaffe/scripts/compat/Makefile.am 2 Apr 2002 03:14:56 -0000 1.2
+++ kaffe/scripts/compat/Makefile.am 3 Feb 2003 18:37:05 -0000
@@ -9,6 +9,9 @@
if SUN_COMPAT
jrebin_SCRIPTS = java
bin_SCRIPTS = appletviewer javac javadoc
+else
+jrebin_SCRIPTS=
+bin_SCRIPTS=
endif
install-exec-local:
Index: libraries/clib/awt/Makefile.am
===================================================================
RCS file: /cvs/kaffe/kaffe/libraries/clib/awt/Makefile.am,v
retrieving revision 1.4
diff -u -r1.4 Makefile.am
--- libraries/clib/awt/Makefile.am 27 Nov 2002 18:32:56 -0000 1.4
+++ libraries/clib/awt/Makefile.am 3 Feb 2003 18:37:05 -0000
@@ -8,7 +8,7 @@
SUBDIRS = $(AWT_DIR)
-DIST_SUBDIRS = X qte
+DIST_SUBDIRS = X qt
EXTRA_DIST = \
win32/btn.cpp \
Index: libraries/clib/awt/qt/Makefile.am
===================================================================
RCS file: /cvs/kaffe/kaffe/libraries/clib/awt/qt/Makefile.am,v
retrieving revision 1.1
diff -u -r1.1 Makefile.am
--- libraries/clib/awt/qt/Makefile.am 27 Nov 2002 18:32:56 -0000 1.1
+++ libraries/clib/awt/qt/Makefile.am 3 Feb 2003 18:37:05 -0000
@@ -23,7 +23,6 @@
libawt_la_MOC = \
evt.moc.cc
libawt_la_SOURCES = \
- $(libawt_la_MOC) \
tlk.cc \
wnd.cc \
evt.cc \
@@ -32,6 +31,9 @@
clr.cc \
img.cc \
cbd.cc
+
+nodist_libawt_la_SOURCES = \
+ $(libawt_la_MOC)
noinst_HEADERS = \
keysyms.h \
Index: libraries/extensions/sound/Makefile.am
===================================================================
RCS file: /cvs/kaffe/kaffe/libraries/extensions/sound/Makefile.am,v
retrieving revision 1.2
diff -u -r1.2 Makefile.am
--- libraries/extensions/sound/Makefile.am 13 Jan 2003 23:27:57 -0000 1.2
+++ libraries/extensions/sound/Makefile.am 3 Feb 2003 18:37:05 -0000
@@ -7,3 +7,5 @@
# of this file.
SUBDIRS = common $(ALSA_DIR) $(ESD_DIR)
+
+DIST_SUBDIRS = common alsa esd
Index: libraries/extensions/sound/common/Makefile.am
===================================================================
RCS file: /cvs/kaffe/kaffe/libraries/extensions/sound/common/Makefile.am,v
retrieving revision 1.1
diff -u -r1.1 Makefile.am
--- libraries/extensions/sound/common/Makefile.am 6 Jan 2003 17:14:30 -0000 1.1
+++ libraries/extensions/sound/common/Makefile.am 3 Feb 2003 18:37:05 -0000
@@ -11,4 +11,9 @@
libtritonuscommon_la_LDFLAGS = $(KLIBFLAGS) -module -release $(KVER) -export-symbols-regex "^([Jj]ava|kaffe|org)_"
libtritonuscommon_la_SOURCES = common.c
+noinst_HEADERS = \
+ common.h \
+ debug.h \
+ HandleFieldHandler.h
+
CLEANFILES = so_locations
Index: libraries/extensions/sound/esd/Makefile.am
===================================================================
RCS file: /cvs/kaffe/kaffe/libraries/extensions/sound/esd/Makefile.am,v
retrieving revision 1.1
diff -u -r1.1 Makefile.am
--- libraries/extensions/sound/esd/Makefile.am 6 Jan 2003 17:14:30 -0000 1.1
+++ libraries/extensions/sound/esd/Makefile.am 3 Feb 2003 18:37:05 -0000
@@ -14,8 +14,4 @@
org_tritonus_lowlevel_esd_EsdRecordingStream.c \
org_tritonus_lowlevel_esd_EsdStream.c
-noinst_HEADERS = \
- common.h
-
-
CLEANFILES = so_locations
Index: libraries/javalib/Makefile.am
===================================================================
RCS file: /cvs/kaffe/kaffe/libraries/javalib/Makefile.am,v
retrieving revision 1.90
diff -u -r1.90 Makefile.am
--- libraries/javalib/Makefile.am 3 Feb 2003 11:39:46 -0000 1.90
+++ libraries/javalib/Makefile.am 3 Feb 2003 18:37:06 -0000
@@ -2201,7 +2201,19 @@
gnu/regexp/MessagesBundle_fr.properties \
gnu/regexp/MessagesBundle.properties
-EXTRA_DIST = Klasses.jar.bootstrap $(toolslib_DATA) $(Klasses_jar_SRCS) \
+EXTRA_DIST = \
+ Klasses.jar.bootstrap \
+ $(jrelib_DATA) \
+ $(toolslib_DATA) \
+ META-INF \
+ gnu \
+ java \
+ javax \
+ kaffe \
+ org \
+ pure-java \
+ essential.files \
+ profiles \
bootstrap.classlist \
$(OMITTED_PACKAGES_SRCS) \
$(serialized_converters) \
@@ -2211,6 +2223,10 @@
kaffe/lang/unicode.idx \
kaffe/lang/unicode.tbl
+dist-hook:
+ rm -rf `find $(distdir) -name CVS`
+ rm -rf `find $(distdir) -name *~`
+
LIBDIR = lib
clean-local:
@@ -2229,7 +2245,7 @@
mkdir $(LIBDIR)
$(SHELL) $(rebuildLib) @essential.files
$(SHELL) $(rebuildLib) $(@java_math_SRCS@)
- for i in `cat profiles/$(PROFILE)/profile` ; do $(SHELL) $(rebuildLib) @profiles/$(PROFILE)/$$i ; done
+ for i in `cat $(srcdir)/profiles/$(PROFILE)/profile` ; do $(SHELL) $(rebuildLib) @profiles/$(PROFILE)/$$i ; done
echo timestamp > $(LIBDIR)/stamp
$(srcdir)/Klasses.jar.bootstrap: rt.jar bootstrap.classlist
@@ -2237,7 +2253,7 @@
if [ -f $(srcdir)/Klasses.jar.bootstrap ]; then \
mv -f $(srcdir)/Klasses.jar.bootstrap $(srcdir)/Klasses.jar.bootstrap.save; \
fi
- (cd $(LIBDIR) && $(ZIP) -DX -r - `grep '\.class$$' $(srcdir)/bootstrap.classlist` \
+ (cd $(LIBDIR) && $(ZIP) -DX -r - `grep '\.class$$' $(abssrcdir)/libraries/javalib/bootstrap.classlist` \
kaffe/lang/unicode.idx \
kaffe/lang/unicode.tbl \
) > $(srcdir)/Klasses.jar.bootstrap
@@ -2254,6 +2270,8 @@
rm -f rt.jar
(cd $(LIBDIR) && $(ZIP) -DX -r ../rt.jar $(SRCDIRS))
$(ZIP) -r rt.jar $(srcdir)/META-INF
+ rm -f $(srcdir)/rt.jar
+ cp rt.jar $(srcdir)/rt.jar
.PHONY: build-classes Klasses
build-classes Klasses: rt.jar
Index: test/regression/Makefile.am
===================================================================
RCS file: /cvs/kaffe/kaffe/test/regression/Makefile.am,v
retrieving revision 1.68
diff -u -r1.68 Makefile.am
--- test/regression/Makefile.am 10 Jan 2003 10:59:18 -0000 1.68
+++ test/regression/Makefile.am 3 Feb 2003 18:37:06 -0000
@@ -224,4 +224,4 @@
CLEANFILES = *.class *.fail *.out core *.core ExceptionTest ziptest1.zip \
ziptest2.zip frozen_serial
-## check-TESTS: clean TestScript
+all-am: TestScript
--%--multipart-mixed-boundary-1.79826.1044301979--%--