Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Makefile: fix dependencies for LIBFFMPEG_STATIC (parallel build)
  • Loading branch information
perexg committed Oct 13, 2014
1 parent 808b16f commit 49ebb3c
Showing 1 changed file with 14 additions and 6 deletions.
20 changes: 14 additions & 6 deletions Makefile
Expand Up @@ -290,9 +290,11 @@ SRCS-$(CONFIG_AVAHI) += src/avahi.c
SRCS-$(CONFIG_BONJOUR) += src/bonjour.c

# libav
SRCS-$(CONFIG_LIBAV) += src/libav.c \
SRCS_LIBAV = \
src/libav.c \
src/muxer/muxer_libav.c \
src/plumbing/transcoding.c \
src/plumbing/transcoding.c
SRCS-$(CONFIG_LIBAV) += $(SRCS_LIBAV)

# Tvhcsa
SRCS-${CONFIG_TVHCSA} += \
Expand Down Expand Up @@ -340,9 +342,6 @@ BUNDLES-${CONFIG_DVBSCAN} += data/dvb-scan
BUNDLES = $(BUNDLES-yes)
ALL-$(CONFIG_DVBSCAN) += check_dvb_scan

# Static libav
ALL-$(CONFIG_LIBFFMPEG_STATIC) += ${ROOTDIR}/libav_static/build/ffmpeg/lib/libavcodec.a

#
# Add-on modules
#
Expand All @@ -358,6 +357,12 @@ OBJS = $(SRCS:%.c=$(BUILDDIR)/%.o)
OBJS_EXTRA = $(SRCS_EXTRA:%.c=$(BUILDDIR)/%.so)
DEPS = ${OBJS:%.o=%.d}

# Static libav
ifeq ($(CONFIG_LIBFFMPEG_STATIC),yes)
OBJS_LIBAV = $(SRCS_LIBAV:%.c=$(BUILDDIR)/%.o)
DEPS += ${OBJS_LIBAV:%.o=${BUILDDIR}/libffmpeg_stamp}
endif

#
# Build Rules
#
Expand Down Expand Up @@ -398,7 +403,7 @@ clean:
find . -name "*~" | xargs rm -f

distclean: clean
rm -rf ${ROOTDIR}/libav_static
rm -rf ${ROOTDIR)/.tvh${ROOTDIR}/libav_static
rm -rf ${ROOTDIR}/build.*
rm -f ${ROOTDIR}/.config.mk

Expand All @@ -424,6 +429,9 @@ $(BUILDDIR)/bundle.c: check_dvb_scan
$(MKBUNDLE) -o $@ -d ${BUILDDIR}/bundle.d $(BUNDLE_FLAGS) $(BUNDLES:%=$(ROOTDIR)/%)

# Static FFMPEG
${BUILDDIR}/libffmpeg_stamp: ${ROOTDIR}/libav_static/build/ffmpeg/lib/libavcodec.a
@touch $@

${ROOTDIR}/libav_static/build/ffmpeg/lib/libavcodec.a:
$(MAKE) -f Makefile.ffmpeg build

Expand Down

0 comments on commit 49ebb3c

Please sign in to comment.