segfault fix

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index 1f0c886f728804335762457e49e9556cffcdae0d..47ef0226076203625f762f7d49037aca13834d0f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -41,10 +41,11 @@ DEP_LIBS=libavcodec/$(LIBPREF)avcodec$(LIBSUF) libavformat/$(LIBPREF)avformat$(L
 ifeq ($(CONFIG_MP3LAME),yes)
 EXTRALIBS+=-lmp3lame
 endif
+endif
+
 ifeq ($(CONFIG_VORBIS),yes)
 EXTRALIBS+=-logg -lvorbis -lvorbisenc
 endif
-endif
 
 ifeq ($(BUILD_VHOOK),yes)
 VHOOK=videohook
@@ -52,8 +53,15 @@ 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) $(VHOOK)
 
@@ -61,18 +69,15 @@ lib:
        $(MAKE) -C libavcodec all
        $(MAKE) -C libavformat all
 
-ffmpeg_g$(EXE): .depend ffmpeg.o $(DEP_LIBS)
-       $(CC) $(LDFLAGS) -o $@ ffmpeg.o -L./libavcodec -L./libavformat \
-              -lavformat -lavcodec $(EXTRALIBS)
+ffmpeg_g$(EXE): ffmpeg.o .libs
+       $(CC) $(LDFLAGS) -o $@ ffmpeg.o $(FFLIBS) $(EXTRALIBS)
 
 ffmpeg$(EXE): ffmpeg_g$(EXE)
        cp -p $< $@
        $(STRIP) $@
 
-ffserver$(EXE): ffserver.o $(DEP_LIBS)
-       $(CC) $(LDFLAGS) $(FFSLDFLAGS) \
-               -o $@ ffserver.o -L./libavcodec -L./libavformat \
-              -lavformat -lavcodec $(EXTRALIBS) 
+ffserver$(EXE): ffserver.o .libs
+       $(CC) $(LDFLAGS) $(FFSLDFLAGS) -o $@ ffserver.o $(FFLIBS) $(EXTRALIBS) 
 
 ffplay: ffmpeg$(EXE)
        ln -sf $< $@
@@ -80,7 +85,7 @@ ffplay: ffmpeg$(EXE)
 %.o: %.c
        $(CC) $(CFLAGS) -c -o $@ $< 
 
-videohook:
+videohook: .libs
        $(MAKE) -C vhook all
 
 install: all $(INSTALLVHOOK)
@@ -102,15 +107,24 @@ installlib:
 dep:   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: $(CLEANVHOOK)
        $(MAKE) -C libavcodec clean
        $(MAKE) -C libavformat clean
        $(MAKE) -C tests clean
-       rm -f *.o *.d *~ .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
@@ -125,7 +139,7 @@ TAGS:
 # 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)
@@ -136,6 +150,8 @@ tar:
        ( cd /tmp ; tar zcvf ~/$(FILE).tar.gz $(FILE) --exclude CVS )
        rm -rf /tmp/$(FILE)
 
+.PHONY: lib
+
 ifneq ($(wildcard .depend),)
 include .depend
 endif