X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=libavutil%2FMakefile;h=63d848a3439e205316ede8383590407ce4e6a1d7;hb=299ab0fd17a1738e21f3d036128db23ec14b2f3a;hp=aa54c9383d4e4031c7f24ad0964a143ee1149d83;hpb=661ce2899608ab7d67a524e2df23d63efa660c20;p=ffmpeg

diff --git a/libavutil/Makefile b/libavutil/Makefile
index aa54c9383d4..63d848a3439 100644
--- a/libavutil/Makefile
+++ b/libavutil/Makefile
@@ -1,32 +1,57 @@
-include $(SUBDIR)../config.mak
-
 NAME = avutil
 
 HEADERS = adler32.h                                                     \
+          aes.h                                                         \
+          attributes.h                                                  \
+          audioconvert.h                                                \
+          avassert.h                                                    \
           avstring.h                                                    \
           avutil.h                                                      \
           base64.h                                                      \
+          bswap.h                                                       \
           common.h                                                      \
+          cpu.h                                                         \
           crc.h                                                         \
+          error.h                                                       \
+          eval.h                                                        \
           fifo.h                                                        \
+          file.h                                                        \
+          imgutils.h                                                    \
           intfloat_readwrite.h                                          \
+          intreadwrite.h                                                \
+          lfg.h                                                         \
           log.h                                                         \
           lzo.h                                                         \
           mathematics.h                                                 \
           md5.h                                                         \
           mem.h                                                         \
+          dict.h                                                        \
+          opt.h                                                         \
+          parseutils.h                                                  \
+          pixdesc.h                                                     \
           pixfmt.h                                                      \
+          random_seed.h                                                 \
           rational.h                                                    \
-          sha1.h
+          samplefmt.h                                                   \
+          sha.h                                                         \
+
+BUILT_HEADERS = avconfig.h
 
 OBJS = adler32.o                                                        \
        aes.o                                                            \
+       audioconvert.o                                                   \
        avstring.o                                                       \
        base64.o                                                         \
+       cpu.o                                                            \
        crc.o                                                            \
        des.o                                                            \
+       error.o                                                          \
+       eval.o                                                           \
        fifo.o                                                           \
+       file.o                                                           \
+       imgutils.o                                                       \
        intfloat_readwrite.o                                             \
+       inverse.o                                                        \
        lfg.o                                                            \
        lls.o                                                            \
        log.o                                                            \
@@ -34,19 +59,28 @@ OBJS = adler32.o                                                        \
        mathematics.o                                                    \
        md5.o                                                            \
        mem.o                                                            \
+       dict.o                                                           \
+       opt.o                                                            \
+       parseutils.o                                                     \
+       pixdesc.o                                                        \
        random_seed.o                                                    \
        rational.o                                                       \
        rc4.o                                                            \
-       sha1.o                                                           \
+       samplefmt.o                                                      \
+       sha.o                                                            \
        tree.o                                                           \
        utils.o                                                          \
 
-TESTPROGS = $(addsuffix -test$(EXESUF), adler32 aes base64 crc des lls md5 pca sha1 softfloat tree)
+OBJS-$(ARCH_ARM) += arm/cpu.o
+OBJS-$(ARCH_PPC) += ppc/cpu.o
+OBJS-$(ARCH_X86) += x86/cpu.o
 
-DIRS = arm bfin sh4 x86
+TESTPROGS = adler32 aes avstring base64 cpu crc des eval fifo lfg lls \
+            md5 opt parseutils rational sha tree
+TESTPROGS-$(HAVE_LZO1X_999_COMPRESS) += lzo
 
-include $(SUBDIR)../subdir.mak
+DIRS = arm bfin sh4 x86
 
-$(SUBDIR)lzo-test$(EXESUF): EXTRALIBS += -llzo2
+ARCH_HEADERS = bswap.h intmath.h intreadwrite.h timer.h
 
-CLEANFILES = lzo-test$(EXESUF)
+$(SUBDIR)lzo-test$(EXESUF): ELIBS = -llzo2