Added VideoBitRateRange and VideoBitRAteTolerance settings

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index 40d7826e87089842617060d1db5c47eea311a217..9e2d203ddfd895818518038dc06e727b8d98fc76 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,8 +6,15 @@ include config.mak
 
 VPATH=$(SRC_PATH)
 
-CFLAGS= $(OPTFLAGS) -Wall -g -I. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libav
-LDFLAGS= -g
+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
@@ -29,6 +36,9 @@ 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
@@ -40,13 +50,17 @@ lib:
        $(MAKE) -C libavcodec all
        $(MAKE) -C libav all
 
-ffmpeg$(EXE): ffmpeg.o $(DEP_LIBS)
+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 $(DEP_LIBS)
-       $(CC) $(LDFLAGS) -o $@ ffserver.o -L./libavcodec -L./libav \
-              -lavformat -lavcodec $(EXTRALIBS)
+       $(CC) $(LDFLAGS) $(FFSLDFLAGS) \
+               -o $@ ffserver.o -L./libavcodec -L./libav \
+              -lavformat -lavcodec -ldl $(EXTRALIBS) 
 
 ffplay: ffmpeg$(EXE)
        ln -sf $< $@
@@ -56,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:
@@ -68,7 +87,7 @@ clean:
        $(MAKE) -C libavcodec clean
        $(MAKE) -C libav clean
        $(MAKE) -C tests clean
-       rm -f *.o *~ .depend gmon.out TAGS $(PROG) 
+       rm -f *.o *~ .depend gmon.out TAGS ffmpeg_g$(EXE) $(PROG) 
 
 distclean: clean
        $(MAKE) -C libavcodec distclean