diff options
| author | Josh Coalson <jcoalson@users.sourceforce.net> | 2006-12-14 07:23:48 +0000 |
|---|---|---|
| committer | Josh Coalson <jcoalson@users.sourceforce.net> | 2006-12-14 07:23:48 +0000 |
| commit | d351d044373fc85c6fee3ffc08517ea623925b81 (patch) | |
| tree | 52f0a12e853e255b37b90499e5b705b0285e79f2 /src/libFLAC/Makefile.am | |
| parent | c25905047080cd6115f21f93e06e47cfdc2a1b1c (diff) | |
| download | flac-d351d044373fc85c6fee3ffc08517ea623925b81.tar.gz | |
fix makefile bug with ogg linkage (SF#1611414: http://sourceforge.net/tracker/index.php?func=detail&aid=1611414&group_id=13478&atid=113478)
Diffstat (limited to 'src/libFLAC/Makefile.am')
| -rw-r--r-- | src/libFLAC/Makefile.am | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/libFLAC/Makefile.am b/src/libFLAC/Makefile.am index 1b137469..4bdc4182 100644 --- a/src/libFLAC/Makefile.am +++ b/src/libFLAC/Makefile.am @@ -45,30 +45,32 @@ CPUCFLAGS = -maltivec -mabi=altivec -DFLAC__NO_ASM endif endif -AM_CFLAGS = $(DEBUGCFLAGS) $(CPUCFLAGS) +AM_CFLAGS = $(DEBUGCFLAGS) $(CPUCFLAGS) @OGG_CFLAGS@ if FLaC__NO_ASM else if FLaC__CPU_IA32 if FLaC__HAS_NASM ARCH_SUBDIRS = ia32 -libFLAC_la_LIBADD = ia32/libFLAC-asm.la +LOCAL_EXTRA_LIBADD = ia32/libFLAC-asm.la endif endif if FLaC__CPU_PPC ARCH_SUBDIRS = ppc if FLaC__HAS_AS__TEMPORARILY_DISABLED -libFLAC_la_LIBADD = ppc/as/libFLAC-asm.la +LOCAL_EXTRA_LIBADD = ppc/as/libFLAC-asm.la LOCAL_EXTRA_LDFLAGS = "-Wl,-read_only_relocs,warning" else if FLaC__HAS_GAS__TEMPORARILY_DISABLED -libFLAC_la_LIBADD = ppc/gas/libFLAC-asm.la +LOCAL_EXTRA_LIBADD = ppc/gas/libFLAC-asm.la LOCAL_EXTRA_LDFLAGS = "" endif endif endif endif +libFLAC_la_LIBADD = $(LOCAL_EXTRA_LIBADD) @OGG_LIBS@ + SUBDIRS = $(ARCH_SUBDIRS) include . m4datadir = $(datadir)/aclocal |