1 --- ffmpeg-0.4.6/libavcodec/Makefile.orig Sun Jan 5 02:32:23 2003
2 +++ ffmpeg-0.4.6/libavcodec/Makefile Sun Jan 5 02:49:11 2003
4 CFLAGS= $(OPT) -Wall -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
7 -OBJS= common.o utils.o mem.o allcodecs.o \
8 - mpegvideo.o h263.o jrevdct.o jfdctfst.o jfdctint.o\
9 - mpegaudio.o ac3enc.o mjpeg.o resample.o dsputil.o \
10 - motion_est.o imgconvert.o imgresample.o msmpeg4.o \
11 - mpeg12.o h263dec.o svq1.o rv10.o mpegaudiodec.o pcm.o simple_idct.o \
12 - ratecontrol.o adpcm.o eval.o dv.o error_resilience.o \
13 - wmadec.o fft.o mdct.o mace.o huffyuv.o
14 +OBJS= common.lo utils.lo mem.lo allcodecs.lo \
15 + mpegvideo.lo h263.lo jrevdct.lo jfdctfst.lo jfdctint.lo\
16 + mpegaudio.lo ac3enc.lo mjpeg.lo resample.lo dsputil.lo \
17 + motion_est.lo imgconvert.lo imgresample.lo msmpeg4.lo \
18 + mpeg12.lo h263dec.lo svq1.lo rv10.lo mpegaudiodec.lo pcm.lo simple_idct.lo \
19 + ratecontrol.lo adpcm.lo eval.lo dv.lo error_resilience.lo \
20 + wmadec.lo fft.lo mdct.lo mace.lo huffyuv.lo
23 # currently using liba52 for ac3 decoding
24 ifeq ($(CONFIG_AC3),yes)
28 # using builtin liba52 or runtime linked liba52.so.0
29 ifneq ($(CONFIG_A52BIN),yes)
30 -OBJS+= liba52/bit_allocate.o liba52/bitstream.o liba52/downmix.o \
31 - liba52/imdct.o liba52/parse.o
32 +OBJS+= liba52/bit_allocate.lo liba52/bitstream.lo liba52/downmix.lo \
33 + liba52/imdct.lo liba52/parse.lo
37 ifeq ($(CONFIG_MP3LAME),yes)
38 -OBJS += mp3lameaudio.o
39 +OBJS += mp3lameaudio.lo
40 EXTRALIBS += -lmp3lame
43 ifeq ($(CONFIG_VORBIS),yes)
46 EXTRALIBS += -lvorbis -lvorbisenc
51 # i386 mmx specific stuff
52 ifeq ($(TARGET_MMX),yes)
53 -OBJS += i386/fdct_mmx.o i386/cputest.o \
54 - i386/dsputil_mmx.o i386/mpegvideo_mmx.o \
55 - i386/idct_mmx.o i386/motion_est_mmx.o \
56 - i386/simple_idct_mmx.o
57 +OBJS += i386/fdct_mmx.lo i386/cputest.lo \
58 + i386/dsputil_mmx.lo i386/mpegvideo_mmx.lo \
59 + i386/idct_mmx.lo i386/motion_est_mmx.lo \
60 + i386/simple_idct_mmx.lo
63 # armv4l specific stuff
64 ifeq ($(TARGET_ARCH_ARMV4L),yes)
65 -ASM_OBJS += armv4l/jrevdct_arm.o
66 -OBJS += armv4l/dsputil_arm.o armv4l/mpegvideo_arm.o
67 +ASM_OBJS += armv4l/jrevdct_arm.lo
68 +OBJS += armv4l/dsputil_arm.lo armv4l/mpegvideo_arm.lo
71 # sun mediaLib specific stuff
72 # currently only works when libavcodec is used in mplayer
73 ifeq ($(HAVE_MLIB),yes)
74 -OBJS += mlib/dsputil_mlib.o
75 +OBJS += mlib/dsputil_mlib.lo
79 # alpha specific stuff
80 ifeq ($(TARGET_ARCH_ALPHA),yes)
81 -OBJS += alpha/dsputil_alpha.o alpha/mpegvideo_alpha.o \
82 - alpha/simple_idct_alpha.o alpha/motion_est_alpha.o
83 -ASM_OBJS += alpha/dsputil_alpha_asm.o alpha/motion_est_mvi_asm.o
84 +OBJS += alpha/dsputil_alpha.lo alpha/mpegvideo_alpha.lo \
85 + alpha/simple_idct_alpha.lo alpha/motion_est_alpha.lo
86 +ASM_OBJS += alpha/dsputil_alpha_asm.lo alpha/motion_est_mvi_asm.lo
87 CFLAGS += -fforce-addr -freduce-all-givs
90 ifeq ($(TARGET_ARCH_POWERPC),yes)
91 -OBJS += ppc/dsputil_ppc.o ppc/mpegvideo_ppc.o
92 +OBJS += ppc/dsputil_ppc.lo ppc/mpegvideo_ppc.lo
95 ifeq ($(TARGET_MMI),yes)
96 -OBJS += ps2/dsputil_mmi.o ps2/idct_mmi.o ps2/mpegvideo_mmi.o
97 +OBJS += ps2/dsputil_mmi.lo ps2/idct_mmi.lo ps2/mpegvideo_mmi.lo
100 ifeq ($(TARGET_ALTIVEC),yes)
102 -OBJS += ppc/dsputil_altivec.o ppc/mpegvideo_altivec.o ppc/idct_altivec.o
103 +OBJS += ppc/dsputil_altivec.lo ppc/mpegvideo_altivec.lo ppc/idct_altivec.lo
106 -SRCS := $(OBJS:.o=.c) $(ASM_OBJS:.o=.S)
107 +SRCS := $(OBJS:.lo=.c) $(ASM_OBJS:.lo=.S)
108 OBJS := $(OBJS) $(ASM_OBJS)
112 ifeq ($(BUILD_SHARED),yes)
114 +RPATH= -rpath $(prefix)/lib libavcodec.so
118 TESTS= imgresample-test dct-test motion-test fft-test
120 @@ -101,38 +103,33 @@
121 tests: apiexample cpuid_test $(TESTS)
125 - $(AR) rc $@ $(OBJS)
127 + libtool --mode=link --tag CC $(CC) $(LDFLAGS) -o $@ $(OBJS) $(RPATH) $(EXTRALIBS) -release $(VERSION)
130 - $(CC) $(SHFLAGS) -o $@ $(OBJS) $(EXTRALIBS)
132 -dsputil.o: dsputil.c dsputil.h
133 +dsputil.lo: dsputil.c dsputil.h
137 - $(CC) $(CFLAGS) -msse -c -o $@ $<
139 + libtool --mode=compile --tag CC $(CC) $(CFLAGS) -msse -c -o $@ $<
141 # specific 3dnow code
142 -%_3dnow.o : %_3dnow.c
143 - $(CC) $(CFLAGS) -m3dnow -c -o $@ $<
144 +%_3dnow.lo : %_3dnow.c
145 + libtool --mode=compile --tag CC $(CC) $(CFLAGS) -m3dnow -c -o $@ $<
148 - $(CC) $(CFLAGS) -c -o $@ $<
150 + libtool --mode=compile --tag CC $(CC) $(CFLAGS) -c -o $@ $<
153 - $(CC) $(CFLAGS) -c -o $@ $<
155 + libtool --mode=compile --tag CC $(CC) $(CFLAGS) -c -o $@ $<
157 # motion_est_alpha uses the MVI extension, which is not available with
158 # -mcpu=ev4 (default) or ev5/ev56. Thus, force -mcpu=pca56 in those
160 ifeq ($(TARGET_ARCH_ALPHA),yes)
161 -alpha/motion_est_alpha.o: alpha/motion_est_alpha.c
162 +alpha/motion_est_alpha.lo: alpha/motion_est_alpha.c
163 cpu=`echo "$(CFLAGS)" | sed -n 's,.*-mcpu=\([a-zA-Z0-9]*\).*,\1,p'`; \
164 case x"$$cpu" in x|xev[45]*) newcpu=pca56;; *) newcpu=$$cpu;; esac; \
165 echo $(CC) $(CFLAGS) -mcpu=$$newcpu -c -o $@ $<;\
166 - $(CC) $(CFLAGS) -mcpu=$$newcpu -c -o $@ $<
167 + libtool --mode=compile --tag CC $(CC) $(CFLAGS) -mcpu=$$newcpu -c -o $@ $<
170 # depend only used by mplayer now
171 @@ -142,13 +139,13 @@
172 $(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
175 - rm -f *.o *~ .depend $(LIB) $(SLIB) *.so i386/*.o i386/*~ \
176 - armv4l/*.o armv4l/*~ \
178 - alpha/*.o alpha/*~ \
181 - liba52/*.o liba52/*~ \
182 + rm -f *.*o *~ .depend $(LIB) $(SLIB) *.so *.la i386/*.*o i386/*~ \
183 + armv4l/*.*o armv4l/*~ \
184 + mlib/*.*o mlib/*~ \
185 + alpha/*.*o alpha/*~ \
188 + liba52/*.*o liba52/*~ \
192 @@ -156,43 +153,41 @@
194 # api example program
195 apiexample: apiexample.c $(LIB)
196 - $(CC) $(CFLAGS) -o $@ $< $(LIB) $(EXTRALIBS) -lm
197 + libtool --mode=link --tag CC $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $< $(LIB) $(EXTRALIBS) -lm
200 cpuid_test: i386/cputest.c
201 - $(CC) $(CFLAGS) -D__TEST__ -o $@ $<
202 + libtool --mode=link --tag CC $(CC) $(LDFLAGS) $(CFLAGS) -D__TEST__ -o $@ $<
206 imgresample-test: imgresample.c
207 - $(CC) $(CFLAGS) -DTEST -o $@ $^ -lm
208 + libtool --mode=link --tag CC $(CC) $(LDFLAGS) $(CFLAGS) -DTEST -o $@ $^ -lm
210 dct-test: dct-test.o jfdctfst.o jfdctint.o i386/fdct_mmx.o\
211 fdctref.o jrevdct.o i386/idct_mmx.o simple_idct.o i386/simple_idct_mmx.o
213 + libtool --mode=link --tag CC $(CC) $(LDFLAGS) -o $@ $^ -lm
215 motion-test: motion_test.o $(LIB)
217 + libtool --mode=link --tag CC $(CC) $(LDFLAGS) -o $@ $^ -lm
219 fft-test: fft-test.o fft.o mdct.o
221 + libtool --mode=link --tag CC $(CC) $(LDFLAGS) -o $@ $^ -lm
224 ifeq ($(BUILD_SHARED),yes)
225 - install -d $(prefix)/lib
226 - install -s -m 755 $(SLIB) $(prefix)/lib/libavcodec-$(VERSION).so
227 - ln -sf libavcodec-$(VERSION).so $(prefix)/lib/libavcodec.so
229 - mkdir -p $(prefix)/include/ffmpeg
230 - install -m 644 $(VPATH)/avcodec.h $(prefix)/include/ffmpeg/avcodec.h
231 - install -m 644 $(VPATH)/common.h $(prefix)/include/ffmpeg/common.h
232 + install -d $(DESTDIR)$(prefix)/lib
233 + libtool --mode=install install $(LIB) $(DESTDIR)$(prefix)/lib
234 + install -d $(DESTDIR)$(prefix)/include/ffmpeg
235 + install -m 644 $(VPATH)/avcodec.h $(DESTDIR)$(prefix)/include/ffmpeg/avcodec.h
236 + install -m 644 $(VPATH)/common.h $(DESTDIR)$(prefix)/include/ffmpeg/common.h
240 - install -m 644 $(LIB) $(prefix)/lib
241 - mkdir -p $(prefix)/include/ffmpeg
242 + libtool --mode=install install $(LIB) $(DESTDIR)$(prefix)/lib
243 + install -d $(DESTDIR)$(prefix)/include/ffmpeg
244 install -m 644 $(SRC_PATH)/libavcodec/avcodec.h $(SRC_PATH)/libavcodec/common.h \
245 - $(prefix)/include/ffmpeg
246 + $(DESTDIR)$(prefix)/include/ffmpeg
249 # include dependency files if they exist
250 --- ffmpeg-0.4.6/libavformat/Makefile.orig Sun Jan 5 02:32:23 2003
251 +++ ffmpeg-0.4.6/libavformat/Makefile Sun Jan 5 02:53:50 2003
254 CFLAGS= $(OPT) -Wall -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
256 -OBJS= utils.o cutils.o allformats.o
257 +OBJS= utils.lo cutils.lo allformats.lo
260 -OBJS+=mpeg.o mpegts.o ffm.o crc.o img.o raw.o rm.o asf.o \
261 - avienc.o avidec.o wav.o swf.o au.o gif.o mov.o jpeg.o dv.o framehook.o
262 +OBJS+=mpeg.lo mpegts.lo ffm.lo crc.lo img.lo raw.lo rm.lo asf.lo \
263 + avienc.lo avidec.lo wav.lo swf.lo au.lo gif.lo mov.lo jpeg.lo dv.lo framehook.lo
265 -OBJS+= avio.o aviobuf.o file.o
266 +OBJS+= avio.lo aviobuf.lo file.lo
268 ifeq ($(BUILD_STRPTIME),yes)
273 ifeq ($(CONFIG_VIDEO4LINUX),yes)
278 ifeq ($(CONFIG_AUDIO_OSS),yes)
283 ifeq ($(CONFIG_AUDIO_BEOS),yes)
288 ifeq ($(CONFIG_NETWORK),yes)
289 -OBJS+= udp.o tcp.o http.o rtsp.o rtp.o rtpproto.o
290 +OBJS+= udp.lo tcp.lo http.lo rtsp.lo rtp.lo rtpproto.lo
292 ifeq ($(NEED_INET_ATON),yes)
298 ifeq ($(CONFIG_VORBIS),yes)
310 - $(AR) rc $@ $(OBJS)
314 - install -m 644 $(LIB) $(prefix)/lib
315 - mkdir -p $(prefix)/include/ffmpeg
316 - install -m 644 $(SRC_PATH)/libav/avformat.h $(SRC_PATH)/libav/avio.h \
317 - $(SRC_PATH)/libav/rtp.h $(SRC_PATH)/libav/rtsp.h \
318 - $(SRC_PATH)/libav/rtspcodes.h \
319 - $(prefix)/include/ffmpeg
320 + libtool --mode=link --tag CC $(CC) $(LDOPT) -o $@ $(OBJS) ../libavcodec/libavcodec.la -rpath $(prefix)/lib -release $(VERSION)
323 + install -d $(DESTDIR)$(prefix)/lib
324 + libtool --mode=install install $(LIB) $(DESTDIR)$(prefix)/lib
325 + install -d $(DESTDIR)$(prefix)/include/ffmpeg
326 + install -m 644 $(SRC_PATH)/libavformat/avformat.h $(SRC_PATH)/libavformat/avio.h \
327 + $(SRC_PATH)/libavformat/rtp.h $(SRC_PATH)/libavformat/rtsp.h \
328 + $(SRC_PATH)/libavformat/rtspcodes.h \
329 + $(DESTDIR)$(prefix)/include/ffmpeg
334 - $(CC) $(CFLAGS) -c -o $@ $<
336 + libtool --mode=compile --tag CC $(CC) $(CFLAGS) -c -o $@ $<
338 # BeOS: remove -Wall to get rid of all the "multibyte constant" warnings
340 - g++ $(subst -Wall,,$(CFLAGS)) -c -o $@ $<
341 + libtool --mode=compile --tag CC g++ $(subst -Wall,,$(CFLAGS)) -c -o $@ $<
345 + rm -f *.o *.lo *~ *.a *.la *.so
346 --- ffmpeg-0.4.6/Makefile.orig Sun Jan 5 02:32:23 2003
347 +++ ffmpeg-0.4.6/Makefile Sun Jan 5 03:01:25 2003
354 ifeq ($(CONFIG_FFSERVER),yes)
360 ifeq ($(BUILD_SHARED),yes)
361 -DEP_LIBS=libavcodec/libavcodec.so libavformat/libavformat.a
362 +DEP_LIBS=libavcodec/libavcodec.la libavformat/libavformat.la
364 DEP_LIBS=libavcodec/libavcodec.a libavformat/libavformat.a
365 ifeq ($(CONFIG_MP3LAME),yes)
367 $(MAKE) -C libavcodec all
368 $(MAKE) -C libavformat all
370 -ffmpeg_g$(EXE): ffmpeg.o $(DEP_LIBS)
371 - $(CC) $(LDFLAGS) -o $@ ffmpeg.o -L./libavcodec -L./libavformat \
372 - -lavformat -lavcodec $(EXTRALIBS)
374 -ffmpeg$(EXE): ffmpeg_g$(EXE)
375 - cp -p $< $@ ; $(STRIP) $@
376 +ffmpeg$(EXE): ffmpeg.o $(DEP_LIBS)
377 + libtool --mode=link --tag CC $(CC) $(LDFLAGS) -o $@ ffmpeg.o $(DEP_LIBS) $(EXTRALIBS)
379 ffserver$(EXE): ffserver.o $(DEP_LIBS)
380 - $(CC) $(LDFLAGS) $(FFSLDFLAGS) \
381 - -o $@ ffserver.o -L./libavcodec -L./libavformat \
382 - -lavformat -lavcodec $(EXTRALIBS)
383 + libtool --mode=link --tag CC $(CC) $(LDFLAGS) $(FFSLDFLAGS) \
384 + -o $@ ffserver.o $(DEP_LIBS) $(EXTRALIBS)
390 -install: all $(INSTALLVHOOK)
391 +install: $(INSTALLVHOOK)
392 $(MAKE) -C libavcodec install
393 - install -d $(prefix)/bin
394 - install -s -m 755 $(PROG) $(prefix)/bin
395 - ln -sf ffmpeg $(prefix)/bin/ffplay
396 + $(MAKE) -C libavformat install
397 + install -d $(DESTDIR)$(prefix)/bin
398 + libtool --mode=install install $(PROG) $(DESTDIR)$(prefix)/bin
399 + ln -sf ffmpeg $(DESTDIR)$(prefix)/bin/ffplay
401 -install-vhook: $(prefix)/lib/vhook
402 - $(MAKE) -C vhook install INSTDIR=$(prefix)/lib/vhook
403 +install-vhook: $(DESTDIR)$(prefix)/lib/vhook
404 + $(MAKE) -C vhook install INSTDIR=$(DESTDIR)$(prefix)/lib/vhook
406 -$(prefix)/lib/vhook:
407 +$(DESTDIR)$(prefix)/lib/vhook: