segfault fix

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index 4c5c739a0ac13e63b88ae3f2af9bc98bf61e9a7b..47ef0226076203625f762f7d49037aca13834d0f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,14 +6,8 @@ include config.mak
 
 VPATH=$(SRC_PATH)
 
-CFLAGS= $(OPTFLAGS) -Wall -g -I. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libav -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
-ifeq ($(CONFIG_DARWIN),yes)
-LDFLAGS+= -g -d
-FFSLDFLAGS= -Wl,-bind_at_load
-else
-LDFLAGS+= -g -Wl,--warn-common
-FFSLDFLAGS= -Wl,-E
-endif
+CFLAGS= $(OPTFLAGS) -Wall -g -I. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
+LDFLAGS+= -g 
 
 ifeq ($(TARGET_GPROF),yes)
 CFLAGS+=-p
@@ -24,43 +18,66 @@ ifeq ($(CONFIG_WIN32),yes)
 EXE=.exe
 PROG=ffmpeg$(EXE)
 else
-EXT=
-PROG=ffmpeg ffplay ffserver
+ifeq ($(CONFIG_OS2),yes)
+EXE=.exe
+PROG=ffmpeg$(EXE)
+else
+EXE=
+PROG=ffmpeg ffplay
+ifeq ($(CONFIG_FFSERVER),yes)
+PROG+=ffserver
+endif
+endif
 endif
 
+ifeq ($(CONFIG_AUDIO_BEOS),yes)
+EXTRALIBS+=-lmedia -lbe
+endif
 
 ifeq ($(BUILD_SHARED),yes)
-DEP_LIBS=libavcodec/libavcodec.so libav/libavformat.a
+DEP_LIBS=libavcodec/$(SLIBPREF)avcodec$(SLIBSUF) libavformat/$(LIBPREF)avformat$(LIBSUF)
 else
-DEP_LIBS=libavcodec/libavcodec.a libav/libavformat.a
+DEP_LIBS=libavcodec/$(LIBPREF)avcodec$(LIBSUF) libavformat/$(LIBPREF)avformat$(LIBSUF)
 ifeq ($(CONFIG_MP3LAME),yes)
 EXTRALIBS+=-lmp3lame
 endif
+endif
+
 ifeq ($(CONFIG_VORBIS),yes)
 EXTRALIBS+=-logg -lvorbis -lvorbisenc
 endif
+
+ifeq ($(BUILD_VHOOK),yes)
+VHOOK=videohook
+INSTALLVHOOK=install-vhook
+CLEANVHOOK=clean-vhook
+endif
+
+ifeq ($(TARGET_OS), SunOS)
+TEST=/usr/bin/test
+else
+TEST=test
 endif
 
 OBJS = ffmpeg.o ffserver.o
 SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s)
+FFLIBS = -L./libavformat -lavformat -L./libavcodec -lavcodec
 
-all: lib $(PROG)
+all: lib $(PROG) $(VHOOK)
 
 lib:
        $(MAKE) -C libavcodec all
-       $(MAKE) -C libav all
+       $(MAKE) -C libavformat all
 
-ffmpeg_g$(EXE): ffmpeg.o $(DEP_LIBS)
-       $(CC) $(LDFLAGS) -o $@ ffmpeg.o -L./libavcodec -L./libav \
-              -lavformat -lavcodec $(EXTRALIBS)
+ffmpeg_g$(EXE): ffmpeg.o .libs
+       $(CC) $(LDFLAGS) -o $@ ffmpeg.o $(FFLIBS) $(EXTRALIBS)
 
 ffmpeg$(EXE): ffmpeg_g$(EXE)
-       cp -p $< $@ ; $(STRIP) $@
+       cp -p $< $@
+       $(STRIP) $@
 
-ffserver$(EXE): ffserver.o $(DEP_LIBS)
-       $(CC) $(LDFLAGS) $(FFSLDFLAGS) \
-               -o $@ ffserver.o -L./libavcodec -L./libav \
-              -lavformat -lavcodec -ldl $(EXTRALIBS) 
+ffserver$(EXE): ffserver.o .libs
+       $(CC) $(LDFLAGS) $(FFSLDFLAGS) -o $@ ffserver.o $(FFLIBS) $(EXTRALIBS) 
 
 ffplay: ffmpeg$(EXE)
        ln -sf $< $@
@@ -68,38 +85,72 @@ ffplay: ffmpeg$(EXE)
 %.o: %.c
        $(CC) $(CFLAGS) -c -o $@ $< 
 
-install: all
+videohook: .libs
+       $(MAKE) -C vhook all
+
+install: all $(INSTALLVHOOK)
        $(MAKE) -C libavcodec install
        install -d $(prefix)/bin
-       install -s -m 755 $(PROG) $(prefix)/bin
+       install -c -s -m 755 $(PROG) $(prefix)/bin
        ln -sf ffmpeg $(prefix)/bin/ffplay 
 
+install-vhook: $(prefix)/lib/vhook
+       $(MAKE) -C vhook install INSTDIR=$(prefix)/lib/vhook
+
+$(prefix)/lib/vhook:
+       install -d $@
+
 installlib:
        $(MAKE) -C libavcodec installlib
-       $(MAKE) -C libav installlib
+       $(MAKE) -C libavformat installlib
 
 dep:   depend
 
-depend:
-       $(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
+depend: .depend
+       make -C libavcodec depend
+       make -C libavformat depend
+ifeq ($(BUILD_VHOOK),yes)
+       make -C vhook depend
+endif
+
+.depend: $(SRCS)
+       $(CC) -MM $(CFLAGS) $^ 1>.depend
+
+.libs: lib
+       @test -f .libs || touch .libs
+       @for i in $(DEP_LIBS) ; do if $(TEST) $$i -nt .libs ; then touch .libs; fi ; done
 
-clean: 
+clean: $(CLEANVHOOK)
        $(MAKE) -C libavcodec clean
-       $(MAKE) -C libav clean
+       $(MAKE) -C libavformat clean
        $(MAKE) -C tests clean
-       rm -f *.o *~ .depend gmon.out TAGS ffmpeg_g$(EXE) $(PROG) 
+       rm -f *.o *.d *~ .libs .depend gmon.out TAGS ffmpeg_g$(EXE) $(PROG) 
+
+clean-vhook:
+       $(MAKE) -C vhook clean
 
 distclean: clean
        $(MAKE) -C libavcodec distclean
        rm -f config.mak config.h
 
 TAGS:
-       etags *.[ch] libav/*.[ch] libavcodec/*.[ch]
+       etags *.[ch] libavformat/*.[ch] libavcodec/*.[ch]
 
 # regression tests
 
 libavtest test mpeg4 mpeg: ffmpeg$(EXE)
-       make -C tests $@
+       $(MAKE) all -C tests $@
+
+# tar release (use 'make -k tar' on a checkouted tree)
+FILE=ffmpeg-$(shell cat VERSION)
+
+tar:
+       rm -rf /tmp/$(FILE)
+       cp -r . /tmp/$(FILE)
+       ( cd /tmp ; tar zcvf ~/$(FILE).tar.gz $(FILE) --exclude CVS )
+       rm -rf /tmp/$(FILE)
+
+.PHONY: lib
 
 ifneq ($(wildcard .depend),)
 include .depend