Make av_pix_fmt_descriptors use the same pixel format names as defined

[ffmpeg] / libavutil / Makefile

diff --git a/libavutil/Makefile b/libavutil/Makefile
index 1e626fa5a3640e6cd7a39195cc1c014c4b7176b0..34898e2089c101955b0dd70a7c42c2ed5ac8fa13 100644 (file)
--- a/libavutil/Makefile
+++ b/libavutil/Makefile
@@ -1,30 +1,53 @@
-#
-# libavutil Makefile
-#
-include ../config.mak
+include $(SUBDIR)../config.mak
 
-CFLAGS+=-DBUILD_AVUTIL
+NAME = avutil
 
-OBJS= mathematics.o \
-      rational.o \
-      intfloat_readwrite.o \
-      crc.o \
-      md5.o \
-      lls.o \
-      adler32.o \
-      log.o \
-      mem.o \
-      fifo.o \
-      tree.o \
-      lzo.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                                                         \
+          pixdesc.h                                                     \
+          pixfmt.h                                                      \
+          rational.h                                                    \
+          sha1.h                                                        \
 
-HEADERS = avutil.h common.h mathematics.h integer.h rational.h \
-          intfloat_readwrite.h md5.h adler32.h log.h fifo.h lzo.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                                                          \
 
-NAME=avutil
-ifeq ($(BUILD_SHARED),yes)
-LIBVERSION=$(LAVUVERSION)
-LIBMAJOR=$(LAVUMAJOR)
-endif
+TESTPROGS = adler32 aes base64 crc des lls md5 pca sha softfloat tree
+TESTPROGS-$(HAVE_LZO1X_999_COMPRESS) += lzo
 
-include ../common.mak
+DIRS = arm bfin sh4 x86
+
+include $(SUBDIR)../subdir.mak
+
+$(SUBDIR)lzo-test$(EXESUF): ELIBS = -llzo2