- Bug fix on RTYPE (rounding type) not being honoured by H.263+ decoder.

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index 78c56f3ef5c707544891a14d7552cef7013ceb2e..a35c32ae0e9c14bd6f33485e07e7cafd455ee2cf 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,8 +3,8 @@
 #
 include config.mak
 
-CFLAGS= $(OPTFLAGS) -Wall -I./libavcodec -I./libav 
-LDFLAGS=  
+CFLAGS= $(OPTFLAGS) -Wall -g -I./libavcodec -I./libav 
+LDFLAGS= -g
 ifeq ($(TARGET_GPROF),yes)
 CFLAGS+=-p
 LDFLAGS+=-p
@@ -18,17 +18,25 @@ EXT=
 PROG=ffmpeg ffplay ffserver
 endif
 
+ifeq ($(BUILD_SHARED),yes)
+FFMPEG_LIB=-Llibavcodec -lffmpeg
+DEP_FFMPEG_LIB=
+else
+FFMPEG_LIB=libavcodec/libavcodec.a
+DEP_FFMPEG_LIB=libavcodec/libavcodec.a
+endif
+
 all: lib $(PROG)
 
 lib:
        $(MAKE) -C libavcodec all
        $(MAKE) -C libav all
 
-ffmpeg$(EXE): ffmpeg.o libav/libav.a libavcodec/libavcodec.a
-       $(CC) $(LDFLAGS) -o $@ $^ -lm
+ffmpeg$(EXE): ffmpeg.o libav/libav.a $(DEP_FFMPEG_LIB)
+       $(CC) $(LDFLAGS) -lm -o $@ $^ $(FFMPEG_LIB)
 
-ffserver$(EXE): ffserver.o libav/libav.a libavcodec/libavcodec.a
-       $(CC) $(LDFLAGS) -o $@ $^ -lm
+ffserver$(EXE): ffserver.o libav/libav.a $(DEP_FFMPEG_LIB)
+       $(CC) $(LDFLAGS) -lm -o $@ $^ $(FFMPEG_LIB)
 
 ffplay: ffmpeg$(EXE)
        ln -sf $< $@
@@ -37,6 +45,7 @@ ffplay: ffmpeg$(EXE)
        $(CC) $(CFLAGS) -c -o $@ $< 
 
 install: all
+       $(MAKE) -C libavcodec install
        install -s -m 755 $(PROG) $(prefix)/bin
        ln -sf ffmpeg $(prefix)/bin/ffplay