correct the custom coding mode alphabet, add some validation on the

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index 8b26516127e6c15d3669299f18e49d4b2317cbb8..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,6 +53,12 @@ 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
@@ -110,7 +117,8 @@ endif
        $(CC) -MM $(CFLAGS) $^ 1>.depend
 
 .libs: lib
-       touch .libs
+       @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
@@ -131,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)