aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Oliva <oliva@dcc.unicamp.br>1999-06-30 12:25:07 +0000
committerTom Tromey <tromey@gcc.gnu.org>1999-06-30 12:25:07 +0000
commit2fa39a0ec6a238c23ce9c6df6fde18e9ea8625d4 (patch)
tree5ccf3cacad34f18c5757884e22ced7467758127b
parentfe7bbd2ae6aa0beeccb1ff9e657de61dbd5ed946 (diff)
downloadgcc-2fa39a0ec6a238c23ce9c6df6fde18e9ea8625d4.zip
gcc-2fa39a0ec6a238c23ce9c6df6fde18e9ea8625d4.tar.gz
gcc-2fa39a0ec6a238c23ce9c6df6fde18e9ea8625d4.tar.bz2
Makefile.am (.s.lo): Renamed from `.s.o'.
1999-06-30 Alexandre Oliva <oliva@dcc.unicamp.br> * Makefile.am (.s.lo): Renamed from `.s.o'. * Makefile.in: Rebuilt. From-SVN: r27850
-rw-r--r--boehm-gc/ChangeLog5
-rw-r--r--boehm-gc/Makefile.am2
-rw-r--r--boehm-gc/Makefile.in8
3 files changed, 10 insertions, 5 deletions
diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog
index af461ba..9a24fb6 100644
--- a/boehm-gc/ChangeLog
+++ b/boehm-gc/ChangeLog
@@ -1,3 +1,8 @@
+1999-06-30 Alexandre Oliva <oliva@dcc.unicamp.br>
+
+ * Makefile.am (.s.lo): Renamed from `.s.o'.
+ * Makefile.in: Rebuilt.
+
1999-06-21 Tom Tromey <tromey@cygnus.com>
Alpha patch from Jeff Sturm:
diff --git a/boehm-gc/Makefile.am b/boehm-gc/Makefile.am
index 921031f..b1d5dc5 100644
--- a/boehm-gc/Makefile.am
+++ b/boehm-gc/Makefile.am
@@ -54,7 +54,7 @@ all_objs = @addobjs@ $(libgcjgc_la_OBJECTS)
$(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.o:
+.s.lo:
$(LTCOMPILE) -x assembler-with-cpp -c $<
## We have our own definition of LTCOMPILE because we want to use our
diff --git a/boehm-gc/Makefile.in b/boehm-gc/Makefile.in
index 7152f16..19b706c 100644
--- a/boehm-gc/Makefile.in
+++ b/boehm-gc/Makefile.in
@@ -271,6 +271,9 @@ uninstall-toolexeclibLTLIBRARIES:
.c.o:
$(COMPILE) -c $<
+.s.o:
+ $(COMPILE) -c $<
+
.S.o:
$(COMPILE) -c $<
@@ -287,9 +290,6 @@ maintainer-clean-compile:
.c.lo:
$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-.s.lo:
- $(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
.S.lo:
$(LIBTOOL) --mode=compile $(COMPILE) -c $<
@@ -486,7 +486,7 @@ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
$(all_objs) : config.h gc_priv.h gc_hdrs.h gc.h gc_mark.h
-.s.o:
+.s.lo:
$(LTCOMPILE) -x assembler-with-cpp -c $<
# Multilib support.