Merge commit '666fe5da47d127074be7f0e2bac93db6af8b4a30'
[ffmpeg.git] / libavutil / Makefile
index 68a8386..103ce5e 100644 (file)
@@ -1,3 +1,5 @@
+include $(SUBDIR)../config.mak
+
 NAME = avutil
 
 HEADERS = adler32.h                                                     \
@@ -10,6 +12,7 @@ HEADERS = adler32.h                                                     \
           avutil.h                                                      \
           base64.h                                                      \
           blowfish.h                                                    \
+          bprint.h                                                      \
           bswap.h                                                       \
           buffer.h                                                      \
           channel_layout.h                                              \
@@ -42,6 +45,8 @@ HEADERS = adler32.h                                                     \
           samplefmt.h                                                   \
           sha.h                                                         \
           time.h                                                        \
+          timecode.h                                                    \
+          timestamp.h                                                   \
           version.h                                                     \
           xtea.h                                                        \
 
@@ -61,6 +66,7 @@ OBJS = adler32.o                                                        \
        avstring.o                                                       \
        base64.o                                                         \
        blowfish.o                                                       \
+       bprint.o                                                         \
        buffer.o                                                         \
        channel_layout.o                                                 \
        cpu.o                                                            \
@@ -93,8 +99,10 @@ OBJS = adler32.o                                                        \
        samplefmt.o                                                      \
        sha.o                                                            \
        time.o                                                           \
+       timecode.o                                                       \
        tree.o                                                           \
        utils.o                                                          \
+       xga_font_data.o                                                  \
        xtea.o                                                           \
 
 OBJS-$(CONFIG_LZO)                      += lzo.o
@@ -113,17 +121,29 @@ TESTPROGS = adler32                                                     \
             avstring                                                    \
             base64                                                      \
             blowfish                                                    \
+            bprint                                                      \
             cpu                                                         \
             crc                                                         \
             des                                                         \
+            error                                                       \
             eval                                                        \
+            file                                                        \
             fifo                                                        \
             hmac                                                        \
             lfg                                                         \
             lls                                                         \
             md5                                                         \
             opt                                                         \
+            pca                                                         \
             parseutils                                                  \
+            random_seed                                                 \
+            rational                                                    \
             sha                                                         \
             tree                                                        \
             xtea                                                        \
+
+TESTPROGS-$(HAVE_LZO1X_999_COMPRESS) += lzo
+
+TOOLS = ffeval ffescape
+
+$(SUBDIR)lzo-test$(EXESUF): ELIBS = -llzo2