build: Remove redundant config.mak includes from subdirectory Makefiles.

Calling Make from subdirectories is not supported and config.mak has
multiple inclusion guards anyway, so the top-level include is enough.

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 0cfa08c..64a2862 100644 (file)
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -1,5 +1,3 @@
-include $(SUBDIR)../config.mak
-
 NAME = avcodec
 FFLIBS = avutil
 

diff --git a/libavdevice/Makefile b/libavdevice/Makefile
index 5cfc5e8..cbe20d6 100644 (file)
--- a/libavdevice/Makefile
+++ b/libavdevice/Makefile
@@ -1,5 +1,3 @@
-include $(SUBDIR)../config.mak
-
 NAME    = avdevice
 FFLIBS  = avformat avcodec avutil
 

diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index 2ed1f93..e22527a 100644 (file)
--- a/libavfilter/Makefile
+++ b/libavfilter/Makefile
@@ -1,5 +1,3 @@
-include $(SUBDIR)../config.mak
-
 NAME = avfilter
 FFLIBS = avutil
 FFLIBS-$(CONFIG_MOVIE_FILTER) += avformat avcodec

diff --git a/libavformat/Makefile b/libavformat/Makefile
index c2fa8af..5041fe0 100644 (file)
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -1,5 +1,3 @@
-include $(SUBDIR)../config.mak
-
 NAME = avformat
 FFLIBS = avcodec avutil
 

diff --git a/libavutil/Makefile b/libavutil/Makefile
index 0d8f01d..304b288 100644 (file)
--- a/libavutil/Makefile
+++ b/libavutil/Makefile
@@ -1,5 +1,3 @@
-include $(SUBDIR)../config.mak
-
 NAME = avutil
 
 HEADERS = adler32.h                                                     \

diff --git a/libpostproc/Makefile b/libpostproc/Makefile
index bd0b71e..7b35970 100644 (file)
--- a/libpostproc/Makefile
+++ b/libpostproc/Makefile
@@ -1,5 +1,3 @@
-include $(SUBDIR)../config.mak
-
 NAME = postproc
 FFLIBS = avutil
 

diff --git a/libswscale/Makefile b/libswscale/Makefile
index 8bb06ba..b291411 100644 (file)
--- a/libswscale/Makefile
+++ b/libswscale/Makefile
@@ -1,5 +1,3 @@
-include $(SUBDIR)../config.mak
-
 NAME = swscale
 FFLIBS = avutil