X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavutil%2FMakefile;h=0f8ed08d61e4a6bb156cbc58f923cf6bcd305731;hb=b469832de993dabbfe037bef59c68e90e82ebca5;hp=bd95156760fed0108032b26708cb63c24afa8fb3;hpb=ec0350c983c34d008fd10f07366abd80c19d06e0;p=ffmpeg

diff --git a/libavutil/Makefile b/libavutil/Makefile
index bd95156760f..0f8ed08d61e 100644
--- a/libavutil/Makefile
+++ b/libavutil/Makefile
@@ -1,50 +1,137 @@
-include $(SUBDIR)../config.mak
-
 NAME = avutil
 
-OBJS = adler32.o \
-       aes.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.o \
-       rational.o \
-       rc4.o \
-       sha1.o \
-       string.o \
-       tree.o \
-       utils.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 pca random sha1 softfloat tree)
-
-include $(SUBDIR)../subdir.mak
-
-$(SUBDIR)lzo-test$(EXESUF): EXTRALIBS += -llzo2
-
-CLEANFILES = lzo-test$(EXESUF)
+HEADERS = adler32.h                                                     \
+          aes.h                                                         \
+          attributes.h                                                  \
+          audio_fifo.h                                                  \
+          audioconvert.h                                                \
+          avassert.h                                                    \
+          avstring.h                                                    \
+          avutil.h                                                      \
+          base64.h                                                      \
+          blowfish.h                                                    \
+          bswap.h                                                       \
+          buffer.h                                                      \
+          channel_layout.h                                              \
+          common.h                                                      \
+          cpu.h                                                         \
+          crc.h                                                         \
+          display.h                                                     \
+          downmix_info.h                                                \
+          error.h                                                       \
+          eval.h                                                        \
+          fifo.h                                                        \
+          file.h                                                        \
+          frame.h                                                       \
+          hmac.h                                                        \
+          imgutils.h                                                    \
+          intfloat.h                                                    \
+          intreadwrite.h                                                \
+          lfg.h                                                         \
+          log.h                                                         \
+          macros.h                                                      \
+          mathematics.h                                                 \
+          md5.h                                                         \
+          mem.h                                                         \
+          dict.h                                                        \
+          old_pix_fmts.h                                                \
+          opt.h                                                         \
+          parseutils.h                                                  \
+          pixdesc.h                                                     \
+          pixfmt.h                                                      \
+          random_seed.h                                                 \
+          replaygain.h                                                  \
+          rational.h                                                    \
+          samplefmt.h                                                   \
+          sha.h                                                         \
+          stereo3d.h                                                    \
+          time.h                                                        \
+          version.h                                                     \
+          xtea.h                                                        \
+
+HEADERS-$(CONFIG_LZO)                   += lzo.h
+
+ARCH_HEADERS = bswap.h                                                  \
+               intmath.h                                                \
+               intreadwrite.h                                           \
+               timer.h                                                  \
+
+BUILT_HEADERS = avconfig.h
+
+OBJS = adler32.o                                                        \
+       aes.o                                                            \
+       atomic.o                                                         \
+       audio_fifo.o                                                     \
+       avstring.o                                                       \
+       base64.o                                                         \
+       blowfish.o                                                       \
+       buffer.o                                                         \
+       channel_layout.o                                                 \
+       cpu.o                                                            \
+       crc.o                                                            \
+       des.o                                                            \
+       display.o                                                        \
+       downmix_info.o                                                   \
+       error.o                                                          \
+       eval.o                                                           \
+       fifo.o                                                           \
+       file.o                                                           \
+       file_open.o                                                      \
+       float_dsp.o                                                      \
+       frame.o                                                          \
+       hmac.o                                                           \
+       imgutils.o                                                       \
+       intmath.o                                                        \
+       lfg.o                                                            \
+       lls.o                                                            \
+       log.o                                                            \
+       log2_tab.o                                                       \
+       mathematics.o                                                    \
+       md5.o                                                            \
+       mem.o                                                            \
+       dict.o                                                           \
+       opt.o                                                            \
+       parseutils.o                                                     \
+       pixdesc.o                                                        \
+       random_seed.o                                                    \
+       rational.o                                                       \
+       rc4.o                                                            \
+       samplefmt.o                                                      \
+       sha.o                                                            \
+       stereo3d.o                                                       \
+       time.o                                                           \
+       tree.o                                                           \
+       utils.o                                                          \
+       xtea.o                                                           \
+
+OBJS-$(CONFIG_LZO)                      += lzo.o
+
+OBJS += $(COMPAT_OBJS:%=../compat/%)
+
+SKIPHEADERS          = old_pix_fmts.h
+
+SKIPHEADERS-$(HAVE_ATOMICS_GCC)        += atomic_gcc.h
+SKIPHEADERS-$(HAVE_ATOMICS_SUNCC)      += atomic_suncc.h
+SKIPHEADERS-$(HAVE_ATOMICS_WIN32)      += atomic_win32.h
+
+TESTPROGS = adler32                                                     \
+            aes                                                         \
+            atomic                                                      \
+            avstring                                                    \
+            base64                                                      \
+            blowfish                                                    \
+            cpu                                                         \
+            crc                                                         \
+            des                                                         \
+            eval                                                        \
+            fifo                                                        \
+            float_dsp                                                   \
+            hmac                                                        \
+            lfg                                                         \
+            lls                                                         \
+            md5                                                         \
+            opt                                                         \
+            parseutils                                                  \
+            sha                                                         \
+            tree                                                        \
+            xtea                                                        \