Commit d351d044 authored by Josh Coalson's avatar Josh Coalson

fix makefile bug with ogg linkage (SF#1611414:...

fix makefile bug with ogg linkage (SF#1611414: http://sourceforge.net/tracker/index.php?func=detail&aid=1611414&group_id=13478&atid=113478)
parent c2590504
......@@ -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>
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment