[SCM] libav/experimental: * dependency for static linking
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 15:30:25 UTC 2013
The following commit has been merged in the experimental branch:
commit cabad2adbc185c27d2df011be198220f79cdc97f
Author: Zdenek Kabelac <kabi at informatics.muni.cz>
Date: Wed Oct 31 19:40:18 2001 +0000
* dependency for static linking
Originally committed as revision 202 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/Makefile b/Makefile
index 2e257a5..a35c32a 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)
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list