[kaffe] CVS kaffe (robilad): Build fixes for darwin, reverted build changes for cygwin
Kaffe CVS
cvs-commits at kaffe.org
Wed Jun 29 02:49:05 PDT 2005
PatchSet 6669
Date: 2005/06/29 09:42:27
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Build fixes for darwin, reverted build changes for cygwin
Members:
ChangeLog:1.4194->1.4195
configure:1.463->1.464
configure.ac:1.147->1.148
libltdl/configure:1.80->1.81
libraries/clib/classpath/Makefile.am:1.5->1.6
libraries/clib/classpath/Makefile.in:1.20->1.21
libraries/clib/fdlibm/Makefile.am:1.4->1.5
libraries/clib/fdlibm/Makefile.in:1.6->1.7
replace/Makefile.am:1.13->1.14
replace/Makefile.in:1.87->1.88
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4194 kaffe/ChangeLog:1.4195
--- kaffe/ChangeLog:1.4194 Mon Jun 27 17:03:07 2005
+++ kaffe/ChangeLog Wed Jun 29 09:42:27 2005
@@ -1,3 +1,15 @@
+2005-06-28 Dalibor Topic <robilad at kaffe.org>
+
+ * configure.ac (DLOPEN_JAVA_LIBS): Removed libclasspath and
+ libfdlibm.
+
+ 2005-05-19 Dalibor Topic <robilad at kaffe.org>
+
+ libraries/clib/classpath/Makefile.am,
+ libraries/clib/fdlibm/Makefile.am,
+ replace/Makefile.am:
+ (AM_LDFLAGS) Removed -module. Build as convenience libraries.
+
2005-06-27 Ito Kazumitsu <kaz at maczuka.gcd.org>
* gnu/java/nio/charset/UnicodeLittle.java
Index: kaffe/configure
diff -u kaffe/configure:1.463 kaffe/configure:1.464
--- kaffe/configure:1.463 Tue Jun 21 16:11:42 2005
+++ kaffe/configure Wed Jun 29 09:42:30 2005
@@ -50155,8 +50155,6 @@
\$(top_builddir)/libraries/clib/zip/libzip.la \
\$(top_builddir)/libraries/clib/management/libmanagement.la \
\$(top_builddir)/libraries/clib/security/libsecurity.la \
-\$(top_builddir)/libraries/clib/classpath/libclasspath.la \
-\$(top_builddir)/libraries/clib/fdlibm/libfdlibm.la \
$JAVA_LIBS \
"
Index: kaffe/configure.ac
diff -u kaffe/configure.ac:1.147 kaffe/configure.ac:1.148
--- kaffe/configure.ac:1.147 Tue Jun 21 15:17:15 2005
+++ kaffe/configure.ac Wed Jun 29 09:42:42 2005
@@ -2059,8 +2059,6 @@
\$(top_builddir)/libraries/clib/zip/libzip.la \
\$(top_builddir)/libraries/clib/management/libmanagement.la \
\$(top_builddir)/libraries/clib/security/libsecurity.la \
-\$(top_builddir)/libraries/clib/classpath/libclasspath.la \
-\$(top_builddir)/libraries/clib/fdlibm/libfdlibm.la \
$JAVA_LIBS \
"
Index: kaffe/libltdl/configure
diff -u kaffe/libltdl/configure:1.80 kaffe/libltdl/configure:1.81
--- kaffe/libltdl/configure:1.80 Thu May 26 10:24:25 2005
+++ kaffe/libltdl/configure Wed Jun 29 09:42:43 2005
@@ -7330,12 +7330,11 @@
tmp_addflag=
case $cc_basename,$host_cpu in
pgcc*) # Portland Group C compiler
- whole_archive_flag_spec='${wl}--whole-archive,`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
- tmp_addflag=' $pic_flag'
+ whole_archive_flag_spec=
;;
pgf77* | pgf90* ) # Portland Group f77 and f90 compilers
- whole_archive_flag_spec='${wl}--whole-archive,`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
- tmp_addflag=' $pic_flag -Mnomain' ;;
+ whole_archive_flag_spec=
+ tmp_addflag=' -fpic -Mnomain' ;;
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
@@ -8499,7 +8498,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
@@ -8564,8 +8563,8 @@
need_lib_prefix=no
# Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
case $host_os in
- openbsd3.3 | openbsd3.3.*) need_version=yes ;;
- *) need_version=no ;;
+ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+ *) need_version=no ;;
esac
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
@@ -9355,7 +9354,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9358 "configure"
+#line 9357 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9453,7 +9452,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9456 "configure"
+#line 9455 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10951,12 +10950,12 @@
;;
pgCC*)
# Portland Group C++ compiler
- archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
- archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+ archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
- whole_archive_flag_spec_CXX='${wl}--whole-archive,`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+ whole_archive_flag_spec_CXX=''
;;
cxx*)
# Compaq C++
@@ -11705,11 +11704,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11708: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11707: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11712: \$? = $ac_status" >&5
+ echo "$as_me:11711: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -11767,11 +11766,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11770: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11769: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11774: \$? = $ac_status" >&5
+ echo "$as_me:11773: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -12280,7 +12279,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
@@ -12345,8 +12344,8 @@
need_lib_prefix=no
# Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
case $host_os in
- openbsd3.3 | openbsd3.3.*) need_version=yes ;;
- *) need_version=no ;;
+ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+ *) need_version=no ;;
esac
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
@@ -13136,7 +13135,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 13139 "configure"
+#line 13138 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13234,7 +13233,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 13237 "configure"
+#line 13236 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -14119,11 +14118,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14122: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14121: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14126: \$? = $ac_status" >&5
+ echo "$as_me:14125: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -14181,11 +14180,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14184: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14183: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14188: \$? = $ac_status" >&5
+ echo "$as_me:14187: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14396,12 +14395,11 @@
tmp_addflag=
case $cc_basename,$host_cpu in
pgcc*) # Portland Group C compiler
- whole_archive_flag_spec_F77='${wl}--whole-archive,`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
- tmp_addflag=' $pic_flag'
+ whole_archive_flag_spec_F77=
;;
pgf77* | pgf90* ) # Portland Group f77 and f90 compilers
- whole_archive_flag_spec_F77='${wl}--whole-archive,`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
- tmp_addflag=' $pic_flag -Mnomain' ;;
+ whole_archive_flag_spec_F77=
+ tmp_addflag=' -fpic -Mnomain' ;;
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
@@ -15545,7 +15543,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
@@ -15610,8 +15608,8 @@
need_lib_prefix=no
# Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
case $host_os in
- openbsd3.3 | openbsd3.3.*) need_version=yes ;;
- *) need_version=no ;;
+ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+ *) need_version=no ;;
esac
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
@@ -16307,11 +16305,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16310: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16308: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16314: \$? = $ac_status" >&5
+ echo "$as_me:16312: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16569,11 +16567,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16572: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16570: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16576: \$? = $ac_status" >&5
+ echo "$as_me:16574: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16631,11 +16629,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16634: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16632: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16638: \$? = $ac_status" >&5
+ echo "$as_me:16636: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -16846,12 +16844,11 @@
tmp_addflag=
case $cc_basename,$host_cpu in
pgcc*) # Portland Group C compiler
- whole_archive_flag_spec_GCJ='${wl}--whole-archive,`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
- tmp_addflag=' $pic_flag'
+ whole_archive_flag_spec_GCJ=
;;
pgf77* | pgf90* ) # Portland Group f77 and f90 compilers
- whole_archive_flag_spec_GCJ='${wl}--whole-archive,`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
- tmp_addflag=' $pic_flag -Mnomain' ;;
+ whole_archive_flag_spec_GCJ=
+ tmp_addflag=' -fpic -Mnomain' ;;
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
@@ -18015,7 +18012,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
@@ -18080,8 +18077,8 @@
need_lib_prefix=no
# Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
case $host_os in
- openbsd3.3 | openbsd3.3.*) need_version=yes ;;
- *) need_version=no ;;
+ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+ *) need_version=no ;;
esac
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
@@ -18871,7 +18868,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 18874 "configure"
+#line 18871 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -18969,7 +18966,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 18972 "configure"
+#line 18969 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -21235,7 +21232,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 21238 "configure"
+#line 21235 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
Index: kaffe/libraries/clib/classpath/Makefile.am
diff -u kaffe/libraries/clib/classpath/Makefile.am:1.5 kaffe/libraries/clib/classpath/Makefile.am:1.6
--- kaffe/libraries/clib/classpath/Makefile.am:1.5 Sat May 21 01:44:12 2005
+++ kaffe/libraries/clib/classpath/Makefile.am Wed Jun 29 09:42:47 2005
@@ -1,4 +1,4 @@
-native_LTLIBRARIES = libclasspath.la
+noinst_LTLIBRARIES = libclasspath.la
AM_CPPFLAGS = \
-I$(top_srcdir)/kaffe/jvmpi -I$(top_builddir)/include \
@@ -12,6 +12,4 @@
libclasspath_la_LDFLAGS = \
$(KLIBFLAGS) \
- -module \
- -no-undefined \
- -release $(PACKAGE_VERSION)
+ -no-undefined
Index: kaffe/libraries/clib/classpath/Makefile.in
diff -u kaffe/libraries/clib/classpath/Makefile.in:1.20 kaffe/libraries/clib/classpath/Makefile.in:1.21
--- kaffe/libraries/clib/classpath/Makefile.in:1.20 Sat May 21 01:44:12 2005
+++ kaffe/libraries/clib/classpath/Makefile.in Wed Jun 29 09:42:47 2005
@@ -67,15 +67,7 @@
mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config/config.h
CONFIG_CLEAN_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(nativedir)"
-nativeLTLIBRARIES_INSTALL = $(INSTALL)
-LTLIBRARIES = $(native_LTLIBRARIES)
+LTLIBRARIES = $(noinst_LTLIBRARIES)
libclasspath_la_LIBADD =
am_libclasspath_la_OBJECTS = jcl.lo jnilink.lo native_state.lo
libclasspath_la_OBJECTS = $(am_libclasspath_la_OBJECTS)
@@ -370,7 +362,7 @@
target_alias = @target_alias@
toolslibdir = @toolslibdir@
with_engine = @with_engine@
-native_LTLIBRARIES = libclasspath.la
+noinst_LTLIBRARIES = libclasspath.la
AM_CPPFLAGS = \
-I$(top_srcdir)/kaffe/jvmpi -I$(top_builddir)/include \
-I$(top_srcdir)/kaffe/kaffevm/jni
@@ -383,9 +375,7 @@
libclasspath_la_LDFLAGS = \
$(KLIBFLAGS) \
- -module \
- -no-undefined \
- -release $(PACKAGE_VERSION)
+ -no-undefined
all: all-am
@@ -420,35 +410,17 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-install-nativeLTLIBRARIES: $(native_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(nativedir)" || $(mkdir_p) "$(DESTDIR)$(nativedir)"
- @list='$(native_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
- f=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=install $(nativeLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(nativedir)/$$f'"; \
- $(LIBTOOL) --mode=install $(nativeLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(nativedir)/$$f"; \
- else :; fi; \
- done
-
-uninstall-nativeLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
- @set -x; list='$(native_LTLIBRARIES)'; for p in $$list; do \
- p=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(nativedir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(nativedir)/$$p"; \
- done
-clean-nativeLTLIBRARIES:
- -test -z "$(native_LTLIBRARIES)" || rm -f $(native_LTLIBRARIES)
- @list='$(native_LTLIBRARIES)'; for p in $$list; do \
+clean-noinstLTLIBRARIES:
+ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+ @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
test "$$dir" != "$$p" || dir=.; \
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
libclasspath.la: $(libclasspath_la_OBJECTS) $(libclasspath_la_DEPENDENCIES)
- $(LINK) -rpath $(nativedir) $(libclasspath_la_LDFLAGS) $(libclasspath_la_OBJECTS) $(libclasspath_la_LIBADD) $(LIBS)
+ $(LINK) $(libclasspath_la_LDFLAGS) $(libclasspath_la_OBJECTS) $(libclasspath_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -570,9 +542,6 @@
check: check-am
all-am: Makefile $(LTLIBRARIES)
installdirs:
- for dir in "$(DESTDIR)$(nativedir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
- done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -599,7 +568,7 @@
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
-clean-am: clean-generic clean-libtool clean-nativeLTLIBRARIES \
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
mostlyclean-am
distclean: distclean-am
@@ -618,7 +587,7 @@
info-am:
-install-data-am: install-nativeLTLIBRARIES
+install-data-am:
install-exec-am:
@@ -646,20 +615,19 @@
ps-am:
-uninstall-am: uninstall-info-am uninstall-nativeLTLIBRARIES
+uninstall-am: uninstall-info-am
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-nativeLTLIBRARIES ctags distclean \
+ clean-libtool clean-noinstLTLIBRARIES ctags distclean \
distclean-compile distclean-generic distclean-libtool \
distclean-tags distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am install-exec \
install-exec-am install-info install-info-am install-man \
- install-nativeLTLIBRARIES install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-info-am \
- uninstall-nativeLTLIBRARIES
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags uninstall uninstall-am \
+ uninstall-info-am
# 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.
Index: kaffe/libraries/clib/fdlibm/Makefile.am
diff -u kaffe/libraries/clib/fdlibm/Makefile.am:1.4 kaffe/libraries/clib/fdlibm/Makefile.am:1.5
--- kaffe/libraries/clib/fdlibm/Makefile.am:1.4 Mon May 23 10:43:41 2005
+++ kaffe/libraries/clib/fdlibm/Makefile.am Wed Jun 29 09:42:48 2005
@@ -1,4 +1,4 @@
-native_LTLIBRARIES = libfdlibm.la
+noinst_LTLIBRARIES = libfdlibm.la
libfdlibm_la_SOURCES = \
dtoa.c \
@@ -50,9 +50,7 @@
AM_LDFLAGS = \
$(KLIBFLAGS) \
- -module \
- -no-undefined \
- -release $(PACKAGE_VERSION)
+ -no-undefined
# We just want the standard flags for fdlibm since it is an upstream lib
# and our normal -pedantic -Wall -Werror breaks this lib. So no AM_CFLAGS.
Index: kaffe/libraries/clib/fdlibm/Makefile.in
diff -u kaffe/libraries/clib/fdlibm/Makefile.in:1.6 kaffe/libraries/clib/fdlibm/Makefile.in:1.7
--- kaffe/libraries/clib/fdlibm/Makefile.in:1.6 Mon May 23 10:43:41 2005
+++ kaffe/libraries/clib/fdlibm/Makefile.in Wed Jun 29 09:42:48 2005
@@ -67,15 +67,7 @@
mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config/config.h
CONFIG_CLEAN_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(nativedir)"
-nativeLTLIBRARIES_INSTALL = $(INSTALL)
-LTLIBRARIES = $(native_LTLIBRARIES)
+LTLIBRARIES = $(noinst_LTLIBRARIES)
libfdlibm_la_LIBADD =
am_libfdlibm_la_OBJECTS = dtoa.lo e_acos.lo e_asin.lo e_atan2.lo \
e_exp.lo e_fmod.lo e_log.lo e_pow.lo e_remainder.lo \
@@ -377,7 +369,7 @@
target_alias = @target_alias@
toolslibdir = @toolslibdir@
with_engine = @with_engine@
-native_LTLIBRARIES = libfdlibm.la
+noinst_LTLIBRARIES = libfdlibm.la
libfdlibm_la_SOURCES = \
dtoa.c \
e_acos.c \
@@ -428,9 +420,7 @@
AM_LDFLAGS = \
$(KLIBFLAGS) \
- -module \
- -no-undefined \
- -release $(PACKAGE_VERSION)
+ -no-undefined
all: all-am
@@ -465,35 +455,17 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-install-nativeLTLIBRARIES: $(native_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(nativedir)" || $(mkdir_p) "$(DESTDIR)$(nativedir)"
- @list='$(native_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
- f=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=install $(nativeLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(nativedir)/$$f'"; \
- $(LIBTOOL) --mode=install $(nativeLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(nativedir)/$$f"; \
- else :; fi; \
- done
-
-uninstall-nativeLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
- @set -x; list='$(native_LTLIBRARIES)'; for p in $$list; do \
- p=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(nativedir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(nativedir)/$$p"; \
- done
-clean-nativeLTLIBRARIES:
- -test -z "$(native_LTLIBRARIES)" || rm -f $(native_LTLIBRARIES)
- @list='$(native_LTLIBRARIES)'; for p in $$list; do \
+clean-noinstLTLIBRARIES:
+ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+ @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
test "$$dir" != "$$p" || dir=.; \
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
libfdlibm.la: $(libfdlibm_la_OBJECTS) $(libfdlibm_la_DEPENDENCIES)
- $(LINK) -rpath $(nativedir) $(libfdlibm_la_LDFLAGS) $(libfdlibm_la_OBJECTS) $(libfdlibm_la_LIBADD) $(LIBS)
+ $(LINK) $(libfdlibm_la_LDFLAGS) $(libfdlibm_la_OBJECTS) $(libfdlibm_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -651,9 +623,6 @@
check: check-am
all-am: Makefile $(LTLIBRARIES)
installdirs:
- for dir in "$(DESTDIR)$(nativedir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
- done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -680,7 +649,7 @@
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
-clean-am: clean-generic clean-libtool clean-nativeLTLIBRARIES \
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
mostlyclean-am
distclean: distclean-am
@@ -699,7 +668,7 @@
info-am:
-install-data-am: install-nativeLTLIBRARIES
+install-data-am:
install-exec-am:
@@ -727,20 +696,19 @@
ps-am:
-uninstall-am: uninstall-info-am uninstall-nativeLTLIBRARIES
+uninstall-am: uninstall-info-am
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-nativeLTLIBRARIES ctags distclean \
+ clean-libtool clean-noinstLTLIBRARIES ctags distclean \
distclean-compile distclean-generic distclean-libtool \
distclean-tags distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am install-exec \
install-exec-am install-info install-info-am install-man \
- install-nativeLTLIBRARIES install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-info-am \
- uninstall-nativeLTLIBRARIES
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags uninstall uninstall-am \
+ uninstall-info-am
# We just want the standard flags for fdlibm since it is an upstream lib
Index: kaffe/replace/Makefile.am
diff -u kaffe/replace/Makefile.am:1.13 kaffe/replace/Makefile.am:1.14
--- kaffe/replace/Makefile.am:1.13 Sat May 21 13:39:24 2005
+++ kaffe/replace/Makefile.am Wed Jun 29 09:42:48 2005
@@ -12,13 +12,11 @@
AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/include
-native_LTLIBRARIES = libreplace.la
+noinst_LTLIBRARIES = libreplace.la
libreplace_la_LDFLAGS = \
$(KVMLIBFLAGS) \
- -module \
- -no-undefined \
- -release $(PACKAGE_VERSION)
+ -no-undefined
libreplace_la_SOURCES = \
dummyin6.c \
Index: kaffe/replace/Makefile.in
diff -u kaffe/replace/Makefile.in:1.87 kaffe/replace/Makefile.in:1.88
--- kaffe/replace/Makefile.in:1.87 Sat May 21 13:39:24 2005
+++ kaffe/replace/Makefile.in Wed Jun 29 09:42:48 2005
@@ -79,15 +79,7 @@
mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config/config.h
CONFIG_CLEAN_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(nativedir)"
-nativeLTLIBRARIES_INSTALL = $(INSTALL)
-LTLIBRARIES = $(native_LTLIBRARIES)
+LTLIBRARIES = $(noinst_LTLIBRARIES)
am__DEPENDENCIES_1 =
libreplace_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
am_libreplace_la_OBJECTS = dummyin6.lo getaddrinfo.lo getifaddrs.lo \
@@ -385,12 +377,10 @@
toolslibdir = @toolslibdir@
with_engine = @with_engine@
AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/include
-native_LTLIBRARIES = libreplace.la
+noinst_LTLIBRARIES = libreplace.la
libreplace_la_LDFLAGS = \
$(KVMLIBFLAGS) \
- -module \
- -no-undefined \
- -release $(PACKAGE_VERSION)
+ -no-undefined
libreplace_la_SOURCES = \
dummyin6.c \
@@ -441,35 +431,17 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-install-nativeLTLIBRARIES: $(native_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(nativedir)" || $(mkdir_p) "$(DESTDIR)$(nativedir)"
- @list='$(native_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
- f=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=install $(nativeLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(nativedir)/$$f'"; \
- $(LIBTOOL) --mode=install $(nativeLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(nativedir)/$$f"; \
- else :; fi; \
- done
-
-uninstall-nativeLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
- @set -x; list='$(native_LTLIBRARIES)'; for p in $$list; do \
- p=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(nativedir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(nativedir)/$$p"; \
- done
-clean-nativeLTLIBRARIES:
- -test -z "$(native_LTLIBRARIES)" || rm -f $(native_LTLIBRARIES)
- @list='$(native_LTLIBRARIES)'; for p in $$list; do \
+clean-noinstLTLIBRARIES:
+ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+ @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
test "$$dir" != "$$p" || dir=.; \
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
libreplace.la: $(libreplace_la_OBJECTS) $(libreplace_la_DEPENDENCIES)
- $(LINK) -rpath $(nativedir) $(libreplace_la_LDFLAGS) $(libreplace_la_OBJECTS) $(libreplace_la_LIBADD) $(LIBS)
+ $(LINK) $(libreplace_la_LDFLAGS) $(libreplace_la_OBJECTS) $(libreplace_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -595,9 +567,6 @@
check: check-am
all-am: Makefile $(LTLIBRARIES)
installdirs:
- for dir in "$(DESTDIR)$(nativedir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
- done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -624,7 +593,7 @@
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
-clean-am: clean-generic clean-libtool clean-nativeLTLIBRARIES \
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
mostlyclean-am
distclean: distclean-am
@@ -643,7 +612,7 @@
info-am:
-install-data-am: install-nativeLTLIBRARIES
+install-data-am:
install-exec-am:
@@ -671,20 +640,19 @@
ps-am:
-uninstall-am: uninstall-info-am uninstall-nativeLTLIBRARIES
+uninstall-am: uninstall-info-am
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-nativeLTLIBRARIES ctags distclean \
+ clean-libtool clean-noinstLTLIBRARIES ctags distclean \
distclean-compile distclean-generic distclean-libtool \
distclean-tags distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am install-exec \
install-exec-am install-info install-info-am install-man \
- install-nativeLTLIBRARIES install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-info-am \
- uninstall-nativeLTLIBRARIES
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags uninstall uninstall-am \
+ uninstall-info-am
# 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.
More information about the kaffe
mailing list