diff Makefile @ 2:2e2c46c87460 libavcodec

fixed config for direct mplayer build compatibility

--- a/Makefile	Mon Jul 23 18:58:11 2001 +0000
+++ b/Makefile	Mon Jul 23 20:06:54 2001 +0000
@@ -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 @@
        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 @@
 %.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