]> git.pld-linux.org Git - packages/ffmpeg.git/blame - ffmpeg-libtool.patch
projects / packages / ffmpeg.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- one more (in libswscale.pc)
[packages/ffmpeg.git] / ffmpeg-libtool.patch
CommitLineData
a77da139
ER		 1--- ffmpeg-export-2006-12-04/Makefile 2006-12-06 01:28:53.860990022 +0200
2+++ ffmpeg-export-2006-12-04/Makefile 2006-12-06 01:57:27.969598912 +0200
0b88e1ce 3@@ -13,7 +13,6 @@
4a55007c 4
0b88e1ce
ER		 5 ifeq ($(CONFIG_FFMPEG),yes)
6 MANPAGES=doc/ffmpeg.1
7-PROGS_G+=ffmpeg_g$(EXESUF)
8 PROGS+=ffmpeg$(EXESUF)
9 endif
2a60eebe 10
0b88e1ce 11@@ -24,13 +23,11 @@
2a60eebe 12
0b88e1ce
ER		 13 ifeq ($(CONFIG_FFPLAY),yes)
14 MANPAGES+=doc/ffplay.1
15-PROGS_G+=ffplay_g$(EXESUF)
16 PROGS+=ffplay$(EXESUF)
17 endif
2a60eebe 18
0b88e1ce
ER		 19 BASENAMES=ffmpeg ffplay ffserver
20 ALLPROGS=$(addsuffix $(EXESUF), $(BASENAMES))
21-ALLPROGS_G=$(addsuffix _g$(EXESUF), $(BASENAMES))
22 ALLMANPAGES=$(addsuffix .1, $(BASENAMES))
2a60eebe 23
4a55007c 24 ifeq ($(BUILD_SHARED),yes)
0b88e1ce
ER		 25@@ -49,17 +46,15 @@
26 INSTALLMAN=install-man
2a60eebe
JB		 27 endif
28
0b88e1ce
ER		 29-OBJS = ffmpeg.o ffserver.o cmdutils.o ffplay.o
30-SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s)
31-LDFLAGS := -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil $(LDFLAGS)
32-EXTRALIBS := -lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS)
33+OBJS = ffmpeg.lo ffserver.lo cmdutils.lo ffplay.lo
34+SRCS = $(OBJS:.lo=.c) $(ASM_OBJS:.lo=.s)
35+EXTRALIBS := $(BUILD_ROOT)/libavformat/libavformat.la $(BUILD_ROOT)/libavcodec/libavcodec.la $(BUILD_ROOT)/libavutil/libavutil.la $(EXTRALIBS)
4a55007c 36
0b88e1ce
ER		 37 ifeq ($(CONFIG_SWSCALER),yes)
38-LDFLAGS+=-L./libswscale
39-EXTRALIBS+=-lswscale$(BUILDSUF)
40+EXTRALIBS+= $(BUILD_ROOT)/libswscale/libswscale.la
2a60eebe 41 endif
ff0ca760 42
0b88e1ce
ER		 43-all: lib $(PROGS_G) $(PROGS) $(VHOOK) $(DOC)
44+all: lib $(PROGS) $(VHOOK) $(DOC)
ff0ca760 45
0b88e1ce
ER		 46 lib:
47 $(MAKE) -C libavutil all
48@@ -72,40 +67,42 @@
49 $(MAKE) -C libswscale all
ff0ca760
JB		 50 endif
51
0b88e1ce
ER		 52-ffmpeg_g$(EXESUF): ffmpeg.o cmdutils.o .libs
53- $(CC) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(EXTRALIBS)
54+ffmpeg$(EXESUF): ffmpeg.lo cmdutils.lo
55+ libtool --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $^ $(EXTRALIBS)
d7493de8 56
0b88e1ce
ER		 57-ffserver$(EXESUF): ffserver.o .libs
58- $(CC) $(LDFLAGS) $(FFSERVERLDFLAGS) -o $@ ffserver.o $(EXTRALIBS)
59+ffserver$(EXESUF): ffserver.lo libavformat/libavformat.la libavcodec/libavcodec.la
60+ libtool --mode=link --tag=CC $(CC) $(LDFLAGS) $(FFSERVERLDFLAGS) -o $@ $^ $(EXTRALIBS)
2a60eebe 61
0b88e1ce
ER		 62-ffplay_g$(EXESUF): ffplay.o cmdutils.o .libs
63- $(CC) $(LDFLAGS) -o $@ ffplay.o cmdutils.o $(EXTRALIBS) $(SDL_LIBS)
64+libavformat/libavformat.la:
65+ $(MAKE) -C libavformat all
0b88e1ce
ER		 66
67-%$(EXESUF): %_g$(EXESUF)
68- cp -p $< $@
69- $(STRIP) $@
68566a65
ER		 70+libavcodec/libavcodec.la:
71+ $(MAKE) -C libavcodec all
72+
0b88e1ce
ER		 73+ffplay$(EXESUF): ffplay.lo cmdutils.lo
74+ libtool --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $^ $(EXTRALIBS) $(SDL_LIBS)
539b540f 75
0b88e1ce
ER		 76 version.h:
77 $(SRC_PATH)/version.sh $(SRC_PATH)
539b540f 78
0b88e1ce
ER		 79-output_example$(EXESUF): output_example.o .libs
80- $(CC) $(LDFLAGS) -o $@ output_example.o $(EXTRALIBS)
81+output_example$(EXESUF): output_example.lo
82+ libtool --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $^ $(EXTRALIBS)
2a60eebe 83
0b88e1ce
ER		 84 qt-faststart$(EXESUF): qt-faststart.c
85- $(CC) $(CFLAGS) $< -o $@
86+ libtool --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $<
d7493de8 87
0b88e1ce
ER		 88 cws2fws$(EXESUF): cws2fws.c
89- $(CC) $< -o $@ -lz
90+ libtool --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $< -lz
d7493de8 91
0b88e1ce
ER		 92-ffplay.o: ffplay.c
93- $(CC) $(CFLAGS) $(SDL_CFLAGS) -c -o $@ $<
94+ffplay.lo: ffplay.c
95+ libtool --mode=compile --tag=CC $(CC) $(CFLAGS) $(SDL_CFLAGS) -c -o $@ $<
ff0ca760 96
0b88e1ce
ER		 97-ffmpeg.o ffplay.o ffserver.o: version.h
98+ffmpeg.lo ffplay.lo ffserver.lo: version.h
2a60eebe 99
0b88e1ce
ER		 100-%.o: %.c
101- $(CC) $(CFLAGS) -c -o $@ $<
102+%.lo: %.c
103+ libtool --mode=compile --tag=CC $(CC) $(CFLAGS) -c -o $@ $<
d7493de8 104
0b88e1ce
ER		 105-videohook: .libs
106+videohook:
107 $(MAKE) -C vhook all
d7493de8 108
0b88e1ce 109 documentation:
b411664d 110@@ -118,16 +115,18 @@
68566a65
ER		 111 else
112 install-progs: $(PROGS)
113 endif
114- install -d "$(bindir)"
115- install -c $(INSTALLSTRIP) -m 755 $(PROGS) "$(bindir)"
116+ install -d "$(DESTDIR)$(bindir)"
b411664d 117+ for prog in $(PROGS); do \
a77da139 118+ libtool --mode=install install -c $(INSTALLSTRIP) $$prog "$(DESTDIR)$(bindir)"; \
b411664d 119+ done
68566a65
ER		 120
121 # create the window installer
122 wininstaller: all install
123 makensis ffinstall.nsi
124
125 install-man:
126- install -d "$(mandir)/man1"
127- install -m 644 $(MANPAGES) "$(mandir)/man1"
128+ install -d "$(DESTDIR)$(mandir)/man1"
129+ install -m 644 $(MANPAGES) "$(DESTDIR)$(mandir)/man1"
130
131 install-vhook:
132 $(MAKE) -C vhook install
a77da139
ER		 133@@ -144,7 +143,7 @@
134 endif
135
136 ifeq ($(BUILD_SHARED),yes)
137- -$(LDCONFIG)
138+ [ -n "$(DESTDIR)" ] || $(LDCONFIG)
139 endif
140
141 install-headers:
b411664d 142@@ -159,10 +158,10 @@
68566a65
ER		 143 uninstall: uninstall-progs uninstall-libs uninstall-headers uninstall-man uninstall-vhook
144
145 uninstall-progs:
146- rm -f $(addprefix $(bindir)/, $(ALLPROGS))
147+ rm -f $(addprefix $(DESTDIR)$(bindir)/, $(ALLPROGS))
148
149 uninstall-man:
150- rm -f $(addprefix $(mandir)/man1/,$(ALLMANPAGES))
151+ rm -f $(addprefix $(DESTDIR)$(mandir)/man1/,$(ALLMANPAGES))
152
153 uninstall-vhook:
154 $(MAKE) -C vhook uninstall
b411664d 155@@ -198,10 +197,6 @@
0b88e1ce
ER		 156 .depend: $(SRCS) version.h
157 $(CC) -MM $(CFLAGS) $(SDL_CFLAGS) $(filter-out %.h,$^) 1>.depend
539b540f 158
0b88e1ce
ER		 159-.libs: lib
160- @test -f .libs || touch .libs
161- @for i in $(DEP_LIBS) ; do if test $$i -nt .libs ; then touch .libs; fi ; done
162-
163 clean:
164 $(MAKE) -C libavutil clean
165 $(MAKE) -C libavcodec clean
b411664d 166@@ -211,7 +206,7 @@
0b88e1ce
ER		 167 $(MAKE) -C tests clean
168 $(MAKE) -C vhook clean
169 $(MAKE) -C doc clean
170- rm -f *.o *.d *~ .libs gmon.out TAGS $(ALLPROGS) $(ALLPROGS_G) \
171+ rm -f *.lo *.d *~ gmon.lout TAGS $(ALLPROGS) \
172 output_example$(EXESUF) qt-faststart$(EXESUF) cws2fws$(EXESUF)
173
174 distclean: clean
68566a65
ER		 175--- ffmpeg-export-2006-12-04.libtool2/common.mak 2006-12-05 13:08:44.141688603 +0200
176+++ ffmpeg-export-2006-12-04/common.mak 2006-12-05 13:40:21.000000000 +0200
0b88e1ce
ER		 177@@ -8,37 +8,30 @@
178 CFLAGS += -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
179 -D_ISOC9X_SOURCE -I$(BUILD_ROOT) -I$(SRC_PATH) \
180 -I$(SRC_PATH)/libavutil $(OPTFLAGS)
181-SRCS := $(OBJS:.o=.c) $(ASM_OBJS:.o=.S) $(CPPOBJS:.o=.cpp)
182+SRCS := $(OBJS:.lo=.c) $(ASM_OBJS:.lo=.S) $(CPPOBJS:.lo=.cpp)
183 OBJS := $(OBJS) $(ASM_OBJS) $(CPPOBJS)
184 STATIC_OBJS := $(OBJS) $(STATIC_OBJS)
185 SHARED_OBJS := $(OBJS) $(SHARED_OBJS)
186+STATIC_OBJS_ = $(shell echo $(OBJS) $(STATIC_OBJS) | tr ' ' '\n' | sort -u)
187+SHARED_OBJS_ = $(shell echo $(OBJS) $(SHARED_OBJS) | tr ' ' '\n' | sort -u)
188
189 all: $(EXTRADEPS) $(LIB) $(SLIBNAME)
190
191-$(LIB): $(STATIC_OBJS)
192- rm -f $@
193- $(AR) rc $@ $^ $(EXTRAOBJS)
194- $(RANLIB) $@
195-
196-$(SLIBNAME): $(SLIBNAME_WITH_MAJOR)
197- ln -sf $^ $@
198-
199-$(SLIBNAME_WITH_MAJOR): $(SHARED_OBJS)
200- $(CC) $(SHFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRALIBS) $(EXTRAOBJS)
201- $(SLIB_EXTRA_CMD)
202+$(SLIBNAME): $(SHARED_OBJS_)
203+ libtool --mode=link --tag=CC $(CC) -o $(LIB) $(SHARED_OBJS_) -rpath $(libdir) -version-number `echo $(LIBVERSION) | tr . :`
539b540f 204
0b88e1ce
ER		 205-%.o: %.c
206- $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
207+%.lo: %.c
208+ libtool --mode=compile --tag=CC $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
539b540f 209
0b88e1ce
ER		 210-%.o: %.S
211- $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
212+%.lo: %.S
213+ libtool --mode=compile --tag=CC $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
d7493de8 214
0b88e1ce
ER		 215 # BeOS: remove -Wall to get rid of all the "multibyte constant" warnings
216-%.o: %.cpp
217- g++ $(subst -Wall,,$(CFLAGS)) -c -o $@ $<
218+%.lo: %.cpp
219+ libtool --mode=compile --tag=CXX $(CC) $(subst -Wall,,$(CFLAGS)) $(LIBOBJFLAGS) -c -o $@ $<
539b540f 220
0b88e1ce
ER		 221-%: %.o $(LIB)
222- $(CC) $(LDFLAGS) -o $@ $^ $(EXTRALIBS)
223+%: %.lo $(LIB)
224+ libtool --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $^ $(EXTRALIBS)
539b540f 225
0b88e1ce
ER		 226 depend dep: $(SRCS)
227 $(CC) -MM $(CFLAGS) $^ 1>.depend
68566a65
ER		 228@@ -50,36 +43,17 @@
229 distclean: clean
230 rm -f .depend
231
232-ifeq ($(BUILD_SHARED),yes)
233-INSTLIBTARGETS += install-lib-shared
234-endif
235-ifeq ($(BUILD_STATIC),yes)
236-INSTLIBTARGETS += install-lib-static
237-endif
238-
239 install: install-libs install-headers
539b540f 240
68566a65
ER		 241-install-libs: $(INSTLIBTARGETS)
242-
243-install-lib-shared: $(SLIBNAME)
0b88e1ce
ER		 244- install -d "$(shlibdir)"
245- install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \
246- "$(shlibdir)/$(SLIBNAME_WITH_VERSION)"
247- cd "$(shlibdir)" && \
248- ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR)
249- cd "$(shlibdir)" && \
250- ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME)
68566a65
ER		 251-
252-install-lib-static: $(LIB)
253- install -d "$(libdir)"
254- install -m 644 $(LIB) "$(libdir)"
255- $(LIB_INSTALL_EXTRA_CMD)
256+install-libs: $(SLIBNAME) $(LIB)
0b88e1ce
ER		 257+ install -d $(DESTDIR)$(libdir)
258+ libtool --mode=install install $(INSTALLSTRIP) $(LIB) $(DESTDIR)$(libdir)
539b540f 259
0b88e1ce
ER		 260 install-headers:
261- install -d "$(incdir)"
262- install -d "$(libdir)/pkgconfig"
263- install -m 644 $(addprefix $(SRC_DIR)/,$(HEADERS)) "$(incdir)"
264- install -m 644 $(BUILD_ROOT)/lib$(NAME).pc "$(libdir)/pkgconfig"
265+ install -d "$(DESTDIR)$(incdir)"
266+ install -d "$(DESTDIR)$(libdir)/pkgconfig"
267+ install -m 644 $(addprefix $(SRC_DIR)/,$(HEADERS)) "$(DESTDIR)$(incdir)"
268+ install -m 644 $(BUILD_ROOT)/lib$(NAME).pc "$(DESTDIR)$(libdir)/pkgconfig"
539b540f 269
0b88e1ce 270 uninstall: uninstall-libs uninstall-headers
539b540f 271
68566a65
ER		 272--- ffmpeg-export-2006-12-04.libtool2/configure 2006-12-05 13:08:44.141688603 +0200
273+++ ffmpeg-export-2006-12-04/configure 2006-12-05 13:46:14.000000000 +0200
0b88e1ce
ER		 274@@ -608,10 +608,10 @@
275 LDCONFIG="ldconfig"
276 LIBPREF="lib"
277 LIBSUF=".a"
278-LIB='$(LIBPREF)$(NAME)$(LIBSUF)'
279+LIB='$(LIBPREF)$(NAME).la'
280 SLIBPREF="lib"
281 SLIBSUF=".so"
282-SLIBNAME='$(SLIBPREF)$(NAME)$(SLIBSUF)'
283+SLIBNAME='$(SLIBPREF)$(NAME).la'
284 SLIBNAME_WITH_VERSION='$(SLIBNAME).$(LIBVERSION)'
285 SLIBNAME_WITH_MAJOR='$(SLIBNAME).$(LIBMAJOR)'
286 EXESUF=""
68566a65
ER		 287@@ -1776,12 +1776,12 @@
288 echo "#define FFMPEG_CONFIGURATION "'"'"$FFMPEG_CONFIGURATION"'"' >> $TMPH
289
290 echo "PREFIX=$PREFIX" >> config.mak
291-echo "prefix=\$(DESTDIR)\${PREFIX}" >> config.mak
292-echo "libdir=\$(DESTDIR)$libdir" >> config.mak
293-echo "shlibdir=\$(DESTDIR)$shlibdir" >> config.mak
294-echo "incdir=\$(DESTDIR)$incdir" >> config.mak
295-echo "bindir=\$(DESTDIR)$bindir" >> config.mak
296-echo "mandir=\$(DESTDIR)$mandir" >> config.mak
297+echo "prefix=\${PREFIX}" >> config.mak
298+echo "libdir=$libdir" >> config.mak
299+echo "shlibdir=$shlibdir" >> config.mak
300+echo "incdir=$incdir" >> config.mak
301+echo "bindir=$bindir" >> config.mak
302+echo "mandir=$mandir" >> config.mak
303 echo "MAKE=$make" >> config.mak
304 echo "CC=$cc" >> config.mak
305 echo "AR=$ar" >> config.mak
0b88e1ce
ER		 306--- ffmpeg-export-2006-12-04/libavcodec/Makefile 2006-11-22 11:20:16.000000000 +0200
307+++ ffmpeg-export-2006-12-04.libtool2/libavcodec/Makefile 2006-12-05 13:08:44.141688603 +0200
308@@ -6,404 +6,403 @@
309
310 CFLAGS+=-I$(SRC_PATH)/libswscale $(AMR_CFLAGS)
311
312-OBJS= bitstream.o \
313- utils.o \
314- allcodecs.o \
315- mpegvideo.o \
316- jrevdct.o \
317- jfdctfst.o \
318- jfdctint.o\
319- mjpeg.o \
320- resample.o \
321- resample2.o \
322- dsputil.o \
323- motion_est.o \
324- imgconvert.o \
325- mpeg12.o \
326- mpegaudiodec.o \
327- simple_idct.o \
328- ratecontrol.o \
329- eval.o \
330- error_resilience.o \
331- fft.o \
332- mdct.o \
333- raw.o \
334- golomb.o \
335- cabac.o\
336- faandct.o \
337- parser.o \
338- vp3dsp.o \
339- h264idct.o \
340- rangecoder.o \
341- pnm.o \
342- h263.o \
343- msmpeg4.o \
344- h263dec.o \
345- opt.o \
346- bitstream_filter.o \
347- audioconvert.o \
348+OBJS= bitstream.lo \
349+ utils.lo \
350+ allcodecs.lo \
351+ mpegvideo.lo \
352+ jrevdct.lo \
353+ jfdctfst.lo \
354+ jfdctint.lo\
355+ mjpeg.lo \
356+ resample.lo \
357+ resample2.lo \
358+ dsputil.lo \
359+ motion_est.lo \
360+ imgconvert.lo \
361+ mpeg12.lo \
362+ mpegaudiodec.lo \
363+ simple_idct.lo \
364+ ratecontrol.lo \
365+ eval.lo \
366+ error_resilience.lo \
367+ fft.lo \
368+ mdct.lo \
369+ raw.lo \
370+ golomb.lo \
371+ cabac.lo\
372+ faandct.lo \
373+ parser.lo \
374+ vp3dsp.lo \
375+ h264idct.lo \
376+ rangecoder.lo \
377+ pnm.lo \
378+ h263.lo \
379+ msmpeg4.lo \
380+ h263dec.lo \
381+ opt.lo \
382+ bitstream_filter.lo \
383+ audioconvert.lo \
384
385
386 HEADERS = avcodec.h opt.h
387
388-OBJS-$(CONFIG_AASC_DECODER) += aasc.o
389-OBJS-$(CONFIG_AC3_ENCODER) += ac3enc.o
390-OBJS-$(CONFIG_ALAC_DECODER) += alac.o
391-OBJS-$(CONFIG_ASV1_DECODER) += asv1.o
392-OBJS-$(CONFIG_ASV1_ENCODER) += asv1.o
393-OBJS-$(CONFIG_ASV2_DECODER) += asv1.o
394-OBJS-$(CONFIG_ASV2_ENCODER) += asv1.o
395-OBJS-$(CONFIG_AVS_DECODER) += avs.o
396-OBJS-$(CONFIG_BMP_DECODER) += bmp.o
397-OBJS-$(CONFIG_CAVS_DECODER) += cavs.o cavsdsp.o
398-OBJS-$(CONFIG_CINEPAK_DECODER) += cinepak.o
399-OBJS-$(CONFIG_CLJR_DECODER) += cljr.o
400-OBJS-$(CONFIG_CLJR_ENCODER) += cljr.o
401-OBJS-$(CONFIG_COOK_DECODER) += cook.o
402-OBJS-$(CONFIG_CSCD_DECODER) += cscd.o lzo.o
403-OBJS-$(CONFIG_CYUV_DECODER) += cyuv.o
404-OBJS-$(CONFIG_DSICINVIDEO_DECODER) += dsicinav.o
405-OBJS-$(CONFIG_DSICINAUDIO_DECODER) += dsicinav.o
406-OBJS-$(CONFIG_DVBSUB_DECODER) += dvbsubdec.o
407-OBJS-$(CONFIG_DVBSUB_ENCODER) += dvbsub.o
408-OBJS-$(CONFIG_DVDSUB_DECODER) += dvdsubdec.o
409-OBJS-$(CONFIG_DVDSUB_ENCODER) += dvdsubenc.o
410-OBJS-$(CONFIG_DVVIDEO_DECODER) += dv.o
411-OBJS-$(CONFIG_DVVIDEO_ENCODER) += dv.o
412-OBJS-$(CONFIG_EIGHTBPS_DECODER) += 8bps.o
413-OBJS-$(CONFIG_FFV1_DECODER) += ffv1.o
414-OBJS-$(CONFIG_FFV1_ENCODER) += ffv1.o
415-OBJS-$(CONFIG_FFVHUFF_DECODER) += huffyuv.o
416-OBJS-$(CONFIG_FFVHUFF_ENCODER) += huffyuv.o
417-OBJS-$(CONFIG_FLAC_DECODER) += flac.o
418-OBJS-$(CONFIG_FLAC_ENCODER) += flacenc.o
419-OBJS-$(CONFIG_FLASHSV_DECODER) += flashsv.o
420-OBJS-$(CONFIG_FLIC_DECODER) += flicvideo.o
421-OBJS-$(CONFIG_FOURXM_DECODER) += 4xm.o
422-OBJS-$(CONFIG_FRAPS_DECODER) += fraps.o
423-OBJS-$(CONFIG_GIF_DECODER) += gifdec.o lzw.o
424-OBJS-$(CONFIG_GIF_ENCODER) += gif.o
425-OBJS-$(CONFIG_H261_DECODER) += h261.o
426-OBJS-$(CONFIG_H261_ENCODER) += h261.o
427-OBJS-$(CONFIG_H264_DECODER) += h264.o
428-OBJS-$(CONFIG_HUFFYUV_DECODER) += huffyuv.o
429-OBJS-$(CONFIG_HUFFYUV_ENCODER) += huffyuv.o
430-OBJS-$(CONFIG_IDCIN_DECODER) += idcinvideo.o
431-OBJS-$(CONFIG_IMC_DECODER) += imc.o
432-OBJS-$(CONFIG_INDEO2_DECODER) += indeo2.o
433-OBJS-$(CONFIG_INDEO3_DECODER) += indeo3.o
434-OBJS-$(CONFIG_INTERPLAY_VIDEO_DECODER) += interplayvideo.o
435-OBJS-$(CONFIG_INTERPLAY_DPCM_DECODER) += dpcm.o
436-OBJS-$(CONFIG_KMVC_DECODER) += kmvc.o
437-OBJS-$(CONFIG_LOCO_DECODER) += loco.o
438-OBJS-$(CONFIG_MACE3_DECODER) += mace.o
439-OBJS-$(CONFIG_MACE6_DECODER) += mace.o
440-OBJS-$(CONFIG_MMVIDEO_DECODER) += mmvideo.o
441-OBJS-$(CONFIG_MP2_ENCODER) += mpegaudio.o
442-OBJS-$(CONFIG_MSRLE_DECODER) += msrle.o
443-OBJS-$(CONFIG_MSVIDEO1_DECODER) += msvideo1.o
444-OBJS-$(CONFIG_MSZH_DECODER) += lcl.o
445-OBJS-$(CONFIG_NUV_DECODER) += nuv.o rtjpeg.o lzo.o
446-OBJS-$(CONFIG_PNG_DECODER) += png.o
447-OBJS-$(CONFIG_PNG_ENCODER) += png.o
448-OBJS-$(CONFIG_QDM2_DECODER) += qdm2.o
449-OBJS-$(CONFIG_QDRAW_DECODER) += qdrw.o
450-OBJS-$(CONFIG_QPEG_DECODER) += qpeg.o
451-OBJS-$(CONFIG_QTRLE_DECODER) += qtrle.o
452-OBJS-$(CONFIG_RA_144_DECODER) += ra144.o
453-OBJS-$(CONFIG_RA_288_DECODER) += ra288.o
454-OBJS-$(CONFIG_ROQ_DECODER) += roqvideo.o
455-OBJS-$(CONFIG_ROQ_DPCM_DECODER) += dpcm.o
456-OBJS-$(CONFIG_RPZA_DECODER) += rpza.o
457-OBJS-$(CONFIG_RV10_DECODER) += rv10.o
458-OBJS-$(CONFIG_RV10_ENCODER) += rv10.o
459-OBJS-$(CONFIG_RV20_DECODER) += rv10.o
460-OBJS-$(CONFIG_RV20_ENCODER) += rv10.o
461-OBJS-$(CONFIG_SHORTEN_DECODER) += shorten.o
462-OBJS-$(CONFIG_SMACKAUD_DECODER) += smacker.o
463-OBJS-$(CONFIG_SMACKER_DECODER) += smacker.o
464-OBJS-$(CONFIG_SMC_DECODER) += smc.o
465-OBJS-$(CONFIG_SNOW_DECODER) += snow.o
466-OBJS-$(CONFIG_SNOW_ENCODER) += snow.o
467-OBJS-$(CONFIG_SOL_DPCM_DECODER) += dpcm.o
468-OBJS-$(CONFIG_SONIC_DECODER) += sonic.o
469-OBJS-$(CONFIG_SONIC_ENCODER) += sonic.o
470-OBJS-$(CONFIG_SONIC_LS_DECODER) += sonic.o
471-OBJS-$(CONFIG_SVQ1_DECODER) += svq1.o
472-OBJS-$(CONFIG_SVQ1_ENCODER) += svq1.o
473-OBJS-$(CONFIG_SVQ3_DECODER) += h264.o
474-OBJS-$(CONFIG_TARGA_DECODER) += targa.o
475-OBJS-$(CONFIG_THEORA_DECODER) += vp3.o
476-OBJS-$(CONFIG_TIERTEXSEQVIDEO_DECODER) += tiertexseqv.o
477-OBJS-$(CONFIG_TIFF_DECODER) += tiff.o lzw.o
478-OBJS-$(CONFIG_TRUEMOTION1_DECODER) += truemotion1.o
479-OBJS-$(CONFIG_TRUEMOTION2_DECODER) += truemotion2.o
480-OBJS-$(CONFIG_TRUESPEECH_DECODER) += truespeech.o
481-OBJS-$(CONFIG_TSCC_DECODER) += tscc.o
482-OBJS-$(CONFIG_TTA_DECODER) += tta.o
483-OBJS-$(CONFIG_ULTI_DECODER) += ulti.o
484-OBJS-$(CONFIG_VC1_DECODER) += vc1.o vc1dsp.o
485-OBJS-$(CONFIG_VCR1_DECODER) += vcr1.o
486-OBJS-$(CONFIG_VCR1_ENCODER) += vcr1.o
487-OBJS-$(CONFIG_VMDAUDIO_DECODER) += vmdav.o
488-OBJS-$(CONFIG_VMDVIDEO_DECODER) += vmdav.o
489-OBJS-$(CONFIG_VMNC_DECODER) += vmnc.o
490-OBJS-$(CONFIG_VORBIS_DECODER) += vorbis.o vorbis_data.o
491-OBJS-$(CONFIG_VORBIS_ENCODER) += vorbis_enc.o vorbis.o vorbis_data.o
492-OBJS-$(CONFIG_VP3_DECODER) += vp3.o
493-OBJS-$(CONFIG_VP5_DECODER) += vp5.o vp56.o vp56data.o
494-OBJS-$(CONFIG_VP6_DECODER) += vp6.o vp56.o vp56data.o
495-OBJS-$(CONFIG_VQA_DECODER) += vqavideo.o
496-OBJS-$(CONFIG_WAVPACK_DECODER) += wavpack.o
497-OBJS-$(CONFIG_WMAV1_DECODER) += wmadec.o
498-OBJS-$(CONFIG_WMAV2_DECODER) += wmadec.o
499-OBJS-$(CONFIG_WMV3_DECODER) += vc1.o vc1dsp.o
500-OBJS-$(CONFIG_WNV1_DECODER) += wnv1.o
501-OBJS-$(CONFIG_WS_SND1_DECODER) += ws-snd1.o
502-OBJS-$(CONFIG_XAN_DPCM_DECODER) += dpcm.o
503-OBJS-$(CONFIG_XAN_WC3_DECODER) += xan.o
504-OBJS-$(CONFIG_XAN_WC4_DECODER) += xan.o
505-OBJS-$(CONFIG_XL_DECODER) += xl.o
506-OBJS-$(CONFIG_ZLIB_DECODER) += lcl.o
507-OBJS-$(CONFIG_ZLIB_ENCODER) += lcl.o
508-OBJS-$(CONFIG_ZMBV_DECODER) += zmbv.o
509-
510-OBJS-$(CONFIG_PCM_S32LE_DECODER) += pcm.o
511-OBJS-$(CONFIG_PCM_S32LE_ENCODER) += pcm.o
512-OBJS-$(CONFIG_PCM_S32BE_DECODER) += pcm.o
513-OBJS-$(CONFIG_PCM_S32BE_ENCODER) += pcm.o
514-OBJS-$(CONFIG_PCM_U32LE_DECODER) += pcm.o
515-OBJS-$(CONFIG_PCM_U32LE_ENCODER) += pcm.o
516-OBJS-$(CONFIG_PCM_U32BE_DECODER) += pcm.o
517-OBJS-$(CONFIG_PCM_U32BE_ENCODER) += pcm.o
518-OBJS-$(CONFIG_PCM_S24LE_DECODER) += pcm.o
519-OBJS-$(CONFIG_PCM_S24LE_ENCODER) += pcm.o
520-OBJS-$(CONFIG_PCM_S24BE_DECODER) += pcm.o
521-OBJS-$(CONFIG_PCM_S24BE_ENCODER) += pcm.o
522-OBJS-$(CONFIG_PCM_U24LE_DECODER) += pcm.o
523-OBJS-$(CONFIG_PCM_U24LE_ENCODER) += pcm.o
524-OBJS-$(CONFIG_PCM_U24BE_DECODER) += pcm.o
525-OBJS-$(CONFIG_PCM_U24BE_ENCODER) += pcm.o
526-OBJS-$(CONFIG_PCM_S24DAUD_DECODER) += pcm.o
527-OBJS-$(CONFIG_PCM_S24DAUD_ENCODER) += pcm.o
528-OBJS-$(CONFIG_PCM_S16LE_DECODER) += pcm.o
529-OBJS-$(CONFIG_PCM_S16LE_ENCODER) += pcm.o
530-OBJS-$(CONFIG_PCM_S16BE_DECODER) += pcm.o
531-OBJS-$(CONFIG_PCM_S16BE_ENCODER) += pcm.o
532-OBJS-$(CONFIG_PCM_U16LE_DECODER) += pcm.o
533-OBJS-$(CONFIG_PCM_U16LE_ENCODER) += pcm.o
534-OBJS-$(CONFIG_PCM_U16BE_DECODER) += pcm.o
535-OBJS-$(CONFIG_PCM_U16BE_ENCODER) += pcm.o
536-OBJS-$(CONFIG_PCM_S8_DECODER) += pcm.o
537-OBJS-$(CONFIG_PCM_S8_ENCODER) += pcm.o
538-OBJS-$(CONFIG_PCM_U8_DECODER) += pcm.o
539-OBJS-$(CONFIG_PCM_U8_ENCODER) += pcm.o
540-OBJS-$(CONFIG_PCM_ALAW_DECODER) += pcm.o
541-OBJS-$(CONFIG_PCM_ALAW_ENCODER) += pcm.o
542-OBJS-$(CONFIG_PCM_MULAW_DECODER) += pcm.o
543-OBJS-$(CONFIG_PCM_MULAW_ENCODER) += pcm.o
544-
545-OBJS-$(CONFIG_ADPCM_4XM_DECODER) += adpcm.o
546-OBJS-$(CONFIG_ADPCM_4XM_ENCODER) += adpcm.o
547-OBJS-$(CONFIG_ADPCM_ADX_DECODER) += adx.o
548-OBJS-$(CONFIG_ADPCM_ADX_ENCODER) += adx.o
549-OBJS-$(CONFIG_ADPCM_CT_DECODER) += adpcm.o
550-OBJS-$(CONFIG_ADPCM_CT_ENCODER) += adpcm.o
551-OBJS-$(CONFIG_ADPCM_EA_DECODER) += adpcm.o
552-OBJS-$(CONFIG_ADPCM_EA_ENCODER) += adpcm.o
553-OBJS-$(CONFIG_ADPCM_G726_DECODER) += g726.o
554-OBJS-$(CONFIG_ADPCM_G726_ENCODER) += g726.o
555-OBJS-$(CONFIG_ADPCM_IMA_DK3_DECODER) += adpcm.o
556-OBJS-$(CONFIG_ADPCM_IMA_DK3_ENCODER) += adpcm.o
557-OBJS-$(CONFIG_ADPCM_IMA_DK4_DECODER) += adpcm.o
558-OBJS-$(CONFIG_ADPCM_IMA_DK4_ENCODER) += adpcm.o
559-OBJS-$(CONFIG_ADPCM_IMA_QT_DECODER) += adpcm.o
560-OBJS-$(CONFIG_ADPCM_IMA_QT_ENCODER) += adpcm.o
561-OBJS-$(CONFIG_ADPCM_IMA_SMJPEG_DECODER)+= adpcm.o
562-OBJS-$(CONFIG_ADPCM_IMA_SMJPEG_ENCODER)+= adpcm.o
563-OBJS-$(CONFIG_ADPCM_IMA_WAV_DECODER) += adpcm.o
564-OBJS-$(CONFIG_ADPCM_IMA_WAV_ENCODER) += adpcm.o
565-OBJS-$(CONFIG_ADPCM_IMA_WS_DECODER) += adpcm.o
566-OBJS-$(CONFIG_ADPCM_IMA_WS_ENCODER) += adpcm.o
567-OBJS-$(CONFIG_ADPCM_MS_DECODER) += adpcm.o
568-OBJS-$(CONFIG_ADPCM_MS_ENCODER) += adpcm.o
569-OBJS-$(CONFIG_ADPCM_SBPRO_2_DECODER) += adpcm.o
570-OBJS-$(CONFIG_ADPCM_SBPRO_2_ENCODER) += adpcm.o
571-OBJS-$(CONFIG_ADPCM_SBPRO_3_DECODER) += adpcm.o
572-OBJS-$(CONFIG_ADPCM_SBPRO_3_ENCODER) += adpcm.o
573-OBJS-$(CONFIG_ADPCM_SBPRO_4_DECODER) += adpcm.o
574-OBJS-$(CONFIG_ADPCM_SBPRO_4_ENCODER) += adpcm.o
575-OBJS-$(CONFIG_ADPCM_SWF_DECODER) += adpcm.o
576-OBJS-$(CONFIG_ADPCM_SWF_ENCODER) += adpcm.o
577-OBJS-$(CONFIG_ADPCM_XA_DECODER) += adpcm.o
578-OBJS-$(CONFIG_ADPCM_XA_ENCODER) += adpcm.o
579-OBJS-$(CONFIG_ADPCM_YAMAHA_DECODER) += adpcm.o
580-OBJS-$(CONFIG_ADPCM_YAMAHA_ENCODER) += adpcm.o
581-
582-OBJS-$(CONFIG_FAAD) += faad.o
583-OBJS-$(CONFIG_FAAC) += faac.o
584-OBJS-$(CONFIG_XVID) += xvidff.o xvid_rc.o
585-OBJS-$(CONFIG_X264) += x264.o
586-OBJS-$(CONFIG_MP3LAME) += mp3lameaudio.o
587-OBJS-$(CONFIG_LIBVORBIS) += oggvorbis.o
588-OBJS-$(CONFIG_LIBGSM) += libgsm.o
589+OBJS-$(CONFIG_AASC_DECODER) += aasc.lo
590+OBJS-$(CONFIG_AC3_ENCODER) += ac3enc.lo
591+OBJS-$(CONFIG_ALAC_DECODER) += alac.lo
592+OBJS-$(CONFIG_ASV1_DECODER) += asv1.lo
593+OBJS-$(CONFIG_ASV1_ENCODER) += asv1.lo
594+OBJS-$(CONFIG_ASV2_DECODER) += asv1.lo
595+OBJS-$(CONFIG_ASV2_ENCODER) += asv1.lo
596+OBJS-$(CONFIG_AVS_DECODER) += avs.lo
597+OBJS-$(CONFIG_BMP_DECODER) += bmp.lo
598+OBJS-$(CONFIG_CAVS_DECODER) += cavs.lo cavsdsp.lo
599+OBJS-$(CONFIG_CINEPAK_DECODER) += cinepak.lo
600+OBJS-$(CONFIG_CLJR_DECODER) += cljr.lo
601+OBJS-$(CONFIG_CLJR_ENCODER) += cljr.lo
602+OBJS-$(CONFIG_COOK_DECODER) += cook.lo
603+OBJS-$(CONFIG_CSCD_DECODER) += cscd.lo lzo.lo
604+OBJS-$(CONFIG_CYUV_DECODER) += cyuv.lo
605+OBJS-$(CONFIG_DSICINVIDEO_DECODER) += dsicinav.lo
606+OBJS-$(CONFIG_DSICINAUDIO_DECODER) += dsicinav.lo
607+OBJS-$(CONFIG_DVBSUB_DECODER) += dvbsubdec.lo
608+OBJS-$(CONFIG_DVBSUB_ENCODER) += dvbsub.lo
609+OBJS-$(CONFIG_DVDSUB_DECODER) += dvdsubdec.lo
610+OBJS-$(CONFIG_DVDSUB_ENCODER) += dvdsubenc.lo
611+OBJS-$(CONFIG_DVVIDEO_DECODER) += dv.lo
612+OBJS-$(CONFIG_DVVIDEO_ENCODER) += dv.lo
613+OBJS-$(CONFIG_EIGHTBPS_DECODER) += 8bps.lo
614+OBJS-$(CONFIG_FFV1_DECODER) += ffv1.lo
615+OBJS-$(CONFIG_FFV1_ENCODER) += ffv1.lo
616+OBJS-$(CONFIG_FFVHUFF_DECODER) += huffyuv.lo
617+OBJS-$(CONFIG_FFVHUFF_ENCODER) += huffyuv.lo
618+OBJS-$(CONFIG_FLAC_DECODER) += flac.lo
619+OBJS-$(CONFIG_FLAC_ENCODER) += flacenc.lo
620+OBJS-$(CONFIG_FLASHSV_DECODER) += flashsv.lo
621+OBJS-$(CONFIG_FLIC_DECODER) += flicvideo.lo
622+OBJS-$(CONFIG_FOURXM_DECODER) += 4xm.lo
623+OBJS-$(CONFIG_FRAPS_DECODER) += fraps.lo
624+OBJS-$(CONFIG_GIF_DECODER) += gifdec.lo lzw.lo
625+OBJS-$(CONFIG_GIF_ENCODER) += gif.lo
626+OBJS-$(CONFIG_H261_DECODER) += h261.lo
627+OBJS-$(CONFIG_H261_ENCODER) += h261.lo
628+OBJS-$(CONFIG_H264_DECODER) += h264.lo
629+OBJS-$(CONFIG_HUFFYUV_DECODER) += huffyuv.lo
630+OBJS-$(CONFIG_HUFFYUV_ENCODER) += huffyuv.lo
631+OBJS-$(CONFIG_IDCIN_DECODER) += idcinvideo.lo
632+OBJS-$(CONFIG_IMC_DECODER) += imc.lo
633+OBJS-$(CONFIG_INDEO2_DECODER) += indeo2.lo
634+OBJS-$(CONFIG_INDEO3_DECODER) += indeo3.lo
635+OBJS-$(CONFIG_INTERPLAY_VIDEO_DECODER) += interplayvideo.lo
636+OBJS-$(CONFIG_INTERPLAY_DPCM_DECODER) += dpcm.lo
637+OBJS-$(CONFIG_KMVC_DECODER) += kmvc.lo
638+OBJS-$(CONFIG_LOCO_DECODER) += loco.lo
639+OBJS-$(CONFIG_MACE3_DECODER) += mace.lo
640+OBJS-$(CONFIG_MACE6_DECODER) += mace.lo
641+OBJS-$(CONFIG_MMVIDEO_DECODER) += mmvideo.lo
642+OBJS-$(CONFIG_MP2_ENCODER) += mpegaudio.lo
643+OBJS-$(CONFIG_MSRLE_DECODER) += msrle.lo
644+OBJS-$(CONFIG_MSVIDEO1_DECODER) += msvideo1.lo
645+OBJS-$(CONFIG_MSZH_DECODER) += lcl.lo
646+OBJS-$(CONFIG_NUV_DECODER) += nuv.lo rtjpeg.lo lzo.lo
647+OBJS-$(CONFIG_PNG_DECODER) += png.lo
648+OBJS-$(CONFIG_PNG_ENCODER) += png.lo
649+OBJS-$(CONFIG_QDM2_DECODER) += qdm2.lo
650+OBJS-$(CONFIG_QDRAW_DECODER) += qdrw.lo
651+OBJS-$(CONFIG_QPEG_DECODER) += qpeg.lo
652+OBJS-$(CONFIG_QTRLE_DECODER) += qtrle.lo
653+OBJS-$(CONFIG_RA_144_DECODER) += ra144.lo
654+OBJS-$(CONFIG_RA_288_DECODER) += ra288.lo
655+OBJS-$(CONFIG_ROQ_DECODER) += roqvideo.lo
656+OBJS-$(CONFIG_ROQ_DPCM_DECODER) += dpcm.lo
657+OBJS-$(CONFIG_RPZA_DECODER) += rpza.lo
658+OBJS-$(CONFIG_RV10_DECODER) += rv10.lo
659+OBJS-$(CONFIG_RV10_ENCODER) += rv10.lo
660+OBJS-$(CONFIG_RV20_DECODER) += rv10.lo
661+OBJS-$(CONFIG_RV20_ENCODER) += rv10.lo
662+OBJS-$(CONFIG_SHORTEN_DECODER) += shorten.lo
663+OBJS-$(CONFIG_SMACKAUD_DECODER) += smacker.lo
664+OBJS-$(CONFIG_SMACKER_DECODER) += smacker.lo
665+OBJS-$(CONFIG_SMC_DECODER) += smc.lo
666+OBJS-$(CONFIG_SNOW_DECODER) += snow.lo
667+OBJS-$(CONFIG_SNOW_ENCODER) += snow.lo
668+OBJS-$(CONFIG_SOL_DPCM_DECODER) += dpcm.lo
669+OBJS-$(CONFIG_SONIC_DECODER) += sonic.lo
670+OBJS-$(CONFIG_SONIC_ENCODER) += sonic.lo
671+OBJS-$(CONFIG_SONIC_LS_DECODER) += sonic.lo
672+OBJS-$(CONFIG_SVQ1_DECODER) += svq1.lo
673+OBJS-$(CONFIG_SVQ1_ENCODER) += svq1.lo
674+OBJS-$(CONFIG_SVQ3_DECODER) += h264.lo
675+OBJS-$(CONFIG_TARGA_DECODER) += targa.lo
676+OBJS-$(CONFIG_THEORA_DECODER) += vp3.lo
677+OBJS-$(CONFIG_TIERTEXSEQVIDEO_DECODER) += tiertexseqv.lo
678+OBJS-$(CONFIG_TIFF_DECODER) += tiff.lo lzw.lo
679+OBJS-$(CONFIG_TRUEMOTION1_DECODER) += truemotion1.lo
680+OBJS-$(CONFIG_TRUEMOTION2_DECODER) += truemotion2.lo
681+OBJS-$(CONFIG_TRUESPEECH_DECODER) += truespeech.lo
682+OBJS-$(CONFIG_TSCC_DECODER) += tscc.lo
683+OBJS-$(CONFIG_TTA_DECODER) += tta.lo
684+OBJS-$(CONFIG_ULTI_DECODER) += ulti.lo
685+OBJS-$(CONFIG_VC1_DECODER) += vc1.lo vc1dsp.lo
686+OBJS-$(CONFIG_VCR1_DECODER) += vcr1.lo
687+OBJS-$(CONFIG_VCR1_ENCODER) += vcr1.lo
688+OBJS-$(CONFIG_VMDAUDIO_DECODER) += vmdav.lo
689+OBJS-$(CONFIG_VMDVIDEO_DECODER) += vmdav.lo
690+OBJS-$(CONFIG_VMNC_DECODER) += vmnc.lo
691+OBJS-$(CONFIG_VORBIS_DECODER) += vorbis.lo vorbis_data.lo
692+OBJS-$(CONFIG_VORBIS_ENCODER) += vorbis_enc.lo vorbis.lo vorbis_data.lo
693+OBJS-$(CONFIG_VP3_DECODER) += vp3.lo
694+OBJS-$(CONFIG_VP5_DECODER) += vp5.lo vp56.lo vp56data.lo
695+OBJS-$(CONFIG_VP6_DECODER) += vp6.lo vp56.lo vp56data.lo
696+OBJS-$(CONFIG_VQA_DECODER) += vqavideo.lo
697+OBJS-$(CONFIG_WAVPACK_DECODER) += wavpack.lo
698+OBJS-$(CONFIG_WMAV1_DECODER) += wmadec.lo
699+OBJS-$(CONFIG_WMAV2_DECODER) += wmadec.lo
700+OBJS-$(CONFIG_WMV3_DECODER) += vc1.lo vc1dsp.lo
701+OBJS-$(CONFIG_WNV1_DECODER) += wnv1.lo
702+OBJS-$(CONFIG_WS_SND1_DECODER) += ws-snd1.lo
703+OBJS-$(CONFIG_XAN_DPCM_DECODER) += dpcm.lo
704+OBJS-$(CONFIG_XAN_WC3_DECODER) += xan.lo
705+OBJS-$(CONFIG_XAN_WC4_DECODER) += xan.lo
706+OBJS-$(CONFIG_XL_DECODER) += xl.lo
707+OBJS-$(CONFIG_ZLIB_DECODER) += lcl.lo
708+OBJS-$(CONFIG_ZLIB_ENCODER) += lcl.lo
709+OBJS-$(CONFIG_ZMBV_DECODER) += zmbv.lo
710+
711+OBJS-$(CONFIG_PCM_S32LE_DECODER) += pcm.lo
712+OBJS-$(CONFIG_PCM_S32LE_ENCODER) += pcm.lo
713+OBJS-$(CONFIG_PCM_S32BE_DECODER) += pcm.lo
714+OBJS-$(CONFIG_PCM_S32BE_ENCODER) += pcm.lo
715+OBJS-$(CONFIG_PCM_U32LE_DECODER) += pcm.lo
716+OBJS-$(CONFIG_PCM_U32LE_ENCODER) += pcm.lo
717+OBJS-$(CONFIG_PCM_U32BE_DECODER) += pcm.lo
718+OBJS-$(CONFIG_PCM_U32BE_ENCODER) += pcm.lo
719+OBJS-$(CONFIG_PCM_S24LE_DECODER) += pcm.lo
720+OBJS-$(CONFIG_PCM_S24LE_ENCODER) += pcm.lo
721+OBJS-$(CONFIG_PCM_S24BE_DECODER) += pcm.lo
722+OBJS-$(CONFIG_PCM_S24BE_ENCODER) += pcm.lo
723+OBJS-$(CONFIG_PCM_U24LE_DECODER) += pcm.lo
724+OBJS-$(CONFIG_PCM_U24LE_ENCODER) += pcm.lo
725+OBJS-$(CONFIG_PCM_U24BE_DECODER) += pcm.lo
726+OBJS-$(CONFIG_PCM_U24BE_ENCODER) += pcm.lo
727+OBJS-$(CONFIG_PCM_S24DAUD_DECODER) += pcm.lo
728+OBJS-$(CONFIG_PCM_S24DAUD_ENCODER) += pcm.lo
729+OBJS-$(CONFIG_PCM_S16LE_DECODER) += pcm.lo
730+OBJS-$(CONFIG_PCM_S16LE_ENCODER) += pcm.lo
731+OBJS-$(CONFIG_PCM_S16BE_DECODER) += pcm.lo
732+OBJS-$(CONFIG_PCM_S16BE_ENCODER) += pcm.lo
733+OBJS-$(CONFIG_PCM_U16LE_DECODER) += pcm.lo
734+OBJS-$(CONFIG_PCM_U16LE_ENCODER) += pcm.lo
735+OBJS-$(CONFIG_PCM_U16BE_DECODER) += pcm.lo
736+OBJS-$(CONFIG_PCM_U16BE_ENCODER) += pcm.lo
737+OBJS-$(CONFIG_PCM_S8_DECODER) += pcm.lo
738+OBJS-$(CONFIG_PCM_S8_ENCODER) += pcm.lo
739+OBJS-$(CONFIG_PCM_U8_DECODER) += pcm.lo
740+OBJS-$(CONFIG_PCM_U8_ENCODER) += pcm.lo
741+OBJS-$(CONFIG_PCM_ALAW_DECODER) += pcm.lo
742+OBJS-$(CONFIG_PCM_ALAW_ENCODER) += pcm.lo
743+OBJS-$(CONFIG_PCM_MULAW_DECODER) += pcm.lo
744+OBJS-$(CONFIG_PCM_MULAW_ENCODER) += pcm.lo
745+
746+OBJS-$(CONFIG_ADPCM_4XM_DECODER) += adpcm.lo
747+OBJS-$(CONFIG_ADPCM_4XM_ENCODER) += adpcm.lo
748+OBJS-$(CONFIG_ADPCM_ADX_DECODER) += adx.lo
749+OBJS-$(CONFIG_ADPCM_ADX_ENCODER) += adx.lo
750+OBJS-$(CONFIG_ADPCM_CT_DECODER) += adpcm.lo
751+OBJS-$(CONFIG_ADPCM_CT_ENCODER) += adpcm.lo
752+OBJS-$(CONFIG_ADPCM_EA_DECODER) += adpcm.lo
753+OBJS-$(CONFIG_ADPCM_EA_ENCODER) += adpcm.lo
754+OBJS-$(CONFIG_ADPCM_G726_DECODER) += g726.lo
755+OBJS-$(CONFIG_ADPCM_G726_ENCODER) += g726.lo
756+OBJS-$(CONFIG_ADPCM_IMA_DK3_DECODER) += adpcm.lo
757+OBJS-$(CONFIG_ADPCM_IMA_DK3_ENCODER) += adpcm.lo
758+OBJS-$(CONFIG_ADPCM_IMA_DK4_DECODER) += adpcm.lo
759+OBJS-$(CONFIG_ADPCM_IMA_DK4_ENCODER) += adpcm.lo
760+OBJS-$(CONFIG_ADPCM_IMA_QT_DECODER) += adpcm.lo
761+OBJS-$(CONFIG_ADPCM_IMA_QT_ENCODER) += adpcm.lo
762+OBJS-$(CONFIG_ADPCM_IMA_SMJPEG_DECODER)+= adpcm.lo
763+OBJS-$(CONFIG_ADPCM_IMA_SMJPEG_ENCODER)+= adpcm.lo
764+OBJS-$(CONFIG_ADPCM_IMA_WAV_DECODER) += adpcm.lo
765+OBJS-$(CONFIG_ADPCM_IMA_WAV_ENCODER) += adpcm.lo
766+OBJS-$(CONFIG_ADPCM_IMA_WS_DECODER) += adpcm.lo
767+OBJS-$(CONFIG_ADPCM_IMA_WS_ENCODER) += adpcm.lo
768+OBJS-$(CONFIG_ADPCM_MS_DECODER) += adpcm.lo
769+OBJS-$(CONFIG_ADPCM_MS_ENCODER) += adpcm.lo
770+OBJS-$(CONFIG_ADPCM_SBPRO_2_DECODER) += adpcm.lo
771+OBJS-$(CONFIG_ADPCM_SBPRO_2_ENCODER) += adpcm.lo
772+OBJS-$(CONFIG_ADPCM_SBPRO_3_DECODER) += adpcm.lo
773+OBJS-$(CONFIG_ADPCM_SBPRO_3_ENCODER) += adpcm.lo
774+OBJS-$(CONFIG_ADPCM_SBPRO_4_DECODER) += adpcm.lo
775+OBJS-$(CONFIG_ADPCM_SBPRO_4_ENCODER) += adpcm.lo
776+OBJS-$(CONFIG_ADPCM_SWF_DECODER) += adpcm.lo
777+OBJS-$(CONFIG_ADPCM_SWF_ENCODER) += adpcm.lo
778+OBJS-$(CONFIG_ADPCM_XA_DECODER) += adpcm.lo
779+OBJS-$(CONFIG_ADPCM_XA_ENCODER) += adpcm.lo
780+OBJS-$(CONFIG_ADPCM_YAMAHA_DECODER) += adpcm.lo
781+OBJS-$(CONFIG_ADPCM_YAMAHA_ENCODER) += adpcm.lo
782+
783+OBJS-$(CONFIG_FAAD) += faad.lo
784+OBJS-$(CONFIG_FAAC) += faac.lo
785+OBJS-$(CONFIG_XVID) += xvidff.lo xvid_rc.lo
786+OBJS-$(CONFIG_X264) += x264.lo
787+OBJS-$(CONFIG_MP3LAME) += mp3lameaudio.lo
788+OBJS-$(CONFIG_LIBVORBIS) += oggvorbis.lo
789+OBJS-$(CONFIG_LIBGSM) += libgsm.lo
539b540f 790
0b88e1ce
ER		 791 # currently using liba52 for ac3 decoding
792-OBJS-$(CONFIG_A52) += a52dec.o
793+OBJS-$(CONFIG_A52) += a52dec.lo
539b540f 794
0b88e1ce
ER		 795 # using builtin liba52 or runtime linked liba52.so.0
796-OBJS-$(CONFIG_A52)$(CONFIG_A52BIN) += liba52/bit_allocate.o \
797- liba52/bitstream.o \
798- liba52/downmix.o \
799- liba52/imdct.o \
800- liba52/parse.o \
801- liba52/crc.o \
802- liba52/resample.o
803+OBJS-$(CONFIG_A52)$(CONFIG_A52BIN) += liba52/bit_allocate.lo \
804+ liba52/bitstream.lo \
805+ liba52/downmix.lo \
806+ liba52/imdct.lo \
807+ liba52/parse.lo \
808+ liba52/crc.lo \
809+ liba52/resample.lo
810
811 # currently using libdts for dts decoding
812-OBJS-$(CONFIG_DTS) += dtsdec.o
813+OBJS-$(CONFIG_DTS) += dtsdec.lo
814
815-OBJS-$(CONFIG_AMR) += amr.o
816-OBJS-$(CONFIG_AMR_NB) += amr_float/sp_dec.o \
817- amr_float/sp_enc.o \
818- amr_float/interf_dec.o \
819- amr_float/interf_enc.o
820+OBJS-$(CONFIG_AMR) += amr.lo
821+OBJS-$(CONFIG_AMR_NB) += amr_float/sp_dec.lo \
822+ amr_float/sp_enc.lo \
823+ amr_float/interf_dec.lo \
824+ amr_float/interf_enc.lo
825
826 ifeq ($(CONFIG_AMR_NB_FIXED),yes)
827-EXTRAOBJS += amr/*.o
828+EXTRAOBJS += amr/*.lo
829 EXTRADEPS=amrlibs
830 endif
831
832-OBJS-$(CONFIG_AMR_WB) += amrwb_float/dec_acelp.o \
833- amrwb_float/dec_dtx.o \
834- amrwb_float/dec_gain.o \
835- amrwb_float/dec_if.o \
836- amrwb_float/dec_lpc.o \
837- amrwb_float/dec_main.o \
838- amrwb_float/dec_rom.o \
839- amrwb_float/dec_util.o \
840- amrwb_float/enc_acelp.o \
841- amrwb_float/enc_dtx.o \
842- amrwb_float/enc_gain.o \
843- amrwb_float/enc_if.o \
844- amrwb_float/enc_lpc.o \
845- amrwb_float/enc_main.o \
846- amrwb_float/enc_rom.o \
847- amrwb_float/enc_util.o \
848- amrwb_float/if_rom.o
849-
850-OBJS-$(CONFIG_AAC_PARSER) += parser.o
851-OBJS-$(CONFIG_AC3_PARSER) += parser.o
852-OBJS-$(CONFIG_CAVSVIDEO_PARSER) += cavs.o parser.o
853-OBJS-$(CONFIG_DVBSUB_PARSER) += dvbsubdec.o
854-OBJS-$(CONFIG_DVDSUB_PARSER) += dvdsubdec.o
855-OBJS-$(CONFIG_H261_PARSER) += h261.o
856-OBJS-$(CONFIG_H263_PARSER) += h263dec.o
857-OBJS-$(CONFIG_H264_PARSER) += h264.o
858-OBJS-$(CONFIG_MJPEG_PARSER) += mjpeg.o
859-OBJS-$(CONFIG_MPEG4VIDEO_PARSER) += parser.o
860-OBJS-$(CONFIG_MPEGAUDIO_PARSER) += parser.o
861-OBJS-$(CONFIG_MPEGVIDEO_PARSER) += parser.o
862-OBJS-$(CONFIG_PNM_PARSER) += pnm.o
863-
864-OBJS-$(HAVE_PTHREADS) += pthread.o
865-OBJS-$(HAVE_W32THREADS) += w32thread.o
866-OBJS-$(HAVE_OS2THREADS) += os2thread.o
867-OBJS-$(HAVE_BEOSTHREADS) += beosthread.o
868+OBJS-$(CONFIG_AMR_WB) += amrwb_float/dec_acelp.lo \
869+ amrwb_float/dec_dtx.lo \
870+ amrwb_float/dec_gain.lo \
871+ amrwb_float/dec_if.lo \
872+ amrwb_float/dec_lpc.lo \
873+ amrwb_float/dec_main.lo \
874+ amrwb_float/dec_rom.lo \
875+ amrwb_float/dec_util.lo \
876+ amrwb_float/enc_acelp.lo \
877+ amrwb_float/enc_dtx.lo \
878+ amrwb_float/enc_gain.lo \
879+ amrwb_float/enc_if.lo \
880+ amrwb_float/enc_lpc.lo \
881+ amrwb_float/enc_main.lo \
882+ amrwb_float/enc_rom.lo \
883+ amrwb_float/enc_util.lo \
884+ amrwb_float/if_rom.lo
885+
886+OBJS-$(CONFIG_AAC_PARSER) += parser.lo
887+OBJS-$(CONFIG_AC3_PARSER) += parser.lo
888+OBJS-$(CONFIG_CAVSVIDEO_PARSER) += cavs.lo parser.lo
889+OBJS-$(CONFIG_DVBSUB_PARSER) += dvbsubdec.lo
890+OBJS-$(CONFIG_DVDSUB_PARSER) += dvdsubdec.lo
891+OBJS-$(CONFIG_H261_PARSER) += h261.lo
892+OBJS-$(CONFIG_H263_PARSER) += h263dec.lo
893+OBJS-$(CONFIG_H264_PARSER) += h264.lo
894+OBJS-$(CONFIG_MJPEG_PARSER) += mjpeg.lo
895+OBJS-$(CONFIG_MPEG4VIDEO_PARSER) += parser.lo
896+OBJS-$(CONFIG_MPEGAUDIO_PARSER) += parser.lo
897+OBJS-$(CONFIG_MPEGVIDEO_PARSER) += parser.lo
898+OBJS-$(CONFIG_PNM_PARSER) += pnm.lo
899+
900+OBJS-$(HAVE_PTHREADS) += pthread.lo
901+OBJS-$(HAVE_W32THREADS) += w32thread.lo
902+OBJS-$(HAVE_OS2THREADS) += os2thread.lo
903+OBJS-$(HAVE_BEOSTHREADS) += beosthread.lo
904
905-OBJS-$(HAVE_XVMC_ACCEL) += xvmcvideo.o
906+OBJS-$(HAVE_XVMC_ACCEL) += xvmcvideo.lo
907
908 ifneq ($(CONFIG_SWSCALER),yes)
909-OBJS += imgresample.o
910+OBJS += imgresample.lo
2a60eebe
JB		 911 endif
912
0b88e1ce
ER		 913 # i386 mmx specific stuff
914 ifeq ($(TARGET_MMX),yes)
915-OBJS += i386/fdct_mmx.o \
916- i386/cputest.o \
917- i386/dsputil_mmx.o \
918- i386/mpegvideo_mmx.o \
919- i386/motion_est_mmx.o \
920- i386/simple_idct_mmx.o \
921- i386/idct_mmx_xvid.o \
922- i386/fft_sse.o \
923- i386/vp3dsp_mmx.o \
924- i386/vp3dsp_sse2.o \
925- i386/fft_3dn.o \
926- i386/fft_3dn2.o \
927- i386/snowdsp_mmx.o \
928+OBJS += i386/fdct_mmx.lo \
929+ i386/cputest.lo \
930+ i386/dsputil_mmx.lo \
931+ i386/mpegvideo_mmx.lo \
932+ i386/motion_est_mmx.lo \
933+ i386/simple_idct_mmx.lo \
934+ i386/idct_mmx_xvid.lo \
935+ i386/fft_sse.lo \
936+ i386/vp3dsp_mmx.lo \
937+ i386/vp3dsp_sse2.lo \
938+ i386/fft_3dn.lo \
939+ i386/fft_3dn2.lo \
940+ i386/snowdsp_mmx.lo \
941
942 ifeq ($(CONFIG_GPL),yes)
943-OBJS += i386/idct_mmx.o
944+OBJS += i386/idct_mmx.lo
945 endif
946 ifeq ($(CONFIG_CAVS_DECODER),yes)
947-OBJS += i386/cavsdsp_mmx.o
948+OBJS += i386/cavsdsp_mmx.lo
ff0ca760 949 endif
ff0ca760 950 endif
2a60eebe 951
0b88e1ce
ER		 952 # armv4l specific stuff
953-ASM_OBJS-$(TARGET_ARCH_ARMV4L) += armv4l/jrevdct_arm.o \
954- armv4l/simple_idct_arm.o \
955- armv4l/dsputil_arm_s.o \
956+ASM_OBJS-$(TARGET_ARCH_ARMV4L) += armv4l/jrevdct_arm.lo \
957+ armv4l/simple_idct_arm.lo \
958+ armv4l/dsputil_arm_s.lo \
539b540f 959
0b88e1ce
ER		 960-OBJS-$(TARGET_ARCH_ARMV4L) += armv4l/dsputil_arm.o \
961- armv4l/mpegvideo_arm.o \
962+OBJS-$(TARGET_ARCH_ARMV4L) += armv4l/dsputil_arm.lo \
963+ armv4l/mpegvideo_arm.lo \
539b540f 964
0b88e1ce
ER		 965-OBJS-$(TARGET_IWMMXT) += armv4l/dsputil_iwmmxt.o \
966- armv4l/mpegvideo_iwmmxt.o \
967+OBJS-$(TARGET_IWMMXT) += armv4l/dsputil_iwmmxt.lo \
968+ armv4l/mpegvideo_iwmmxt.lo \
ff0ca760 969
0b88e1ce
ER		 970-ASM_OBJS-$(TARGET_ARMV5TE) += armv4l/simple_idct_armv5te.o \
971+ASM_OBJS-$(TARGET_ARMV5TE) += armv4l/simple_idct_armv5te.lo \
d7493de8 972
0b88e1ce
ER		 973 # sun sparc
974-OBJS-$(TARGET_ARCH_SPARC) += sparc/dsputil_vis.o \
975+OBJS-$(TARGET_ARCH_SPARC) += sparc/dsputil_vis.lo \
539b540f 976
0b88e1ce
ER		 977-sparc/dsputil_vis.o: CFLAGS += -mcpu=ultrasparc -mtune=ultrasparc
978+sparc/dsputil_vis.lo: CFLAGS += -mcpu=ultrasparc -mtune=ultrasparc
539b540f 979
0b88e1ce
ER		 980 # sun mediaLib specific stuff
981-OBJS-$(HAVE_MLIB) += mlib/dsputil_mlib.o \
982+OBJS-$(HAVE_MLIB) += mlib/dsputil_mlib.lo \
539b540f 983
0b88e1ce
ER		 984 # alpha specific stuff
985-OBJS-$(TARGET_ARCH_ALPHA) += alpha/dsputil_alpha.o \
986- alpha/mpegvideo_alpha.o \
987- alpha/simple_idct_alpha.o \
988- alpha/motion_est_alpha.o \
989-
990-ASM_OBJS-$(TARGET_ARCH_ALPHA) += alpha/dsputil_alpha_asm.o \
991- alpha/motion_est_mvi_asm.o \
992-
993-OBJS-$(TARGET_ARCH_POWERPC) += ppc/dsputil_ppc.o \
994- ppc/mpegvideo_ppc.o \
995-
996-OBJS-$(TARGET_MMI) += ps2/dsputil_mmi.o \
997- ps2/idct_mmi.o \
998- ps2/mpegvideo_mmi.o \
999-
1000-OBJS-$(TARGET_ARCH_SH4) += sh4/idct_sh4.o \
1001- sh4/dsputil_sh4.o \
1002- sh4/dsputil_align.o \
1003-
1004-OBJS-$(TARGET_ALTIVEC) += ppc/dsputil_altivec.o \
1005- ppc/mpegvideo_altivec.o \
1006- ppc/idct_altivec.o \
1007- ppc/fft_altivec.o \
1008- ppc/gmc_altivec.o \
1009- ppc/fdct_altivec.o \
1010- ppc/float_altivec.o \
1011+OBJS-$(TARGET_ARCH_ALPHA) += alpha/dsputil_alpha.lo \
1012+ alpha/mpegvideo_alpha.lo \
1013+ alpha/simple_idct_alpha.lo \
1014+ alpha/motion_est_alpha.lo \
1015+
1016+ASM_OBJS-$(TARGET_ARCH_ALPHA) += alpha/dsputil_alpha_asm.lo \
1017+ alpha/motion_est_mvi_asm.lo \
1018+
1019+OBJS-$(TARGET_ARCH_POWERPC) += ppc/dsputil_ppc.lo \
1020+ ppc/mpegvideo_ppc.lo \
1021+
1022+OBJS-$(TARGET_MMI) += ps2/dsputil_mmi.lo \
1023+ ps2/idct_mmi.lo \
1024+ ps2/mpegvideo_mmi.lo \
1025+
1026+OBJS-$(TARGET_ARCH_SH4) += sh4/idct_sh4.lo \
1027+ sh4/dsputil_sh4.lo \
1028+ sh4/dsputil_align.lo \
1029+
1030+OBJS-$(TARGET_ALTIVEC) += ppc/dsputil_altivec.lo \
1031+ ppc/mpegvideo_altivec.lo \
1032+ ppc/idct_altivec.lo \
1033+ ppc/fft_altivec.lo \
1034+ ppc/gmc_altivec.lo \
1035+ ppc/fdct_altivec.lo \
1036+ ppc/float_altivec.lo \
539b540f 1037
0b88e1ce
ER		 1038 ifeq ($(TARGET_ALTIVEC),yes)
1039-OBJS-$(CONFIG_H264_DECODER) += ppc/h264_altivec.o
1040-OBJS-$(CONFIG_SNOW_DECODER) += ppc/snow_altivec.o
1041-OBJS-$(CONFIG_VC1_DECODER) += ppc/vc1dsp_altivec.o
1042-OBJS-$(CONFIG_WMV3_DECODER) += ppc/vc1dsp_altivec.o
1043+OBJS-$(CONFIG_H264_DECODER) += ppc/h264_altivec.lo
1044+OBJS-$(CONFIG_SNOW_DECODER) += ppc/snow_altivec.lo
1045+OBJS-$(CONFIG_VC1_DECODER) += ppc/vc1dsp_altivec.lo
1046+OBJS-$(CONFIG_WMV3_DECODER) += ppc/vc1dsp_altivec.lo
1047 endif
1048
1049-OBJS-$(TARGET_ARCH_BFIN) += bfin/dsputil_bfin.o \
1050+OBJS-$(TARGET_ARCH_BFIN) += bfin/dsputil_bfin.lo \
1051
1052-CFLAGS += $(CFLAGS-yes)
1053-OBJS += $(OBJS-yes)
1054-ASM_OBJS += $(ASM_OBJS-yes)
1055+OBJS += $(shell echo $(OBJS-yes) | tr ' ' '\n' | sort -u)
1056+ASM_OBJS += $(shell echo $(ASM_OBJS-yes) | tr ' ' '\n' | sort -u)
1057
1058-EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
1059+EXTRALIBS += $(SRC_PATH)/libavutil/libavutil.la
539b540f 1060
0b88e1ce
ER		 1061 NAME=avcodec
1062 ifeq ($(BUILD_SHARED),yes)
1063@@ -425,21 +424,21 @@
1064
1065 clean::
1066 rm -f \
1067- i386/*.o i386/*~ \
1068- armv4l/*.o armv4l/*~ \
1069- mlib/*.o mlib/*~ \
1070- alpha/*.o alpha/*~ \
1071- ppc/*.o ppc/*~ \
1072- ps2/*.o ps2/*~ \
1073- sh4/*.o sh4/*~ \
1074- sparc/*.o sparc/*~ \
1075- liba52/*.o liba52/*~ \
1076- amr_float/*.o \
1077+ i386/*.lo i386/*~ \
1078+ armv4l/*.lo armv4l/*~ \
1079+ mlib/*.lo mlib/*~ \
1080+ alpha/*.lo alpha/*~ \
1081+ ppc/*.lo ppc/*~ \
1082+ ps2/*.lo ps2/*~ \
1083+ sh4/*.lo sh4/*~ \
1084+ sparc/*.lo sparc/*~ \
1085+ liba52/*.lo liba52/*~ \
1086+ amr_float/*.lo \
1087 apiexample $(TESTS)
1088 -$(MAKE) -C amr clean
1089 -$(MAKE) -C amrwb_float -f makefile.gcc clean
1090
1091-apiexample: apiexample.o $(LIB)
1092+apiexample: apiexample.lo $(LIB)
539b540f 1093
539b540f 1094 cpuid_test: i386/cputest.c
0b88e1ce
ER		 1095 $(CC) $(CFLAGS) -D__TEST__ -o $@ $<
1096@@ -447,10 +446,10 @@
1097 imgresample-test: imgresample.c $(LIB)
1098 $(CC) $(CFLAGS) -DTEST -o $@ $^ $(EXTRALIBS)
539b540f 1099
0b88e1ce
ER		 1100-dct-test: dct-test.o fdctref.o $(LIB)
1101+dct-test: dct-test.lo fdctref.lo $(LIB)
05e1eb2f 1102
0b88e1ce
ER		 1103-motion-test: motion_test.o $(LIB)
1104+motion-test: motion_test.lo $(LIB)
539b540f 1105
0b88e1ce
ER		 1106-fft-test: fft-test.o $(LIB)
1107+fft-test: fft-test.lo $(LIB)
539b540f 1108
0b88e1ce
ER		 1109 .PHONY: amrlibs tests
1110--- ffmpeg-export-2006-12-04/libavformat/Makefile 2006-11-21 15:18:21.000000000 +0200
1111+++ ffmpeg-export-2006-12-04.libtool2/libavformat/Makefile 2006-12-05 13:08:44.131688378 +0200
1112@@ -6,187 +6,186 @@
1113
1114 CFLAGS+=-I$(SRC_PATH)/libavcodec
539b540f 1115
05e1eb2f
JB		 1116-OBJS= utils.o cutils.o os_support.o allformats.o
1117+OBJS= utils.lo cutils.lo os_support.lo allformats.lo
4a55007c 1118
0b88e1ce
ER		 1119 HEADERS = avformat.h avio.h rtp.h rtsp.h rtspcodes.h
1120
1121 # muxers/demuxers
1122-OBJS-$(CONFIG_FOURXM_DEMUXER) += 4xm.o
1123-OBJS-$(CONFIG_ADTS_MUXER) += adtsenc.o
1124-OBJS-$(CONFIG_AIFF_DEMUXER) += aiff.o riff.o
1125-OBJS-$(CONFIG_AIFF_MUXER) += aiff.o riff.o
1126-OBJS-$(CONFIG_AMR_DEMUXER) += amr.o
1127-OBJS-$(CONFIG_AMR_MUXER) += amr.o
1128-OBJS-$(CONFIG_ASF_DEMUXER) += asf.o riff.o
1129-OBJS-$(CONFIG_ASF_MUXER) += asf-enc.o riff.o
1130-OBJS-$(CONFIG_ASF_STREAM_MUXER) += asf-enc.o riff.o
1131-OBJS-$(CONFIG_AU_DEMUXER) += au.o riff.o
1132-OBJS-$(CONFIG_AU_MUXER) += au.o riff.o
1133-OBJS-$(CONFIG_AVI_DEMUXER) += avidec.o riff.o
1134-OBJS-$(CONFIG_AVI_MUXER) += avienc.o riff.o
1135-OBJS-$(CONFIG_AVISYNTH) += avisynth.o
1136-OBJS-$(CONFIG_AVS_DEMUXER) += avs.o vocdec.o voc.o riff.o
1137-OBJS-$(CONFIG_CRC_MUXER) += crc.o
1138-OBJS-$(CONFIG_FRAMECRC_MUXER) += crc.o
1139-OBJS-$(CONFIG_DAUD_DEMUXER) += daud.o
1140-OBJS-$(CONFIG_DSICIN_DEMUXER) += dsicin.o
1141-OBJS-$(CONFIG_DV_DEMUXER) += dv.o
1142-OBJS-$(CONFIG_DV_MUXER) += dvenc.o
1143-OBJS-$(CONFIG_EA_DEMUXER) += electronicarts.o
1144-OBJS-$(CONFIG_FFM_DEMUXER) += ffm.o
1145-OBJS-$(CONFIG_FFM_MUXER) += ffm.o
1146-OBJS-$(CONFIG_FLIC_DEMUXER) += flic.o
1147-OBJS-$(CONFIG_FLV_DEMUXER) += flvdec.o
1148-OBJS-$(CONFIG_FLV_MUXER) += flvenc.o
1149-OBJS-$(CONFIG_GIF_MUXER) += gif.o
1150-OBJS-$(CONFIG_GIF_DEMUXER) += gifdec.o
1151-OBJS-$(CONFIG_GXF_DEMUXER) += gxf.o
1152-OBJS-$(CONFIG_IDCIN_DEMUXER) += idcin.o
1153-OBJS-$(CONFIG_ROQ_DEMUXER) += idroq.o
1154-OBJS-$(CONFIG_IMAGE2_DEMUXER) += img2.o
1155-OBJS-$(CONFIG_IMAGE2PIPE_DEMUXER) += img2.o
1156-OBJS-$(CONFIG_IMAGE2_MUXER) += img2.o
1157-OBJS-$(CONFIG_IMAGE2PIPE_MUXER) += img2.o
1158-OBJS-$(CONFIG_IPMOVIE_DEMUXER) += ipmovie.o
1159-OBJS-$(CONFIG_MATROSKA_DEMUXER) += matroska.o riff.o
1160-OBJS-$(CONFIG_MM_DEMUXER) += mm.o
1161-OBJS-$(CONFIG_MMF_DEMUXER) += mmf.o riff.o
1162-OBJS-$(CONFIG_MMF_MUXER) += mmf.o riff.o
1163-OBJS-$(CONFIG_MOV_DEMUXER) += mov.o riff.o isom.o
1164-OBJS-$(CONFIG_MOV_MUXER) += movenc.o riff.o isom.o
1165-OBJS-$(CONFIG_MTV_DEMUXER) += mtv.o
1166-OBJS-$(CONFIG_TGP_MUXER) += movenc.o riff.o isom.o
1167-OBJS-$(CONFIG_MP4_MUXER) += movenc.o riff.o isom.o
1168-OBJS-$(CONFIG_PSP_MUXER) += movenc.o riff.o isom.o
1169-OBJS-$(CONFIG_TG2_MUXER) += movenc.o riff.o isom.o
1170-OBJS-$(CONFIG_MP3_DEMUXER) += mp3.o
1171-OBJS-$(CONFIG_MP2_MUXER) += mp3.o
1172-OBJS-$(CONFIG_MP3_MUXER) += mp3.o
1173-OBJS-$(CONFIG_MPEG1SYSTEM_MUXER) += mpeg.o
1174-OBJS-$(CONFIG_MPEG1VCD_MUXER) += mpeg.o
1175-OBJS-$(CONFIG_MPEG2VOB_MUXER) += mpeg.o
1176-OBJS-$(CONFIG_MPEG2SVCD_MUXER) += mpeg.o
1177-OBJS-$(CONFIG_MPEG2DVD_MUXER) += mpeg.o
1178-OBJS-$(CONFIG_MPEGPS_DEMUXER) += mpeg.o
1179-OBJS-$(CONFIG_MPEGTS_DEMUXER) += mpegts.o
1180-OBJS-$(CONFIG_MPEGTS_MUXER) += mpegtsenc.o
1181-OBJS-$(CONFIG_MPJPEG_MUXER) += mpjpeg.o
1182-OBJS-$(CONFIG_MXF_DEMUXER) += mxf.o
1183-OBJS-$(CONFIG_NSV_DEMUXER) += nsvdec.o riff.o
1184-OBJS-$(CONFIG_NUV_DEMUXER) += nuv.o riff.o
1185-OBJS-$(CONFIG_OGG_DEMUXER) += ogg2.o \
1186- oggparsevorbis.o \
1187- oggparsetheora.o \
1188- oggparseflac.o \
1189- oggparseogm.o \
1190- riff.o
1191-OBJS-$(CONFIG_STR_DEMUXER) += psxstr.o
1192-OBJS-$(CONFIG_SHORTEN_DEMUXER) += raw.o
1193-OBJS-$(CONFIG_FLAC_DEMUXER) += raw.o
1194-OBJS-$(CONFIG_FLAC_MUXER) += raw.o
1195-OBJS-$(CONFIG_AC3_DEMUXER) += raw.o
1196-OBJS-$(CONFIG_AC3_MUXER) += raw.o
1197-OBJS-$(CONFIG_DTS_DEMUXER) += raw.o
1198-OBJS-$(CONFIG_AAC_DEMUXER) += raw.o
1199-OBJS-$(CONFIG_H261_DEMUXER) += raw.o
1200-OBJS-$(CONFIG_H261_MUXER) += raw.o
1201-OBJS-$(CONFIG_H263_DEMUXER) += raw.o
1202-OBJS-$(CONFIG_H263_MUXER) += raw.o
1203-OBJS-$(CONFIG_M4V_DEMUXER) += raw.o
1204-OBJS-$(CONFIG_M4V_MUXER) += raw.o
1205-OBJS-$(CONFIG_H264_DEMUXER) += raw.o
1206-OBJS-$(CONFIG_H264_MUXER) += raw.o
1207-OBJS-$(CONFIG_MPEGVIDEO_DEMUXER) += raw.o
1208-OBJS-$(CONFIG_MPEG1VIDEO_MUXER) += raw.o
1209-OBJS-$(CONFIG_MPEG2VIDEO_MUXER) += raw.o
1210-OBJS-$(CONFIG_MJPEG_DEMUXER) += raw.o
1211-OBJS-$(CONFIG_INGENIENT_DEMUXER) += raw.o
1212-OBJS-$(CONFIG_MJPEG_MUXER) += raw.o
1213-OBJS-$(CONFIG_RAWVIDEO_DEMUXER) += raw.o
1214-OBJS-$(CONFIG_RAWVIDEO_MUXER) += raw.o
1215-OBJS-$(CONFIG_NULL_MUXER) += raw.o
1216-OBJS-$(CONFIG_RM_DEMUXER) += rm.o
1217-OBJS-$(CONFIG_RM_MUXER) += rm.o
1218-OBJS-$(CONFIG_SEGAFILM_DEMUXER) += segafilm.o
1219-OBJS-$(CONFIG_VMD_DEMUXER) += sierravmd.o
1220-OBJS-$(CONFIG_SMACKER_DEMUXER) += smacker.o
1221-OBJS-$(CONFIG_SOL_DEMUXER) += sol.o
1222-OBJS-$(CONFIG_SWF_DEMUXER) += swf.o
1223-OBJS-$(CONFIG_SWF_MUXER) += swf.o
1224-OBJS-$(CONFIG_TIERTEXSEQ_DEMUXER) += tiertexseq.o
1225-OBJS-$(CONFIG_TTA_DEMUXER) += tta.o
1226-OBJS-$(CONFIG_VOC_DEMUXER) += vocdec.o voc.o riff.o
1227-OBJS-$(CONFIG_VOC_MUXER) += vocenc.o voc.o riff.o
1228-OBJS-$(CONFIG_WAV_DEMUXER) += wav.o riff.o
1229-OBJS-$(CONFIG_WAV_MUXER) += wav.o riff.o
1230-OBJS-$(CONFIG_WC3_DEMUXER) += wc3movie.o
1231-OBJS-$(CONFIG_WSAUD_DEMUXER) += westwood.o
1232-OBJS-$(CONFIG_WSVQA_DEMUXER) += westwood.o
1233-OBJS-$(CONFIG_WV_DEMUXER) += wv.o
1234-OBJS-$(CONFIG_YUV4MPEGPIPE_MUXER) += yuv4mpeg.o
1235-OBJS-$(CONFIG_YUV4MPEGPIPE_DEMUXER) += yuv4mpeg.o
1236+OBJS-$(CONFIG_FOURXM_DEMUXER) += 4xm.lo
1237+OBJS-$(CONFIG_ADTS_MUXER) += adtsenc.lo
1238+OBJS-$(CONFIG_AIFF_DEMUXER) += aiff.lo riff.lo
1239+OBJS-$(CONFIG_AIFF_MUXER) += aiff.lo riff.lo
1240+OBJS-$(CONFIG_AMR_DEMUXER) += amr.lo
1241+OBJS-$(CONFIG_AMR_MUXER) += amr.lo
1242+OBJS-$(CONFIG_ASF_DEMUXER) += asf.lo riff.lo
1243+OBJS-$(CONFIG_ASF_MUXER) += asf-enc.lo riff.lo
1244+OBJS-$(CONFIG_ASF_STREAM_MUXER) += asf-enc.lo riff.lo
1245+OBJS-$(CONFIG_AU_DEMUXER) += au.lo riff.lo
1246+OBJS-$(CONFIG_AU_MUXER) += au.lo riff.lo
1247+OBJS-$(CONFIG_AVI_DEMUXER) += avidec.lo riff.lo
1248+OBJS-$(CONFIG_AVI_MUXER) += avienc.lo riff.lo
1249+OBJS-$(CONFIG_AVISYNTH) += avisynth.lo
1250+OBJS-$(CONFIG_AVS_DEMUXER) += avs.lo vocdec.lo voc.lo riff.lo
1251+OBJS-$(CONFIG_CRC_MUXER) += crc.lo
1252+OBJS-$(CONFIG_FRAMECRC_MUXER) += crc.lo
1253+OBJS-$(CONFIG_DAUD_DEMUXER) += daud.lo
1254+OBJS-$(CONFIG_DSICIN_DEMUXER) += dsicin.lo
1255+OBJS-$(CONFIG_DV_DEMUXER) += dv.lo
1256+OBJS-$(CONFIG_DV_MUXER) += dvenc.lo
1257+OBJS-$(CONFIG_EA_DEMUXER) += electronicarts.lo
1258+OBJS-$(CONFIG_FFM_DEMUXER) += ffm.lo
1259+OBJS-$(CONFIG_FFM_MUXER) += ffm.lo
1260+OBJS-$(CONFIG_FLIC_DEMUXER) += flic.lo
1261+OBJS-$(CONFIG_FLV_DEMUXER) += flvdec.lo
1262+OBJS-$(CONFIG_FLV_MUXER) += flvenc.lo
1263+OBJS-$(CONFIG_GIF_MUXER) += gif.lo
1264+OBJS-$(CONFIG_GIF_DEMUXER) += gifdec.lo
1265+OBJS-$(CONFIG_GXF_DEMUXER) += gxf.lo
1266+OBJS-$(CONFIG_IDCIN_DEMUXER) += idcin.lo
1267+OBJS-$(CONFIG_ROQ_DEMUXER) += idroq.lo
1268+OBJS-$(CONFIG_IMAGE2_DEMUXER) += img2.lo
1269+OBJS-$(CONFIG_IMAGE2PIPE_DEMUXER) += img2.lo
1270+OBJS-$(CONFIG_IMAGE2_MUXER) += img2.lo
1271+OBJS-$(CONFIG_IMAGE2PIPE_MUXER) += img2.lo
1272+OBJS-$(CONFIG_IPMOVIE_DEMUXER) += ipmovie.lo
1273+OBJS-$(CONFIG_MATROSKA_DEMUXER) += matroska.lo riff.lo
1274+OBJS-$(CONFIG_MM_DEMUXER) += mm.lo
1275+OBJS-$(CONFIG_MMF_DEMUXER) += mmf.lo riff.lo
1276+OBJS-$(CONFIG_MMF_MUXER) += mmf.lo riff.lo
1277+OBJS-$(CONFIG_MOV_DEMUXER) += mov.lo riff.lo isom.lo
1278+OBJS-$(CONFIG_MOV_MUXER) += movenc.lo riff.lo isom.lo
1279+OBJS-$(CONFIG_MTV_DEMUXER) += mtv.lo
1280+OBJS-$(CONFIG_TGP_MUXER) += movenc.lo riff.lo isom.lo
1281+OBJS-$(CONFIG_MP4_MUXER) += movenc.lo riff.lo isom.lo
1282+OBJS-$(CONFIG_PSP_MUXER) += movenc.lo riff.lo isom.lo
1283+OBJS-$(CONFIG_TG2_MUXER) += movenc.lo riff.lo isom.lo
1284+OBJS-$(CONFIG_MP3_DEMUXER) += mp3.lo
1285+OBJS-$(CONFIG_MP2_MUXER) += mp3.lo
1286+OBJS-$(CONFIG_MP3_MUXER) += mp3.lo
1287+OBJS-$(CONFIG_MPEG1SYSTEM_MUXER) += mpeg.lo
1288+OBJS-$(CONFIG_MPEG1VCD_MUXER) += mpeg.lo
1289+OBJS-$(CONFIG_MPEG2VOB_MUXER) += mpeg.lo
1290+OBJS-$(CONFIG_MPEG2SVCD_MUXER) += mpeg.lo
1291+OBJS-$(CONFIG_MPEG2DVD_MUXER) += mpeg.lo
1292+OBJS-$(CONFIG_MPEGPS_DEMUXER) += mpeg.lo
1293+OBJS-$(CONFIG_MPEGTS_DEMUXER) += mpegts.lo
1294+OBJS-$(CONFIG_MPEGTS_MUXER) += mpegtsenc.lo
1295+OBJS-$(CONFIG_MPJPEG_MUXER) += mpjpeg.lo
1296+OBJS-$(CONFIG_MXF_DEMUXER) += mxf.lo
1297+OBJS-$(CONFIG_NSV_DEMUXER) += nsvdec.lo riff.lo
1298+OBJS-$(CONFIG_NUV_DEMUXER) += nuv.lo riff.lo
1299+OBJS-$(CONFIG_OGG_DEMUXER) += ogg2.lo \
1300+ oggparsevorbis.lo \
1301+ oggparsetheora.lo \
1302+ oggparseflac.lo \
1303+ oggparseogm.lo \
1304+ riff.lo
1305+OBJS-$(CONFIG_STR_DEMUXER) += psxstr.lo
1306+OBJS-$(CONFIG_SHORTEN_DEMUXER) += raw.lo
1307+OBJS-$(CONFIG_FLAC_DEMUXER) += raw.lo
1308+OBJS-$(CONFIG_FLAC_MUXER) += raw.lo
1309+OBJS-$(CONFIG_AC3_DEMUXER) += raw.lo
1310+OBJS-$(CONFIG_AC3_MUXER) += raw.lo
1311+OBJS-$(CONFIG_DTS_DEMUXER) += raw.lo
1312+OBJS-$(CONFIG_AAC_DEMUXER) += raw.lo
1313+OBJS-$(CONFIG_H261_DEMUXER) += raw.lo
1314+OBJS-$(CONFIG_H261_MUXER) += raw.lo
1315+OBJS-$(CONFIG_H263_DEMUXER) += raw.lo
1316+OBJS-$(CONFIG_H263_MUXER) += raw.lo
1317+OBJS-$(CONFIG_M4V_DEMUXER) += raw.lo
1318+OBJS-$(CONFIG_M4V_MUXER) += raw.lo
1319+OBJS-$(CONFIG_H264_DEMUXER) += raw.lo
1320+OBJS-$(CONFIG_H264_MUXER) += raw.lo
1321+OBJS-$(CONFIG_MPEGVIDEO_DEMUXER) += raw.lo
1322+OBJS-$(CONFIG_MPEG1VIDEO_MUXER) += raw.lo
1323+OBJS-$(CONFIG_MPEG2VIDEO_MUXER) += raw.lo
1324+OBJS-$(CONFIG_MJPEG_DEMUXER) += raw.lo
1325+OBJS-$(CONFIG_INGENIENT_DEMUXER) += raw.lo
1326+OBJS-$(CONFIG_MJPEG_MUXER) += raw.lo
1327+OBJS-$(CONFIG_RAWVIDEO_DEMUXER) += raw.lo
1328+OBJS-$(CONFIG_RAWVIDEO_MUXER) += raw.lo
1329+OBJS-$(CONFIG_NULL_MUXER) += raw.lo
1330+OBJS-$(CONFIG_RM_DEMUXER) += rm.lo
1331+OBJS-$(CONFIG_RM_MUXER) += rm.lo
1332+OBJS-$(CONFIG_SEGAFILM_DEMUXER) += segafilm.lo
1333+OBJS-$(CONFIG_VMD_DEMUXER) += sierravmd.lo
1334+OBJS-$(CONFIG_SMACKER_DEMUXER) += smacker.lo
1335+OBJS-$(CONFIG_SOL_DEMUXER) += sol.lo
1336+OBJS-$(CONFIG_SWF_DEMUXER) += swf.lo
1337+OBJS-$(CONFIG_SWF_MUXER) += swf.lo
1338+OBJS-$(CONFIG_TIERTEXSEQ_DEMUXER) += tiertexseq.lo
1339+OBJS-$(CONFIG_TTA_DEMUXER) += tta.lo
1340+OBJS-$(CONFIG_VOC_DEMUXER) += vocdec.lo voc.lo riff.lo
1341+OBJS-$(CONFIG_VOC_MUXER) += vocenc.lo voc.lo riff.lo
1342+OBJS-$(CONFIG_WAV_DEMUXER) += wav.lo riff.lo
1343+OBJS-$(CONFIG_WAV_MUXER) += wav.lo riff.lo
1344+OBJS-$(CONFIG_WC3_DEMUXER) += wc3movie.lo
1345+OBJS-$(CONFIG_WSAUD_DEMUXER) += westwood.lo
1346+OBJS-$(CONFIG_WSVQA_DEMUXER) += westwood.lo
1347+OBJS-$(CONFIG_WV_DEMUXER) += wv.lo
1348+OBJS-$(CONFIG_YUV4MPEGPIPE_MUXER) += yuv4mpeg.lo
1349+OBJS-$(CONFIG_YUV4MPEGPIPE_DEMUXER) += yuv4mpeg.lo
4a55007c 1350
4a55007c 1351-OBJS+= framehook.o
4a55007c 1352+OBJS+= framehook.lo
539b540f
JB		 1353
1354 ifeq ($(CONFIG_VIDEO4LINUX),yes)
0b88e1ce
ER		 1355-OBJS-$(CONFIG_VIDEO_GRAB_DEVICE_DEMUXER) += grab.o
1356+OBJS-$(CONFIG_VIDEO_GRAB_DEVICE_DEMUXER) += grab.lo
1357 endif
1358
1359 ifeq ($(CONFIG_VIDEO4LINUX2),yes)
1360-OBJS-$(CONFIG_V4L2_DEMUXER) += v4l2.o
1361+OBJS-$(CONFIG_V4L2_DEMUXER) += v4l2.lo
539b540f
JB		 1362 endif
1363
d7493de8 1364 ifeq ($(CONFIG_BKTR),yes)
0b88e1ce
ER		 1365-OBJS-$(CONFIG_VIDEO_GRAB_DEVICE_DEMUXER) += grab_bktr.o
1366+OBJS-$(CONFIG_VIDEO_GRAB_DEVICE_DEMUXER) += grab_bktr.lo
d7493de8
JB		 1367 endif
1368
2a60eebe 1369 ifeq ($(CONFIG_DV1394),yes)
0b88e1ce
ER		 1370-OBJS-$(CONFIG_DV1394_DEMUXER) += dv1394.o
1371+OBJS-$(CONFIG_DV1394_DEMUXER) += dv1394.lo
2a60eebe
JB		 1372 endif
1373
d7493de8 1374 ifeq ($(CONFIG_DC1394),yes)
0b88e1ce
ER		 1375-OBJS-$(CONFIG_DC1394_DEMUXER) += dc1394.o
1376+OBJS-$(CONFIG_DC1394_DEMUXER) += dc1394.lo
d7493de8
JB		 1377 endif
1378
539b540f 1379 ifeq ($(CONFIG_AUDIO_OSS),yes)
0b88e1ce
ER		 1380-OBJS-$(CONFIG_AUDIO_DEMUXER) += audio.o
1381-OBJS-$(CONFIG_AUDIO_MUXER) += audio.o
1382+OBJS-$(CONFIG_AUDIO_DEMUXER) += audio.lo
1383+OBJS-$(CONFIG_AUDIO_MUXER) += audio.lo
539b540f
JB		 1384 endif
1385
0b88e1ce
ER		 1386-EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) \
1387- -lavcodec$(BUILDSUF) -L$(BUILD_ROOT)/libavcodec $(EXTRALIBS)
1388+EXTRALIBS += ../libavcodec/libavcodec.la ../libavutil/libavutil.la
4a55007c 1389
539b540f 1390 ifeq ($(CONFIG_AUDIO_BEOS),yes)
0b88e1ce
ER		 1391-CPPOBJS+= beosaudio.o
1392+CPPOBJS+= beosaudio.lo
539b540f
JB		 1393 endif
1394
4a55007c
JB		 1395 # protocols I/O
1396-OBJS+= avio.o aviobuf.o
1397+OBJS+= avio.lo aviobuf.lo
1398
1399 ifeq ($(CONFIG_PROTOCOLS),yes)
1400-OBJS+= file.o
1401+OBJS+= file.lo
539b540f 1402 ifeq ($(CONFIG_NETWORK),yes)
0b88e1ce
ER		 1403-OBJS+= udp.o tcp.o http.o rtsp.o rtp.o rtpproto.o mpegts.o base64.o rtp_h264.o
1404+OBJS+= udp.lo tcp.lo http.lo rtsp.lo rtp.lo rtpproto.lo mpegts.lo base64.lo rtp_h264.lo
539b540f 1405 endif
4a55007c 1406 endif
539b540f 1407
0b88e1ce
ER		 1408 ifeq ($(CONFIG_LIBNUT),yes)
1409-OBJS-$(CONFIG_NUT_DEMUXER) += libnut.o riff.o
1410-OBJS-$(CONFIG_NUT_MUXER) += libnut.o riff.o
1411+OBJS-$(CONFIG_NUT_DEMUXER) += libnut.lo riff.lo
1412+OBJS-$(CONFIG_NUT_MUXER) += libnut.lo riff.lo
1413 else
1414-OBJS-$(CONFIG_NUT_DEMUXER) += nutdec.o riff.o
1415-#OBJS-$(CONFIG_NUT_MUXER) += nutenc.o riff.o
1416+OBJS-$(CONFIG_NUT_DEMUXER) += nutdec.lo riff.lo
1417+#OBJS-$(CONFIG_NUT_MUXER) += nutenc.lo riff.lo
539b540f
JB		 1418 endif
1419
0b88e1ce
ER		 1420 ifeq ($(CONFIG_LIBOGG),yes)
1421-OBJS-$(CONFIG_OGG_MUXER) += ogg.o
1422+OBJS-$(CONFIG_OGG_MUXER) += ogg.lo
ff0ca760
JB		 1423 endif
1424
0b88e1ce
ER		 1425 ifeq ($(CONFIG_GPL),yes)
1426-OBJS-$(CONFIG_GXF_MUXER) += gxfenc.o
1427+OBJS-$(CONFIG_GXF_MUXER) += gxfenc.lo
2a60eebe 1428 endif
539b540f 1429
0b88e1ce
ER		 1430-OBJS += $(OBJS-yes)
1431+OBJS += $(shell echo $(OBJS-yes) | tr ' ' '\n' | sort -u)
539b540f 1432
0b88e1ce
ER		 1433 NAME=avformat
1434 ifeq ($(BUILD_SHARED),yes)
1435--- ffmpeg-export-2006-12-04/libavutil/Makefile 2006-11-14 03:02:30.000000000 +0200
1436+++ ffmpeg-export-2006-12-04.libtool2/libavutil/Makefile 2006-12-05 13:08:44.141688603 +0200
1437@@ -5,17 +5,17 @@
539b540f 1438
0b88e1ce 1439 CFLAGS+=-DBUILD_AVUTIL
d7493de8
JB		 1440
1441-OBJS= mathematics.o \
d7493de8
JB		 1442- rational.o \
1443- intfloat_readwrite.o \
0b88e1ce
ER		 1444- crc.o \
1445- md5.o \
1446- lls.o \
1447- adler32.o \
1448- log.o \
1449- mem.o \
1450- fifo.o \
1451- tree.o \
d7493de8 1452+OBJS= mathematics.lo \
d7493de8
JB		 1453+ rational.lo \
1454+ intfloat_readwrite.lo \
0b88e1ce
ER		 1455+ crc.lo \
1456+ md5.lo \
1457+ lls.lo \
1458+ adler32.lo \
1459+ log.lo \
1460+ mem.lo \
1461+ fifo.lo \
1462+ tree.lo \
1463
1464 HEADERS = avutil.h common.h mathematics.h integer.h rational.h \
1465 intfloat_readwrite.h md5.h adler32.h log.h fifo.h
1466--- ffmpeg-export-2006-12-04/libpostproc/Makefile 2006-11-08 02:02:15.000000000 +0200
1467+++ ffmpeg-export-2006-12-04.libtool2/libpostproc/Makefile 2006-12-05 13:08:44.131688378 +0200
1468@@ -12,8 +12,8 @@
1469 LIBMAJOR=$(SPPMAJOR)
539b540f
JB		 1470 endif
1471
0b88e1ce
ER		 1472-STATIC_OBJS=postprocess.o
1473-SHARED_OBJS=postprocess_pic.o
1474+STATIC_OBJS=postprocess.lo
1475+SHARED_OBJS=postprocess_pic.lo
2a60eebe 1476
0b88e1ce 1477 HEADERS = postprocess.h
2a60eebe 1478
0b88e1ce 1479@@ -21,6 +21,5 @@
2a60eebe 1480
0b88e1ce 1481 depend dep: postprocess.c
ff0ca760 1482
0b88e1ce
ER		 1483-postprocess_pic.o: postprocess.c
1484- $(CC) -c $(CFLAGS) -fomit-frame-pointer -fPIC -DPIC -o $@ $<
ff0ca760 1485-
0b88e1ce
ER		 1486+postprocess_pic.lo: postprocess.c
1487+ libtool --mode=compile --tag=CC $(CC) -c $(CFLAGS) -fomit-frame-pointer -fPIC -DPIC -o $@ $<
1488--- ffmpeg-export-2006-12-04/vhook/Makefile 2006-11-08 02:02:15.000000000 +0200
1489+++ ffmpeg-export-2006-12-04.libtool2/vhook/Makefile 2006-12-05 13:08:44.141688603 +0200
1490@@ -28,8 +28,8 @@
1491 $(CC) -MM $(CFLAGS) $^ 1>.depend
539b540f 1492
0b88e1ce
ER		 1493 install: $(HOOKS)
1494- install -d "$(shlibdir)/vhook"
1495- install -m 755 $(HOOKS) "$(shlibdir)/vhook"
1496+ install -d "$(DESTDIR)$(shlibdir)/vhook"
1497+ install -m 755 $(HOOKS) "$(DESTDIR)$(shlibdir)/vhook"
2a60eebe 1498
0b88e1ce
ER		 1499 uninstall:
1500 rm -f $(addprefix $(shlibdir)/vhook/,$(ALLHOOKS))
FFmpeg - a very fast video and audio converter
This page took 0.225245 seconds and 4 git commands to generate.