mirrors
/
flac
mirror of https://github.com/xiph/flac
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix makefile bug with ogg linkage (SF#1611414: http://sourceforge.net/tracker/index.php?func=detail&aid=1611414&group_id=13478&atid=113478)

This commit is contained in:
Josh Coalson 2006-12-14 07:23:48 +00:00
parent c259050470
commit d351d04437
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/html/changelog.html
View File

@ -104,7 +104,7 @@
<li>
build system:
<ul>
<li>(none)</li>
<li>Fixed a makefile linkage bug with libogg (<a href="http://sourceforge.net/tracker/index.php?func=detail&amp;aid=1611414&amp;group_id=13478&amp;atid=113478">SF #1611414</a>).</li>
</ul>
</li>
<li>

10
src/libFLAC/Makefile.am
View File

@ -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