avoid AVInteger usage in av_rescale

[ffmpeg] / libavutil / Makefile

diff --git a/libavutil/Makefile b/libavutil/Makefile
index efa40da08e5d8ace0bad5da7261f3871bb5da6fa..e1ab0d17dfe308a5499257087d57da20a6660210 100644 (file)
--- a/libavutil/Makefile
+++ b/libavutil/Makefile
@@ -3,97 +3,31 @@
 #
 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
+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 \
+      crc.o \
 
+HEADERS = avutil.h common.h mathematics.h integer.h rational.h \
+          intfloat_readwrite.h
 
 ifeq ($(TARGET_ARCH_SPARC64),yes)
 CFLAGS+= -mcpu=ultrasparc -mtune=ultrasparc
 endif
 
-SRCS := $(OBJS:.o=.c)
-
-LIB= $(LIBPREF)avutil$(LIBSUF)
+NAME=avutil
+SUBDIR = libavutil
 ifeq ($(BUILD_SHARED),yes)
 LIBVERSION=$(LAVUVERSION)
 LIBMAJOR=$(LAVUMAJOR)
-NAME=avutil
-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)/$(SLIBNAME_WITH_VERSION)
-       ln -sf $(SLIBNAME_WITH_VERSION) \
-               $(libdir)/$(SLIBNAME_WITH_MAJOR)
-       ln -sf $(SLIBNAME_WITH_VERSION) \
-               $(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 $(SRC_PATH)/common.mak