summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZdenek Kabelac <kabi@informatics.muni.cz>2001-10-31 19:40:18 +0000
committerZdenek Kabelac <kabi@informatics.muni.cz>2001-10-31 19:40:18 +0000
commitcabad2adbc185c27d2df011be198220f79cdc97f (patch)
treed460aadf0cce6eb6e82596f122e6f2398befcfb7
parent7fb36f6c517c40facfacad3d732aa0e4f598369f (diff)
* dependency for static linking
Originally committed as revision 202 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 2e257a5593..a35c32ae0e 100644
--- a/Makefile
+++ b/Makefile
@@ -20,8 +20,10 @@ 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)
@@ -30,10 +32,10 @@ lib:
$(MAKE) -C libavcodec all
$(MAKE) -C libav all
-ffmpeg$(EXE): ffmpeg.o libav/libav.a
+ffmpeg$(EXE): ffmpeg.o libav/libav.a $(DEP_FFMPEG_LIB)
$(CC) $(LDFLAGS) -lm -o $@ $^ $(FFMPEG_LIB)
-ffserver$(EXE): ffserver.o libav/libav.a
+ffserver$(EXE): ffserver.o libav/libav.a $(DEP_FFMPEG_LIB)
$(CC) $(LDFLAGS) -lm -o $@ $^ $(FFMPEG_LIB)
ffplay: ffmpeg$(EXE)