projects
/
platform
/
upstream
/
flac.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Enable utf8 I/O stuff when compiling with MinGW.
[platform/upstream/flac.git]
/
src
/
libFLAC
/
Makefile.am
diff --git
a/src/libFLAC/Makefile.am
b/src/libFLAC/Makefile.am
index
371cdae
..
aa0b8b6
100644
(file)
--- a/
src/libFLAC/Makefile.am
+++ b/
src/libFLAC/Makefile.am
@@
-1,5
+1,5
@@
# libFLAC - Free Lossless Audio Codec library
# libFLAC - Free Lossless Audio Codec library
-# Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
+# Copyright (C) 2001,2002,2003,2004,2005
,2006,2007,2008,2009
Josh Coalson
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@@
-28,64
+28,98
@@
# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include
lib_LTLIBRARIES = libFLAC.la
lib_LTLIBRARIES = libFLAC.la
+noinst_LTLIBRARIES = libFLAC-static.la
if DEBUG
DEBUGCFLAGS = -DFLAC__OVERFLOW_DETECT
endif
if DEBUG
DEBUGCFLAGS = -DFLAC__OVERFLOW_DETECT
endif
+
+# FIXME: The following logic should be part of configure, not of Makefile.am
+
if FLaC__CPU_PPC
# The -force_cpusubtype_ALL is needed to insert a ppc64 instruction
# into cpu.c with an asm().
if FLaC__SYS_DARWIN
if FLaC__CPU_PPC
# The -force_cpusubtype_ALL is needed to insert a ppc64 instruction
# into cpu.c with an asm().
if FLaC__SYS_DARWIN
-#@@@
@@@
PPC optimizations temporarily disabled
+#@@@ PPC optimizations temporarily disabled
CPUCFLAGS = -faltivec -force_cpusubtype_ALL -DFLAC__NO_ASM
else
CPUCFLAGS = -faltivec -force_cpusubtype_ALL -DFLAC__NO_ASM
else
-#@@@@@@ PPC optimizations temporarily disabled
-CPUCFLAGS = -maltivec -mabi=altivec -force_cpusubtype_ALL -DFLAC__NO_ASM
+# Linux-gcc for PPC does not have -force_cpusubtype_ALL, it is Darwin-specific
+CPUCFLAGS =
+if FLaC__CPU_PPC_SPE
+else
+CPUCFLAGS += -maltivec -mabi=altivec
endif
endif
+#@@@ PPC optimizations temporarily disabled
+CPUCFLAGS += -DFLAC__NO_ASM
endif
endif
-CFLAGS = @CFLAGS@ $(DEBUGCFLAGS) $(CPUCFLAGS)
+endif
+
+AM_CFLAGS = $(DEBUGCFLAGS) $(CPUCFLAGS) @OGG_CFLAGS@
if FLaC__NO_ASM
else
if FLaC__CPU_IA32
if FLaC__HAS_NASM
ARCH_SUBDIRS = ia32
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
endif
endif
if FLaC__CPU_PPC
ARCH_SUBDIRS = ppc
-if FLaC__HAS_AS
-libFLAC_la_LIBADD = ppc/as/libFLAC-asm.la
+if FLaC__HAS_AS
__TEMPORARILY_DISABLED
+if FLaC__CPU_PPC_SPE
else
else
-if FLaC__HAS_GAS
-libFLAC_la_LIBADD = ppc/gas/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
+LOCAL_EXTRA_LIBADD = ppc/gas/libFLAC-asm.la
+LOCAL_EXTRA_LDFLAGS = ""
+endif
endif
endif
endif
endif
-LOCAL_EXTRA_LDFLAGS = "-Wl,-read_only_relocs,warning"
endif
endif
endif
endif
+if OS_IS_WINDOWS
+win_utf8_lib = $(top_builddir)/src/share/win_utf8_io/libwin_utf8_io.la
+endif
+
+libFLAC_la_LIBADD = $(win_utf8_lib) $(LOCAL_EXTRA_LIBADD) @OGG_LIBS@ -lm
+
SUBDIRS = $(ARCH_SUBDIRS) include .
m4datadir = $(datadir)/aclocal
m4data_DATA = libFLAC.m4
SUBDIRS = $(ARCH_SUBDIRS) include .
m4datadir = $(datadir)/aclocal
m4data_DATA = libFLAC.m4
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = flac.pc
+
EXTRA_DIST = \
Makefile.lite \
EXTRA_DIST = \
Makefile.lite \
- libFLAC_dynamic.dsp \
- libFLAC_static.dsp \
+ flac.pc.in \
+ libFLAC_dynamic.vcproj \
+ libFLAC_static.vcproj \
libFLAC.m4
libFLAC.m4
-# see 'http://www.gnu.org/software/libtool/manual.html#SEC35' for numbering convention
-libFLAC_la_LDFLAGS = -version-info 6:1:0 -lm $(LOCAL_EXTRA_LDFLAGS)
-libFLAC_la_SOURCES = \
- bitbuffer.c \
+if FLaC__HAS_OGG
+extra_ogg_sources = \
+ ogg_decoder_aspect.c \
+ ogg_encoder_aspect.c \
+ ogg_helper.c \
+ ogg_mapping.c
+endif
+
+# see 'http://www.gnu.org/software/libtool/manual/libtool.html#Libtool-versioning' for numbering convention
+libFLAC_la_LDFLAGS = -version-info 11:0:3 $(LOCAL_EXTRA_LDFLAGS) @LT_NO_UNDEFINED@
+
+libFLAC_sources = \
bitmath.c \
bitmath.c \
+ bitreader.c \
+ bitwriter.c \
cpu.c \
crc.c \
cpu.c \
crc.c \
- file_decoder.c \
- file_encoder.c \
fixed.c \
float.c \
format.c \
fixed.c \
float.c \
format.c \
@@
-94,8
+128,14
@@
libFLAC_la_SOURCES = \
memory.c \
metadata_iterators.c \
metadata_object.c \
memory.c \
metadata_iterators.c \
metadata_object.c \
- seekable_stream_decoder.c \
- seekable_stream_encoder.c \
stream_decoder.c \
stream_encoder.c \
stream_decoder.c \
stream_encoder.c \
- stream_encoder_framing.c
+ stream_encoder_framing.c \
+ window.c \
+ $(extra_ogg_sources)
+
+libFLAC_la_SOURCES = $(libFLAC_sources)
+
+# needed for test_libFLAC
+libFLAC_static_la_LIBADD = $(LOCAL_EXTRA_LIBADD)
+libFLAC_static_la_SOURCES = $(libFLAC_sources)