Skip to content
Snippets Groups Projects
Commit cabad2ad authored by Zdenek Kabelac's avatar Zdenek Kabelac
Browse files

* dependency for static linking 

Originally committed as revision 202 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 7fb36f6c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 4 additions and 2 deletions
Makefile
+ 4
− 2
View file @ cabad2ad
...@@ -20,8 +20,10 @@ endif ...@@ -20,8 +20,10 @@ endif
ifeq ($(BUILD_SHARED),yes) ifeq ($(BUILD_SHARED),yes)
FFMPEG_LIB=-Llibavcodec -lffmpeg FFMPEG_LIB=-Llibavcodec -lffmpeg
DEP_FFMPEG_LIB=
else else
FFMPEG_LIB=libavcodec/libavcodec.a FFMPEG_LIB=libavcodec/libavcodec.a
DEP_FFMPEG_LIB=libavcodec/libavcodec.a
endif endif
all: lib $(PROG) all: lib $(PROG)
...@@ -30,10 +32,10 @@ lib: ...@@ -30,10 +32,10 @@ lib:
$(MAKE) -C libavcodec all $(MAKE) -C libavcodec all
$(MAKE) -C libav 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) $(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) $(CC) $(LDFLAGS) -lm -o $@ $^ $(FFMPEG_LIB)
ffplay: ffmpeg$(EXE) ffplay: ffmpeg$(EXE)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment