Merged GC 5.0alpha4 with local changes, plus:

[pf3gnuchains/gcc-fork.git] / boehm-gc / Makefile.am

diff --git a/boehm-gc/Makefile.am b/boehm-gc/Makefile.am
index 4f214f6..6ab97ff 100644 (file)
--- a/boehm-gc/Makefile.am
+++ b/boehm-gc/Makefile.am
@@ -17,7 +17,7 @@ MULTICLEAN = true
 ## Install a library built with a cross compiler in tooldir, not
 ## libdir.
 if USE_LIBDIR
-toolexeclibdir = $(libdir)
+toolexeclibdir = $(libdir)$(MULTISUBDIR)
 else
 toolexecdir = $(exec_prefix)/$(target_alias)
 toolexeclibdir = $(toolexecdir)/lib$(MULTISUBDIR)
@@ -46,8 +46,9 @@ AM_CFLAGS = @BOEHM_GC_CFLAGS@
 
 check_PROGRAMS = gctest
 gctest_SOURCES = test.c
-gctest_LDADD = ./libgcjgc.la
+gctest_LDADD = ./libgcjgc.la $(THREADLIB)
 
+TESTS = gctest
 
 ## FIXME: relies on internal code generated by automake.
 all_objs = @addobjs@ $(libgcjgc_la_OBJECTS)
@@ -55,7 +56,9 @@ $(all_objs) : config.h gc_priv.h gc_hdrs.h gc.h gc_mark.h
 
 ## FIXME: we shouldn't have to do this, but automake forces us to.
 .s.lo:
-       $(LTCOMPILE) -x assembler-with-cpp -c $<
+## We use -Wp,-P to strip #line directives.  Irix `as' chokes on
+## these.
+       $(LTCOMPILE) -Wp,-P -x assembler-with-cpp -c $<
 
 ## We have our own definition of LTCOMPILE because we want to use our
 ## CFLAGS, not those passed in from the top level make.