[kaffe] CVS kaffe (robilad): Cygwin makefile fixes from Gerrit
Kaffe CVS
cvs-commits at kaffe.org
Wed Mar 30 14:56:28 PST 2005
PatchSet 5622
Date: 2005/03/30 22:50:07
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Cygwin makefile fixes from Gerrit
2005-03-31 Gerrit P. Haase <gp at familiehaase.de>
* kaffe/jvmpi/Makefile.am,
kaffe/kaffe/Makefile.am,
kaffe/kaffevm/Makefile.am,
kaffe/xprof/Makefile.am,
libraries/clib/awt/X/Makefile.am,
libraries/clib/awt/nano-X/Makefile.am,
libraries/clib/awt/qt/Makefile.am,
libraries/clib/io/Makefile.am,
libraries/clib/management/Makefile.am,
libraries/clib/math/Makefile.am,
libraries/clib/native/Makefile.am,
libraries/clib/net/Makefile.am,
libraries/clib/nio/Makefile.am,
libraries/clib/security/Makefile.am,
libraries/clib/zip/Makefile.am:
(*_LDFLAGS) Added -no-undefined.
(*_DEPENDENCIES) Added libkaffevm.
Members:
ChangeLog:1.3793->1.3794
kaffe/jvmpi/Makefile.am:1.7->1.8
kaffe/jvmpi/Makefile.in:1.67->1.68
kaffe/kaffe/Makefile.am:1.31->1.32
kaffe/kaffe/Makefile.in:1.165->1.166
kaffe/kaffevm/Makefile.am:1.73->1.74
kaffe/kaffevm/Makefile.in:1.196->1.197
kaffe/xprof/Makefile.am:1.12->1.13
kaffe/xprof/Makefile.in:1.99->1.100
libraries/clib/awt/X/Makefile.am:1.15->1.16
libraries/clib/awt/X/Makefile.in:1.133->1.134
libraries/clib/awt/nano-X/Makefile.am:1.1->1.2
libraries/clib/awt/nano-X/Makefile.in:1.6->1.7
libraries/clib/awt/qt/Makefile.am:1.12->1.13
libraries/clib/awt/qt/Makefile.in:1.90->1.91
libraries/clib/io/Makefile.am:1.16->1.17
libraries/clib/io/Makefile.in:1.137->1.138
libraries/clib/management/Makefile.am:1.14->1.15
libraries/clib/management/Makefile.in:1.144->1.145
libraries/clib/math/Makefile.am:1.11->1.12
libraries/clib/math/Makefile.in:1.139->1.140
libraries/clib/native/Makefile.am:1.40->1.41
libraries/clib/native/Makefile.in:1.176->1.177
libraries/clib/net/Makefile.am:1.18->1.19
libraries/clib/net/Makefile.in:1.148->1.149
libraries/clib/nio/Makefile.am:1.11->1.12
libraries/clib/nio/Makefile.in:1.67->1.68
libraries/clib/security/Makefile.am:1.15->1.16
libraries/clib/security/Makefile.in:1.110->1.111
libraries/clib/zip/Makefile.am:1.11->1.12
libraries/clib/zip/Makefile.in:1.141->1.142
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3793 kaffe/ChangeLog:1.3794
--- kaffe/ChangeLog:1.3793 Tue Mar 29 17:58:50 2005
+++ kaffe/ChangeLog Wed Mar 30 22:50:07 2005
@@ -1,3 +1,23 @@
+2005-03-31 Gerrit P. Haase <gp at familiehaase.de>
+
+ * kaffe/jvmpi/Makefile.am,
+ kaffe/kaffe/Makefile.am,
+ kaffe/kaffevm/Makefile.am,
+ kaffe/xprof/Makefile.am,
+ libraries/clib/awt/X/Makefile.am,
+ libraries/clib/awt/nano-X/Makefile.am,
+ libraries/clib/awt/qt/Makefile.am,
+ libraries/clib/io/Makefile.am,
+ libraries/clib/management/Makefile.am,
+ libraries/clib/math/Makefile.am,
+ libraries/clib/native/Makefile.am,
+ libraries/clib/net/Makefile.am,
+ libraries/clib/nio/Makefile.am,
+ libraries/clib/security/Makefile.am,
+ libraries/clib/zip/Makefile.am:
+ (*_LDFLAGS) Added -no-undefined.
+ (*_DEPENDENCIES) Added libkaffevm.
+
2005-03-29 Guilhem Lavaux <guilhem at kaffe.org>
* libraries/clib/nio/gnu_java_nio_VMSelector.c
Index: kaffe/kaffe/jvmpi/Makefile.am
diff -u kaffe/kaffe/jvmpi/Makefile.am:1.7 kaffe/kaffe/jvmpi/Makefile.am:1.8
--- kaffe/kaffe/jvmpi/Makefile.am:1.7 Fri Jul 30 11:06:19 2004
+++ kaffe/kaffe/jvmpi/Makefile.am Wed Mar 30 22:50:11 2005
@@ -7,6 +7,7 @@
$(CFLAGS_PG)
libkaffejvmpi_la_LDFLAGS = \
+ -no-undefined \
-export-dynamic \
-release $(PACKAGE_VERSION)
Index: kaffe/kaffe/jvmpi/Makefile.in
diff -u kaffe/kaffe/jvmpi/Makefile.in:1.67 kaffe/kaffe/jvmpi/Makefile.in:1.68
--- kaffe/kaffe/jvmpi/Makefile.in:1.67 Wed Mar 16 10:31:00 2005
+++ kaffe/kaffe/jvmpi/Makefile.in Wed Mar 30 22:50:11 2005
@@ -377,6 +377,7 @@
$(CFLAGS_PG)
libkaffejvmpi_la_LDFLAGS = \
+ -no-undefined \
-export-dynamic \
-release $(PACKAGE_VERSION)
Index: kaffe/kaffe/kaffe/Makefile.am
diff -u kaffe/kaffe/kaffe/Makefile.am:1.31 kaffe/kaffe/kaffe/Makefile.am:1.32
--- kaffe/kaffe/kaffe/Makefile.am:1.31 Sat Feb 5 17:46:34 2005
+++ kaffe/kaffe/kaffe/Makefile.am Wed Mar 30 22:50:11 2005
@@ -48,7 +48,7 @@
LIBKAFFEVM = \
$(libxprof) \
$(libjvmpi) \
- ../kaffevm/libkaffevm.la
+ $(top_builddir)/kaffe/kaffevm/libkaffevm.la
kaffe_bin_LDFLAGS = \
$(KVMBINFLAGS) \
Index: kaffe/kaffe/kaffe/Makefile.in
diff -u kaffe/kaffe/kaffe/Makefile.in:1.165 kaffe/kaffe/kaffe/Makefile.in:1.166
--- kaffe/kaffe/kaffe/Makefile.in:1.165 Wed Mar 16 10:31:00 2005
+++ kaffe/kaffe/kaffe/Makefile.in Wed Mar 30 22:50:11 2005
@@ -84,7 +84,7 @@
@NEED_LIBXPROF_TRUE at am__DEPENDENCIES_2 = ../xprof/libkaffexprof.la
@ENABLE_JVMPI_TRUE at am__DEPENDENCIES_3 = ../jvmpi/libkaffejvmpi.la
am__DEPENDENCIES_4 = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
- ../kaffevm/libkaffevm.la
+ $(top_builddir)/kaffe/kaffevm/libkaffevm.la
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/config -I$(top_builddir)/include/kaffe
depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
am__depfiles_maybe = depfiles
@@ -401,7 +401,7 @@
LIBKAFFEVM = \
$(libxprof) \
$(libjvmpi) \
- ../kaffevm/libkaffevm.la
+ $(top_builddir)/kaffe/kaffevm/libkaffevm.la
kaffe_bin_LDFLAGS = \
$(KVMBINFLAGS) \
Index: kaffe/kaffe/kaffevm/Makefile.am
diff -u kaffe/kaffe/kaffevm/Makefile.am:1.73 kaffe/kaffe/kaffevm/Makefile.am:1.74
--- kaffe/kaffe/kaffevm/Makefile.am:1.73 Tue Feb 8 19:34:05 2005
+++ kaffe/kaffe/kaffevm/Makefile.am Wed Mar 30 22:50:12 2005
@@ -53,6 +53,7 @@
$(PTHREAD_LIBS) \
$(SEMAPHORE_LIB) \
$(KVMLIBFLAGS) \
+ -no-undefined \
-export-dynamic \
-release $(PACKAGE_VERSION)
Index: kaffe/kaffe/kaffevm/Makefile.in
diff -u kaffe/kaffe/kaffevm/Makefile.in:1.196 kaffe/kaffe/kaffevm/Makefile.in:1.197
--- kaffe/kaffe/kaffevm/Makefile.in:1.196 Wed Mar 16 10:31:01 2005
+++ kaffe/kaffe/kaffevm/Makefile.in Wed Mar 30 22:50:12 2005
@@ -455,6 +455,7 @@
$(PTHREAD_LIBS) \
$(SEMAPHORE_LIB) \
$(KVMLIBFLAGS) \
+ -no-undefined \
-export-dynamic \
-release $(PACKAGE_VERSION)
Index: kaffe/kaffe/xprof/Makefile.am
diff -u kaffe/kaffe/xprof/Makefile.am:1.12 kaffe/kaffe/xprof/Makefile.am:1.13
--- kaffe/kaffe/xprof/Makefile.am:1.12 Fri Jul 30 11:06:33 2004
+++ kaffe/kaffe/xprof/Makefile.am Wed Mar 30 22:50:12 2005
@@ -17,6 +17,7 @@
native_LTLIBRARIES = libkaffexprof.la
libkaffexprof_la_LDFLAGS = \
+ -no-undefined \
-export-dynamic \
-release $(PACKAGE_VERSION)
Index: kaffe/kaffe/xprof/Makefile.in
diff -u kaffe/kaffe/xprof/Makefile.in:1.99 kaffe/kaffe/xprof/Makefile.in:1.100
--- kaffe/kaffe/xprof/Makefile.in:1.99 Wed Mar 16 10:31:12 2005
+++ kaffe/kaffe/xprof/Makefile.in Wed Mar 30 22:50:12 2005
@@ -390,6 +390,7 @@
AM_CPPFLAGS = -I$(top_srcdir)/kaffe/kaffevm/$(THREAD_DIR) $(ENGINE_INCLUDES) -I$(top_srcdir)/libltdl $(ENGINE_DEFS) -I$(top_srcdir)/kaffe/kaffevm -I$(top_builddir)/include
native_LTLIBRARIES = libkaffexprof.la
libkaffexprof_la_LDFLAGS = \
+ -no-undefined \
-export-dynamic \
-release $(PACKAGE_VERSION)
Index: kaffe/libraries/clib/awt/X/Makefile.am
diff -u kaffe/libraries/clib/awt/X/Makefile.am:1.15 kaffe/libraries/clib/awt/X/Makefile.am:1.16
--- kaffe/libraries/clib/awt/X/Makefile.am:1.15 Wed Aug 4 07:00:51 2004
+++ kaffe/libraries/clib/awt/X/Makefile.am Wed Mar 30 22:50:13 2005
@@ -18,11 +18,12 @@
libxawt_la_LDFLAGS = \
$(KLIBFLAGS) \
+ -no-undefined \
-module \
-release $(PACKAGE_VERSION) \
-export-symbols-regex "^([Jj]ava|kaffe)_"
-libxawt_la_LIBADD = $(AWT_LIBS)
+libxawt_la_LIBADD = $(top_builddir)/kaffe/kaffevm/libkaffevm.la $(AWT_LIBS)
libxawt_la_SOURCES = \
tlk.c \
Index: kaffe/libraries/clib/awt/X/Makefile.in
diff -u kaffe/libraries/clib/awt/X/Makefile.in:1.133 kaffe/libraries/clib/awt/X/Makefile.in:1.134
--- kaffe/libraries/clib/awt/X/Makefile.in:1.133 Wed Mar 16 10:31:16 2005
+++ kaffe/libraries/clib/awt/X/Makefile.in Wed Mar 30 22:50:14 2005
@@ -86,7 +86,8 @@
nativeLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(native_LTLIBRARIES)
am__DEPENDENCIES_1 =
-libxawt_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+libxawt_la_DEPENDENCIES = $(top_builddir)/kaffe/kaffevm/libkaffevm.la \
+ $(am__DEPENDENCIES_1)
am_libxawt_la_OBJECTS = libxawt_la-tlk.lo libxawt_la-wnd.lo \
libxawt_la-evt.lo libxawt_la-gra.lo libxawt_la-fnt.lo \
libxawt_la-clr.lo libxawt_la-img.lo libxawt_la-imggif.lo \
@@ -395,11 +396,12 @@
libxawt_la_LDFLAGS = \
$(KLIBFLAGS) \
+ -no-undefined \
-module \
-release $(PACKAGE_VERSION) \
-export-symbols-regex "^([Jj]ava|kaffe)_"
-libxawt_la_LIBADD = $(AWT_LIBS)
+libxawt_la_LIBADD = $(top_builddir)/kaffe/kaffevm/libkaffevm.la $(AWT_LIBS)
libxawt_la_SOURCES = \
tlk.c \
wnd.c \
Index: kaffe/libraries/clib/awt/nano-X/Makefile.am
diff -u kaffe/libraries/clib/awt/nano-X/Makefile.am:1.1 kaffe/libraries/clib/awt/nano-X/Makefile.am:1.2
--- kaffe/libraries/clib/awt/nano-X/Makefile.am:1.1 Sat Feb 5 17:47:23 2005
+++ kaffe/libraries/clib/awt/nano-X/Makefile.am Wed Mar 30 22:50:15 2005
@@ -23,11 +23,12 @@
libnanoxawt_la_LDFLAGS = \
$(KLIBFLAGS) \
+ -no-undefined \
-module \
-release $(PACKAGE_VERSION) \
-export-symbols-regex "^([Jj]ava|kaffe)_"
-libnanoxawt_la_LIBADD = $(AWT_LIBS)
+libnanoxawt_la_LIBADD = $(top_builddir)/kaffe/kaffevm/libkaffevm.la $(AWT_LIBS)
libnanoxawt_la_SOURCES = \
event.c \
Index: kaffe/libraries/clib/awt/nano-X/Makefile.in
diff -u kaffe/libraries/clib/awt/nano-X/Makefile.in:1.6 kaffe/libraries/clib/awt/nano-X/Makefile.in:1.7
--- kaffe/libraries/clib/awt/nano-X/Makefile.in:1.6 Wed Mar 16 10:31:19 2005
+++ kaffe/libraries/clib/awt/nano-X/Makefile.in Wed Mar 30 22:50:15 2005
@@ -91,7 +91,9 @@
nativeLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(native_LTLIBRARIES)
am__DEPENDENCIES_1 =
-libnanoxawt_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+libnanoxawt_la_DEPENDENCIES = \
+ $(top_builddir)/kaffe/kaffevm/libkaffevm.la \
+ $(am__DEPENDENCIES_1)
am_libnanoxawt_la_OBJECTS = libnanoxawt_la-event.lo \
libnanoxawt_la-handler.lo libnanoxawt_la-color.lo \
libnanoxawt_la-font.lo libnanoxawt_la-window.lo \
@@ -401,11 +403,12 @@
libnanoxawt_la_LDFLAGS = \
$(KLIBFLAGS) \
+ -no-undefined \
-module \
-release $(PACKAGE_VERSION) \
-export-symbols-regex "^([Jj]ava|kaffe)_"
-libnanoxawt_la_LIBADD = $(AWT_LIBS)
+libnanoxawt_la_LIBADD = $(top_builddir)/kaffe/kaffevm/libkaffevm.la $(AWT_LIBS)
libnanoxawt_la_SOURCES = \
event.c \
handler.c \
Index: kaffe/libraries/clib/awt/qt/Makefile.am
diff -u kaffe/libraries/clib/awt/qt/Makefile.am:1.12 kaffe/libraries/clib/awt/qt/Makefile.am:1.13
--- kaffe/libraries/clib/awt/qt/Makefile.am:1.12 Fri Jul 30 11:06:42 2004
+++ kaffe/libraries/clib/awt/qt/Makefile.am Wed Mar 30 22:50:15 2005
@@ -25,11 +25,12 @@
libqtawt_la_LDFLAGS = \
$(KLIBFLAGS) \
+ -no-undefined \
-module \
-release $(PACKAGE_VERSION) \
-export-symbols-regex "^([Jj]ava|kaffe)_"
-libqtawt_la_LIBADD = $(AWT_LIBS) $(QT_LDADD)
+libqtawt_la_LIBADD = $(top_builddir)/kaffe/kaffevm/libkaffevm.la $(AWT_LIBS) $(QT_LDADD)
libqtawt_la_MOC = \
evt.moc.cc
Index: kaffe/libraries/clib/awt/qt/Makefile.in
diff -u kaffe/libraries/clib/awt/qt/Makefile.in:1.90 kaffe/libraries/clib/awt/qt/Makefile.in:1.91
--- kaffe/libraries/clib/awt/qt/Makefile.in:1.90 Wed Mar 16 10:31:20 2005
+++ kaffe/libraries/clib/awt/qt/Makefile.in Wed Mar 30 22:50:15 2005
@@ -90,7 +90,9 @@
nativeLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(native_LTLIBRARIES)
am__DEPENDENCIES_1 =
-libqtawt_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+libqtawt_la_DEPENDENCIES = \
+ $(top_builddir)/kaffe/kaffevm/libkaffevm.la \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_libqtawt_la_OBJECTS = libqtawt_la-tlk.lo libqtawt_la-wnd.lo \
libqtawt_la-evt.lo libqtawt_la-gra.lo libqtawt_la-fnt.lo \
libqtawt_la-clr.lo libqtawt_la-img.lo libqtawt_la-cbd.lo
@@ -402,11 +404,12 @@
libqtawt_la_LDFLAGS = \
$(KLIBFLAGS) \
+ -no-undefined \
-module \
-release $(PACKAGE_VERSION) \
-export-symbols-regex "^([Jj]ava|kaffe)_"
-libqtawt_la_LIBADD = $(AWT_LIBS) $(QT_LDADD)
+libqtawt_la_LIBADD = $(top_builddir)/kaffe/kaffevm/libkaffevm.la $(AWT_LIBS) $(QT_LDADD)
libqtawt_la_MOC = \
evt.moc.cc
Index: kaffe/libraries/clib/io/Makefile.am
diff -u kaffe/libraries/clib/io/Makefile.am:1.16 kaffe/libraries/clib/io/Makefile.am:1.17
--- kaffe/libraries/clib/io/Makefile.am:1.16 Fri Dec 3 21:54:04 2004
+++ kaffe/libraries/clib/io/Makefile.am Wed Mar 30 22:50:16 2005
@@ -18,9 +18,12 @@
libio_la_LDFLAGS = \
$(KLIBFLAGS) \
+ -no-undefined \
-module \
-release $(PACKAGE_VERSION) \
-export-symbols-regex "^([Jj]ava|kaffe)_"
+
+libio_la_LIBADD = $(top_builddir)/kaffe/kaffevm/libkaffevm.la
libio_la_SOURCES = \
File.c \
Index: kaffe/libraries/clib/io/Makefile.in
diff -u kaffe/libraries/clib/io/Makefile.in:1.137 kaffe/libraries/clib/io/Makefile.in:1.138
--- kaffe/libraries/clib/io/Makefile.in:1.137 Wed Mar 16 10:31:21 2005
+++ kaffe/libraries/clib/io/Makefile.in Wed Mar 30 22:50:16 2005
@@ -83,7 +83,7 @@
am__installdirs = "$(DESTDIR)$(nativedir)"
nativeLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(native_LTLIBRARIES)
-libio_la_LIBADD =
+libio_la_DEPENDENCIES = $(top_builddir)/kaffe/kaffevm/libkaffevm.la
am_libio_la_OBJECTS = libio_la-File.lo \
libio_la-java_io_ObjectInputStream.lo \
libio_la-java_io_VMObjectStreamClass.lo
@@ -390,10 +390,12 @@
libio_la_LDFLAGS = \
$(KLIBFLAGS) \
+ -no-undefined \
-module \
-release $(PACKAGE_VERSION) \
-export-symbols-regex "^([Jj]ava|kaffe)_"
+libio_la_LIBADD = $(top_builddir)/kaffe/kaffevm/libkaffevm.la
libio_la_SOURCES = \
File.c \
java_io_ObjectInputStream.c \
Index: kaffe/libraries/clib/management/Makefile.am
diff -u kaffe/libraries/clib/management/Makefile.am:1.14 kaffe/libraries/clib/management/Makefile.am:1.15
--- kaffe/libraries/clib/management/Makefile.am:1.14 Fri Jul 30 11:06:44 2004
+++ kaffe/libraries/clib/management/Makefile.am Wed Mar 30 22:50:16 2005
@@ -17,9 +17,12 @@
libmanagement_la_LDFLAGS = \
$(KLIBFLAGS) \
+ -no-undefined \
-module \
-release $(PACKAGE_VERSION) \
-export-symbols-regex "^([Jj]ava|kaffe)_"
+
+libmanagement_la_LIBADD = $(top_builddir)/kaffe/kaffevm/libkaffevm.la
libmanagement_la_SOURCES = \
Classpath.c \
Index: kaffe/libraries/clib/management/Makefile.in
diff -u kaffe/libraries/clib/management/Makefile.in:1.144 kaffe/libraries/clib/management/Makefile.in:1.145
--- kaffe/libraries/clib/management/Makefile.in:1.144 Wed Mar 16 10:31:22 2005
+++ kaffe/libraries/clib/management/Makefile.in Wed Mar 30 22:50:16 2005
@@ -83,7 +83,8 @@
am__installdirs = "$(DESTDIR)$(nativedir)"
nativeLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(native_LTLIBRARIES)
-libmanagement_la_LIBADD =
+libmanagement_la_DEPENDENCIES = \
+ $(top_builddir)/kaffe/kaffevm/libkaffevm.la
am_libmanagement_la_OBJECTS = libmanagement_la-Classpath.lo \
libmanagement_la-JIT.lo libmanagement_la-Debug.lo \
libmanagement_la-XProfiler.lo
@@ -389,10 +390,12 @@
libmanagement_la_LDFLAGS = \
$(KLIBFLAGS) \
+ -no-undefined \
-module \
-release $(PACKAGE_VERSION) \
-export-symbols-regex "^([Jj]ava|kaffe)_"
+libmanagement_la_LIBADD = $(top_builddir)/kaffe/kaffevm/libkaffevm.la
libmanagement_la_SOURCES = \
Classpath.c \
JIT.c \
Index: kaffe/libraries/clib/math/Makefile.am
diff -u kaffe/libraries/clib/math/Makefile.am:1.11 kaffe/libraries/clib/math/Makefile.am:1.12
--- kaffe/libraries/clib/math/Makefile.am:1.11 Sun Jul 18 15:27:56 2004
+++ kaffe/libraries/clib/math/Makefile.am Wed Mar 30 22:50:17 2005
@@ -12,11 +12,12 @@
libmath_la_LDFLAGS = \
$(KLIBFLAGS) \
+ -no-undefined \
-module \
-release $(PACKAGE_VERSION) \
-export-symbols-regex "^([Jj]ava|kaffe)_"
-libmath_la_LIBADD = $(LIBADD_GMP) $(M_LIBS)
+libmath_la_LIBADD = $(top_builddir)/kaffe/kaffevm/libkaffevm.la $(LIBADD_GMP) $(M_LIBS)
libmath_la_SOURCES = BigInteger.c
Index: kaffe/libraries/clib/math/Makefile.in
diff -u kaffe/libraries/clib/math/Makefile.in:1.139 kaffe/libraries/clib/math/Makefile.in:1.140
--- kaffe/libraries/clib/math/Makefile.in:1.139 Wed Mar 16 10:31:22 2005
+++ kaffe/libraries/clib/math/Makefile.in Wed Mar 30 22:50:17 2005
@@ -84,7 +84,8 @@
nativeLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(native_LTLIBRARIES)
am__DEPENDENCIES_1 =
-libmath_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+libmath_la_DEPENDENCIES = $(top_builddir)/kaffe/kaffevm/libkaffevm.la \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_libmath_la_OBJECTS = BigInteger.lo
libmath_la_OBJECTS = $(am_libmath_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/config -I$(top_builddir)/include/kaffe
@@ -382,11 +383,12 @@
native_LTLIBRARIES = libmath.la
libmath_la_LDFLAGS = \
$(KLIBFLAGS) \
+ -no-undefined \
-module \
-release $(PACKAGE_VERSION) \
-export-symbols-regex "^([Jj]ava|kaffe)_"
-libmath_la_LIBADD = $(LIBADD_GMP) $(M_LIBS)
+libmath_la_LIBADD = $(top_builddir)/kaffe/kaffevm/libkaffevm.la $(LIBADD_GMP) $(M_LIBS)
libmath_la_SOURCES = BigInteger.c
CLEANFILES = so_locations
all: all-am
Index: kaffe/libraries/clib/native/Makefile.am
diff -u kaffe/libraries/clib/native/Makefile.am:1.40 kaffe/libraries/clib/native/Makefile.am:1.41
--- kaffe/libraries/clib/native/Makefile.am:1.40 Sun Feb 6 18:45:44 2005
+++ kaffe/libraries/clib/native/Makefile.am Wed Mar 30 22:50:17 2005
@@ -64,6 +64,7 @@
libnative_la_LDFLAGS = \
$(KLIBFLAGS) \
+ -no-undefined \
-module \
-release $(PACKAGE_VERSION) \
-export-symbols-regex "^([Jj]ava|kaffe)_"
@@ -72,7 +73,10 @@
../../../kaffe/kaffevm/libkaffevm.la \
$(top_builddir)/libraries/clib/classpath/libclasspath.la
-libnative_la_LIBADD = $(M_LIBS) $(LTLIBICONV) \
+libnative_la_LIBADD = \
+ $(top_builddir)/kaffe/kaffevm/libkaffevm.la \
+ $(M_LIBS) \
+ $(LTLIBICONV) \
$(libnative_la_DEPENDENCIES)
libnative_la_SOURCES = \
Index: kaffe/libraries/clib/native/Makefile.in
diff -u kaffe/libraries/clib/native/Makefile.in:1.176 kaffe/libraries/clib/native/Makefile.in:1.177
--- kaffe/libraries/clib/native/Makefile.in:1.176 Wed Mar 16 10:31:23 2005
+++ kaffe/libraries/clib/native/Makefile.in Wed Mar 30 22:50:18 2005
@@ -458,6 +458,7 @@
libnative_la_LDFLAGS = \
$(KLIBFLAGS) \
+ -no-undefined \
-module \
-release $(PACKAGE_VERSION) \
-export-symbols-regex "^([Jj]ava|kaffe)_"
@@ -466,7 +467,10 @@
../../../kaffe/kaffevm/libkaffevm.la \
$(top_builddir)/libraries/clib/classpath/libclasspath.la
-libnative_la_LIBADD = $(M_LIBS) $(LTLIBICONV) \
+libnative_la_LIBADD = \
+ $(top_builddir)/kaffe/kaffevm/libkaffevm.la \
+ $(M_LIBS) \
+ $(LTLIBICONV) \
$(libnative_la_DEPENDENCIES)
libnative_la_SOURCES = \
Index: kaffe/libraries/clib/net/Makefile.am
diff -u kaffe/libraries/clib/net/Makefile.am:1.18 kaffe/libraries/clib/net/Makefile.am:1.19
--- kaffe/libraries/clib/net/Makefile.am:1.18 Fri Jul 30 11:06:46 2004
+++ kaffe/libraries/clib/net/Makefile.am Wed Mar 30 22:50:19 2005
@@ -18,11 +18,16 @@
libnet_la_LDFLAGS = \
$(KLIBFLAGS) \
+ -no-undefined \
-module \
-release $(PACKAGE_VERSION) \
-export-symbols-regex "^([Jj]ava|kaffe|gnu)_"
-libnet_la_LIBADD = $(NET_LIBS) $(top_builddir)/replace/libreplace.la
+libnet_la_LIBADD = \
+ $(top_builddir)/kaffe/kaffevm/libkaffevm.la \
+ $(NET_LIBS) \
+ $(top_builddir)/replace/libreplace.la \
+ $(LTLIBINTL)
libnet_la_SOURCES = \
InetAddressImpl.c \
Index: kaffe/libraries/clib/net/Makefile.in
diff -u kaffe/libraries/clib/net/Makefile.in:1.148 kaffe/libraries/clib/net/Makefile.in:1.149
--- kaffe/libraries/clib/net/Makefile.in:1.148 Wed Mar 16 10:31:24 2005
+++ kaffe/libraries/clib/net/Makefile.in Wed Mar 30 22:50:19 2005
@@ -84,8 +84,9 @@
nativeLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(native_LTLIBRARIES)
am__DEPENDENCIES_1 =
-libnet_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(top_builddir)/replace/libreplace.la
+libnet_la_DEPENDENCIES = $(top_builddir)/kaffe/kaffevm/libkaffevm.la \
+ $(am__DEPENDENCIES_1) $(top_builddir)/replace/libreplace.la \
+ $(am__DEPENDENCIES_1)
am_libnet_la_OBJECTS = libnet_la-InetAddressImpl.lo \
libnet_la-NetworkInterface.lo \
libnet_la-PlainDatagramSocketImpl.lo \
@@ -393,11 +394,17 @@
libnet_la_LDFLAGS = \
$(KLIBFLAGS) \
+ -no-undefined \
-module \
-release $(PACKAGE_VERSION) \
-export-symbols-regex "^([Jj]ava|kaffe|gnu)_"
-libnet_la_LIBADD = $(NET_LIBS) $(top_builddir)/replace/libreplace.la
+libnet_la_LIBADD = \
+ $(top_builddir)/kaffe/kaffevm/libkaffevm.la \
+ $(NET_LIBS) \
+ $(top_builddir)/replace/libreplace.la \
+ $(LTLIBINTL)
+
libnet_la_SOURCES = \
InetAddressImpl.c \
NetworkInterface.c \
Index: kaffe/libraries/clib/nio/Makefile.am
diff -u kaffe/libraries/clib/nio/Makefile.am:1.11 kaffe/libraries/clib/nio/Makefile.am:1.12
--- kaffe/libraries/clib/nio/Makefile.am:1.11 Mon Mar 21 17:15:10 2005
+++ kaffe/libraries/clib/nio/Makefile.am Wed Mar 30 22:50:20 2005
@@ -17,6 +17,7 @@
libnio_la_LDFLAGS = \
$(KLIBFLAGS) \
+ -no-undefined \
-module \
-release $(PACKAGE_VERSION) \
-export-symbols-regex "^([Jj]ava|kaffe|gnu)_"
@@ -30,6 +31,7 @@
$(top_builddir)/libraries/clib/classpath/libclasspath.la
libnio_la_LIBADD = \
+ $(top_builddir)/kaffe/kaffevm/libkaffevm.la \
$(libnio_la_DEPENDENCIES)
CLEANFILES = so_locations
Index: kaffe/libraries/clib/nio/Makefile.in
diff -u kaffe/libraries/clib/nio/Makefile.in:1.67 kaffe/libraries/clib/nio/Makefile.in:1.68
--- kaffe/libraries/clib/nio/Makefile.in:1.67 Mon Mar 21 17:15:10 2005
+++ kaffe/libraries/clib/nio/Makefile.in Wed Mar 30 22:50:20 2005
@@ -390,6 +390,7 @@
libnio_la_LDFLAGS = \
$(KLIBFLAGS) \
+ -no-undefined \
-module \
-release $(PACKAGE_VERSION) \
-export-symbols-regex "^([Jj]ava|kaffe|gnu)_"
@@ -403,6 +404,7 @@
$(top_builddir)/libraries/clib/classpath/libclasspath.la
libnio_la_LIBADD = \
+ $(top_builddir)/kaffe/kaffevm/libkaffevm.la \
$(libnio_la_DEPENDENCIES)
CLEANFILES = so_locations
Index: kaffe/libraries/clib/security/Makefile.am
diff -u kaffe/libraries/clib/security/Makefile.am:1.15 kaffe/libraries/clib/security/Makefile.am:1.16
--- kaffe/libraries/clib/security/Makefile.am:1.15 Fri Jul 30 11:06:48 2004
+++ kaffe/libraries/clib/security/Makefile.am Wed Mar 30 22:50:20 2005
@@ -29,11 +29,12 @@
libsecurity_la_LDFLAGS = \
$(KLIBFLAGS) \
+ -no-undefined \
-module \
-release $(PACKAGE_VERSION) \
-export-symbols-regex "^([Jj]ava|kaffe)_"
-libsecurity_la_LIBADD = $(SECURITY_LIBS)
+libsecurity_la_LIBADD = $(top_builddir)/kaffe/kaffevm/libkaffevm.la $(SECURITY_LIBS)
libsecurity_la_SOURCES = $(SECURITY_SRCS)
Index: kaffe/libraries/clib/security/Makefile.in
diff -u kaffe/libraries/clib/security/Makefile.in:1.110 kaffe/libraries/clib/security/Makefile.in:1.111
--- kaffe/libraries/clib/security/Makefile.in:1.110 Wed Mar 16 10:31:26 2005
+++ kaffe/libraries/clib/security/Makefile.in Wed Mar 30 22:50:20 2005
@@ -85,7 +85,9 @@
nativeLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(native_LTLIBRARIES)
am__DEPENDENCIES_1 =
-libsecurity_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+libsecurity_la_DEPENDENCIES = \
+ $(top_builddir)/kaffe/kaffevm/libkaffevm.la \
+ $(am__DEPENDENCIES_1)
am__objects_1 = libsecurity_la-digest.lo libsecurity_la-kaffe_md5.lo \
libsecurity_la-sha-1.lo
am_libsecurity_la_OBJECTS = $(am__objects_1)
@@ -404,11 +406,12 @@
libsecurity_la_LDFLAGS = \
$(KLIBFLAGS) \
+ -no-undefined \
-module \
-release $(PACKAGE_VERSION) \
-export-symbols-regex "^([Jj]ava|kaffe)_"
-libsecurity_la_LIBADD = $(SECURITY_LIBS)
+libsecurity_la_LIBADD = $(top_builddir)/kaffe/kaffevm/libkaffevm.la $(SECURITY_LIBS)
libsecurity_la_SOURCES = $(SECURITY_SRCS)
CLEANFILES = so_locations
all: all-am
Index: kaffe/libraries/clib/zip/Makefile.am
diff -u kaffe/libraries/clib/zip/Makefile.am:1.11 kaffe/libraries/clib/zip/Makefile.am:1.12
--- kaffe/libraries/clib/zip/Makefile.am:1.11 Fri Jul 30 11:06:51 2004
+++ kaffe/libraries/clib/zip/Makefile.am Wed Mar 30 22:50:21 2005
@@ -15,11 +15,12 @@
libzip_la_LDFLAGS = \
$(KLIBFLAGS) \
+ -no-undefined \
-module \
-release $(PACKAGE_VERSION) \
-export-symbols-regex "^([Jj]ava|kaffe)_"
-libzip_la_LIBADD = $(ZIP_LIBS)
+libzip_la_LIBADD = $(top_builddir)/kaffe/kaffevm/libkaffevm.la $(ZIP_LIBS)
libzip_la_SOURCES = \
Adler32.c \
Index: kaffe/libraries/clib/zip/Makefile.in
diff -u kaffe/libraries/clib/zip/Makefile.in:1.141 kaffe/libraries/clib/zip/Makefile.in:1.142
--- kaffe/libraries/clib/zip/Makefile.in:1.141 Wed Mar 16 10:31:29 2005
+++ kaffe/libraries/clib/zip/Makefile.in Wed Mar 30 22:50:21 2005
@@ -84,7 +84,8 @@
nativeLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(native_LTLIBRARIES)
am__DEPENDENCIES_1 =
-libzip_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+libzip_la_DEPENDENCIES = $(top_builddir)/kaffe/kaffevm/libkaffevm.la \
+ $(am__DEPENDENCIES_1)
am_libzip_la_OBJECTS = libzip_la-Adler32.lo libzip_la-CRC32.lo \
libzip_la-Deflater.lo libzip_la-Inflater.lo
libzip_la_OBJECTS = $(am_libzip_la_OBJECTS)
@@ -386,11 +387,12 @@
libzip_la_LDFLAGS = \
$(KLIBFLAGS) \
+ -no-undefined \
-module \
-release $(PACKAGE_VERSION) \
-export-symbols-regex "^([Jj]ava|kaffe)_"
-libzip_la_LIBADD = $(ZIP_LIBS)
+libzip_la_LIBADD = $(top_builddir)/kaffe/kaffevm/libkaffevm.la $(ZIP_LIBS)
libzip_la_SOURCES = \
Adler32.c \
CRC32.c \
More information about the kaffe
mailing list