Fix make distcheck

[platform/upstream/flac.git] / src / libFLAC / Makefile.am

diff --git a/src/libFLAC/Makefile.am b/src/libFLAC/Makefile.am
index 1b13746..2deb958 100644 (file)
--- 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,2005,2006  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
@@ -40,44 +40,60 @@ if FLaC__SYS_DARWIN
 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
+endif
 #@@@ PPC optimizations temporarily disabled
-CPUCFLAGS = -maltivec -mabi=altivec -DFLAC__NO_ASM
+CPUCFLAGS += -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
+if FLaC__CPU_PPC_SPE
+else
+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
+endif
+
+libFLAC_la_LIBADD = $(LOCAL_EXTRA_LIBADD) @OGG_LIBS@
 
 SUBDIRS = $(ARCH_SUBDIRS) include .
 
 m4datadir = $(datadir)/aclocal
 m4data_DATA = libFLAC.m4
 
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = flac.pc
+
 EXTRA_DIST = \
        Makefile.lite \
+       flac.pc.in \
        libFLAC_dynamic.dsp \
+       libFLAC_dynamic.vcproj \
        libFLAC_static.dsp \
+       libFLAC_static.vcproj \
        libFLAC.m4
 
 if FLaC__HAS_OGG
@@ -88,10 +104,11 @@ extra_ogg_sources = \
        ogg_mapping.c
 endif
 # see 'http://www.gnu.org/software/libtool/manual.html#Libtool-versioning' for numbering convention
-libFLAC_la_LDFLAGS = -version-info 8:0:0 -lm $(LOCAL_EXTRA_LDFLAGS)
+libFLAC_la_LDFLAGS = -version-info 10:0:2 -lm $(LOCAL_EXTRA_LDFLAGS) @LT_NO_UNDEFINED@
 libFLAC_la_SOURCES = \
-       bitbuffer.c \
        bitmath.c \
+       bitreader.c \
+       bitwriter.c \
        cpu.c \
        crc.c \
        fixed.c \