← Back to branch summary

~ubuntu-branches/ubuntu/lucid/mpg123/lucid

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: Bazaar Package Importer
  • Author(s): Daniel Kobras
  • Date: 2004-09-07 15:57:57 UTC
  • Revision ID: james.westby@ubuntu.com-20040907155757-pgypftl9bt2uqyyl
Tags: 0.59r-16
http://bugs.debian.org/261255
http://bugs.debian.org/242212
http://bugs.debian.org/222982
* layer2.c: Fix buffer overflow in layer2 decoder (CVE ID CAN-2004-0805).
* Makefile: Fix compiler options to build for generic targets on ARM,
  but optimise for xscale. Closes: #261255
* README.3DNOW, dct36_3dnow.s, dct64_3dnow.s, decode_3dnow.s,
  decode_i386.c, equalizer_3dnow.s, getcpuflags.s, layer3.c, mpg123.c,
  mpg123.h, tabinit.c, debian/rules: Apply patch by KIMURA Takuhiro and
  Syuuhei Kashiyama to fix errors in 3dnow-optimised decoding.
  Thanks to Alberto Garcia for the patch-merging. Closes: #242212
* debian/prerm: De-register mp3-decoder alternative. Closes: #222982
* debian/changelog: Convert to utf8.
* debian/control: Bump standards version.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
59
59
        @echo "make linux-alpha    make with minor changes for ALPHA-Linux"
60
60
        @echo "make linux-ppc      LinuxPPC or MkLinux for the PowerPC"
61
61
        @echo "make linux-m68k     Linux/m68k (Amiga, Atari) using OSS"
 
62
        @echo "make linux-arm      Linux on the StrongArm"
 
63
        @echo "make linux-hppa     Linux/hppa HP-PARISC using OSS"
62
64
        @echo "make linux-nas      Linux, output to Network Audio System"
63
65
        @echo "make linux-sparc    Linux/Sparc"
64
66
        @echo "make linux-sajber   Linux, build binary for Sajber Jukebox frontend"
89
91
linux-devel:
90
92
        $(MAKE) OBJECTS='decode_i386.o dct64_i386.o audio_oss.o' \
91
93
        CC=gcc LDFLAGS= \
92
 
        CFLAGS='-DREAL_IS_FLOAT -DLINUX -Wall -g -m486 \
 
94
        CFLAGS='-DREAL_IS_FLOAT -DLINUX -Wall -g -mcpu=i486 \
93
95
                -DREAD_MMAP -DOSS -funroll-all-loops \
94
96
                -finline-functions -ffast-math' \
95
97
        mpg123-make
97
99
linux-profile:
98
100
        $(MAKE) OBJECTS='decode_i386.o dct64_i386.o audio_oss.o' \
99
101
        CC=gcc LDFLAGS='-pg' \
100
 
        CFLAGS='-DREAL_IS_FLOAT -DLINUX -Wall -pg -m486 \
 
102
        CFLAGS='-DREAL_IS_FLOAT -DLINUX -Wall -pg -mcpu=i486 \
101
103
                -DREAD_MMAP -DOSS -funroll-all-loops \
102
104
                -finline-functions -ffast-math' \
103
105
        mpg123-make
107
109
                OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
108
110
                        audio_oss.o term.o' \
109
111
                CFLAGS='-DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT -DLINUX \
110
 
                        -DREAD_MMAP -DOSS -DTERM_CONTROL\
111
 
                        -Wall -O2 -m486 \
 
112
                        -DOSS -DTERM_CONTROL\
 
113
                        -Wall -g -O2 -mcpu=i486 \
112
114
                        -fomit-frame-pointer -funroll-all-loops \
113
115
                        -finline-functions -ffast-math' \
114
116
                mpg123-make
115
117
 
116
118
linux-3dnow:
117
119
        $(MAKE) CC=gcc LDFLAGS= \
118
 
                OBJECTS='decode_i386.o dct64_3dnow.o \
119
 
                        decode_3dnow.o audio_oss.o term.o' \
 
120
                OBJECTS='decode_i386.o decode_3dnow.o dct64_3dnow.o \
 
121
                        dct64_i386.o dct36_3dnow.o getcpuflags.o \
 
122
                        equalizer_3dnow.o decode_i586.o audio_oss.o term.o' \
120
123
                CFLAGS='-DI386_ASSEM -DREAL_IS_FLOAT -DPENTIUM_OPT -DLINUX \
121
 
                        -DUSE_3DNOW -DREAD_MMAP -DOSS -DTERM_CONTROL\
122
 
                        -Wall -O2 -m486 \
 
124
                        -DUSE_3DNOW -DOSS -DTERM_CONTROL\
 
125
                        -Wall -O2 -mcpu=i486 \
123
126
                        -fomit-frame-pointer -funroll-all-loops \
124
127
                        -finline-functions -ffast-math' \
125
128
                mpg123-make
129
132
                OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
130
133
                        decode_i486.o dct64_i486.o audio_oss.o term.o' \
131
134
                CFLAGS='-DI386_ASSEM -DREAL_IS_FLOAT -DI486_OPT -DLINUX \
132
 
                        -DREAD_MMAP -DOSS -DTERM_CONTROL\
133
 
                        -Wall -O2 -m486 \
 
135
                        -DOSS -DTERM_CONTROL\
 
136
                        -Wall -O2 -mcpu=i486 \
134
137
                        -fomit-frame-pointer -funroll-all-loops \
135
138
                        -finline-functions -ffast-math' \
136
139
                mpg123-make
139
142
        $(MAKE) CC=gcc LDFLAGS= \
140
143
                AUDIO_LIB='-lesd -laudiofile' \
141
144
                OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
142
 
                        audio_esd.o' \
 
145
                        audio_esd.o term.o' \
143
146
                CFLAGS='-DI386_ASSEM -DREAL_IS_FLOAT -DPENTIUM_OPT -DLINUX \
144
 
                        -DREAD_MMAP -DOSS -DUSE_ESD \
145
 
                        -Wall  -O2 -m486 \
 
147
                        -DOSS -DUSE_ESD -DTERM_CONTROL\
 
148
                        -Wall  -O2 -mcpu=i486 \
146
149
                        -fomit-frame-pointer -funroll-all-loops \
147
150
                        -finline-functions -ffast-math \
148
151
                        $(RPM_OPT_FLAGS)' \
154
157
                OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
155
158
                        audio_alsa.o term.o' \
156
159
                CFLAGS='-DI386_ASSEM -DREAL_IS_FLOAT -DPENTIUM_OPT -DLINUX \
157
 
                        -DREAD_MMAP -DALSA -DTERM_CONTROL\
158
 
                        -Wall  -O2 -m486 \
 
160
                        -DALSA -DTERM_CONTROL\
 
161
                        -Wall  -O2 -mcpu=i486 \
159
162
                        -fomit-frame-pointer -funroll-all-loops \
160
163
                        -finline-functions -ffast-math \
161
164
                        $(RPM_OPT_FLAGS)' \
165
168
        $(MAKE) CC=gcc LDFLAGS= \
166
169
                AUDIO_LIB='-lasound' \
167
170
                OBJECTS='decode.o dct64.o audio_alsa.o term.o' \
168
 
                CFLAGS='-DREAL_IS_FLOAT -DLINUX -DREAD_MMAP -DALSA \
 
171
                CFLAGS='-DREAL_IS_FLOAT -DLINUX -DALSA \
169
172
                        -DTERM_CONTROL -Wall  -O2 \
170
173
                        -fomit-frame-pointer -funroll-all-loops \
171
174
                        -finline-functions -ffast-math \
173
176
                mpg123-make
174
177
 
175
178
linux-alpha:
176
 
        $(MAKE) CC=gcc LDFLAGS= OBJECTS='decode.o dct64.o audio_oss.o' \
177
 
                CFLAGS='-DLINUX -DOSS -Wall -O2 \
 
179
        $(MAKE) CC=gcc LDFLAGS= OBJECTS='decode.o dct64.o audio_oss.o term.o' \
 
180
                CFLAGS='-DLINUX -DOSS -DTERM_CONTROL -Wall -O2 \
178
181
                        -fomit-frame-pointer -funroll-all-loops \
179
182
                        -finline-functions -ffast-math \
180
183
                        -Wall -O6 -DUSE_MMAP \
184
187
linux-alpha-esd:
185
188
        $(MAKE) CC=gcc LDFLAGS= \
186
189
                AUDIO_LIB='-lesd -laudiofile' \
187
 
                OBJECTS='decode.o dct64.o audio_esd.o' \
188
 
                CFLAGS='-DLINUX -DOSS -Wall -O2 \
 
190
                OBJECTS='decode.o dct64.o audio_esd.o term.o' \
 
191
                CFLAGS='-DLINUX -DOSS -DTERM_CONTROL -Wall -O2 \
189
192
                        -fomit-frame-pointer -funroll-all-loops \
190
193
                        -finline-functions -ffast-math \
191
194
                        -Wall -O6 -DUSE_MMAP \
213
216
 
214
217
linux-ppc:
215
218
        $(MAKE) CC=gcc  LDFLAGS= \
216
 
                OBJECTS='decode.o dct64.o audio_oss.o' \
217
 
                CFLAGS='-DREAL_IS_FLOAT -DLINUX -Wall -O2 -mcpu=ppc \
218
 
                        -DOSS \
 
219
                OBJECTS='decode.o dct64.o audio_oss.o term.o' \
 
220
                CFLAGS='-DREAL_IS_FLOAT -DLINUX -Wall -O2 -mcpu=powerpc \
 
221
                        -DOSS -DTERM_CONTROL\
219
222
                        -fomit-frame-pointer -funroll-all-loops \
220
223
                        -finline-functions -ffast-math' \
221
224
                mpg123-make
223
226
linux-ppc-esd:
224
227
        $(MAKE) CC=gcc  LDFLAGS= \
225
228
                AUDIO_LIB='-lesd -laudiofile' \
226
 
                OBJECTS='decode.o dct64.o audio_esd.o' \
227
 
                CFLAGS='-DREAL_IS_FLOAT -DLINUX -Wall -O2 -mcpu=ppc \
228
 
                        -DOSS  \
 
229
                OBJECTS='decode.o dct64.o audio_esd.o term.o' \
 
230
                CFLAGS='-DREAL_IS_FLOAT -DLINUX -Wall -O2 -mcpu=powerpc \
 
231
                        -DOSS  -DTERM_CONTROL\
229
232
                        -fomit-frame-pointer -funroll-all-loops \
230
233
                        -finline-functions -ffast-math' \
231
234
                mpg123-make
232
235
 
233
236
linux-sparc:
234
237
        $(MAKE) CC=gcc  LDFLAGS= \
235
 
                OBJECTS='decode.o dct64.o audio_sun.o' \
 
238
                OBJECTS='decode.o dct64.o audio_sun.o term.o' \
236
239
                CFLAGS='-DREAL_IS_FLOAT -DUSE_MMAP -DSPARCLINUX -Wall -O2 \
 
240
                        -DTERM_CONTROL \
 
241
                        -fomit-frame-pointer -funroll-all-loops \
 
242
                        -finline-functions -ffast-math' \
 
243
                mpg123-make
 
244
 
 
245
linux-hppa:
 
246
        $(MAKE) CC=gcc  LDFLAGS= \
 
247
                OBJECTS='decode.o dct64.o audio_oss.o term.o' \
 
248
                CFLAGS='-DREAL_IS_FLOAT -DLINUX -Wall -O2 \
 
249
                        -DTERM_CONTROL \
237
250
                        -fomit-frame-pointer -funroll-all-loops \
238
251
                        -finline-functions -ffast-math' \
239
252
                mpg123-make
240
253
 
241
254
linux-m68k:
242
 
        $(MAKE) CC=gcc LDFLAGS= OBJECTS='decode.o dct64.o audio_oss.o' \
243
 
                CFLAGS='-DREAL_IS_FLOAT -DLINUX -DREAD_MMAP \
 
255
        $(MAKE) CC=gcc LDFLAGS= OBJECTS='decode.o dct64.o audio_oss.o term.o' \
 
256
                CFLAGS='-DREAL_IS_FLOAT -DLINUX -DTERM_CONTROL \
244
257
                        -DOSS -DOSS_BIG_ENDIAN -Wall -O2 -m68040 \
245
258
                        -fomit-frame-pointer -funroll-loops \
246
259
                        -finline-functions -ffast-math' \
247
260
                mpg123-make
248
261
 
 
262
linux-arm:
 
263
        $(MAKE) CC=gcc LDFLAGS= OBJECTS='decode.o dct64.o audio_oss.o term.o' \
 
264
                CFLAGS='-DREAL_IS_FIXED -DLINUX -DTERM_CONTROL \
 
265
                        -DOSS -Wall -O6 -mtune=xscale \
 
266
                        -fomit-frame-pointer -funroll-all-loops \
 
267
                        -finline-functions -ffast-math' \
 
268
                mpg123-make
 
269
 
249
270
linux-sajber:
250
271
        @ $(MAKE) FRONTEND=sajberplay-make linux-frontend
251
272
 
263
284
                OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
264
285
                        control_sajber.o control_tk3play.o audio_oss.o' \
265
286
                CFLAGS='-DFRONTEND -DOSS -DI386_ASSEM -DREAL_IS_FLOAT \
266
 
                        -DPENTIUM_OPT -DLINUX -Wall -O2 -m486 \
 
287
                        -DPENTIUM_OPT -DLINUX -Wall -O2 -mcpu=i486 \
267
288
                        -fomit-frame-pointer -funroll-all-loops \
268
289
                        -finline-functions -ffast-math' \
269
290
                $(FRONTEND)
270
291
 
271
292
linux-nas:
272
293
        $(MAKE) CC=gcc LDFLAGS='-L/usr/X11R6/lib' \
273
 
                AUDIO_LIB='-laudio -lXau' \
274
 
                OBJECTS='decode_i386.o dct64_i386.o audio_nas.o' \
 
294
                AUDIO_LIB='-laudio -lXau -lXt' \
 
295
                OBJECTS='decode_i386.o dct64_i386.o audio_nas.o term.o' \
275
296
                CFLAGS='-I/usr/X11R6/include \
276
297
                        -DI386_ASSEM -DREAL_IS_FLOAT -DLINUX -DNAS \
277
 
                        -Wall -O2 -m486 \
 
298
                        -DTERM_CONTROL \
 
299
                        -Wall -O2 -mcpu=i486 \
278
300
                        -fomit-frame-pointer -funroll-all-loops \
279
301
                        -finline-functions -ffast-math' \
280
302
                mpg123-make
281
303
 
282
304
#### the following defines are for experimental use ... 
283
305
#
284
 
#CFLAGS='-pg -DI386_ASSEM -DREAL_IS_FLOAT -DLINUX -Wall -O2 -m486 -funroll-all-loops -finline-functions -ffast-math' mpg123
 
306
#CFLAGS='-pg -DI386_ASSEM -DREAL_IS_FLOAT -DLINUX -Wall -O2 -mcpu=i486 -funroll-all-loops -finline-functions -ffast-math' mpg123
285
307
#CFLAGS='-DI386_ASSEM -O2 -DREAL_IS_FLOAT -DLINUX -Wall -g'
286
 
#CFLAGS='-DI386_ASSEM -DREAL_IS_FLOAT -DLINUX -Wall -O2 -m486 -fomit-frame-pointer -funroll-all-loops -finline-functions -ffast-math -malign-loops=2 -malign-jumps=2 -malign-functions=2'
 
308
#CFLAGS='-DI386_ASSEM -DREAL_IS_FLOAT -DLINUX -Wall -O2 -mcpu=i486 -fomit-frame-pointer -funroll-all-loops -finline-functions -ffast-math -malign-loops=2 -malign-jumps=2 -malign-functions=2'
287
309
 
288
310
freebsd:
289
311
        $(MAKE) CC=cc LDFLAGS= \
290
312
                OBJECTS='decode_i386.o dct64_i386.o audio_oss.o' \
291
 
                CFLAGS='-Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \
 
313
                CFLAGS='-Wall -ansi -pedantic -O4 -mcpu=i486 -fomit-frame-pointer \
292
314
                        -funroll-all-loops -ffast-math -DROT_I386 \
293
315
                        -DREAD_MMAP \
294
316
                        -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS' \
298
320
        $(MAKE) CC=cc LDFLAGS= \
299
321
                AUDIO_LIB='-lesd -laudiofile' \
300
322
                OBJECTS='decode_i386.o dct64_i386.o $(GETBITS) audio_esd.o' \
301
 
                CFLAGS='-Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \
 
323
                CFLAGS='-Wall -ansi -pedantic -O4 -mcpu=i486 -fomit-frame-pointer \
302
324
                        -funroll-all-loops -ffast-math -DROT_I386 \
303
325
                        -DREAD_MMAP \
304
326
                        -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS \
310
332
        $(MAKE) CC=cc LDFLAGS= \
311
333
                OBJECTS='decode_i386.o dct64_i386.o audio_oss.o \
312
334
                        control_sajber.o control_tk3play.o' \
313
 
                CFLAGS='-Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \
 
335
                CFLAGS='-Wall -ansi -pedantic -O4 -mcpu=i486 -fomit-frame-pointer \
314
336
                        -funroll-all-loops -ffast-math -DROT_I386 \
315
337
                        -DFRONTEND \
316
338
                        -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS' \
377
399
                        audio_oss.o' \
378
400
                CFLAGS='-DI386_ASSEM -DREAL_IS_FLOAT -DPENTIUM_OPT -DUSE_MMAP \
379
401
                        -DREAD_MMAP -DOSS \
380
 
                        -Wall -O2 -m486 \
 
402
                        -Wall -O2 -mcpu=i486 \
381
403
                        -funroll-all-loops -finline-functions' \
382
404
                mpg123-make
383
405
 
473
495
os2:
474
496
        $(MAKE) CC=gcc LDFLAGS= \
475
497
                OBJECTS='decode_i386.o dct64_i386.o audio_os2.o' \
476
 
                CFLAGS='-DREAL_IS_FLOAT -DNOXFERMEM -DOS2 -Wall -O2 -m486 \
 
498
                CFLAGS='-DREAL_IS_FLOAT -DNOXFERMEM -DOS2 -Wall -O2 -mcpu=i486 \
477
499
                -fomit-frame-pointer -funroll-all-loops \
478
500
                -finline-functions -ffast-math' \
479
501
                LIBS='-los2me -lsocket' \
490
512
netbsd-i386:
491
513
        $(MAKE) CC=cc LDFLAGS= \
492
514
                OBJECTS='decode_i386.o dct64_i386.o audio_sun.o' \
493
 
                CFLAGS='-Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \
 
515
                CFLAGS='-Wall -ansi -pedantic -O4 -mcpu=i486 -fomit-frame-pointer \
494
516
                        -funroll-all-loops -ffast-math -DROT_I386 \
495
517
                        -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \
496
518
                mpg123-make
499
521
        $(MAKE) CC=shlicc2 LDFLAGS= \
500
522
                OBJECTS='decode_i386.o dct64_i386.o \
501
523
                         audio_oss.o' \
502
 
                CFLAGS='-Wall -O4 -m486 -fomit-frame-pointer \
 
524
                CFLAGS='-Wall -O4 -mcpu=i486 -fomit-frame-pointer \
503
525
                        -funroll-all-loops -ffast-math -DROT_I386 \
504
526
                        -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS \
505
527
                        -DDONT_CATCH_SIGNALS' \
508
530
bsdos4:
509
531
        $(MAKE) CC=gcc LDFLAGS= \
510
532
                OBJECTS='decode_i386.o dct64_i386.o audio_oss.o' \
511
 
                CFLAGS='-Wall -O4 -m486 -fomit-frame-pointer \
 
533
                CFLAGS='-Wall -O4 -mcpu=i486 -fomit-frame-pointer \
512
534
                        -funroll-all-loops -ffast-math -DROT_I386 \
513
535
                        -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS \
514
536
                        -DREAD_MMAP -DDONT_CATCH_SIGNALS' \
519
541
                AUDIO_LIB='-laudio -lXau -L/usr/X11R6/lib' \
520
542
                OBJECTS='decode_i386.o dct64_i386.o \
521
543
                        audio_nas.o' \
522
 
                CFLAGS='-Wall -O4 -m486 -fomit-frame-pointer \
 
544
                CFLAGS='-Wall -O4 -mcpu=i486 -fomit-frame-pointer \
523
545
                        -funroll-all-loops -ffast-math -DROT_I386 \
524
546
                        -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS \
525
547
                        -DDONT_CATCH_SIGNALS -DNAS' \