mathematics.h: remove a couple of math defines

[ffmpeg] / libavutil / Makefile

diff --git a/libavutil/Makefile b/libavutil/Makefile
index f4b1766d838de19e096d3e0c7c810acd03dfc610..56ccd04dff81b2c52a51565e082a5e224162fd0f 100644 (file)
--- a/libavutil/Makefile
+++ b/libavutil/Makefile
@@ -1,33 +1,98 @@
-#
-# libavutil Makefile
-#
-include ../config.mak
+NAME = avutil
 
-CFLAGS+=-DBUILD_AVUTIL
+HEADERS = adler32.h                                                     \
+          aes.h                                                         \
+          attributes.h                                                  \
+          audio_fifo.h                                                  \
+          audioconvert.h                                                \
+          avassert.h                                                    \
+          avstring.h                                                    \
+          avutil.h                                                      \
+          base64.h                                                      \
+          bswap.h                                                       \
+          common.h                                                      \
+          cpu.h                                                         \
+          crc.h                                                         \
+          error.h                                                       \
+          eval.h                                                        \
+          fifo.h                                                        \
+          file.h                                                        \
+          imgutils.h                                                    \
+          intfloat.h                                                    \
+          intfloat_readwrite.h                                          \
+          intreadwrite.h                                                \
+          lfg.h                                                         \
+          log.h                                                         \
+          lzo.h                                                         \
+          mathematics.h                                                 \
+          md5.h                                                         \
+          mem.h                                                         \
+          dict.h                                                        \
+          opt.h                                                         \
+          parseutils.h                                                  \
+          pixdesc.h                                                     \
+          pixfmt.h                                                      \
+          random_seed.h                                                 \
+          rational.h                                                    \
+          samplefmt.h                                                   \
+          sha.h                                                         \
 
-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 \
-      random.o \
-      aes.o \
+ARCH_HEADERS = bswap.h                                                  \
+               intmath.h                                                \
+               intreadwrite.h                                           \
+               timer.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 \
-          random.h
+BUILT_HEADERS = avconfig.h
 
-NAME=avutil
-ifeq ($(BUILD_SHARED),yes)
-LIBVERSION=$(LAVUVERSION)
-LIBMAJOR=$(LAVUMAJOR)
-endif
+OBJS = adler32.o                                                        \
+       aes.o                                                            \
+       audio_fifo.o                                                     \
+       audioconvert.o                                                   \
+       avstring.o                                                       \
+       base64.o                                                         \
+       cpu.o                                                            \
+       crc.o                                                            \
+       des.o                                                            \
+       error.o                                                          \
+       eval.o                                                           \
+       fifo.o                                                           \
+       file.o                                                           \
+       float_dsp.o                                                      \
+       imgutils.o                                                       \
+       intfloat_readwrite.o                                             \
+       inverse.o                                                        \
+       lfg.o                                                            \
+       lls.o                                                            \
+       log.o                                                            \
+       lzo.o                                                            \
+       mathematics.o                                                    \
+       md5.o                                                            \
+       mem.o                                                            \
+       dict.o                                                           \
+       opt.o                                                            \
+       parseutils.o                                                     \
+       pixdesc.o                                                        \
+       random_seed.o                                                    \
+       rational.o                                                       \
+       rc4.o                                                            \
+       samplefmt.o                                                      \
+       sha.o                                                            \
+       tree.o                                                           \
+       utils.o                                                          \
 
-include ../common.mak
+TESTPROGS = adler32                                                     \
+            aes                                                         \
+            avstring                                                    \
+            base64                                                      \
+            cpu                                                         \
+            crc                                                         \
+            des                                                         \
+            eval                                                        \
+            fifo                                                        \
+            lfg                                                         \
+            lls                                                         \
+            md5                                                         \
+            opt                                                         \
+            parseutils                                                  \
+            sha                                                         \
+            tree                                                        \