OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

configure.ac (ac_configure_args): Add --with-native-libdir. 

2006-07-06  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* configure.ac (ac_configure_args): Add --with-native-libdir.
	* configure: Regenerate.
	* classpath/native/jni/gtk-peer/Makefile.am: Remove GCJ LOCAL
	sections.
	* classpath/native/jni/gtk-peer/Makefile.in: Regenerate.
	* classpath/native/jawt/Makefile.am: Remove GCJ LOCAL sections.
	* classpath/native/jawt/Makefile.in: Regenerate.
	* classpath/native/plugin/Makefile.am: Remove GCJ LOCAL sections.
	* classpath/native/plugin/Makefile.in: Regenerate.

From-SVN: r115223
This commit is contained in:
Thomas Fitzsimmons 2006-07-06 16:00:57 +00:00 committed by Thomas Fitzsimmons
parent 303c8bfdb2
commit 80f06e289b
9 changed files with 132 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libjava/ChangeLog
View File

@ -1,3 +1,15 @@
2006-07-06 Thomas Fitzsimmons <fitzsim@redhat.com>
* configure.ac (ac_configure_args): Add --with-native-libdir.
* configure: Regenerate.
* classpath/native/jni/gtk-peer/Makefile.am: Remove GCJ LOCAL
sections.
* classpath/native/jni/gtk-peer/Makefile.in: Regenerate.
* classpath/native/jawt/Makefile.am: Remove GCJ LOCAL sections.
* classpath/native/jawt/Makefile.in: Regenerate.
* classpath/native/plugin/Makefile.am: Remove GCJ LOCAL sections.
* classpath/native/plugin/Makefile.in: Regenerate.
2006-07-05 Ranjit Mathew <rmathew@gcc.gnu.org> 2006-07-05 Ranjit Mathew <rmathew@gcc.gnu.org>
Danny Smith <dannysmith@users.sourceforge.net> Danny Smith <dannysmith@users.sourceforge.net>

10
libjava/classpath/native/jawt/Makefile.am
View File

@ -1,16 +1,8 @@
## GCJ LOCAL: install this library in GCJ's versioned library nativeexeclib_LTLIBRARIES = libjawt.la
## directory
gcc_version := $(shell cat $(top_srcdir)/../../gcc/BASE-VER)
gcjversionedlibdir = $(libdir)/gcj-$(gcc_version)
gcjversionedlib_LTLIBRARIES = libjawt.la
libjawt_la_SOURCES = jawt.c libjawt_la_SOURCES = jawt.c
libjawt_la_LIBADD = $(top_builddir)/native/jni/gtk-peer/libgtkpeer.la libjawt_la_LIBADD = $(top_builddir)/native/jni/gtk-peer/libgtkpeer.la
## GCJ LOCAL: encode the library path and use GCJ's library version
libjawt_la_LDFLAGS = -rpath $(gcjversionedlibdir) \
-version-info `grep -v '^\#' $(top_srcdir)/../libtool-version`
AM_LDFLAGS = @CLASSPATH_MODULE@ @GTK_LIBS@ @PANGOFT2_LIBS@ @X_LIBS@ @XTEST_LIBS@ AM_LDFLAGS = @CLASSPATH_MODULE@ @GTK_LIBS@ @PANGOFT2_LIBS@ @X_LIBS@ @XTEST_LIBS@
AM_CPPFLAGS = @CLASSPATH_INCLUDES@ AM_CPPFLAGS = @CLASSPATH_INCLUDES@

68
libjava/classpath/native/jawt/Makefile.in
View File

@ -58,9 +58,9 @@ am__vpath_adj = case $$p in \
*) f=$$p;; \ *) f=$$p;; \
esac; esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(gcjversionedlibdir)" am__installdirs = "$(DESTDIR)$(nativeexeclibdir)"
gcjversionedlibLTLIBRARIES_INSTALL = $(INSTALL) nativeexeclibLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(gcjversionedlib_LTLIBRARIES) LTLIBRARIES = $(nativeexeclib_LTLIBRARIES)
libjawt_la_DEPENDENCIES = \ libjawt_la_DEPENDENCIES = \
$(top_builddir)/native/jni/gtk-peer/libgtkpeer.la $(top_builddir)/native/jni/gtk-peer/libgtkpeer.la
am_libjawt_la_OBJECTS = jawt.lo am_libjawt_la_OBJECTS = jawt.lo
@ -295,14 +295,9 @@ target_cpu = @target_cpu@
target_os = @target_os@ target_os = @target_os@
target_vendor = @target_vendor@ target_vendor = @target_vendor@
vm_classes = @vm_classes@ vm_classes = @vm_classes@
gcc_version := $(shell cat $(top_srcdir)/../../gcc/BASE-VER) nativeexeclib_LTLIBRARIES = libjawt.la
gcjversionedlibdir = $(libdir)/gcj-$(gcc_version)
gcjversionedlib_LTLIBRARIES = libjawt.la
libjawt_la_SOURCES = jawt.c libjawt_la_SOURCES = jawt.c
libjawt_la_LIBADD = $(top_builddir)/native/jni/gtk-peer/libgtkpeer.la libjawt_la_LIBADD = $(top_builddir)/native/jni/gtk-peer/libgtkpeer.la
libjawt_la_LDFLAGS = -rpath $(gcjversionedlibdir) \
-version-info `grep -v '^\#' $(top_srcdir)/../libtool-version`
AM_LDFLAGS = @CLASSPATH_MODULE@ @GTK_LIBS@ @PANGOFT2_LIBS@ @X_LIBS@ @XTEST_LIBS@ AM_LDFLAGS = @CLASSPATH_MODULE@ @GTK_LIBS@ @PANGOFT2_LIBS@ @X_LIBS@ @XTEST_LIBS@
AM_CPPFLAGS = @CLASSPATH_INCLUDES@ AM_CPPFLAGS = @CLASSPATH_INCLUDES@
@ -344,35 +339,35 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-gcjversionedlibLTLIBRARIES: $(gcjversionedlib_LTLIBRARIES) install-nativeexeclibLTLIBRARIES: $(nativeexeclib_LTLIBRARIES)
@$(NORMAL_INSTALL) @$(NORMAL_INSTALL)
test -z "$(gcjversionedlibdir)" || $(mkdir_p) "$(DESTDIR)$(gcjversionedlibdir)" test -z "$(nativeexeclibdir)" || $(mkdir_p) "$(DESTDIR)$(nativeexeclibdir)"
@list='$(gcjversionedlib_LTLIBRARIES)'; for p in $$list; do \ @list='$(nativeexeclib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \ if test -f $$p; then \
f=$(am__strip_dir) \ f=$(am__strip_dir) \
echo " $(LIBTOOL) --mode=install $(gcjversionedlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(gcjversionedlibdir)/$$f'"; \ echo " $(LIBTOOL) --mode=install $(nativeexeclibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(nativeexeclibdir)/$$f'"; \
$(LIBTOOL) --mode=install $(gcjversionedlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(gcjversionedlibdir)/$$f"; \ $(LIBTOOL) --mode=install $(nativeexeclibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(nativeexeclibdir)/$$f"; \
else :; fi; \ else :; fi; \
done done
uninstall-gcjversionedlibLTLIBRARIES: uninstall-nativeexeclibLTLIBRARIES:
@$(NORMAL_UNINSTALL) @$(NORMAL_UNINSTALL)
@set -x; list='$(gcjversionedlib_LTLIBRARIES)'; for p in $$list; do \ @set -x; list='$(nativeexeclib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \ p=$(am__strip_dir) \
echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(gcjversionedlibdir)/$$p'"; \ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(nativeexeclibdir)/$$p'"; \
$(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(gcjversionedlibdir)/$$p"; \ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(nativeexeclibdir)/$$p"; \
done done
clean-gcjversionedlibLTLIBRARIES: clean-nativeexeclibLTLIBRARIES:
-test -z "$(gcjversionedlib_LTLIBRARIES)" || rm -f $(gcjversionedlib_LTLIBRARIES) -test -z "$(nativeexeclib_LTLIBRARIES)" || rm -f $(nativeexeclib_LTLIBRARIES)
@list='$(gcjversionedlib_LTLIBRARIES)'; for p in $$list; do \ @list='$(nativeexeclib_LTLIBRARIES)'; for p in $$list; do \
dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
test "$$dir" != "$$p" || dir=.; \ test "$$dir" != "$$p" || dir=.; \
echo "rm -f \"$${dir}/so_locations\""; \ echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \ rm -f "$${dir}/so_locations"; \
done done
libjawt.la: $(libjawt_la_OBJECTS) $(libjawt_la_DEPENDENCIES) libjawt.la: $(libjawt_la_OBJECTS) $(libjawt_la_DEPENDENCIES)
$(LINK) -rpath $(gcjversionedlibdir) $(libjawt_la_LDFLAGS) $(libjawt_la_OBJECTS) $(libjawt_la_LIBADD) $(LIBS) $(LINK) -rpath $(nativeexeclibdir) $(libjawt_la_LDFLAGS) $(libjawt_la_OBJECTS) $(libjawt_la_LIBADD) $(LIBS)
mostlyclean-compile: mostlyclean-compile:
-rm -f *.$(OBJEXT) -rm -f *.$(OBJEXT)
@ -492,7 +487,7 @@ check-am: all-am
check: check-am check: check-am
all-am: Makefile $(LTLIBRARIES) all-am: Makefile $(LTLIBRARIES)
installdirs: installdirs:
for dir in "$(DESTDIR)$(gcjversionedlibdir)"; do \ for dir in "$(DESTDIR)$(nativeexeclibdir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \ test -z "$$dir" || $(mkdir_p) "$$dir"; \
done done
install: install-am install: install-am
@ -521,7 +516,7 @@ maintainer-clean-generic:
@echo "it deletes files that may require special tools to rebuild." @echo "it deletes files that may require special tools to rebuild."
clean: clean-am clean: clean-am
clean-am: clean-gcjversionedlibLTLIBRARIES clean-generic clean-libtool \ clean-am: clean-generic clean-libtool clean-nativeexeclibLTLIBRARIES \
mostlyclean-am mostlyclean-am
distclean: distclean-am distclean: distclean-am
@ -540,9 +535,9 @@ info: info-am
info-am: info-am:
install-data-am: install-gcjversionedlibLTLIBRARIES install-data-am:
install-exec-am: install-exec-am: install-nativeexeclibLTLIBRARIES
install-info: install-info-am install-info: install-info-am
@ -568,21 +563,20 @@ ps: ps-am
ps-am: ps-am:
uninstall-am: uninstall-gcjversionedlibLTLIBRARIES uninstall-info-am uninstall-am: uninstall-info-am uninstall-nativeexeclibLTLIBRARIES
.PHONY: CTAGS GTAGS all all-am check check-am clean \ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
clean-gcjversionedlibLTLIBRARIES clean-generic clean-libtool \ clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \
ctags distclean distclean-compile distclean-generic \ distclean-compile distclean-generic distclean-libtool \
distclean-libtool distclean-tags distdir dvi dvi-am html \ distclean-tags distdir dvi dvi-am html html-am info info-am \
html-am info info-am install install-am install-data \ install install-am install-data install-data-am install-exec \
install-data-am install-exec install-exec-am \ install-exec-am install-info install-info-am install-man \
install-gcjversionedlibLTLIBRARIES install-info \ install-nativeexeclibLTLIBRARIES install-strip installcheck \
install-info-am install-man install-strip installcheck \
installcheck-am installdirs maintainer-clean \ installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \ maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags uninstall uninstall-am \ tags uninstall uninstall-am uninstall-info-am \
uninstall-gcjversionedlibLTLIBRARIES uninstall-info-am uninstall-nativeexeclibLTLIBRARIES
# Tell versions [3.59,3.63) of GNU make to not export all variables. # 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. # Otherwise a system limit (for SysV at least) may be exceeded.

10
libjava/classpath/native/jni/gtk-peer/Makefile.am
View File

@ -1,8 +1,4 @@
## GCJ LOCAL: install this library in GCJ's versioned library nativeexeclib_LTLIBRARIES = libgtkpeer.la
## directory
gcc_version := $(shell cat $(top_srcdir)/../../gcc/BASE-VER)
gcjversionedlibdir = $(libdir)/gcj-$(gcc_version)
gcjversionedlib_LTLIBRARIES = libgtkpeer.la
# GTK JNI sources. # GTK JNI sources.
libgtkpeer_la_SOURCES = gnu_java_awt_peer_gtk_CairoSurface.c \ libgtkpeer_la_SOURCES = gnu_java_awt_peer_gtk_CairoSurface.c \
@ -54,10 +50,6 @@ libgtkpeer_la_SOURCES = gnu_java_awt_peer_gtk_CairoSurface.c \
gtk_jawt.c \ gtk_jawt.c \
gtkpeer.h gtkpeer.h
## GCJ LOCAL: encode the library path and use GCJ's library version
libgtkpeer_la_LDFLAGS = -rpath $(gcjversionedlibdir) \
-version-info `grep -v '^\#' $(top_srcdir)/../libtool-version`
libgtkpeer_la_LIBADD = $(top_builddir)/native/jni/classpath/native_state.lo \ libgtkpeer_la_LIBADD = $(top_builddir)/native/jni/classpath/native_state.lo \
$(top_builddir)/native/jni/classpath/jcl.lo $(top_builddir)/native/jni/classpath/jcl.lo

68
libjava/classpath/native/jni/gtk-peer/Makefile.in
View File

@ -58,9 +58,9 @@ am__vpath_adj = case $$p in \
*) f=$$p;; \ *) f=$$p;; \
esac; esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(gcjversionedlibdir)" am__installdirs = "$(DESTDIR)$(nativeexeclibdir)"
gcjversionedlibLTLIBRARIES_INSTALL = $(INSTALL) nativeexeclibLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(gcjversionedlib_LTLIBRARIES) LTLIBRARIES = $(nativeexeclib_LTLIBRARIES)
libgtkpeer_la_DEPENDENCIES = \ libgtkpeer_la_DEPENDENCIES = \
$(top_builddir)/native/jni/classpath/native_state.lo \ $(top_builddir)/native/jni/classpath/native_state.lo \
$(top_builddir)/native/jni/classpath/jcl.lo $(top_builddir)/native/jni/classpath/jcl.lo
@ -337,9 +337,7 @@ target_cpu = @target_cpu@
target_os = @target_os@ target_os = @target_os@
target_vendor = @target_vendor@ target_vendor = @target_vendor@
vm_classes = @vm_classes@ vm_classes = @vm_classes@
gcc_version := $(shell cat $(top_srcdir)/../../gcc/BASE-VER) nativeexeclib_LTLIBRARIES = libgtkpeer.la
gcjversionedlibdir = $(libdir)/gcj-$(gcc_version)
gcjversionedlib_LTLIBRARIES = libgtkpeer.la
# GTK JNI sources. # GTK JNI sources.
libgtkpeer_la_SOURCES = gnu_java_awt_peer_gtk_CairoSurface.c \ libgtkpeer_la_SOURCES = gnu_java_awt_peer_gtk_CairoSurface.c \
@ -391,9 +389,6 @@ libgtkpeer_la_SOURCES = gnu_java_awt_peer_gtk_CairoSurface.c \
gtk_jawt.c \ gtk_jawt.c \
gtkpeer.h gtkpeer.h
libgtkpeer_la_LDFLAGS = -rpath $(gcjversionedlibdir) \
-version-info `grep -v '^\#' $(top_srcdir)/../libtool-version`
libgtkpeer_la_LIBADD = $(top_builddir)/native/jni/classpath/native_state.lo \ libgtkpeer_la_LIBADD = $(top_builddir)/native/jni/classpath/native_state.lo \
$(top_builddir)/native/jni/classpath/jcl.lo $(top_builddir)/native/jni/classpath/jcl.lo
@ -441,35 +436,35 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-gcjversionedlibLTLIBRARIES: $(gcjversionedlib_LTLIBRARIES) install-nativeexeclibLTLIBRARIES: $(nativeexeclib_LTLIBRARIES)
@$(NORMAL_INSTALL) @$(NORMAL_INSTALL)
test -z "$(gcjversionedlibdir)" || $(mkdir_p) "$(DESTDIR)$(gcjversionedlibdir)" test -z "$(nativeexeclibdir)" || $(mkdir_p) "$(DESTDIR)$(nativeexeclibdir)"
@list='$(gcjversionedlib_LTLIBRARIES)'; for p in $$list; do \ @list='$(nativeexeclib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \ if test -f $$p; then \
f=$(am__strip_dir) \ f=$(am__strip_dir) \
echo " $(LIBTOOL) --mode=install $(gcjversionedlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(gcjversionedlibdir)/$$f'"; \ echo " $(LIBTOOL) --mode=install $(nativeexeclibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(nativeexeclibdir)/$$f'"; \
$(LIBTOOL) --mode=install $(gcjversionedlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(gcjversionedlibdir)/$$f"; \ $(LIBTOOL) --mode=install $(nativeexeclibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(nativeexeclibdir)/$$f"; \
else :; fi; \ else :; fi; \
done done
uninstall-gcjversionedlibLTLIBRARIES: uninstall-nativeexeclibLTLIBRARIES:
@$(NORMAL_UNINSTALL) @$(NORMAL_UNINSTALL)
@set -x; list='$(gcjversionedlib_LTLIBRARIES)'; for p in $$list; do \ @set -x; list='$(nativeexeclib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \ p=$(am__strip_dir) \
echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(gcjversionedlibdir)/$$p'"; \ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(nativeexeclibdir)/$$p'"; \
$(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(gcjversionedlibdir)/$$p"; \ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(nativeexeclibdir)/$$p"; \
done done
clean-gcjversionedlibLTLIBRARIES: clean-nativeexeclibLTLIBRARIES:
-test -z "$(gcjversionedlib_LTLIBRARIES)" || rm -f $(gcjversionedlib_LTLIBRARIES) -test -z "$(nativeexeclib_LTLIBRARIES)" || rm -f $(nativeexeclib_LTLIBRARIES)
@list='$(gcjversionedlib_LTLIBRARIES)'; for p in $$list; do \ @list='$(nativeexeclib_LTLIBRARIES)'; for p in $$list; do \
dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
test "$$dir" != "$$p" || dir=.; \ test "$$dir" != "$$p" || dir=.; \
echo "rm -f \"$${dir}/so_locations\""; \ echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \ rm -f "$${dir}/so_locations"; \
done done
libgtkpeer.la: $(libgtkpeer_la_OBJECTS) $(libgtkpeer_la_DEPENDENCIES) libgtkpeer.la: $(libgtkpeer_la_OBJECTS) $(libgtkpeer_la_DEPENDENCIES)
$(LINK) -rpath $(gcjversionedlibdir) $(libgtkpeer_la_LDFLAGS) $(libgtkpeer_la_OBJECTS) $(libgtkpeer_la_LIBADD) $(LIBS) $(LINK) -rpath $(nativeexeclibdir) $(libgtkpeer_la_LDFLAGS) $(libgtkpeer_la_OBJECTS) $(libgtkpeer_la_LIBADD) $(LIBS)
mostlyclean-compile: mostlyclean-compile:
-rm -f *.$(OBJEXT) -rm -f *.$(OBJEXT)
@ -631,7 +626,7 @@ check-am: all-am
check: check-am check: check-am
all-am: Makefile $(LTLIBRARIES) all-am: Makefile $(LTLIBRARIES)
installdirs: installdirs:
for dir in "$(DESTDIR)$(gcjversionedlibdir)"; do \ for dir in "$(DESTDIR)$(nativeexeclibdir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \ test -z "$$dir" || $(mkdir_p) "$$dir"; \
done done
install: install-am install: install-am
@ -660,7 +655,7 @@ maintainer-clean-generic:
@echo "it deletes files that may require special tools to rebuild." @echo "it deletes files that may require special tools to rebuild."
clean: clean-am clean: clean-am
clean-am: clean-gcjversionedlibLTLIBRARIES clean-generic clean-libtool \ clean-am: clean-generic clean-libtool clean-nativeexeclibLTLIBRARIES \
mostlyclean-am mostlyclean-am
distclean: distclean-am distclean: distclean-am
@ -679,9 +674,9 @@ info: info-am
info-am: info-am:
install-data-am: install-gcjversionedlibLTLIBRARIES install-data-am:
install-exec-am: install-exec-am: install-nativeexeclibLTLIBRARIES
install-info: install-info-am install-info: install-info-am
@ -707,21 +702,20 @@ ps: ps-am
ps-am: ps-am:
uninstall-am: uninstall-gcjversionedlibLTLIBRARIES uninstall-info-am uninstall-am: uninstall-info-am uninstall-nativeexeclibLTLIBRARIES
.PHONY: CTAGS GTAGS all all-am check check-am clean \ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
clean-gcjversionedlibLTLIBRARIES clean-generic clean-libtool \ clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \
ctags distclean distclean-compile distclean-generic \ distclean-compile distclean-generic distclean-libtool \
distclean-libtool distclean-tags distdir dvi dvi-am html \ distclean-tags distdir dvi dvi-am html html-am info info-am \
html-am info info-am install install-am install-data \ install install-am install-data install-data-am install-exec \
install-data-am install-exec install-exec-am \ install-exec-am install-info install-info-am install-man \
install-gcjversionedlibLTLIBRARIES install-info \ install-nativeexeclibLTLIBRARIES install-strip installcheck \
install-info-am install-man install-strip installcheck \
installcheck-am installdirs maintainer-clean \ installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \ maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags uninstall uninstall-am \ tags uninstall uninstall-am uninstall-info-am \
uninstall-gcjversionedlibLTLIBRARIES uninstall-info-am uninstall-nativeexeclibLTLIBRARIES
# Tell versions [3.59,3.63) of GNU make to not export all variables. # 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. # Otherwise a system limit (for SysV at least) may be exceeded.

14
libjava/classpath/native/plugin/Makefile.am
View File

@ -1,24 +1,16 @@
## GCJ LOCAL: install this library in GCJ's versioned library nativeexeclib_LTLIBRARIES = libgcjwebplugin.la
## directory
gcc_version := $(shell cat $(top_srcdir)/../../gcc/BASE-VER)
gcjversionedlibdir = $(libdir)/gcj-$(gcc_version)
gcjversionedlib_LTLIBRARIES = libgcjwebplugin.la
libgcjwebplugin_la_SOURCES = gcjwebplugin.cc libgcjwebplugin_la_SOURCES = gcjwebplugin.cc
libgcjwebplugin_la_CXXFLAGS = \ libgcjwebplugin_la_CXXFLAGS = \
-Wall -DAPPLETVIEWER_EXECUTABLE="\"$(bindir)/gappletviewer\"" \ -Wall -DAPPLETVIEWER_EXECUTABLE="\"$(bindir)/gappletviewer\"" \
-DPLUGIN_DATA_DIRECTORY="\"$(PLUGIN_DIR)/gcjwebplugin-data\"" \
$(MOZILLA_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS) $(MOZILLA_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS)
## GCJ LOCAL: encode the library path and use GCJ's library version libgcjwebplugin_la_LDFLAGS = -avoid-version \
libgcjwebplugin_la_LDFLAGS = -rpath $(gcjversionedlibdir) \
-version-info `grep -v '^\#' $(top_srcdir)/../libtool-version` \
$(GLIB_LIBS) $(GTK_LIBS) \ $(GLIB_LIBS) $(GTK_LIBS) \
-lstdc++ -lstdc++
## GCJ LOCAL: depend on gcjversionedlib_LTLIBRARIES install-plugin: $(nativeexeclib_LTLIBRARIES)
install-plugin: $(gcjversionedlib_LTLIBRARIES)
$(INSTALL) -d -m0755 $(DESTDIR)$(PLUGIN_DIR) $(INSTALL) -d -m0755 $(DESTDIR)$(PLUGIN_DIR)
$(INSTALL) .libs/libgcjwebplugin.so $(DESTDIR)$(PLUGIN_DIR) $(INSTALL) .libs/libgcjwebplugin.so $(DESTDIR)$(PLUGIN_DIR)

71
libjava/classpath/native/plugin/Makefile.in
View File

@ -58,9 +58,9 @@ am__vpath_adj = case $$p in \
*) f=$$p;; \ *) f=$$p;; \
esac; esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(gcjversionedlibdir)" am__installdirs = "$(DESTDIR)$(nativeexeclibdir)"
gcjversionedlibLTLIBRARIES_INSTALL = $(INSTALL) nativeexeclibLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(gcjversionedlib_LTLIBRARIES) LTLIBRARIES = $(nativeexeclib_LTLIBRARIES)
libgcjwebplugin_la_LIBADD = libgcjwebplugin_la_LIBADD =
am_libgcjwebplugin_la_OBJECTS = libgcjwebplugin_la-gcjwebplugin.lo am_libgcjwebplugin_la_OBJECTS = libgcjwebplugin_la-gcjwebplugin.lo
libgcjwebplugin_la_OBJECTS = $(am_libgcjwebplugin_la_OBJECTS) libgcjwebplugin_la_OBJECTS = $(am_libgcjwebplugin_la_OBJECTS)
@ -294,17 +294,13 @@ target_cpu = @target_cpu@
target_os = @target_os@ target_os = @target_os@
target_vendor = @target_vendor@ target_vendor = @target_vendor@
vm_classes = @vm_classes@ vm_classes = @vm_classes@
gcc_version := $(shell cat $(top_srcdir)/../../gcc/BASE-VER) nativeexeclib_LTLIBRARIES = libgcjwebplugin.la
gcjversionedlibdir = $(libdir)/gcj-$(gcc_version)
gcjversionedlib_LTLIBRARIES = libgcjwebplugin.la
libgcjwebplugin_la_SOURCES = gcjwebplugin.cc libgcjwebplugin_la_SOURCES = gcjwebplugin.cc
libgcjwebplugin_la_CXXFLAGS = \ libgcjwebplugin_la_CXXFLAGS = \
-Wall -DAPPLETVIEWER_EXECUTABLE="\"$(bindir)/gappletviewer\"" \ -Wall -DAPPLETVIEWER_EXECUTABLE="\"$(bindir)/gappletviewer\"" \
-DPLUGIN_DATA_DIRECTORY="\"$(PLUGIN_DIR)/gcjwebplugin-data\"" \
$(MOZILLA_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS) $(MOZILLA_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS)
libgcjwebplugin_la_LDFLAGS = -rpath $(gcjversionedlibdir) \ libgcjwebplugin_la_LDFLAGS = -avoid-version \
-version-info `grep -v '^\#' $(top_srcdir)/../libtool-version` \
$(GLIB_LIBS) $(GTK_LIBS) \ $(GLIB_LIBS) $(GTK_LIBS) \
-lstdc++ -lstdc++
@ -341,35 +337,35 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-gcjversionedlibLTLIBRARIES: $(gcjversionedlib_LTLIBRARIES) install-nativeexeclibLTLIBRARIES: $(nativeexeclib_LTLIBRARIES)
@$(NORMAL_INSTALL) @$(NORMAL_INSTALL)
test -z "$(gcjversionedlibdir)" || $(mkdir_p) "$(DESTDIR)$(gcjversionedlibdir)" test -z "$(nativeexeclibdir)" || $(mkdir_p) "$(DESTDIR)$(nativeexeclibdir)"
@list='$(gcjversionedlib_LTLIBRARIES)'; for p in $$list; do \ @list='$(nativeexeclib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \ if test -f $$p; then \
f=$(am__strip_dir) \ f=$(am__strip_dir) \
echo " $(LIBTOOL) --mode=install $(gcjversionedlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(gcjversionedlibdir)/$$f'"; \ echo " $(LIBTOOL) --mode=install $(nativeexeclibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(nativeexeclibdir)/$$f'"; \
$(LIBTOOL) --mode=install $(gcjversionedlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(gcjversionedlibdir)/$$f"; \ $(LIBTOOL) --mode=install $(nativeexeclibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(nativeexeclibdir)/$$f"; \
else :; fi; \ else :; fi; \
done done
uninstall-gcjversionedlibLTLIBRARIES: uninstall-nativeexeclibLTLIBRARIES:
@$(NORMAL_UNINSTALL) @$(NORMAL_UNINSTALL)
@set -x; list='$(gcjversionedlib_LTLIBRARIES)'; for p in $$list; do \ @set -x; list='$(nativeexeclib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \ p=$(am__strip_dir) \
echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(gcjversionedlibdir)/$$p'"; \ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(nativeexeclibdir)/$$p'"; \
$(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(gcjversionedlibdir)/$$p"; \ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(nativeexeclibdir)/$$p"; \
done done
clean-gcjversionedlibLTLIBRARIES: clean-nativeexeclibLTLIBRARIES:
-test -z "$(gcjversionedlib_LTLIBRARIES)" || rm -f $(gcjversionedlib_LTLIBRARIES) -test -z "$(nativeexeclib_LTLIBRARIES)" || rm -f $(nativeexeclib_LTLIBRARIES)
@list='$(gcjversionedlib_LTLIBRARIES)'; for p in $$list; do \ @list='$(nativeexeclib_LTLIBRARIES)'; for p in $$list; do \
dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
test "$$dir" != "$$p" || dir=.; \ test "$$dir" != "$$p" || dir=.; \
echo "rm -f \"$${dir}/so_locations\""; \ echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \ rm -f "$${dir}/so_locations"; \
done done
libgcjwebplugin.la: $(libgcjwebplugin_la_OBJECTS) $(libgcjwebplugin_la_DEPENDENCIES) libgcjwebplugin.la: $(libgcjwebplugin_la_OBJECTS) $(libgcjwebplugin_la_DEPENDENCIES)
$(CXXLINK) -rpath $(gcjversionedlibdir) $(libgcjwebplugin_la_LDFLAGS) $(libgcjwebplugin_la_OBJECTS) $(libgcjwebplugin_la_LIBADD) $(LIBS) $(CXXLINK) -rpath $(nativeexeclibdir) $(libgcjwebplugin_la_LDFLAGS) $(libgcjwebplugin_la_OBJECTS) $(libgcjwebplugin_la_LIBADD) $(LIBS)
mostlyclean-compile: mostlyclean-compile:
-rm -f *.$(OBJEXT) -rm -f *.$(OBJEXT)
@ -496,7 +492,7 @@ check-am: all-am
check: check-am check: check-am
all-am: Makefile $(LTLIBRARIES) all-am: Makefile $(LTLIBRARIES)
installdirs: installdirs:
for dir in "$(DESTDIR)$(gcjversionedlibdir)"; do \ for dir in "$(DESTDIR)$(nativeexeclibdir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \ test -z "$$dir" || $(mkdir_p) "$$dir"; \
done done
install: install-am install: install-am
@ -525,7 +521,7 @@ maintainer-clean-generic:
@echo "it deletes files that may require special tools to rebuild." @echo "it deletes files that may require special tools to rebuild."
clean: clean-am clean: clean-am
clean-am: clean-gcjversionedlibLTLIBRARIES clean-generic clean-libtool \ clean-am: clean-generic clean-libtool clean-nativeexeclibLTLIBRARIES \
mostlyclean-am mostlyclean-am
distclean: distclean-am distclean: distclean-am
@ -544,9 +540,9 @@ info: info-am
info-am: info-am:
install-data-am: install-gcjversionedlibLTLIBRARIES install-data-am:
install-exec-am: install-exec-am: install-nativeexeclibLTLIBRARIES
install-info: install-info-am install-info: install-info-am
@ -572,24 +568,23 @@ ps: ps-am
ps-am: ps-am:
uninstall-am: uninstall-gcjversionedlibLTLIBRARIES uninstall-info-am uninstall-am: uninstall-info-am uninstall-nativeexeclibLTLIBRARIES
.PHONY: CTAGS GTAGS all all-am check check-am clean \ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
clean-gcjversionedlibLTLIBRARIES clean-generic clean-libtool \ clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \
ctags distclean distclean-compile distclean-generic \ distclean-compile distclean-generic distclean-libtool \
distclean-libtool distclean-tags distdir dvi dvi-am html \ distclean-tags distdir dvi dvi-am html html-am info info-am \
html-am info info-am install install-am install-data \ install install-am install-data install-data-am install-exec \
install-data-am install-exec install-exec-am \ install-exec-am install-info install-info-am install-man \
install-gcjversionedlibLTLIBRARIES install-info \ install-nativeexeclibLTLIBRARIES install-strip installcheck \
install-info-am install-man install-strip installcheck \
installcheck-am installdirs maintainer-clean \ installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \ maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags uninstall uninstall-am \ tags uninstall uninstall-am uninstall-info-am \
uninstall-gcjversionedlibLTLIBRARIES uninstall-info-am uninstall-nativeexeclibLTLIBRARIES
install-plugin: $(gcjversionedlib_LTLIBRARIES) install-plugin: $(nativeexeclib_LTLIBRARIES)
$(INSTALL) -d -m0755 $(DESTDIR)$(PLUGIN_DIR) $(INSTALL) -d -m0755 $(DESTDIR)$(PLUGIN_DIR)
$(INSTALL) .libs/libgcjwebplugin.so $(DESTDIR)$(PLUGIN_DIR) $(INSTALL) .libs/libgcjwebplugin.so $(DESTDIR)$(PLUGIN_DIR)

13
libjava/configure vendored
View File

@ -14988,11 +14988,18 @@ esac
# Determine where the standard .db file is found. # Determine where the standard .db file and GNU Classpath JNI
# libraries are found.
multi_os_directory=`$CC -print-multi-os-directory` multi_os_directory=`$CC -print-multi-os-directory`
case $multi_os_directory in case $multi_os_directory in
.) dbexecdir='$(libdir)/gcj-$(gcc_version)' ;; # Avoid /. .)
*) dbexecdir='$(libdir)/'$multi_os_directory'/gcj-$(gcc_version)' ;; dbexecdir='$(libdir)/gcj-$(gcc_version)' # Avoid /.
ac_configure_args="$ac_configure_args --with-native-libdir=\$\(libdir\)/gcj-`cat $srcdir/../gcc/BASE-VER`"
;;
*)
dbexecdir='$(libdir)/'$multi_os_directory'/gcj-$(gcc_version)'
ac_configure_args="$ac_configure_args --with-native-libdir=\$\(libdir\)/$multi_os_directory/gcj-`cat $srcdir/../gcc/BASE-VER`"
;;
esac esac

13
libjava/configure.ac
View File

@ -1266,11 +1266,18 @@ AC_SUBST(toolexecdir)
AC_SUBST(toolexecmainlibdir) AC_SUBST(toolexecmainlibdir)
AC_SUBST(toolexeclibdir) AC_SUBST(toolexeclibdir)
# Determine where the standard .db file is found. # Determine where the standard .db file and GNU Classpath JNI
# libraries are found.
multi_os_directory=`$CC -print-multi-os-directory` multi_os_directory=`$CC -print-multi-os-directory`
case $multi_os_directory in case $multi_os_directory in
.) dbexecdir='$(libdir)/gcj-$(gcc_version)' ;; # Avoid /. .)
*) dbexecdir='$(libdir)/'$multi_os_directory'/gcj-$(gcc_version)' ;; dbexecdir='$(libdir)/gcj-$(gcc_version)' # Avoid /.
ac_configure_args="$ac_configure_args --with-native-libdir=\$\(libdir\)/gcj-`cat $srcdir/../gcc/BASE-VER`"
;;
*)
dbexecdir='$(libdir)/'$multi_os_directory'/gcj-$(gcc_version)'
ac_configure_args="$ac_configure_args --with-native-libdir=\$\(libdir\)/$multi_os_directory/gcj-`cat $srcdir/../gcc/BASE-VER`"
;;
esac esac
AC_SUBST(dbexecdir) AC_SUBST(dbexecdir)