Makefile.ffmpeg: Fix PATHs, also simplificate deps in the main Makefile

diff --git a/Makefile b/Makefile
index 7146e6c75eb5508715a19798f081235473fa476e..f63350ddd3a1bf1a898807f7693c64c7f580743d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -357,10 +357,8 @@ 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}
+DEPS      += ${BUILDDIR}/libffmpeg_stamp
 endif
 
 #
@@ -429,7 +427,14 @@ $(BUILDDIR)/bundle.c: check_dvb_scan
        $(MKBUNDLE) -o $@ -d ${BUILDDIR}/bundle.d $(BUNDLE_FLAGS) $(BUNDLES:%=$(ROOTDIR)/%)
 
 # Static FFMPEG
+
+ifeq ($(CONFIG_LIBFFMPEG_STATIC),yes)
+${ROOTDIR}/src/libav.h: ${BUILDDIR}/libffmpeg_stamp
+${SRCS_LIBAV}: ${BUILDDIR}/libffmpeg_stamp
+endif
+
 ${BUILDDIR}/libffmpeg_stamp: ${ROOTDIR}/libav_static/build/ffmpeg/lib/libavcodec.a
+       echo "$(DEPS)"
        @touch $@
 
 ${ROOTDIR}/libav_static/build/ffmpeg/lib/libavcodec.a:

diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg
index 26001004fbe655b38de983b47e684ed094c9cb72..44377282d8b47daef2ef8b9f0c88b59446c59879 100644 (file)
--- a/Makefile.ffmpeg
+++ b/Makefile.ffmpeg
@@ -21,7 +21,7 @@ include $(dir $(lastword $(MAKEFILE_LIST))).config.mk
 define DOWNLOAD
        @mkdir -p $(LIBAVDIR)/build
        if test -z "$${TVHEADEND_FILE_CACHE}"; then \
-          wget -O $(2) $(1); \
+          wget --no-verbose -O $(2) $(1); \
         else \
           file=$$(basename $(2)); \
           cp "$$TVHEADEND_FILE_CACHE/$$(file)" $(2); \
@@ -34,6 +34,8 @@ endef
 
 LIBAVDIR = $(ROOTDIR)/libav_static
 
+export PATH := $(LIBAVDIR)/build/ffmpeg/bin:$(PATH)
+
 ECFLAGS         = -I$(LIBAVDIR)/build/ffmpeg/include
 ELIBS           = -L$(LIBAVDIR)/build/ffmpeg/lib -ldl
 
@@ -103,8 +105,7 @@ $(LIBAVDIR)/$(LIBOGG)/.tvh_build: \
                 --prefix=/ffmpeg \
                --enable-static \
                --disable-shared
-       PATH="$(LIBAVDIR)/build/ffmpeg/bin:$(PATH)" \
-               DESTDIR=$(LIBAVDIR)/build \
+       DESTDIR=$(LIBAVDIR)/build \
                make -C $(LIBAVDIR)/$(LIBOGG) install
        @touch $@
 
@@ -123,8 +124,7 @@ $(LIBAVDIR)/$(LIBVORBIS)/.tvh_build: \
                --enable-static \
                --disable-shared \
                --with-ogg=$(LIBAVDIR)/build/ffmpeg
-       PATH="$(LIBAVDIR)/build/ffmpeg/bin:$(PATH)" \
-               DESTDIR=$(LIBAVDIR)/build \
+       DESTDIR=$(LIBAVDIR)/build \
                make -C $(LIBAVDIR)/$(LIBVORBIS) install
        @touch $@
 
@@ -152,8 +152,7 @@ $(LIBAVDIR)/$(LIBX264)/.tvh_build: \
                --disable-ffms \
                --disable-gpac \
                --disable-lsmash
-       PATH="$(LIBAVDIR)/build/ffmpeg/bin:$(PATH)" \
-               DESTDIR=$(LIBAVDIR)/build \
+       DESTDIR=$(LIBAVDIR)/build \
                make -C $(LIBAVDIR)/$(LIBX264) install
        @touch $@
 
@@ -174,8 +173,7 @@ $(LIBAVDIR)/$(LIBVPX)/.tvh_build: \
                --prefix=/ffmpeg \
                --enable-static \
                --disable-shared
-       PATH="$(LIBAVDIR)/build/ffmpeg/bin:$(PATH)" \
-               DIST_DIR=$(LIBAVDIR)/build/ffmpeg \
+       DIST_DIR=$(LIBAVDIR)/build/ffmpeg \
                make -C $(LIBAVDIR)/$(LIBVPX) install
        @touch $@
 
@@ -208,8 +206,7 @@ $(LIBAVDIR)/$(FFMPEG)/.tvh_build: \
                $(foreach decoder,$(DECODERS),--enable-decoder=$(decoder)) \
                $(foreach encoder,$(ENCODERS),--enable-encoder=$(encoder)) \
                $(foreach muxer,$(MUXERS),--enable-muxer=$(muxer))
-       PATH="$(LIBAVDIR)/build/ffmpeg/bin:$(PATH)" \
-               DESTDIR=$(LIBAVDIR)/build \
+       DESTDIR=$(LIBAVDIR)/build \
                make -C $(LIBAVDIR)/$(FFMPEG) install
        @touch $@