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 47ce5520ee8d911fc4e39af1779144ddce916678..34898e2089c101955b0dd70a7c42c2ed5ac8fa13 100644 (file)
--- a/libavutil/Makefile
+++ b/libavutil/Makefile
@@ -1,93 +1,53 @@
-#
-# libavutil Makefile
-#
-include ../config.mak
-
-VPATH=$(SRC_PATH)/libavutil
-
-# NOTE: -I.. is needed to include config.h
-CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
-
-OBJS= mathematics.o \
-      integer.o \
-      rational.o \
-      intfloat_readwrite.o \
-
-
-ifeq ($(TARGET_ARCH_SPARC64),yes)
-CFLAGS+= -mcpu=ultrasparc -mtune=ultrasparc
-endif
-
-SRCS := $(OBJS:.o=.c)
-
-LIB= $(LIBPREF)avutil$(LIBSUF)
-ifeq ($(BUILD_SHARED),yes)
-LIBVERSION=$(LAVUMAJOR)
-SLIBNAME= $(SLIBPREF)avutil$(SLIBSUF)
-endif
-
-all: $(LIB) $(SLIBNAME)
-
-$(LIB): $(OBJS)
-       rm -f $@
-       $(AR) rc $@ $(OBJS)
-       $(RANLIB) $@
-
-$(SLIBNAME): $(OBJS)
-ifeq ($(CONFIG_WIN32),yes)
-       $(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS)
-       -lib /machine:i386 /def:$(@:.dll=.def)
-else
-       $(CC) $(SHFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS)
-endif
-
-%.o: %.c
-       $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
-
-depend: $(SRCS)
-       $(CC) -MM $(CFLAGS) $^ 1>.depend
-
-dep:   depend
-
-clean:
-       rm -f *.o *.d *~ .depend $(LIB) $(SLIBNAME) *$(SLIBSUF)
-
-distclean: clean
-       rm -f Makefile.bak .depend
-
-
-ifeq ($(BUILD_SHARED),yes)
-install: all install-headers
-ifeq ($(CONFIG_WIN32),yes)
-       install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)"
-else
-       install -d $(libdir)
-       install $(INSTALLSTRIP) -m 755 $(SLIBNAME) $(libdir)/libavutil-$(VERSION)$(SLIBSUF)
-       ln -sf libavutil-$(VERSION)$(SLIBSUF) $(libdir)/$(SLIBNAME)
-       $(LDCONFIG) || true
-endif
-else
-install:
-endif
-
-installlib: all install-headers
-       install -m 644 $(LIB) "$(libdir)"
-
-install-headers:
-       mkdir -p "$(prefix)/include/ffmpeg"
-       install -m 644 $(SRC_PATH)/libavutil/avutil.h \
-                      $(SRC_PATH)/libavutil/common.h \
-                      $(SRC_PATH)/libavutil/mathematics.h \
-                      $(SRC_PATH)/libavutil/integer.h \
-                      $(SRC_PATH)/libavutil/rational.h \
-                      $(SRC_PATH)/libavutil/intfloat_readwrite.h \
-                "$(prefix)/include/ffmpeg"
-       install -d "$(libdir)/pkgconfig"
-       install -m 644 ../libavutil.pc "$(libdir)/pkgconfig"
-
-#
-# include dependency files if they exist
-#
-ifneq ($(wildcard .depend),)
-include .depend
-endif
+include $(SUBDIR)../config.mak
+
+NAME = avutil
+
+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                                                        \
+
+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                                                          \
+
+TESTPROGS = adler32 aes base64 crc des lls md5 pca sha softfloat tree
+TESTPROGS-$(HAVE_LZO1X_999_COMPRESS) += lzo
+
+DIRS = arm bfin sh4 x86
+
+include $(SUBDIR)../subdir.mak
+
+$(SUBDIR)lzo-test$(EXESUF): ELIBS = -llzo2