01-makefile_fix_updated.patch

[ffmpeg] / libavformat / Makefile

diff --git a/libavformat/Makefile b/libavformat/Makefile
index de385a53c5cf5345e01eac649b411563532f0c08..5ecd750f5ad75a1c5f9813cb6914a63fccc831a0 100644 (file)
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -6,27 +6,32 @@ include ../config.mak
 
 VPATH=$(SRC_PATH)/libavformat
 
-CFLAGS= -Wall $(OPTFLAGS) -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
+CFLAGS=$(OPTFLAGS) -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
 
 OBJS= utils.o cutils.o os_support.o allformats.o
 PPOBJS=
 
 # mux and demuxes
-OBJS+=mpeg.o mpegts.o mpegtsenc.o ffm.o crc.o img.o raw.o rm.o \
+OBJS+=mpeg.o mpegts.o mpegtsenc.o ffm.o crc.o img.o img2.o raw.o rm.o \
       avienc.o avidec.o wav.o swf.o au.o gif.o mov.o mpjpeg.o dv.o \
       yuv4mpeg.o 4xm.o flvenc.o flvdec.o movenc.o psxstr.o idroq.o ipmovie.o \
-      nut.o wc3movie.o mp3.o westwood.o segafilm.o idcin.o
+      nut.o wc3movie.o mp3.o westwood.o segafilm.o idcin.o flic.o \
+      sierravmd.o matroska.o sol.o electronicarts.o nsvdec.o asf.o asf-enc.o
 
-ifeq ($(CONFIG_RISKY),yes)
-OBJS+= asf.o
+AMROBJS=
+ifeq ($(AMR_NB),yes)
+AMROBJS= amr.o
 endif
-
-ifeq ($(AMR_NB),yes) | ifeq ($(AMR_NB_FIXED),yes) | ifeq ($(AMR_WB),yes)
-OBJS+= amr.o
+ifeq ($(AMR_NB_FIXED),yes)
+AMROBJS= amr.o
+endif
+ifeq ($(AMR_WB),yes)
+AMROBJS= amr.o
 endif
+OBJS+= $(AMROBJS)
 
 # image formats
-OBJS+= pnm.o yuv.o png.o jpeg.o gifdec.o
+OBJS+= pnm.o yuv.o png.o jpeg.o gifdec.o sgi.o
 # file I/O
 OBJS+= avio.o aviobuf.o file.o 
 OBJS+= framehook.o 
@@ -39,6 +44,10 @@ ifeq ($(CONFIG_DV1394),yes)
 OBJS+= dv1394.o
 endif
 
+ifeq ($(CONFIG_DC1394),yes)
+OBJS+= dc1394.o
+endif
+
 ifeq ($(CONFIG_AUDIO_OSS),yes)
 OBJS+= audio.o 
 endif
@@ -58,15 +67,24 @@ OBJS+= barpainet.o
 endif
 endif
 
-ifeq ($(CONFIG_VORBIS),yes)
+ifeq ($(CONFIG_LIBOGG),yes)
 OBJS+= ogg.o
 endif
 
+ifeq ($(TARGET_ARCH_SPARC64),yes)
+CFLAGS+= -mcpu=ultrasparc -mtune=ultrasparc
+endif
+
 LIB= $(LIBPREF)avformat$(LIBSUF)
 ifeq ($(BUILD_SHARED),yes)
 SLIB= $(SLIBPREF)avformat$(SLIBSUF)
 endif
 
+EXTRALIBS+=-lavcodec -L../libavcodec
+ifeq ($(CONFIG_MP3LAME),yes)
+EXTRALIBS+=-lmp3lame
+endif
+
 SRCS := $(OBJS:.o=.c) $(PPOBJS:.o=.cpp)
 
 all: $(LIB) $(SLIB)
@@ -90,10 +108,10 @@ depend: $(SRCS)
 ifeq ($(BUILD_SHARED),yes)
 install: all install-headers
 ifeq ($(CONFIG_WIN32),yes)
-       install -s -m 755 $(SLIB) "$(prefix)"
+       install $(INSTALLSTRIP) -m 755 $(SLIB) "$(prefix)"
 else
        install -d $(prefix)/lib
-       install -s -m 755 $(SLIB) $(prefix)/lib/libavformat-$(VERSION).so
+       install $(INSTALLSTRIP) -m 755 $(SLIB) $(prefix)/lib/libavformat-$(VERSION).so
        ln -sf libavformat-$(VERSION).so $(prefix)/lib/libavformat.so
        ldconfig || true
 endif
@@ -102,7 +120,7 @@ install:
 endif
 
 installlib: all install-headers
-       install -m 644 $(LIB) $(prefix)/lib
+       install -m 644 $(LIB) "$(prefix)/lib"
 
 install-headers:
        mkdir -p "$(prefix)/include/ffmpeg"
@@ -118,8 +136,8 @@ install-headers:
 %.o: %.cpp
        g++ $(subst -Wall,,$(CFLAGS)) -c -o $@ $< 
 
-clean: 
-       rm -f *.o *.d .depend *~ *.a $(LIB)
+distclean clean: 
+       rm -f *.o *.d .depend *~ *.a *.so $(LIB)
 
 #
 # include dependency files if they exist