h264: eliminate copy_fields

[ffmpeg] / libavutil / Makefile

diff --git a/libavutil/Makefile b/libavutil/Makefile
index a8ff244b13a3cffd6d1e95a43f5def86ad94a468..11d91794cbf4a1c626d1ebd3ab29ac460c229e3d 100644 (file)
--- a/libavutil/Makefile
+++ b/libavutil/Makefile
@@ -1,51 +1,144 @@
-include $(SUBDIR)../config.mak
-
 NAME = avutil
 
 HEADERS = adler32.h                                                     \
+          aes.h                                                         \
+          attributes.h                                                  \
+          audio_fifo.h                                                  \
+          avassert.h                                                    \
           avstring.h                                                    \
           avutil.h                                                      \
           base64.h                                                      \
+          blowfish.h                                                    \
+          bswap.h                                                       \
+          buffer.h                                                      \
+          channel_layout.h                                              \
           common.h                                                      \
+          cpu.h                                                         \
           crc.h                                                         \
+          dict.h                                                        \
+          display.h                                                     \
+          downmix_info.h                                                \
+          error.h                                                       \
+          eval.h                                                        \
           fifo.h                                                        \
-          intfloat_readwrite.h                                          \
+          file.h                                                        \
+          frame.h                                                       \
+          hmac.h                                                        \
+          hwcontext.h                                                   \
+          hwcontext_cuda.h                                              \
+          hwcontext_vaapi.h                                             \
+          hwcontext_vdpau.h                                             \
+          imgutils.h                                                    \
+          intfloat.h                                                    \
+          intreadwrite.h                                                \
+          lfg.h                                                         \
           log.h                                                         \
-          lzo.h                                                         \
+          macros.h                                                      \
           mathematics.h                                                 \
           md5.h                                                         \
           mem.h                                                         \
+          opt.h                                                         \
+          parseutils.h                                                  \
+          pixdesc.h                                                     \
           pixfmt.h                                                      \
+          random_seed.h                                                 \
           rational.h                                                    \
-          sha1.h
+          replaygain.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                                                            \
+       dict.o                                                           \
+       display.o                                                        \
+       downmix_info.o                                                   \
+       error.o                                                          \
+       eval.o                                                           \
        fifo.o                                                           \
-       intfloat_readwrite.o                                             \
+       file.o                                                           \
+       file_open.o                                                      \
+       float_dsp.o                                                      \
+       frame.o                                                          \
+       hmac.o                                                           \
+       hwcontext.o                                                      \
+       imgutils.o                                                       \
+       intmath.o                                                        \
        lfg.o                                                            \
        lls.o                                                            \
        log.o                                                            \
-       lzo.o                                                            \
+       log2_tab.o                                                       \
        mathematics.o                                                    \
        md5.o                                                            \
        mem.o                                                            \
+       opt.o                                                            \
+       parseutils.o                                                     \
+       pixdesc.o                                                        \
        random_seed.o                                                    \
        rational.o                                                       \
        rc4.o                                                            \
-       sha1.o                                                           \
+       samplefmt.o                                                      \
+       sha.o                                                            \
+       stereo3d.o                                                       \
+       time.o                                                           \
        tree.o                                                           \
        utils.o                                                          \
+       xtea.o                                                           \
 
-TESTPROGS = adler32 aes base64 crc des lls md5 pca sha1 softfloat tree
-TESTPROGS-$(HAVE_LZO1X_999_COMPRESS) += lzo
+OBJS-$(CONFIG_CUDA)                     += hwcontext_cuda.o
+OBJS-$(CONFIG_LZO)                      += lzo.o
+OBJS-$(CONFIG_VAAPI)                    += hwcontext_vaapi.o
+OBJS-$(CONFIG_VDPAU)                    += hwcontext_vdpau.o
 
-DIRS = arm bfin sh4 x86
+OBJS += $(COMPAT_OBJS:%=../compat/%)
 
-include $(SUBDIR)../subdir.mak
+SKIPHEADERS-$(CONFIG_CUDA)             += hwcontext_cuda.h
+SKIPHEADERS-$(CONFIG_VAAPI)            += hwcontext_vaapi.h
+SKIPHEADERS-$(CONFIG_VDPAU)            += hwcontext_vdpau.h
+SKIPHEADERS-$(HAVE_ATOMICS_GCC)        += atomic_gcc.h
+SKIPHEADERS-$(HAVE_ATOMICS_SUNCC)      += atomic_suncc.h
+SKIPHEADERS-$(HAVE_ATOMICS_WIN32)      += atomic_win32.h
 
-$(SUBDIR)lzo-test$(EXESUF): ELIBS = -llzo2
+TESTPROGS = adler32                                                     \
+            aes                                                         \
+            atomic                                                      \
+            avstring                                                    \
+            base64                                                      \
+            blowfish                                                    \
+            cpu                                                         \
+            crc                                                         \
+            des                                                         \
+            eval                                                        \
+            fifo                                                        \
+            float_dsp                                                   \
+            hmac                                                        \
+            lfg                                                         \
+            lls                                                         \
+            md5                                                         \
+            opt                                                         \
+            parseutils                                                  \
+            sha                                                         \
+            tree                                                        \
+            xtea                                                        \