diff options
author | Fabrice Bellard <fabrice@bellard.org> | 2001-07-23 20:06:54 +0000 |
---|---|---|
committer | Fabrice Bellard <fabrice@bellard.org> | 2001-07-23 20:06:54 +0000 |
commit | 980fc7b83458fe6bbd58910813ba7ad3faf6cf76 (patch) | |
tree | 54215c0a4172d6a0490478d6e83685c0851884e7 /libavcodec/Makefile | |
parent | d78647e8b4ae46352d689179079a65cc7e1d1efe (diff) | |
download | ffmpeg-980fc7b83458fe6bbd58910813ba7ad3faf6cf76.tar.gz |
fixed config for direct mplayer build compatibility
Originally committed as revision 8 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/Makefile')
-rw-r--r-- | libavcodec/Makefile | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index a418516b16..e6dbe85bec 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1,11 +1,13 @@ -include ../config.mk -CFLAGS= -O2 -Wall -g +include ../config.mak + +CFLAGS= $(OPTFLAGS) -Wall -g LDFLAGS= -g OBJS= common.o utils.o mpegvideo.o h263.o jrevdct.o jfdctfst.o \ mpegaudio.o ac3enc.o mjpegenc.o resample.o dsputil.o \ motion_est.o imgconvert.o imgresample.o msmpeg4.o \ mpeg12.o h263dec.o rv10.o +ASM_OBJS= # currently using libac3 for ac3 decoding OBJS+= ac3dec.o \ @@ -18,19 +20,22 @@ OBJS+= mpegaudiodec.o \ mpglib/dct64_i386.o mpglib/decode_i386.o mpglib/tabinit.o # i386 mmx specific stuff -ifdef CONFIG_MMX -OBJS += i386/fdct_mmx.o i386/fdctdata.o i386/sad_mmx.o i386/cputest.o \ +ifeq ($(TARGET_MMX),yes) +ASM_OBJS += i386/fdct_mmx.o i386/sad_mmx.o +OBJS += i386/fdctdata.o i386/cputest.o \ i386/dsputil_mmx.o endif +SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s) + LIB= libavcodec.a TESTS= imgresample-test dct-test all: $(LIB) apiexample -$(LIB): $(OBJS) +$(LIB): $(OBJS) $(ASM_OBJS) rm -f $@ - $(AR) rcs $@ $(OBJS) + $(AR) rcs $@ $(OBJS) $(ASM_OBJS) dsputil.o: dsputil.c dsputil.h @@ -40,12 +45,21 @@ dsputil.o: dsputil.c dsputil.h %.o: %.s nasm -f elf -o $@ $< +# depend only used by mplayer now +dep: depend + +depend: + $(CC) -MM $(CFLAGS) $(SRCS) 1>.depend + clean: rm -f *.o *~ *.a i386/*.o i386/*~ \ libac3/*.o libac3/*~ \ mpglib/*.o mpglib/*~ \ apiexample $(TESTS) +distclean: clean + rm -f Makefile.bak .depend + # api example program apiexample: apiexample.c $(LIB) $(CC) $(CFLAGS) -o $@ $< $(LIB) -lm |