# HG changeset patch
# User glantau
# Date 997914651 0
# Node ID d7603c46c52f256bed367ad10935a7137b5a2125
# Parent  c4bacc159bb2b93bf9f9e156042780155efdbd03
suppressed nasm stuff

diff -r c4bacc159bb2 -r d7603c46c52f Makefile
--- a/Makefile	Wed Aug 15 22:26:09 2001 +0000
+++ b/Makefile	Wed Aug 15 22:30:51 2001 +0000
@@ -25,10 +25,9 @@
 
 # i386 mmx specific stuff
 ifeq ($(TARGET_MMX),yes)
-ASM_OBJS += i386/fdct_mmx.o i386/sad_mmx.o
-OBJS += i386/fdctdata.o i386/cputest.o \
+OBJS += i386/fdct_mmx.o i386/cputest.o \
 	i386/dsputil_mmx.o i386/mpegvideo_mmx.o \
-        i386/idct_mmx.o
+        i386/idct_mmx.o i386/motion_est_mmx.o
 endif
 
 # armv4l specific stuff
@@ -40,7 +39,7 @@
 SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s)
 
 LIB= libavcodec.a
-TESTS= imgresample-test dct-test
+TESTS= imgresample-test dct-test motion-test
 
 all: $(LIB)
 tests: apiexample cpuid_test $(TESTS)
@@ -57,9 +56,6 @@
 %.o: %.S
 	$(CC) $(CFLAGS) -c -o $@ $<
 
-%.o: %.s
-	nasm -f elf -o $@ $<
-
 # depend only used by mplayer now
 dep:	depend
 
@@ -89,10 +85,13 @@
 imgresample-test: imgresample.c
 	$(CC) $(CFLAGS) -DTEST -o $@ $^ 
 
-dct-test: dct-test.o jfdctfst.o i386/fdct_mmx.o i386/fdctdata.o \
+dct-test: dct-test.o jfdctfst.o i386/fdct_mmx.o \
           fdctref.o jrevdct.o i386/idct_mmx.o
 	$(CC) -o $@ $^
 
+motion-test: motion_test.o $(LIB)
+	$(CC) -o $@ $^
+
 #
 # include dependency files if they exist
 #