]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
Makefile: static ffmpeg - fix for parallel build (e.g.: make -j4)
authorJaroslav Kysela <perex@perex.cz>
Fri, 25 Mar 2016 18:33:41 +0000 (19:33 +0100)
committerJaroslav Kysela <perex@perex.cz>
Fri, 25 Mar 2016 18:33:58 +0000 (19:33 +0100)
Makefile

index 1c53ed9f811be7fa74690eb4f245ad4573d36298..cc0726897a260b1d340a196f58de510efbdc5313 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -76,9 +76,15 @@ FFMPEG_LIBS := \
     libavcodec \
     libavutil
 
-# FFMEG_STATIC
+# FFMPEG_STATIC
 ifeq ($(CONFIG_FFMPEG_STATIC),yes)
 
+ifeq (,$(wildcard ${BUILDDIR}/libffmpeg_stamp))
+# build static FFMPEG as first for pkgconfig
+ffmpeg_all: ${BUILDDIR}/libffmpeg_stamp
+       $(MAKE) all
+endif
+
 FFMPEG_PREFIX := $(BUILDDIR)/ffmpeg/build/ffmpeg
 FFMPEG_LIBDIR := $(FFMPEG_PREFIX)/lib
 FFMPEG_CONFIG := \
@@ -120,11 +126,11 @@ endif
 LDFLAGS += $(foreach lib,$(FFMPEG_LIBS),$(FFMPEG_LIBDIR)/$(lib).a)
 LDFLAGS += $(foreach lib,$(FFMPEG_DEPS),$(FFMPEG_LIBDIR)/$(lib).a)
 
-else
+else # !FFMPEG_STATIC
 
 FFMPEG_CONFIG := $(PKG_CONFIG)
 
-endif # FFMEG_STATIC
+endif # FFMPEG_STATIC
 
 CFLAGS  += `$(FFMPEG_CONFIG) --cflags $(FFMPEG_LIBS)`
 LDFLAGS += `$(FFMPEG_CONFIG) --libs $(FFMPEG_LIBS)`