Add multiple inclusion guards to config.h.

[ffmpeg] / libavutil / Makefile

diff --git a/libavutil/Makefile b/libavutil/Makefile
index 2a75cb3a4e2a940cdef287d7e9d891d6824eb262..069912a258333b48b0aaee502e5bfdd859a27a14 100644 (file)
--- a/libavutil/Makefile
+++ b/libavutil/Makefile
@@ -1,95 +1,41 @@
-#
-# libavutil Makefile
-#
 include ../config.mak
 
-VPATH=$(SRC_PATH)/libavutil
-
-# NOTE: -I.. is needed to include config.h
-CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -DBUILD_AVUTIL -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
-
-#FIXME: This should be in configure/config.mak
-ifeq ($(CONFIG_WIN32),yes)
-    LDFLAGS=-Wl,--output-def,$(@:.dll=.def),--out-implib,lib$(SLIBNAME:$(SLIBSUF)=.dll.a)
-endif
-
-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)
+OBJS = adler32.o \
+       aes.o \
+       base64.o \
+       crc.o \
+       fifo.o \
+       intfloat_readwrite.o \
+       lls.o \
+       log.o \
+       lzo.o \
+       mathematics.o \
+       md5.o \
+       mem.o \
+       random.o \
+       rational.o \
+       rc4.o \
+       string.o \
+       tree.o \
+
+HEADERS = adler32.h \
+          avstring.h \
+          avutil.h \
+          base64.h \
+          common.h \
+          fifo.h \
+          integer.h \
+          intfloat_readwrite.h \
+          log.h \
+          lzo.h \
+          mathematics.h \
+          md5.h \
+          mem.h \
+          random.h \
+          rational.h \
 
 NAME=avutil
-ifeq ($(BUILD_SHARED),yes)
 LIBVERSION=$(LAVUVERSION)
 LIBMAJOR=$(LAVUMAJOR)
-endif
-
-all: $(LIB) $(SLIBNAME)
-
-$(LIB): $(OBJS)
-       rm -f $@
-       $(AR) rc $@ $(OBJS)
-       $(RANLIB) $@
-
-$(SLIBNAME): $(OBJS)
-       $(CC) $(SHFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS)
-ifeq ($(CONFIG_WIN32),yes)
-       -lib /machine:i386 /def:$(@:.dll=.def)
-endif
-
-%.o: %.c
-       $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
-
-depend: $(SRCS)
-       $(CC) -MM $(CFLAGS) $^ 1>.depend
-
-dep:   depend
-
-clean:
-       rm -f *.o *.d *~ *.a *.lib *.so *.dylib *.dll \
-             *.lib *.def *.dll.a *.exp
-
-distclean: clean
-       rm -f .depend
-
-
-install-lib-shared: $(SLIBNAME)
-ifeq ($(CONFIG_WIN32),yes)
-       install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)"
-else
-       install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \
-               $(libdir)/$(SLIBNAME_WITH_VERSION)
-       ln -sf $(SLIBNAME_WITH_VERSION) \
-               $(libdir)/$(SLIBNAME_WITH_MAJOR)
-       ln -sf $(SLIBNAME_WITH_VERSION) \
-               $(libdir)/$(SLIBNAME)
-endif
-
-install-lib-static: $(LIB)
-       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 ../common.mak