X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavutil%2FMakefile;h=5b6cd0e836a34bcb407705ae1ab2ca288afd37ed;hb=b7dc88fc68759ddd79caf291d75e715930362aac;hp=2ff0a9764fa9621b3f84f5ca0b2512a2d28435cd;hpb=9b25f4a65ffa71596fc09f6c1f553394c65b4692;p=ffmpeg

diff --git a/libavutil/Makefile b/libavutil/Makefile
index 2ff0a9764fa..5b6cd0e836a 100644
--- a/libavutil/Makefile
+++ b/libavutil/Makefile
@@ -1,49 +1,59 @@
-include ../config.mak
+include $(SUBDIR)../config.mak
 
 NAME = avutil
 
-OBJS = adler32.o \
-       aes.o \
-       base64.o \
-       crc.o \
-       des.o \
-       fifo.o \
-       intfloat_readwrite.o \
-       lls.o \
-       log.o \
-       lzo.o \
-       mathematics.o \
-       md5.o \
-       mem.o \
-       random.o \
-       rational.o \
-       rc4.o \
-       sha1.o \
-       string.o \
-       tree.o \
-
-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 \
-          random.h \
-          rational.h \
-          sha1.h
-
-TESTS = $(addsuffix -test$(EXESUF), adler32 aes crc des lls md5 sha1 softfloat tree)
-
-include ../common.mak
-
-lzo-test$(EXESUF): EXTRALIBS += -llzo2
-
-clean::
-	rm -f lzo-test$(EXESUF)
+HEADERS = adler32.h                                                     \
+          attributes.h                                                  \
+          avstring.h                                                    \
+          avutil.h                                                      \
+          base64.h                                                      \
+          common.h                                                      \
+          crc.h                                                         \
+          error.h                                                       \
+          fifo.h                                                        \
+          intfloat_readwrite.h                                          \
+          log.h                                                         \
+          lzo.h                                                         \
+          mathematics.h                                                 \
+          md5.h                                                         \
+          mem.h                                                         \
+          pixdesc.h                                                     \
+          pixfmt.h                                                      \
+          rational.h                                                    \
+          sha1.h                                                        \
+
+BUILT_HEADERS = avconfig.h
+
+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                                                            \
+       pixdesc.o                                                        \
+       random_seed.o                                                    \
+       rational.o                                                       \
+       rc4.o                                                            \
+       sha.o                                                            \
+       tree.o                                                           \
+       utils.o                                                          \
+
+TESTPROGS = adler32 aes base64 crc des lls md5 pca sha softfloat tree
+TESTPROGS-$(HAVE_LZO1X_999_COMPRESS) += lzo
+
+DIRS = arm bfin sh4 x86
+
+ARCH_HEADERS = bswap.h intmath.h intreadwrite.h timer.h
+
+include $(SUBDIR)../subdir.mak
+
+$(SUBDIR)lzo-test$(EXESUF): ELIBS = -llzo2