[kaffe] CVS kaffe (dalibor): Turned libreplace into a real shared library
Kaffe CVS
cvs-commits at kaffe.org
Sat Mar 20 11:45:05 PST 2004
PatchSet 4542
Date: 2004/03/20 19:41:25
Author: dalibor
Branch: HEAD
Tag: (none)
Log:
Turned libreplace into a real shared library
2004-03-19 Dalibor Topic <robilad at kaffe.org>
* replace/Makefile.am:
Made libreplace a real shared library to hopefully
fix systems where handling on covenience libraries
seems to be broken.
* replace/Makefile.in,
libraries/javalib/Makefile.am,
libraries/javalib/Makefile.in:
Regenerated.
Members:
ChangeLog:1.2120->1.2121
libraries/javalib/Makefile.am:1.175->1.176
libraries/javalib/Makefile.in:1.234->1.235
replace/Makefile.am:1.6->1.7
replace/Makefile.in:1.36->1.37
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2120 kaffe/ChangeLog:1.2121
--- kaffe/ChangeLog:1.2120 Sat Mar 20 18:26:02 2004
+++ kaffe/ChangeLog Sat Mar 20 19:41:25 2004
@@ -1,5 +1,17 @@
2004-03-19 Dalibor Topic <robilad at kaffe.org>
+ * replace/Makefile.am:
+ Made libreplace a real shared library to hopefully
+ fix systems where handling on covenience libraries
+ seems to be broken.
+
+ * replace/Makefile.in,
+ libraries/javalib/Makefile.am,
+ libraries/javalib/Makefile.in:
+ Regenerated.
+
+2004-03-19 Dalibor Topic <robilad at kaffe.org>
+
* include/jsyscall.h:
Added missing includes.
Index: kaffe/libraries/javalib/Makefile.am
diff -u kaffe/libraries/javalib/Makefile.am:1.175 kaffe/libraries/javalib/Makefile.am:1.176
--- kaffe/libraries/javalib/Makefile.am:1.175 Sat Mar 20 18:26:05 2004
+++ kaffe/libraries/javalib/Makefile.am Sat Mar 20 19:41:26 2004
@@ -1586,16 +1586,10 @@
java/text/ParsePosition.java \
java/text/RuleBasedCollator.java \
java/text/SimpleDateFormat.java \
- java/text/SimpleLineIterator.java \
- java/text/SimpleSentenceIterator.java \
- java/text/SimpleWordIterator.java \
java/text/StringCharacterIterator.java
java_util_SRCS = \
java/util/AbstractCollection.java \
- java/util/AbstractListIterator.java \
java/util/AbstractList.java \
- java/util/AbstractMapEntry.java \
- java/util/AbstractMapEntrySet.java \
java/util/AbstractMap.java \
java/util/AbstractSequentialList.java \
java/util/AbstractSet.java \
Index: kaffe/libraries/javalib/Makefile.in
diff -u kaffe/libraries/javalib/Makefile.in:1.234 kaffe/libraries/javalib/Makefile.in:1.235
--- kaffe/libraries/javalib/Makefile.in:1.234 Sat Mar 20 18:26:05 2004
+++ kaffe/libraries/javalib/Makefile.in Sat Mar 20 19:41:26 2004
@@ -1945,17 +1945,11 @@
java/text/ParsePosition.java \
java/text/RuleBasedCollator.java \
java/text/SimpleDateFormat.java \
- java/text/SimpleLineIterator.java \
- java/text/SimpleSentenceIterator.java \
- java/text/SimpleWordIterator.java \
java/text/StringCharacterIterator.java
java_util_SRCS = \
java/util/AbstractCollection.java \
- java/util/AbstractListIterator.java \
java/util/AbstractList.java \
- java/util/AbstractMapEntry.java \
- java/util/AbstractMapEntrySet.java \
java/util/AbstractMap.java \
java/util/AbstractSequentialList.java \
java/util/AbstractSet.java \
Index: kaffe/replace/Makefile.am
diff -u kaffe/replace/Makefile.am:1.6 kaffe/replace/Makefile.am:1.7
--- kaffe/replace/Makefile.am:1.6 Fri Jan 2 17:40:29 2004
+++ kaffe/replace/Makefile.am Sat Mar 20 19:41:27 2004
@@ -11,7 +11,14 @@
# University of Utah, http://www.cs.utah.edu/flux/
AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/include
-noinst_LTLIBRARIES = libreplace.la
+
+native_LTLIBRARIES = libreplace.la
+
+libreplace_la_LDFLAGS = \
+ $(KVMLIBFLAGS) \
+ -export-dynamic \
+ -release $(PACKAGE_VERSION)
+
libreplace_la_SOURCES = \
dummyin6.c \
getaddrinfo.c \
Index: kaffe/replace/Makefile.in
diff -u kaffe/replace/Makefile.in:1.36 kaffe/replace/Makefile.in:1.37
--- kaffe/replace/Makefile.in:1.36 Tue Mar 16 14:11:20 2004
+++ kaffe/replace/Makefile.in Sat Mar 20 19:41:27 2004
@@ -68,7 +68,9 @@
CONFIG_HEADER = $(top_builddir)/config/config.h \
$(top_builddir)/include/kaffe/jtypes.h
CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(noinst_LTLIBRARIES)
+am__installdirs = "$(DESTDIR)$(nativedir)"
+nativeLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(native_LTLIBRARIES)
libreplace_la_LIBADD =
am_libreplace_la_OBJECTS = dummyin6.lo getaddrinfo.lo getifaddrs.lo \
inet_pton.lo inet_ntop.lo memset.lo
@@ -325,7 +327,12 @@
toolslibdir = @toolslibdir@
with_engine = @with_engine@
AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/include
-noinst_LTLIBRARIES = libreplace.la
+native_LTLIBRARIES = libreplace.la
+libreplace_la_LDFLAGS = \
+ $(KVMLIBFLAGS) \
+ -export-dynamic \
+ -release $(PACKAGE_VERSION)
+
libreplace_la_SOURCES = \
dummyin6.c \
getaddrinfo.c \
@@ -370,17 +377,35 @@
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="`echo $$p | sed -e 's|^.*/||'`"; \
+ 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
-clean-noinstLTLIBRARIES:
- -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
- @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+uninstall-nativeLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+ @list='$(native_LTLIBRARIES)'; for p in $$list; do \
+ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ 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 \
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) $(libreplace_la_LDFLAGS) $(libreplace_la_OBJECTS) $(libreplace_la_LIBADD) $(LIBS)
+ $(LINK) -rpath $(nativedir) $(libreplace_la_LDFLAGS) $(libreplace_la_OBJECTS) $(libreplace_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -506,6 +531,9 @@
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
@@ -532,7 +560,7 @@
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+clean-am: clean-generic clean-libtool clean-nativeLTLIBRARIES \
mostlyclean-am
distclean: distclean-am
@@ -551,7 +579,7 @@
info-am:
-install-data-am:
+install-data-am: install-nativeLTLIBRARIES
install-exec-am:
@@ -579,19 +607,20 @@
ps-am:
-uninstall-am: uninstall-info-am
+uninstall-am: uninstall-info-am uninstall-nativeLTLIBRARIES
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+ clean-libtool clean-nativeLTLIBRARIES 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-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
+ 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
# 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