PatchSet 7092
Date: 2006/01/14 10:59:38
Author: guilhem
Branch: HEAD
Tag: (none)
Log:
Fastjar build fix.
* external/gcc/fastjar/Makefile.am: Include the right
subdirectory for zlib.
* external/gcc/fastjar/Makefile.in: Regenerated.
Members:
ChangeLog:1.4612->1.4613
external/gcc/fastjar/Makefile.am:1.4->1.5
external/gcc/fastjar/Makefile.in:1.10->1.11
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4612 kaffe/ChangeLog:1.4613
--- kaffe/ChangeLog:1.4612 Sat Jan 14 09:11:31 2006
+++ kaffe/ChangeLog Sat Jan 14 10:59:38 2006
@@ -1,5 +1,12 @@
2006-01-14 Guilhem Lavaux <[EMAIL PROTECTED]>
+ * external/gcc/fastjar/Makefile.am: Include the right
+ subdirectory for zlib.
+
+ * external/gcc/fastjar/Makefile.in: Regenerated.
+
+2006-01-14 Guilhem Lavaux <[EMAIL PROTECTED]>
+
* kaffe/kaffevm/code-analyse.c
(analyzeBasicBlock): Ensure that the method has not been
translated by this thread while loading a subclass.
Index: kaffe/external/gcc/fastjar/Makefile.am
diff -u kaffe/external/gcc/fastjar/Makefile.am:1.4
kaffe/external/gcc/fastjar/Makefile.am:1.5
--- kaffe/external/gcc/fastjar/Makefile.am:1.4 Tue Jan 10 21:16:15 2006
+++ kaffe/external/gcc/fastjar/Makefile.am Sat Jan 14 10:59:42 2006
@@ -5,8 +5,8 @@
if COND_SYSTEM_ZLIB
LINKED_ZIP_LIBS=$(ZIP_LIBS)
else
-LINKED_ZIP_LIBS=../zlib/libz.la
-MAYBE_INTERNAL_ZIP_INCLUDES=-I../zlib/
+LINKED_ZIP_LIBS=$(top_builddir)/../zlib/libz.la
+MAYBE_INTERNAL_ZIP_INCLUDES=-I$(srcdir)/../zlib/
endif
Index: kaffe/external/gcc/fastjar/Makefile.in
diff -u kaffe/external/gcc/fastjar/Makefile.in:1.10
kaffe/external/gcc/fastjar/Makefile.in:1.11
--- kaffe/external/gcc/fastjar/Makefile.in:1.10 Tue Jan 10 21:16:15 2006
+++ kaffe/external/gcc/fastjar/Makefile.in Sat Jan 14 10:59:42 2006
@@ -67,7 +67,8 @@
fastjar-dostime.$(OBJEXT) fastjar-compress.$(OBJEXT) \
fastjar-pushback.$(OBJEXT) fastjar-shift.$(OBJEXT)
fastjar_OBJECTS = $(am_fastjar_OBJECTS)
[EMAIL PROTECTED]@am__DEPENDENCIES_1 = ../zlib/libz.la
[EMAIL PROTECTED]@am__DEPENDENCIES_1 = \
[EMAIL PROTECTED]@ $(top_builddir)/../zlib/libz.la
fastjar_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(top_builddir)/../../../replace/libreplace.la
DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
@@ -220,9 +221,9 @@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
ACLOCAL_AMFLAGS = -I m4
[EMAIL PROTECTED]@LINKED_ZIP_LIBS = ../zlib/libz.la
[EMAIL PROTECTED]@LINKED_ZIP_LIBS = $(top_builddir)/../zlib/libz.la
@[EMAIL PROTECTED] = $(ZIP_LIBS)
[EMAIL PROTECTED]@MAYBE_INTERNAL_ZIP_INCLUDES = -I../zlib/
[EMAIL PROTECTED]@MAYBE_INTERNAL_ZIP_INCLUDES = -I$(srcdir)/../zlib/
AM_CPPFLAGS = -I. -I$(top_srcdir) $(MAYBE_INTERNAL_ZIP_INCLUDES)
-I$(top_srcdir)/../include
fastjar_SOURCES = jartool.c dostime.c compress.c pushback.c shift.c jartool.h \
zipfile.h dostime.h compress.h pushback.h shift.h
_______________________________________________
kaffe mailing list
[email protected]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
