X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavutil%2FMakefile;h=a8ff244b13a3cffd6d1e95a43f5def86ad94a468;hb=0766291a669281f556d7a0b32e8a920650dd93db;hp=cea3cab55b060f9be3d75713d6fdb1c7562d1843;hpb=1e97ce4a3149fbf45f5d10e98a3000ef88f4653a;p=ffmpeg

diff --git a/libavutil/Makefile b/libavutil/Makefile
index cea3cab55b0..a8ff244b13a 100644
--- a/libavutil/Makefile
+++ b/libavutil/Makefile
@@ -1,40 +1,51 @@
-include ../config.mak
+include $(SUBDIR)../config.mak
 
-OBJS = adler32.o \
-       aes.o \
-       base64.o \
-       crc.o \
-       intfloat_readwrite.o \
-       fifo.o \
-       lls.o \
-       log.o \
-       lzo.o \
-       mathematics.o \
-       md5.o \
-       mem.o \
-       random.o \
-       rational.o \
-       string.o \
-       tree.o \
+NAME = avutil
 
-HEADERS = adler32.h \
-          avstring.h \
-          avutil.h \
-          base64.h \
-          common.h \
-          fifo.h \
-          integer.h \
-          intfloat_readwrite.h \
-          log.h \
-          lzo.h \
-          mathematics.h \
-          md5.h \
-          mem.h \
-          random.h \
-          rational.h \
+HEADERS = adler32.h                                                     \
+          avstring.h                                                    \
+          avutil.h                                                      \
+          base64.h                                                      \
+          common.h                                                      \
+          crc.h                                                         \
+          fifo.h                                                        \
+          intfloat_readwrite.h                                          \
+          log.h                                                         \
+          lzo.h                                                         \
+          mathematics.h                                                 \
+          md5.h                                                         \
+          mem.h                                                         \
+          pixfmt.h                                                      \
+          rational.h                                                    \
+          sha1.h
 
-NAME=avutil
-LIBVERSION=$(LAVUVERSION)
-LIBMAJOR=$(LAVUMAJOR)
+OBJS = adler32.o                                                        \
+       aes.o                                                            \
+       avstring.o                                                       \
+       base64.o                                                         \
+       crc.o                                                            \
+       des.o                                                            \
+       fifo.o                                                           \
+       intfloat_readwrite.o                                             \
+       lfg.o                                                            \
+       lls.o                                                            \
+       log.o                                                            \
+       lzo.o                                                            \
+       mathematics.o                                                    \
+       md5.o                                                            \
+       mem.o                                                            \
+       random_seed.o                                                    \
+       rational.o                                                       \
+       rc4.o                                                            \
+       sha1.o                                                           \
+       tree.o                                                           \
+       utils.o                                                          \
 
-include ../common.mak
+TESTPROGS = adler32 aes base64 crc des lls md5 pca sha1 softfloat tree
+TESTPROGS-$(HAVE_LZO1X_999_COMPRESS) += lzo
+
+DIRS = arm bfin sh4 x86
+
+include $(SUBDIR)../subdir.mak
+
+$(SUBDIR)lzo-test$(EXESUF): ELIBS = -llzo2