This is the mail archive of the
sid@sources.redhat.com
mailing list for the SID project.
Patch to fix init_disassemble_info linking
- From: Robert Cragie <rcc at jennic dot com>
- To: sid at sources dot redhat dot com
- Date: Sat, 8 May 2004 11:56:25 +0100
- Subject: Patch to fix init_disassemble_info linking
This patch, along the lines of what Frank was suggesting, seems to fix the
build - not tried running it though. Note it looks like I am using a
newer version of automake.
? cvs.diff
Index: sid/component/cgen-cpu/Makefile.am
===================================================================
RCS file: /cvs/src/src/sid/component/cgen-cpu/Makefile.am,v
retrieving revision 1.8
diff -r1.8 Makefile.am
25,26c25,26
< libcgencpu_la_LIBADD = @cpu_libs@ $(INTLLIBS) $(LIBIBERTY) cgen-asm.lo
cgen-dis.lo cgen-opc.lo dis-buf.lo
< libcgencpu_la_DEPENDENCIES = @cpu_libs@ cgen-asm.lo cgen-dis.lo cgen-opc.lo
dis-buf.lo
---
> libcgencpu_la_LIBADD = @cpu_libs@ $(INTLLIBS) $(LIBIBERTY) cgen-asm.lo
cgen-dis.lo cgen-opc.lo dis-buf.lo dis-init.lo
> libcgencpu_la_DEPENDENCIES = @cpu_libs@ cgen-asm.lo cgen-dis.lo cgen-opc.lo
dis-buf.lo dis-init.lo
47a48,50
> ??????/bin/sh ./libtool --mode=compile $(CC) $(OPCODES_COMPILE_FLAGS)
$(CFLAGS)
-c $<
>
> dis-init.lo: ../../../opcodes/dis-init.c
Index: sid/component/cgen-cpu/Makefile.in
===================================================================
RCS file: /cvs/src/src/sid/component/cgen-cpu/Makefile.in,v
retrieving revision 1.9
diff -r1.9 Makefile.in
1c1
< # Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
---
> # Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
115,116c115,116
< libcgencpu_la_LIBADD = @cpu_libs@ $(INTLLIBS) $(LIBIBERTY) cgen-asm.lo
cgen-dis.lo cgen-opc.lo dis-buf.lo
< libcgencpu_la_DEPENDENCIES = @cpu_libs@ cgen-asm.lo cgen-dis.lo cgen-opc.lo
dis-buf.lo
---
> libcgencpu_la_LIBADD = @cpu_libs@ $(INTLLIBS) $(LIBIBERTY) cgen-asm.lo
cgen-dis.lo cgen-opc.lo dis-buf.lo dis-init.lo
> libcgencpu_la_DEPENDENCIES = @cpu_libs@ cgen-asm.lo cgen-dis.lo cgen-opc.lo
dis-buf.lo dis-init.lo
118,126c118
< OPCODES_COMPILE_FLAGS = -DHAVE_CONFIG_H \
< ??????-I../../../opcodes \
< ??????-I../../../bfd \
< ??????-I../../../intl \
< ??????-I$(srcdir)/../../../opcodes \
< ??????-I$(srcdir)/../../../include \
< ??????-I$(srcdir)/../../../bfd ? ? \
< ??????-I$(srcdir)/../../../intl ? ?\
< ??????-D_GNU_SOURCE
---
> OPCODES_COMPILE_FLAGS =
-DHAVE_CONFIG_H ??????-I../../../opcodes ?????-I../../../bfd
????????-I../../../intl ????????-I$(srcdir)/../../../opcodes ???-I$(srcdir)/../../../include
????????-I$(srcdir)/../../../bfd ? ? ???-I$(srcdir)/../../../intl ? ????-D_GNU_SOURCE
152c144
< aclocal.m4 config.in configure configure.in
---
> acinclude.m4 aclocal.m4 config.in configure configure.in
173c165
< $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in
---
> $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in ?acinclude.m4
580a573,575
> ??????/bin/sh ./libtool --mode=compile $(CC) $(OPCODES_COMPILE_FLAGS)
$(CFLAGS)
-c $<
>
> dis-init.lo: ../../../opcodes/dis-init.c