From 79fc33aca863145accc9ea4c771da9b0111c026b Mon Sep 17 00:00:00 2001 From: Christian Prochaska Date: Mon, 13 Mar 2017 14:30:15 +0100 Subject: [PATCH] libav: improve port check Fixes #2322 --- repos/libports/lib/mk/avcodec.inc | 2 +- repos/libports/lib/mk/avfilter.mk | 2 +- repos/libports/lib/mk/avformat.mk | 2 +- repos/libports/lib/mk/avresample.mk | 2 +- repos/libports/lib/mk/avutil.inc | 2 +- repos/libports/lib/mk/spec/arm/avcodec.mk | 2 +- repos/libports/lib/mk/spec/arm/avutil.mk | 2 +- repos/libports/lib/mk/spec/x86/avcodec.inc | 2 +- repos/libports/lib/mk/spec/x86/avutil.inc | 2 +- repos/libports/lib/mk/swscale.mk | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/repos/libports/lib/mk/avcodec.inc b/repos/libports/lib/mk/avcodec.inc index 4ac24ae4f5..56cb11c307 100644 --- a/repos/libports/lib/mk/avcodec.inc +++ b/repos/libports/lib/mk/avcodec.inc @@ -5,7 +5,7 @@ include $(REP_DIR)/lib/import/import-avcodec.mk LIBAV_PORT_DIR := $(call select_from_ports,libav) LIBAVCODEC_DIR := $(LIBAV_PORT_DIR)/src/lib/libav/libavcodec -include $(LIBAVCODEC_DIR)/Makefile +-include $(LIBAVCODEC_DIR)/Makefile LIBS += zlib diff --git a/repos/libports/lib/mk/avfilter.mk b/repos/libports/lib/mk/avfilter.mk index 063bac6fcf..e12e0c6ce0 100644 --- a/repos/libports/lib/mk/avfilter.mk +++ b/repos/libports/lib/mk/avfilter.mk @@ -4,6 +4,6 @@ include $(REP_DIR)/lib/import/import-avfilter.mk LIBAVFILTER_DIR = $(call select_from_ports,libav)/src/lib/libav/libavfilter -include $(LIBAVFILTER_DIR)/Makefile +-include $(LIBAVFILTER_DIR)/Makefile vpath % $(LIBAVFILTER_DIR) diff --git a/repos/libports/lib/mk/avformat.mk b/repos/libports/lib/mk/avformat.mk index e5493112d7..d231f9bfd3 100644 --- a/repos/libports/lib/mk/avformat.mk +++ b/repos/libports/lib/mk/avformat.mk @@ -4,7 +4,7 @@ include $(REP_DIR)/lib/import/import-avformat.mk LIBAVFORMAT_DIR = $(call select_from_ports,libav)/src/lib/libav/libavformat -include $(LIBAVFORMAT_DIR)/Makefile +-include $(LIBAVFORMAT_DIR)/Makefile LIBS += avcodec avutil zlib diff --git a/repos/libports/lib/mk/avresample.mk b/repos/libports/lib/mk/avresample.mk index b6c2c388fa..50e997d525 100644 --- a/repos/libports/lib/mk/avresample.mk +++ b/repos/libports/lib/mk/avresample.mk @@ -4,6 +4,6 @@ include $(REP_DIR)/lib/import/import-avresample.mk LIBAVRESAMPLE_DIR = $(call select_from_ports,libav)/src/lib/libav/libavresample -include $(LIBAVRESAMPLE_DIR)/Makefile +-include $(LIBAVRESAMPLE_DIR)/Makefile vpath % $(LIBAVRESAMPLE_DIR) diff --git a/repos/libports/lib/mk/avutil.inc b/repos/libports/lib/mk/avutil.inc index eb822f89f6..3734f0109f 100644 --- a/repos/libports/lib/mk/avutil.inc +++ b/repos/libports/lib/mk/avutil.inc @@ -4,6 +4,6 @@ include $(REP_DIR)/lib/import/import-avutil.mk LIBAVUTIL_DIR = $(call select_from_ports,libav)/src/lib/libav/libavutil -include $(LIBAVUTIL_DIR)/Makefile +-include $(LIBAVUTIL_DIR)/Makefile vpath % $(LIBAVUTIL_DIR) diff --git a/repos/libports/lib/mk/spec/arm/avcodec.mk b/repos/libports/lib/mk/spec/arm/avcodec.mk index 039e6d51af..d8f94a064d 100644 --- a/repos/libports/lib/mk/spec/arm/avcodec.mk +++ b/repos/libports/lib/mk/spec/arm/avcodec.mk @@ -2,4 +2,4 @@ CC_C_OPT += -DARCH_ARM=1 include $(REP_DIR)/lib/mk/avcodec.inc -include $(LIBAVCODEC_DIR)/arm/Makefile +-include $(LIBAVCODEC_DIR)/arm/Makefile diff --git a/repos/libports/lib/mk/spec/arm/avutil.mk b/repos/libports/lib/mk/spec/arm/avutil.mk index a95d6eab4d..7e8f7ba524 100644 --- a/repos/libports/lib/mk/spec/arm/avutil.mk +++ b/repos/libports/lib/mk/spec/arm/avutil.mk @@ -5,4 +5,4 @@ CC_C_OPT += -DARCH_ARM=1 include $(REP_DIR)/lib/mk/avutil.inc -include $(LIBAVUTIL_DIR)/arm/Makefile +-include $(LIBAVUTIL_DIR)/arm/Makefile diff --git a/repos/libports/lib/mk/spec/x86/avcodec.inc b/repos/libports/lib/mk/spec/x86/avcodec.inc index c6f50e3b91..59c33c7a22 100644 --- a/repos/libports/lib/mk/spec/x86/avcodec.inc +++ b/repos/libports/lib/mk/spec/x86/avcodec.inc @@ -2,4 +2,4 @@ CC_C_OPT += -DARCH_X86=1 include $(REP_DIR)/lib/mk/avcodec.inc -include $(LIBAVCODEC_DIR)/x86/Makefile +-include $(LIBAVCODEC_DIR)/x86/Makefile diff --git a/repos/libports/lib/mk/spec/x86/avutil.inc b/repos/libports/lib/mk/spec/x86/avutil.inc index 14a3b99de0..328171cb9e 100644 --- a/repos/libports/lib/mk/spec/x86/avutil.inc +++ b/repos/libports/lib/mk/spec/x86/avutil.inc @@ -5,4 +5,4 @@ CC_C_OPT += -DARCH_X86=1 include $(REP_DIR)/lib/mk/avutil.inc -include $(LIBAVUTIL_DIR)/x86/Makefile +-include $(LIBAVUTIL_DIR)/x86/Makefile diff --git a/repos/libports/lib/mk/swscale.mk b/repos/libports/lib/mk/swscale.mk index 666da526fd..12bcdc4cee 100644 --- a/repos/libports/lib/mk/swscale.mk +++ b/repos/libports/lib/mk/swscale.mk @@ -6,6 +6,6 @@ CC_WARN += -Wno-switch LIBSWSCALE_DIR = $(call select_from_ports,libav)/src/lib/libav/libswscale -include $(LIBSWSCALE_DIR)/Makefile +-include $(LIBSWSCALE_DIR)/Makefile vpath % $(LIBSWSCALE_DIR)