]>
Commit | Line | Data |
---|---|---|
c965771b JB |
1 | --- flac-1.1.3/src/libFLAC/Makefile.am.orig 2006-10-13 06:25:26.000000000 +0200 |
2 | +++ flac-1.1.3/src/libFLAC/Makefile.am 2006-12-01 00:43:17.655239500 +0100 | |
3 | @@ -52,17 +52,17 @@ | |
4 | if FLaC__CPU_IA32 | |
5 | if FLaC__HAS_NASM | |
6 | ARCH_SUBDIRS = ia32 | |
7 | -libFLAC_la_LIBADD = ia32/libFLAC-asm.la | |
8 | +FLAC_ADD = ia32/libFLAC-asm.la | |
9 | endif | |
10 | endif | |
11 | if FLaC__CPU_PPC | |
12 | ARCH_SUBDIRS = ppc | |
13 | if FLaC__HAS_AS__TEMPORARILY_DISABLED | |
14 | -libFLAC_la_LIBADD = ppc/as/libFLAC-asm.la | |
15 | +FLAC_ADD = ppc/as/libFLAC-asm.la | |
16 | LOCAL_EXTRA_LDFLAGS = "-Wl,-read_only_relocs,warning" | |
17 | else | |
18 | if FLaC__HAS_GAS__TEMPORARILY_DISABLED | |
19 | -libFLAC_la_LIBADD = ppc/gas/libFLAC-asm.la | |
20 | +FLAC_ADD = ppc/gas/libFLAC-asm.la | |
21 | LOCAL_EXTRA_LDFLAGS = "" | |
22 | endif | |
23 | endif | |
24 | @@ -107,3 +107,4 @@ | |
25 | stream_encoder_framing.c \ | |
26 | window.c \ | |
27 | $(extra_ogg_sources) | |
28 | +libFLAC_la_LIBADD = $(FLAC_ADD) $(OGG_LIBS) |