summaryrefslogtreecommitdiff
path: root/boehm-gc
diff options
context:
space:
mode:
authorrwild <rwild@138bc75d-0d04-0410-961f-82ee72b054a4>2009-08-22 12:43:24 +0000
committerrwild <rwild@138bc75d-0d04-0410-961f-82ee72b054a4>2009-08-22 12:43:24 +0000
commit60598a3af9ba4d8820cd3a4573f446e4be8da3c0 (patch)
treedbca9c0b63a0a6b0fbfe0697e6a57ec3e8e27604 /boehm-gc
parentf0c89091eecbba9b514286df92e46a94ef56473f (diff)
downloadgcc-60598a3af9ba4d8820cd3a4573f446e4be8da3c0.tar.gz
LIBTOOLFLAGS, and *_LINK fixes for Automake 1.11
boehm-gc/: * Makefile.am (LTCOMPILE, LTLINK): Add $(AM_LIBTOOLFLAGS) and $(LIBTOOLFLAGS). * Makefile.in: Regenerate. libgfortran/: * Makefile.am (libgfortran_la_LINK): Add $(libgfortran_la_LDFLAGS). * Makefile.in: Regenerate. libjava/: * Makefile.am (libgcj_la_LINK, libgcj_tools_la_LINK) (lib_gnu_awt_xlib_la_LINK, libgcj_bc_la_LINK, jv_convert_LINK) (gcj_dbtool_LINK, gc_analyze_LINK, gij_LINK, ecjx_LINK) (gappletviewer_LINK, gjarsigner_LINK, gkeytool_LINK) (gjar_LINK, gjavah_LINK, gcjh_LINK, gnative2ascii_LINK) (gorbd_LINK, grmid_LINK, gserialver_LINK, gtnameserv_LINK) (grmic_LINK, grmiregistry_LINK, gjdoc_LINK): Add $(gjdoc_LDFLAGS). (GCJLINK, LIBLINK, CXXLINK): Add $(LIBTOOLFLAGS). * Makefile.in: Regenerate. libstdc++-v3/: * libsupc++/Makefile.am (LTCOMPILE, LTCXXCOMPILE, CXXLINK): Add $(LIBTOOLFLAGS). * libsupc++/Makefile.in: Regenerate. * src/Makefile.am (LTCXXCOMPILE, CXXLINK): Add $(AM_LIBTOOLFLAGS) and $(LIBTOOLFLAGS). * src/Makefile.in: Regenerate. libgomp/: * Makefile.am (LINK): Add $(AM_LIBTOOLFLAGS) and $(LIBTOOLFLAGS). * Makefile.in: Regenerate. libobjc/: * Makefile.in (LIBTOOL): Add $(LIBTOOLFLAGS). git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@151013 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'boehm-gc')
-rw-r--r--boehm-gc/ChangeLog6
-rw-r--r--boehm-gc/Makefile.am6
-rw-r--r--boehm-gc/Makefile.in7
3 files changed, 15 insertions, 4 deletions
diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog
index 0e37031371e..b49dc31b366 100644
--- a/boehm-gc/ChangeLog
+++ b/boehm-gc/ChangeLog
@@ -1,3 +1,9 @@
+2009-08-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+
+ * Makefile.am (LTCOMPILE, LTLINK): Add $(AM_LIBTOOLFLAGS)
+ and $(LIBTOOLFLAGS).
+ * Makefile.in: Regenerate.
+
2009-07-30 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* configure.ac (_AC_ARG_VAR_PRECIOUS): Use m4_rename_force.
diff --git a/boehm-gc/Makefile.am b/boehm-gc/Makefile.am
index 41528ae14ea..83005b2e803 100644
--- a/boehm-gc/Makefile.am
+++ b/boehm-gc/Makefile.am
@@ -64,10 +64,12 @@ TESTS = gctest
## We have our own definition of LTCOMPILE because we want to use our
## CFLAGS, not those passed in from the top level make.
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) \
+LTCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile \
+ $(CC) $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CFLAGS) $(MY_CFLAGS) $(GC_CFLAGS)
LTLDFLAGS = $(shell $(top_srcdir)/../libtool-ldflags $(LDFLAGS))
-LINK = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(MY_CFLAGS) $(LTLDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
+ $(CC) $(AM_CFLAGS) $(MY_CFLAGS) $(LTLDFLAGS) -o $@
# Work around what appears to be a GNU make bug handling MAKEFLAGS
# values defined in terms of make variables, as is the case for CC and
diff --git a/boehm-gc/Makefile.in b/boehm-gc/Makefile.in
index d6dcd9bcb5b..e143e6e1fa4 100644
--- a/boehm-gc/Makefile.in
+++ b/boehm-gc/Makefile.in
@@ -314,11 +314,14 @@ gctest_LDADD = ./libgcjgc.la $(THREADLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
gctest_LDFLAGS = -shared-libgcc
TESTS_ENVIRONMENT = LD_LIBRARY_PATH=../../$(MULTIBUILDTOP)gcc
TESTS = gctest
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) \
+LTCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile \
+ $(CC) $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CFLAGS) $(MY_CFLAGS) $(GC_CFLAGS)
LTLDFLAGS = $(shell $(top_srcdir)/../libtool-ldflags $(LDFLAGS))
-LINK = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(MY_CFLAGS) $(LTLDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
+ $(CC) $(AM_CFLAGS) $(MY_CFLAGS) $(LTLDFLAGS) -o $@
+
# Work around what appears to be a GNU make bug handling MAKEFLAGS
# values defined in terms of make variables, as is the case for CC and