Add multiple inclusion guards to config.h.

[ffmpeg] / libavutil / Makefile

diff --git a/libavutil/Makefile b/libavutil/Makefile
index 55d1f2b330fef0d53f862f7745cd1fd535088595..069912a258333b48b0aaee502e5bfdd859a27a14 100644 (file)
--- a/libavutil/Makefile
+++ b/libavutil/Makefile
@@ -1,29 +1,41 @@
-#
-# libavutil Makefile
-#
 include ../config.mak
 
-# 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_ISOC9X_SOURCE
+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 \
 
-OBJS= mathematics.o \
-      rational.o \
-      intfloat_readwrite.o \
-      crc.o \
-      md5.o \
-      lls.o \
-      adler32.o \
-      log.o \
-      mem.o \
-
-HEADERS = avutil.h common.h mathematics.h integer.h rational.h \
-          intfloat_readwrite.h md5.h adler32.h log.h
+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
 
-include $(SRC_PATH)/common.mak
+include ../common.mak