← Back to branch summary

~ubuntu-branches/ubuntu/saucy/speex/saucy-proposed

« back to all changes in this revision

Viewing changes to libspeex/Makefile.in

  • Committer: Bazaar Package Importer
  • Author(s): Ron Lee
  • Date: 2008-06-04 03:48:19 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20080604034819-jc7eevhn9behha7w
Tags: 1.2~beta4-2
Move the extra sse libs to /usr/lib/sse2.  That is a bit more elitist than
we need to be, but the linker already looks there without adding yet another
path permutation, and in practice most people who really care about how long
this is going to take won't find that sets the bar too high for them at all.

Actually, it's apparently ldconfig rather than the linker that is missing
this path, but this will still do for now while people figure out if or when
that should be fixed too.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libspeex/Makefile.in
75
75
        speex_callbacks.lo speex_header.lo window.lo
76
76
libspeex_la_OBJECTS = $(am_libspeex_la_OBJECTS)
77
77
libspeexdsp_la_LIBADD =
78
 
am_libspeexdsp_la_OBJECTS = preprocess.lo smallft.lo jitter.lo mdf.lo \
79
 
        fftwrap.lo kiss_fft.lo kiss_fftr.lo filterbank.lo resample.lo \
80
 
        buffer.lo
 
78
am__libspeexdsp_la_SOURCES_DIST = preprocess.c jitter.c mdf.c \
 
79
        fftwrap.c filterbank.c resample.c buffer.c smallft.c \
 
80
        kiss_fft.c _kiss_fft_guts.h kiss_fft.h kiss_fftr.c kiss_fftr.h
 
81
@BUILD_KISS_FFT_FALSE@@BUILD_SMALLFT_TRUE@am__objects_1 = smallft.lo
 
82
@BUILD_KISS_FFT_TRUE@am__objects_1 = kiss_fft.lo kiss_fftr.lo
 
83
am_libspeexdsp_la_OBJECTS = preprocess.lo jitter.lo mdf.lo fftwrap.lo \
 
84
        filterbank.lo resample.lo buffer.lo $(am__objects_1)
81
85
libspeexdsp_la_OBJECTS = $(am_libspeexdsp_la_OBJECTS)
82
86
PROGRAMS = $(noinst_PROGRAMS)
83
87
am_testdenoise_OBJECTS = testdenoise.$(OBJEXT)
113
117
        $(testdenoise_SOURCES) $(testecho_SOURCES) $(testenc_SOURCES) \
114
118
        $(testenc_uwb_SOURCES) $(testenc_wb_SOURCES) \
115
119
        $(testjitter_SOURCES)
116
 
DIST_SOURCES = $(libspeex_la_SOURCES) $(libspeexdsp_la_SOURCES) \
117
 
        $(testdenoise_SOURCES) $(testecho_SOURCES) $(testenc_SOURCES) \
118
 
        $(testenc_uwb_SOURCES) $(testenc_wb_SOURCES) \
119
 
        $(testjitter_SOURCES)
 
120
DIST_SOURCES = $(libspeex_la_SOURCES) \
 
121
        $(am__libspeexdsp_la_SOURCES_DIST) $(testdenoise_SOURCES) \
 
122
        $(testecho_SOURCES) $(testenc_SOURCES) $(testenc_uwb_SOURCES) \
 
123
        $(testenc_wb_SOURCES) $(testjitter_SOURCES)
120
124
HEADERS = $(noinst_HEADERS)
121
125
ETAGS = etags
122
126
CTAGS = ctags
131
135
AUTOHEADER = @AUTOHEADER@
132
136
AUTOMAKE = @AUTOMAKE@
133
137
AWK = @AWK@
 
138
BUILD_KISS_FFT_FALSE = @BUILD_KISS_FFT_FALSE@
 
139
BUILD_KISS_FFT_TRUE = @BUILD_KISS_FFT_TRUE@
 
140
BUILD_SMALLFT_FALSE = @BUILD_SMALLFT_FALSE@
 
141
BUILD_SMALLFT_TRUE = @BUILD_SMALLFT_TRUE@
134
142
CC = @CC@
135
143
CCDEPMODE = @CCDEPMODE@
136
144
CFLAGS = @CFLAGS@
144
152
DEFS = @DEFS@
145
153
DEPDIR = @DEPDIR@
146
154
DLLTOOL = @DLLTOOL@
 
155
DSYMUTIL = @DSYMUTIL@
147
156
ECHO = @ECHO@
148
157
ECHO_C = @ECHO_C@
149
158
ECHO_N = @ECHO_N@
152
161
EXEEXT = @EXEEXT@
153
162
F77 = @F77@
154
163
FFLAGS = @FFLAGS@
 
164
FFT_CFLAGS = @FFT_CFLAGS@
 
165
FFT_LIBS = @FFT_LIBS@
 
166
FFT_PKGCONFIG = @FFT_PKGCONFIG@
155
167
GREP = @GREP@
156
168
INSTALL_DATA = @INSTALL_DATA@
157
169
INSTALL_PROGRAM = @INSTALL_PROGRAM@
167
179
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
168
180
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
169
181
MAKEINFO = @MAKEINFO@
 
182
NMEDIT = @NMEDIT@
170
183
OBJDUMP = @OBJDUMP@
171
184
OBJEXT = @OBJEXT@
172
185
OGG_CFLAGS = @OGG_CFLAGS@
178
191
PACKAGE_TARNAME = @PACKAGE_TARNAME@
179
192
PACKAGE_VERSION = @PACKAGE_VERSION@
180
193
PATH_SEPARATOR = @PATH_SEPARATOR@
 
194
PKG_CONFIG = @PKG_CONFIG@
181
195
RANLIB = @RANLIB@
182
196
SED = @SED@
183
197
SET_MAKE = @SET_MAKE@
239
253
sysconfdir = @sysconfdir@
240
254
target_alias = @target_alias@
241
255
EXTRA_DIST = echo_diagnostic.m
242
 
INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) @OGG_CFLAGS@
 
256
INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) @OGG_CFLAGS@ @FFT_CFLAGS@
243
257
lib_LTLIBRARIES = libspeex.la libspeexdsp.la
244
258
 
245
259
# Sources for compilation in the library
250
264
        lpc.c lsp_tables_nb.c modes.c modes_wb.c nb_celp.c quant_lsp.c sb_celp.c \
251
265
        speex_callbacks.c speex_header.c window.c
252
266
 
253
 
libspeexdsp_la_SOURCES = preprocess.c   smallft.c \
254
 
                                jitter.c        mdf.c fftwrap.c kiss_fft.c _kiss_fft_guts.h kiss_fft.h \
255
 
        kiss_fftr.c kiss_fftr.h filterbank.c resample.c buffer.c
256
 
 
 
267
@BUILD_KISS_FFT_FALSE@@BUILD_SMALLFT_FALSE@FFTSRC = 
 
268
@BUILD_KISS_FFT_FALSE@@BUILD_SMALLFT_TRUE@FFTSRC = smallft.c
 
269
@BUILD_KISS_FFT_TRUE@FFTSRC = kiss_fft.c _kiss_fft_guts.h kiss_fft.h kiss_fftr.c kiss_fftr.h 
 
270
libspeexdsp_la_SOURCES = preprocess.c jitter.c mdf.c fftwrap.c filterbank.c resample.c buffer.c $(FFTSRC)
257
271
noinst_HEADERS = arch.h         cb_search_arm4.h        cb_search_bfin.h        cb_search_sse.h \
258
272
                filters.h       filters_arm4.h  filters_bfin.h  filters_sse.h   fixed_arm4.h \
259
273
                fixed_arm5e.h   fixed_bfin.h    fixed_debug.h   lpc.h   lpc_bfin.h      ltp.h   ltp_arm4.h \
260
274
                ltp_sse.h       math_approx.h           misc_bfin.h     nb_celp.h       quant_lsp.h     sb_celp.h \
261
275
                stack_alloc.h   vbr.h   vq.h    vq_arm4.h       vq_bfin.h       vq_sse.h cb_search.h fftwrap.h \
262
276
        filterbank.h fixed_generic.h lsp.h lsp_bfin.h ltp_bfin.h modes.h os_support.h \
263
 
        pseudofloat.h quant_lsp_bfin.h smallft.h vorbis_psy.h
 
277
        pseudofloat.h quant_lsp_bfin.h smallft.h vorbis_psy.h resample_sse.h
264
278
 
265
279
libspeex_la_LDFLAGS = -no-undefined -version-info @SPEEX_LT_CURRENT@:@SPEEX_LT_REVISION@:@SPEEX_LT_AGE@
266
280
libspeexdsp_la_LDFLAGS = -no-undefined -version-info @SPEEX_LT_CURRENT@:@SPEEX_LT_REVISION@:@SPEEX_LT_AGE@
267
281
testenc_SOURCES = testenc.c
268
282
testenc_LDADD = libspeex.la
269
283
testenc_wb_SOURCES = testenc_wb.c
270
 
testenc_wb_LDADD = libspeex.la
 
284
testenc_wb_LDADD = libspeex.la 
271
285
testenc_uwb_SOURCES = testenc_uwb.c
272
286
testenc_uwb_LDADD = libspeex.la
273
287
testdenoise_SOURCES = testdenoise.c
274
 
testdenoise_LDADD = libspeexdsp.la
 
288
testdenoise_LDADD = libspeexdsp.la @FFT_LIBS@
275
289
testecho_SOURCES = testecho.c
276
 
testecho_LDADD = libspeexdsp.la
 
290
testecho_LDADD = libspeexdsp.la @FFT_LIBS@
277
291
testjitter_SOURCES = testjitter.c
278
 
testjitter_LDADD = libspeexdsp.la
 
292
testjitter_LDADD = libspeexdsp.la @FFT_LIBS@
279
293
all: all-am
280
294
 
281
295
.SUFFIXES: