01-makefile_fix_updated.patch

[ffmpeg] / libavformat / Makefile

diff --git a/libavformat/Makefile b/libavformat/Makefile
index e898e40f21552712226e21963875cbe3fd0e8683..5ecd750f5ad75a1c5f9813cb6914a63fccc831a0 100644 (file)
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -1,39 +1,41 @@
 #
 # libavformat Makefile
-# (c) 2000, 2001, 2002 Fabrice Bellard
+# (c) 2000-2003 Fabrice Bellard
 #
 include ../config.mak
 
 VPATH=$(SRC_PATH)/libavformat
 
-CFLAGS= $(OPTFLAGS) -Wall -g -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 allformats.o
+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
-
-ifeq ($(CONFIG_RISKY),yes)
-OBJS+= asf.o
-endif
+      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 flic.o \
+      sierravmd.o matroska.o sol.o electronicarts.o nsvdec.o asf.o asf-enc.o
 
+AMROBJS=
 ifeq ($(AMR_NB),yes)
-OBJS+= amr.o
+AMROBJS= amr.o
+endif
+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 
 
-ifeq ($(BUILD_STRPTIME),yes)
-OBJS+= strptime.o
-endif
-
 ifeq ($(CONFIG_VIDEO4LINUX),yes)
 OBJS+= grab.o
 endif
@@ -42,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
@@ -61,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)
@@ -80,32 +95,39 @@ $(LIB): $(OBJS) $(PPOBJS)
        $(RANLIB) $@
 
 $(SLIB): $(OBJS)
-       $(CC) $(SHFLAGS) -o $@ $(OBJS) $(PPOBJS) $(EXTRALIBS) $(AMREXTRALIBS)
+ifeq ($(CONFIG_WIN32),yes)
+       $(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(PPOBJS) $(EXTRALIBS) $(VPATH)/../libavcodec/avcodec.dll
+       -lib /machine:i386 /def:$(@:.dll=.def)
+else
+       $(CC) $(SHFLAGS) -o $@ $(OBJS) $(PPOBJS) $(EXTRALIBS)
+endif
 
 depend: $(SRCS)
        $(CC) -MM $(CFLAGS) $^ 1>.depend
 
-install: all
 ifeq ($(BUILD_SHARED),yes)
+install: all install-headers
+ifeq ($(CONFIG_WIN32),yes)
+       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
-       mkdir -p $(prefix)/include/ffmpeg
-       install -m 644 $(VPATH)/avformat.h $(prefix)/include/ffmpeg/avformat.h
-       install -m 644 $(VPATH)/avio.h $(prefix)/include/ffmpeg/avio.h
-       install -m 644 $(VPATH)/rtp.h $(prefix)/include/ffmpeg/rtp.h
-       install -m 644 $(VPATH)/rtsp.h $(prefix)/include/ffmpeg/rtsp.h
-       install -m 644 $(VPATH)/rtspcodes.h $(prefix)/include/ffmpeg/rtspcodes.h
 endif
+else
+install:
+endif
+
+installlib: all install-headers
+       install -m 644 $(LIB) "$(prefix)/lib"
 
-installlib: all
-       install -m 644 $(LIB) $(prefix)/lib
-       mkdir -p $(prefix)/include/ffmpeg
+install-headers:
+       mkdir -p "$(prefix)/include/ffmpeg"
        install -m 644 $(SRC_PATH)/libavformat/avformat.h $(SRC_PATH)/libavformat/avio.h \
                 $(SRC_PATH)/libavformat/rtp.h $(SRC_PATH)/libavformat/rtsp.h \
                 $(SRC_PATH)/libavformat/rtspcodes.h \
-                $(prefix)/include/ffmpeg
+                "$(prefix)/include/ffmpeg"
 
 %.o: %.c
        $(CC) $(CFLAGS) -c -o $@ $< 
@@ -114,8 +136,8 @@ installlib: all
 %.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