Added VideoBitRateRange and VideoBitRAteTolerance settings

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index a4f8d579df848b0d405e40489dae389250d3bef2..9e2d203ddfd895818518038dc06e727b8d98fc76 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,20 @@
+#
 # Main ffmpeg Makefile
-# (c) 2000, 2001 Gerard Lantau
+# (c) 2000, 2001, 2002 Fabrice Bellard
 #
 include config.mak
 
-CFLAGS= $(OPTFLAGS) -Wall -g -I./libavcodec -I./libav 
-LDFLAGS= -g
+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
+
 ifeq ($(TARGET_GPROF),yes)
 CFLAGS+=-p
 LDFLAGS+=-p
@@ -18,15 +28,17 @@ EXT=
 PROG=ffmpeg ffplay ffserver
 endif
 
+
 ifeq ($(BUILD_SHARED),yes)
-FFMPEG_LIB=-Llibavcodec -lffmpeg
-DEP_FFMPEG_LIB=
+DEP_LIBS=libavcodec/libavcodec.so libav/libavformat.a
 else
-FFMPEG_LIB=libavcodec/libavcodec.a
-DEP_FFMPEG_LIB=libavcodec/libavcodec.a
+DEP_LIBS=libavcodec/libavcodec.a libav/libavformat.a
 ifeq ($(CONFIG_MP3LAME),yes)
 EXTRALIBS+=-lmp3lame
 endif
+ifeq ($(CONFIG_VORBIS),yes)
+EXTRALIBS+=-logg -lvorbis -lvorbisenc
+endif
 endif
 
 OBJS = ffmpeg.o ffserver.o
@@ -38,11 +50,17 @@ lib:
        $(MAKE) -C libavcodec all
        $(MAKE) -C libav all
 
-ffmpeg$(EXE): ffmpeg.o libav/libav.a $(DEP_FFMPEG_LIB)
-       $(CC) $(LDFLAGS) -o $@ $^ $(FFMPEG_LIB) $(EXTRALIBS)
+ffmpeg_g$(EXE): ffmpeg.o $(DEP_LIBS)
+       $(CC) $(LDFLAGS) -o $@ ffmpeg.o -L./libavcodec -L./libav \
+              -lavformat -lavcodec $(EXTRALIBS)
+
+ffmpeg$(EXE): ffmpeg_g$(EXE)
+       $(STRIP) -o $@ $<
 
-ffserver$(EXE): ffserver.o libav/libav.a $(DEP_FFMPEG_LIB)
-       $(CC) $(LDFLAGS) -o $@ $^ $(FFMPEG_LIB) $(EXTRALIBS)
+ffserver$(EXE): ffserver.o $(DEP_LIBS)
+       $(CC) $(LDFLAGS) $(FFSLDFLAGS) \
+               -o $@ ffserver.o -L./libavcodec -L./libav \
+              -lavformat -lavcodec -ldl $(EXTRALIBS) 
 
 ffplay: ffmpeg$(EXE)
        ln -sf $< $@
@@ -52,9 +70,14 @@ ffplay: ffmpeg$(EXE)
 
 install: all
        $(MAKE) -C libavcodec install
+       install -d $(prefix)/bin
        install -s -m 755 $(PROG) $(prefix)/bin
        ln -sf ffmpeg $(prefix)/bin/ffplay 
 
+installlib:
+       $(MAKE) -C libavcodec installlib
+       $(MAKE) -C libav installlib
+
 dep:   depend
 
 depend:
@@ -63,7 +86,8 @@ depend:
 clean: 
        $(MAKE) -C libavcodec clean
        $(MAKE) -C libav clean
-       rm -f *.o *~ .depend gmon.out TAGS $(PROG) 
+       $(MAKE) -C tests clean
+       rm -f *.o *~ .depend gmon.out TAGS ffmpeg_g$(EXE) $(PROG) 
 
 distclean: clean
        $(MAKE) -C libavcodec distclean
@@ -72,6 +96,11 @@ distclean: clean
 TAGS:
        etags *.[ch] libav/*.[ch] libavcodec/*.[ch]
 
+# regression tests
+
+libavtest test mpeg4 mpeg: ffmpeg$(EXE)
+       make -C tests $@
+
 ifneq ($(wildcard .depend),)
 include .depend
 endif