← Back to branch summary

~ubuntu-branches/ubuntu/precise/flac/precise-updates

« back to all changes in this revision

Viewing changes to src/libFLAC/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Joshua Kwan
  • Date: 2007-05-29 22:56:36 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20070529225636-ljeff8xxip09qaap
Tags: 1.1.4-1
http://bugs.debian.org/405167
http://bugs.debian.org/411311
* New upstream release. closes: #405167, #411311
  - libOggFLAC and libOggFLAC++ have been merged into libFLAC, so
    remove their corresponding packages.
  - Because of the API changes required to effect the above, there has
    been yet another soname bump. libflac7 -> libflac8 and
    libflac++5 -> libflac++6. Emails have been dispatched to the
    maintainers of dependent packages.
* Some notes on patches that were removed:
  - 02_stdin_stdout, 06_manpage_mention_utf8_convert: merged upstream
  - 08_manpage_warnings: Upstream has changed the manpage so it defintely
    can't fit in in 80 cols, so just forget about it. We'll live.
  - 05_eof_warnings_are_errors: Upstream decided to add a -w option to
    flac to treat all warnings as errors. I am going to defer to that
    for now, but if people think it's stupid let me know and I'll port
    the patch forward.
  - 04_stack_smasher: was a backport from 1.1.3, so it's obsolete.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/libFLAC/Makefile.am
1
1
#  libFLAC - Free Lossless Audio Codec library
2
 
#  Copyright (C) 2001,2002,2003,2004,2005  Josh Coalson
 
2
#  Copyright (C) 2001,2002,2003,2004,2005,2006,2007  Josh Coalson
3
3
#
4
4
#  Redistribution and use in source and binary forms, with or without
5
5
#  modification, are permitted provided that the following conditions
36
36
# The -force_cpusubtype_ALL is needed to insert a ppc64 instruction
37
37
# into cpu.c with an asm().
38
38
if FLaC__SYS_DARWIN
39
 
#@@@@@@ PPC optimizations temporarily disabled
 
39
#@@@ PPC optimizations temporarily disabled
40
40
CPUCFLAGS = -faltivec -force_cpusubtype_ALL -DFLAC__NO_ASM
41
41
else
42
42
# Linux-gcc for PPC does not have -force_cpusubtype_ALL, it is Darwin-specific
43
 
#@@@@@@ PPC optimizations temporarily disabled
 
43
#@@@ PPC optimizations temporarily disabled
44
44
CPUCFLAGS = -maltivec -mabi=altivec -DFLAC__NO_ASM
45
45
endif
46
46
endif
47
47
 
48
 
AM_CFLAGS = $(DEBUGCFLAGS) $(CPUCFLAGS)
 
48
AM_CFLAGS = $(DEBUGCFLAGS) $(CPUCFLAGS) @OGG_CFLAGS@
49
49
 
50
50
if FLaC__NO_ASM
51
51
else
52
52
if FLaC__CPU_IA32
53
53
if FLaC__HAS_NASM
54
54
ARCH_SUBDIRS = ia32
55
 
libFLAC_la_LIBADD = ia32/libFLAC-asm.la
 
55
LOCAL_EXTRA_LIBADD = ia32/libFLAC-asm.la
56
56
endif
57
57
endif
58
58
if FLaC__CPU_PPC
59
59
ARCH_SUBDIRS = ppc
60
60
if FLaC__HAS_AS__TEMPORARILY_DISABLED
61
 
libFLAC_la_LIBADD = ppc/as/libFLAC-asm.la
 
61
LOCAL_EXTRA_LIBADD = ppc/as/libFLAC-asm.la
 
62
LOCAL_EXTRA_LDFLAGS = "-Wl,-read_only_relocs,warning"
62
63
else
63
64
if FLaC__HAS_GAS__TEMPORARILY_DISABLED
64
 
libFLAC_la_LIBADD = ppc/gas/libFLAC-asm.la
65
 
endif
66
 
endif
67
 
LOCAL_EXTRA_LDFLAGS = "-Wl,-read_only_relocs,warning"
68
 
endif
69
 
endif
 
65
LOCAL_EXTRA_LIBADD = ppc/gas/libFLAC-asm.la
 
66
LOCAL_EXTRA_LDFLAGS = ""
 
67
endif
 
68
endif
 
69
endif
 
70
endif
 
71
 
 
72
libFLAC_la_LIBADD = $(LOCAL_EXTRA_LIBADD) @OGG_LIBS@
70
73
 
71
74
SUBDIRS = $(ARCH_SUBDIRS) include .
72
75
 
73
76
m4datadir = $(datadir)/aclocal
74
77
m4data_DATA = libFLAC.m4
75
78
 
 
79
pkgconfigdir = $(libdir)/pkgconfig
 
80
pkgconfig_DATA = flac.pc
 
81
 
76
82
EXTRA_DIST = \
77
83
        Makefile.lite \
 
84
        flac.pc.in \
78
85
        libFLAC_dynamic.dsp \
79
86
        libFLAC_static.dsp \
80
87
        libFLAC.m4
81
88
 
82
 
# see 'http://www.gnu.org/software/libtool/manual.html#SEC35' for numbering convention
83
 
libFLAC_la_LDFLAGS = -version-info 7:0:0 -lm $(LOCAL_EXTRA_LDFLAGS)
 
89
if FLaC__HAS_OGG
 
90
extra_ogg_sources = \
 
91
        ogg_decoder_aspect.c \
 
92
        ogg_encoder_aspect.c \
 
93
        ogg_helper.c \
 
94
        ogg_mapping.c
 
95
endif
 
96
# see 'http://www.gnu.org/software/libtool/manual.html#Libtool-versioning' for numbering convention
 
97
libFLAC_la_LDFLAGS = -version-info 8:1:0 -lm $(LOCAL_EXTRA_LDFLAGS)
84
98
libFLAC_la_SOURCES = \
85
 
        bitbuffer.c \
86
99
        bitmath.c \
 
100
        bitreader.c \
 
101
        bitwriter.c \
87
102
        cpu.c \
88
103
        crc.c \
89
 
        file_decoder.c \
90
 
        file_encoder.c \
91
104
        fixed.c \
92
105
        float.c \
93
106
        format.c \
96
109
        memory.c \
97
110
        metadata_iterators.c \
98
111
        metadata_object.c \
99
 
        seekable_stream_decoder.c \
100
 
        seekable_stream_encoder.c \
101
112
        stream_decoder.c \
102
113
        stream_encoder.c \
103
 
        stream_encoder_framing.c
 
114
        stream_encoder_framing.c \
 
115
        window.c \
 
116
        $(extra_ogg_sources)