Commit 0404aca7 by Andreas Schwab Committed by Andreas Schwab

Makefile.am (toolexeclib_LTLIBRARIES): Use install/libgcj_bc.la instead of libgcj_bc.la.

* Makefile.am (toolexeclib_LTLIBRARIES) [USE_LIBGCJ_BC]: Use
install/libgcj_bc.la instead of libgcj_bc.la.
(noinst_LTLIBRARIES) [USE_LIBGCJ_BC]: Define.
(install_libgcj_bc_la_SOURCES): Define.
(install/libgcj_bc.la): New rule.
* Makefile.in: Regenerate.

From-SVN: r205809
parent 8cfaeac7
2013-12-09 Andreas Schwab <schwab@suse.de>
* Makefile.am (toolexeclib_LTLIBRARIES) [USE_LIBGCJ_BC]: Use
install/libgcj_bc.la instead of libgcj_bc.la.
(noinst_LTLIBRARIES) [USE_LIBGCJ_BC]: Define.
(install_libgcj_bc_la_SOURCES): Define.
(install/libgcj_bc.la): New rule.
* Makefile.in: Regenerate.
2013-09-20 Alan Modra <amodra@gmail.com> 2013-09-20 Alan Modra <amodra@gmail.com>
* configure: Regenerate. * configure: Regenerate.
......
...@@ -212,7 +212,8 @@ LIBJAVA_CORE_EXTRA = ...@@ -212,7 +212,8 @@ LIBJAVA_CORE_EXTRA =
endif endif
if USE_LIBGCJ_BC if USE_LIBGCJ_BC
toolexeclib_LTLIBRARIES += libgcj_bc.la toolexeclib_LTLIBRARIES += install/libgcj_bc.la
noinst_LTLIBRARIES = libgcj_bc.la
endif endif
if XLIB_AWT if XLIB_AWT
...@@ -606,6 +607,7 @@ lib_gnu_awt_xlib_la_LINK = $(LIBLINK) $(lib_gnu_awt_xlib_la_LDFLAGS) \ ...@@ -606,6 +607,7 @@ lib_gnu_awt_xlib_la_LINK = $(LIBLINK) $(lib_gnu_awt_xlib_la_LDFLAGS) \
## This lets us have one soname in BC objects and another in C++ ABI objects. ## This lets us have one soname in BC objects and another in C++ ABI objects.
## This library is not linked against libgcj. ## This library is not linked against libgcj.
libgcj_bc_la_SOURCES = libgcj_bc.c libgcj_bc_la_SOURCES = libgcj_bc.c
install_libgcj_bc_la_SOURCES = $(libgcj_bc_la_SOURCES)
libgcj_bc_la_LDFLAGS = -rpath $(toolexeclibdir) -no-static -version-info 1:0:0 \ libgcj_bc_la_LDFLAGS = -rpath $(toolexeclibdir) -no-static -version-info 1:0:0 \
$(LIBGCJ_LD_SYMBOLIC_FUNCTIONS) $(LIBJAVA_LDFLAGS_NOUNDEF) $(LIBGCJ_LD_SYMBOLIC_FUNCTIONS) $(LIBJAVA_LDFLAGS_NOUNDEF)
libgcj_bc_la_DEPENDENCIES = libgcj.la $(libgcj_bc_la_version_dep) libgcj_bc_la_DEPENDENCIES = libgcj.la $(libgcj_bc_la_version_dep)
...@@ -628,6 +630,11 @@ libgcj_bc.la: $(libgcj_bc_la_OBJECTS) $(libgcj_bc_la_DEPENDENCIES) ...@@ -628,6 +630,11 @@ libgcj_bc.la: $(libgcj_bc_la_OBJECTS) $(libgcj_bc_la_DEPENDENCIES)
rm .libs/libgcj_bc.so.1; \ rm .libs/libgcj_bc.so.1; \
$(LN_S) libgcj_bc.so.1.0.0 .libs/libgcj_bc.so.1 $(LN_S) libgcj_bc.so.1.0.0 .libs/libgcj_bc.so.1
## This rule creates the libgcj_bc library that is actually installed.
install/libgcj_bc.la: $(libgcj_bc_la_OBJECTS) $(libgcj_bc_la_DEPENDENCIES) install/$(am__dirstamp)
$(libgcj_bc_la_LINK) $(am_libgcj_bc_la_rpath) $(libgcj_bc_la_LDFLAGS) \
$(libgcj_bc_la_OBJECTS) $(libgcj_bc_la_LIBADD) $(LIBS)
## Note that property_files is defined in sources.am. ## Note that property_files is defined in sources.am.
propertyo_files = $(patsubst classpath/resource/%,%,$(addsuffix .lo,$(property_files))) propertyo_files = $(patsubst classpath/resource/%,%,$(addsuffix .lo,$(property_files)))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment