Re: Problems rebuilding libffi/Makefile.in

[Bryce McKinlay <bryce at albatross dot co dot nz>]

Bryce McKinlay wrote:

> After rebuilding libffi's Makefile.am and configure, I'm getting this
> build error:

This patch allows me to rebuild libffi's configure and Makefile.in and
still have a working build. Does it look reasonable? Tom? Alex?

regards

  [ bryce ]


2001-03-26  Bryce McKinlay  <bryce@albatross.co.nz>

	* Makefile.am: Override suffix based rules to specify correct output
	subdirectory.
	* configure.in: Make target subdirectory in build dir.
	* Makefile.in: Rebuilt.
	* configure: Rebuilt.

Index: Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libffi/Makefile.am,v
retrieving revision 1.8.4.2
diff -u -r1.8.4.2 Makefile.am
--- Makefile.am	2001/03/24 03:10:30	1.8.4.2
+++ Makefile.am	2001/03/26 08:00:25
@@ -135,6 +135,26 @@
 
 INCLUDES = -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src
 
+# Override these rules so that object files get put in the correct 
+# subdirectories. 
+.c.o:
+	$(LTCOMPILE) -c -o $@ $<
+
+.s.o:
+	$(LTCOMPILE) -c -o $@ $<
+
+.S.o:
+	$(LTCOMPILE) -c -o $@ $<
+
+.c.lo:
+	$(LTCOMPILE) -c -o $@ $<
+
+.s.lo:
+	$(LTCOMPILE) -c -o $@ $<
+
+.S.lo:
+	$(LTCOMPILE) -c -o $@ $<
+
 # Multilib support.
 .PHONY: all-multi mostlyclean-multi clean-multi distclean-multi \
 	maintainer-clean-multi
Index: configure.in
===================================================================
RCS file: /cvs/gcc/gcc/libffi/configure.in,v
retrieving revision 1.10
diff -u -r1.10 configure.in
--- configure.in	2000/08/24 01:01:57	1.10
+++ configure.in	2001/03/26 08:00:25
@@ -34,6 +34,8 @@
 
 AC_CANONICAL_HOST
 
+AM_PROG_LIBTOOL
+
 AM_INIT_AUTOMAKE(libffi,2.00-beta,no-define)
 
 AC_EXEEXT
@@ -137,3 +139,12 @@
 	cp fficonfig.h include/fficonfig.h
 fi
 )
+
+# Make target subdirectories if required.
+if ! test -d src; then
+  mkdir src
+fi
+
+if ! test -d src/${TARGETDIR}; then
+  mkdir src/${TARGETDIR}
+fi