stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Makefile: fix dependencies for LIBFFMPEG_STATIC (parallel build)

Browse source
This commit is contained in:
Jaroslav Kysela 2014-10-13 12:44:53 +02:00
parent 808b16f690
commit 49ebb3c48d
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Makefile
View file

@ -290,9 +290,11 @@ SRCS-$(CONFIG_AVAHI) += src/avahi.c
SRCS-$(CONFIG_BONJOUR) += src/bonjour.c SRCS-$(CONFIG_BONJOUR) += src/bonjour.c
# libav # libav
SRCS-$(CONFIG_LIBAV) += src/libav.c \ SRCS_LIBAV = \
src/libav.c \
src/muxer/muxer_libav.c \ src/muxer/muxer_libav.c \
src/plumbing/transcoding.c \ src/plumbing/transcoding.c
SRCS-$(CONFIG_LIBAV) += $(SRCS_LIBAV)
# Tvhcsa # Tvhcsa
SRCS-${CONFIG_TVHCSA} += \ SRCS-${CONFIG_TVHCSA} += \
@ -340,9 +342,6 @@ BUNDLES-${CONFIG_DVBSCAN} += data/dvb-scan
BUNDLES = $(BUNDLES-yes) BUNDLES = $(BUNDLES-yes)
ALL-$(CONFIG_DVBSCAN) += check_dvb_scan ALL-$(CONFIG_DVBSCAN) += check_dvb_scan
# Static libav
ALL-$(CONFIG_LIBFFMPEG_STATIC) += ${ROOTDIR}/libav_static/build/ffmpeg/lib/libavcodec.a
# #
# Add-on modules # Add-on modules
# #
@ -358,6 +357,12 @@ OBJS = $(SRCS:%.c=$(BUILDDIR)/%.o)
OBJS_EXTRA = $(SRCS_EXTRA:%.c=$(BUILDDIR)/%.so) OBJS_EXTRA = $(SRCS_EXTRA:%.c=$(BUILDDIR)/%.so)
DEPS = ${OBJS:%.o=%.d} 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 # Build Rules
# #
@ -398,7 +403,7 @@ clean:
find . -name "*~" | xargs rm -f find . -name "*~" | xargs rm -f
distclean: clean distclean: clean
rm -rf ${ROOTDIR}/libav_static rm -rf ${ROOTDIR)/.tvh${ROOTDIR}/libav_static
rm -rf ${ROOTDIR}/build.* rm -rf ${ROOTDIR}/build.*
rm -f ${ROOTDIR}/.config.mk rm -f ${ROOTDIR}/.config.mk
@ -424,6 +429,9 @@ $(BUILDDIR)/bundle.c: check_dvb_scan
$(MKBUNDLE) -o $@ -d ${BUILDDIR}/bundle.d $(BUNDLE_FLAGS) $(BUNDLES:%=$(ROOTDIR)/%) $(MKBUNDLE) -o $@ -d ${BUILDDIR}/bundle.d $(BUNDLE_FLAGS) $(BUNDLES:%=$(ROOTDIR)/%)
# Static FFMPEG # Static FFMPEG
${BUILDDIR}/libffmpeg_stamp: ${ROOTDIR}/libav_static/build/ffmpeg/lib/libavcodec.a
@touch $@
${ROOTDIR}/libav_static/build/ffmpeg/lib/libavcodec.a: ${ROOTDIR}/libav_static/build/ffmpeg/lib/libavcodec.a:
$(MAKE) -f Makefile.ffmpeg build $(MAKE) -f Makefile.ffmpeg build