PatchSet 7329
Date: 2006/07/10 23:59:52
Author: robilad
Branch: HEAD
Tag: (none)
Log:
replace regen-forward in kaffeh by AC_CONFIG_LINKS
2006-07-11 Dalibor Topic <[EMAIL PROTECTED]>
* configure.ac (AC_CONFIG_LINKS) Link files from kaffevm
into kaffeh directory to compile them there as well. This
should really become a shared library eventually.
* kaffe/kaffeh/Makefile.am (GEN_SRCS, DISTCLEANFILES,
$(GEN_SRCS), dist-hook) Removed.
(nodist_kaffeh_SOURCES) List the linked over sources.
Members:
ChangeLog:1.4832->1.4833
Makefile.in:1.254->1.255
configure:1.548->1.549
configure.ac:1.226->1.227
kaffe/kaffeh/Makefile.am:1.25->1.26
kaffe/kaffeh/Makefile.in:1.178->1.179
kaffe/kaffevm/Makefile.in:1.232->1.233
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4832 kaffe/ChangeLog:1.4833
--- kaffe/ChangeLog:1.4832 Mon Jul 10 22:51:14 2006
+++ kaffe/ChangeLog Mon Jul 10 23:59:52 2006
@@ -1,3 +1,13 @@
+2006-07-11 Dalibor Topic <[EMAIL PROTECTED]>
+
+ * configure.ac (AC_CONFIG_LINKS) Link files from kaffevm
+ into kaffeh directory to compile them there as well. This
+ should really become a shared library eventually.
+
+ * kaffe/kaffeh/Makefile.am (GEN_SRCS, DISTCLEANFILES,
+ $(GEN_SRCS), dist-hook) Removed.
+ (nodist_kaffeh_SOURCES) List the linked over sources.
+
2006-07-11 Riccardo Mottola <[EMAIL PROTECTED]>
* libraries/javalib/awt-implementations/kaffe/java/awt/Component.java:
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.254 kaffe/Makefile.in:1.255
--- kaffe/Makefile.in:1.254 Sun Jul 9 16:58:31 2006
+++ kaffe/Makefile.in Tue Jul 11 00:00:03 2006
@@ -738,7 +738,7 @@
distdir: $(DISTFILES)
$(am__remove_distdir)
mkdir $(distdir)
- $(mkdir_p) $(distdir)/. $(distdir)/FAQ $(distdir)/compat-include
$(distdir)/developers $(distdir)/kaffe/man $(distdir)/kaffe/scripts
$(distdir)/kaffe/scripts/compat $(distdir)/libraries/javalib $(distdir)/m4
$(distdir)/po $(distdir)/scripts $(distdir)/test/regression
$(distdir)/test/regression/compile_time $(distdir)/test/regression/compiler
$(distdir)/test/regression/run_time $(distdir)/tools/gjdoc/javalib
+ $(mkdir_p) $(distdir)/. $(distdir)/FAQ $(distdir)/compat-include
$(distdir)/developers $(distdir)/kaffe/kaffevm $(distdir)/kaffe/man
$(distdir)/kaffe/scripts $(distdir)/kaffe/scripts/compat
$(distdir)/libraries/javalib $(distdir)/m4 $(distdir)/po $(distdir)/scripts
$(distdir)/test/regression $(distdir)/test/regression/compile_time
$(distdir)/test/regression/compiler $(distdir)/test/regression/run_time
$(distdir)/tools/gjdoc/javalib
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
Index: kaffe/configure
diff -u kaffe/configure:1.548 kaffe/configure:1.549
--- kaffe/configure:1.548 Mon Jul 10 07:48:46 2006
+++ kaffe/configure Tue Jul 11 00:00:04 2006
@@ -51210,6 +51210,21 @@
ac_config_files="$ac_config_files test/jni/Makefile"
+ ac_config_links="$ac_config_links
kaffe/kaffeh/constants.c:kaffe/kaffevm/constants.c"
+
+ ac_config_links="$ac_config_links
kaffe/kaffeh/debug.c:kaffe/kaffevm/debug.c"
+
+ ac_config_links="$ac_config_links
kaffe/kaffeh/file.c:kaffe/kaffevm/file.c"
+
+ ac_config_links="$ac_config_links
kaffe/kaffeh/jar.c:kaffe/kaffevm/jar.c"
+
+ ac_config_links="$ac_config_links
kaffe/kaffeh/readClass.c:kaffe/kaffevm/readClass.c"
+
+ ac_config_links="$ac_config_links
kaffe/kaffeh/utf8const.c:kaffe/kaffevm/utf8const.c"
+
+ ac_config_links="$ac_config_links
kaffe/kaffeh/binreloc.c:kaffe/kaffevm/binreloc.c"
+
+
if test x"$with_engine" != x"intrp" ; then
ac_config_links="$ac_config_links config/jit-md.h:$CONFIG_JIT_MD_H"
@@ -52150,6 +52165,13 @@
"test/regression/run_time/Makefile" ) CONFIG_FILES="$CONFIG_FILES
test/regression/run_time/Makefile" ;;
"test/regression/run_time/CompileScript" ) CONFIG_FILES="$CONFIG_FILES
test/regression/run_time/CompileScript" ;;
"test/jni/Makefile" ) CONFIG_FILES="$CONFIG_FILES test/jni/Makefile" ;;
+ "kaffe/kaffeh/constants.c" ) CONFIG_LINKS="$CONFIG_LINKS
kaffe/kaffeh/constants.c:kaffe/kaffevm/constants.c" ;;
+ "kaffe/kaffeh/debug.c" ) CONFIG_LINKS="$CONFIG_LINKS
kaffe/kaffeh/debug.c:kaffe/kaffevm/debug.c" ;;
+ "kaffe/kaffeh/file.c" ) CONFIG_LINKS="$CONFIG_LINKS
kaffe/kaffeh/file.c:kaffe/kaffevm/file.c" ;;
+ "kaffe/kaffeh/jar.c" ) CONFIG_LINKS="$CONFIG_LINKS
kaffe/kaffeh/jar.c:kaffe/kaffevm/jar.c" ;;
+ "kaffe/kaffeh/readClass.c" ) CONFIG_LINKS="$CONFIG_LINKS
kaffe/kaffeh/readClass.c:kaffe/kaffevm/readClass.c" ;;
+ "kaffe/kaffeh/utf8const.c" ) CONFIG_LINKS="$CONFIG_LINKS
kaffe/kaffeh/utf8const.c:kaffe/kaffevm/utf8const.c" ;;
+ "kaffe/kaffeh/binreloc.c" ) CONFIG_LINKS="$CONFIG_LINKS
kaffe/kaffeh/binreloc.c:kaffe/kaffevm/binreloc.c" ;;
"config/jit-md.h" ) CONFIG_LINKS="$CONFIG_LINKS
config/jit-md.h:$CONFIG_JIT_MD_H" ;;
"config/callKaffeException.h" ) CONFIG_LINKS="$CONFIG_LINKS
config/callKaffeException.h:$CONFIG_CALLKAFFEEXCEPTION_H" ;;
"config/xprofile-md.h" ) CONFIG_LINKS="$CONFIG_LINKS
config/xprofile-md.h:$CONFIG_XPROFILE_MD_H" ;;
Index: kaffe/configure.ac
diff -u kaffe/configure.ac:1.226 kaffe/configure.ac:1.227
--- kaffe/configure.ac:1.226 Mon Jul 10 07:48:53 2006
+++ kaffe/configure.ac Tue Jul 11 00:00:15 2006
@@ -2612,6 +2612,14 @@
AC_CONFIG_FILES([test/regression/run_time/CompileScript])
AC_CONFIG_FILES([test/jni/Makefile])
+AC_CONFIG_LINKS([kaffe/kaffeh/constants.c:kaffe/kaffevm/constants.c])
+AC_CONFIG_LINKS([kaffe/kaffeh/debug.c:kaffe/kaffevm/debug.c])
+AC_CONFIG_LINKS([kaffe/kaffeh/file.c:kaffe/kaffevm/file.c])
+AC_CONFIG_LINKS([kaffe/kaffeh/jar.c:kaffe/kaffevm/jar.c])
+AC_CONFIG_LINKS([kaffe/kaffeh/readClass.c:kaffe/kaffevm/readClass.c])
+AC_CONFIG_LINKS([kaffe/kaffeh/utf8const.c:kaffe/kaffevm/utf8const.c])
+AC_CONFIG_LINKS([kaffe/kaffeh/binreloc.c:kaffe/kaffevm/binreloc.c])
+
if test x"$with_engine" != x"intrp" ; then
AC_CONFIG_LINKS([config/jit-md.h:$CONFIG_JIT_MD_H])
AC_CONFIG_LINKS([config/callKaffeException.h:$CONFIG_CALLKAFFEEXCEPTION_H])
Index: kaffe/kaffe/kaffeh/Makefile.am
diff -u kaffe/kaffe/kaffeh/Makefile.am:1.25 kaffe/kaffe/kaffeh/Makefile.am:1.26
--- kaffe/kaffe/kaffeh/Makefile.am:1.25 Sun Jul 9 16:58:45 2006
+++ kaffe/kaffe/kaffeh/Makefile.am Tue Jul 11 00:00:18 2006
@@ -28,17 +28,6 @@
bin_PROGRAMS = kaffeh
-GEN_SRCS = \
- constants.c \
- debug.c \
- file.c \
- jar.c \
- readClass.c \
- utf8const.c \
- binreloc.c
-
-DISTCLEANFILES = $(GEN_SRCS)
-
kaffeh_CFLAGS = \
$(CFLAGS_PG)
@@ -52,18 +41,17 @@
sigs.c \
support.c
-nodist_kaffeh_SOURCES = $(GEN_SRCS)
+nodist_kaffeh_SOURCES = \
+ constants.c \
+ debug.c \
+ file.c \
+ jar.c \
+ readClass.c \
+ utf8const.c \
+ binreloc.c
noinst_HEADERS = \
kaffeh-support.h \
java_lang_ClassLoader.h \
java_lang_Object.h \
java_lang_String.h
-
-$(GEN_SRCS):
- $(SHELL) $(REGEN_FORWARD) $(srcdir)/../kaffevm/$@ $@
-
-##dist-hook:
-## @for file in $(DISTCLEANFILES); do \
-## rm -f $(distdir)/$$file; \
-## done
Index: kaffe/kaffe/kaffeh/Makefile.in
diff -u kaffe/kaffe/kaffeh/Makefile.in:1.178
kaffe/kaffe/kaffeh/Makefile.in:1.179
--- kaffe/kaffe/kaffeh/Makefile.in:1.178 Sun Jul 9 16:58:45 2006
+++ kaffe/kaffe/kaffeh/Makefile.in Tue Jul 11 00:00:18 2006
@@ -74,17 +74,17 @@
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config/config.h
-CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_FILES = constants.c debug.c file.c jar.c readClass.c \
+ utf8const.c binreloc.c
am__installdirs = "$(DESTDIR)$(bindir)"
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
am_kaffeh_OBJECTS = kaffeh-main.$(OBJEXT) kaffeh-mem.$(OBJEXT) \
kaffeh-sigs.$(OBJEXT) kaffeh-support.$(OBJEXT)
-am__objects_1 = kaffeh-constants.$(OBJEXT) kaffeh-debug.$(OBJEXT) \
- kaffeh-file.$(OBJEXT) kaffeh-jar.$(OBJEXT) \
- kaffeh-readClass.$(OBJEXT) kaffeh-utf8const.$(OBJEXT) \
- kaffeh-binreloc.$(OBJEXT)
-nodist_kaffeh_OBJECTS = $(am__objects_1)
+nodist_kaffeh_OBJECTS = kaffeh-constants.$(OBJEXT) \
+ kaffeh-debug.$(OBJEXT) kaffeh-file.$(OBJEXT) \
+ kaffeh-jar.$(OBJEXT) kaffeh-readClass.$(OBJEXT) \
+ kaffeh-utf8const.$(OBJEXT) kaffeh-binreloc.$(OBJEXT)
kaffeh_OBJECTS = $(am_kaffeh_OBJECTS) $(nodist_kaffeh_OBJECTS)
am__DEPENDENCIES_1 =
@[EMAIL PROTECTED] = \
@@ -394,16 +394,6 @@
-I$(top_srcdir)/config/$(Khost_cpu)/$(Khost_os) \
$(MAYBE_INTERNAL_ZIP_INCLUDES)
-GEN_SRCS = \
- constants.c \
- debug.c \
- file.c \
- jar.c \
- readClass.c \
- utf8const.c \
- binreloc.c
-
-DISTCLEANFILES = $(GEN_SRCS)
kaffeh_CFLAGS = \
$(CFLAGS_PG)
@@ -417,7 +407,15 @@
sigs.c \
support.c
-nodist_kaffeh_SOURCES = $(GEN_SRCS)
+nodist_kaffeh_SOURCES = \
+ constants.c \
+ debug.c \
+ file.c \
+ jar.c \
+ readClass.c \
+ utf8const.c \
+ binreloc.c
+
noinst_HEADERS = \
kaffeh-support.h \
java_lang_ClassLoader.h \
@@ -794,7 +792,6 @@
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -861,9 +858,6 @@
pdf pdf-am ps ps-am tags uninstall uninstall-am \
uninstall-binPROGRAMS uninstall-info-am
-
-$(GEN_SRCS):
- $(SHELL) $(REGEN_FORWARD) $(srcdir)/../kaffevm/$@ $@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Index: kaffe/kaffe/kaffevm/Makefile.in
diff -u kaffe/kaffe/kaffevm/Makefile.in:1.232
kaffe/kaffe/kaffevm/Makefile.in:1.233
--- kaffe/kaffe/kaffevm/Makefile.in:1.232 Sun Jul 9 16:58:45 2006
+++ kaffe/kaffe/kaffevm/Makefile.in Tue Jul 11 00:00:19 2006
@@ -50,7 +50,9 @@
host_triplet = @host@
subdir = kaffe/kaffevm
DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in
+ $(srcdir)/Makefile.in $(srcdir)/binreloc.c \
+ $(srcdir)/constants.c $(srcdir)/debug.c $(srcdir)/file.c \
+ $(srcdir)/jar.c $(srcdir)/readClass.c $(srcdir)/utf8const.c
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c_bigendian_cross.m4 \
$(top_srcdir)/m4/acx_pthread.m4 $(top_srcdir)/m4/alsa.m4 \
_______________________________________________
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
