X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2FlibFLAC%2FMakefile.am;h=aa0b8b634e52b9ec1b3b8e3591a6bf0991a80822;hb=2199d086921eb37d249cae0731f334556ec6209d;hp=9c44d212a7a0b027ca83a9b088ac2222d22f9158;hpb=663c599b0a43d0ae254a1f4e7c662f8aad7d3baa;p=platform%2Fupstream%2Fflac.git

diff --git a/src/libFLAC/Makefile.am b/src/libFLAC/Makefile.am
index 9c44d21..aa0b8b6 100644
--- a/src/libFLAC/Makefile.am
+++ b/src/libFLAC/Makefile.am
@@ -1,5 +1,5 @@
 #  libFLAC - Free Lossless Audio Codec library
-#  Copyright (C) 2001,2002,2003,2004  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
@@ -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.
 
+AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include
 lib_LTLIBRARIES = libFLAC.la
-DEBUGCFLAGS = 
-CPUCFLAGS = 
+noinst_LTLIBRARIES = libFLAC-static.la
 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
-CPUCFLAGS= -faltivec -force_cpusubtype_ALL
+#@@@ PPC optimizations temporarily disabled
+CPUCFLAGS = -faltivec -force_cpusubtype_ALL -DFLAC__NO_ASM
+else
+# 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 -force_cpusubtype_ALL
+CPUCFLAGS += -maltivec -mabi=altivec
 endif
+#@@@ PPC optimizations temporarily disabled
+CPUCFLAGS += -DFLAC__NO_ASM
 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
-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
-libFLAC_la_LIBADD = ppc/as/libFLAC-asm.la
+if FLaC__HAS_AS__TEMPORARILY_DISABLED
+if FLaC__CPU_PPC_SPE
 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
-LOCAL_EXTRA_LDFLAGS = "-Wl,-read_only_relocs,warning"
 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
 
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = flac.pc
+
 EXTRA_DIST = \
 	Makefile.lite \
-	libFLAC_dynamic.dsp \
-	libFLAC_static.dsp \
+	flac.pc.in \
+	libFLAC_dynamic.vcproj \
+	libFLAC_static.vcproj \
 	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 \
+	bitreader.c \
+	bitwriter.c \
 	cpu.c \
 	crc.c \
-	file_decoder.c \
-	file_encoder.c \
 	fixed.c \
 	float.c \
 	format.c \
@@ -94,8 +128,14 @@ libFLAC_la_SOURCES = \
 	memory.c \
 	metadata_iterators.c \
 	metadata_object.c \
-	seekable_stream_decoder.c \
-	seekable_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)