[FFmpeg-cvslog] Revert "build: Remove redundant config. mak includes from subdirectory Makefiles."

[Reimar Döffinger]

ffmpeg | branch: master | Reimar Döffinger <Reimar.Doeffinger at gmx.de> | Sun Jun 26 09:46:05 2011 +0200| [11096804340ac2cec37ef1bce828105bd0a7dfbe] | committer: Reimar Döffinger

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

This reverts commit a6213f3dce4006e0d47bd938e15832987d95efef.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=11096804340ac2cec37ef1bce828105bd0a7dfbe
---

 libavcodec/Makefile  |    2 ++
 libavdevice/Makefile |    2 ++
 libavfilter/Makefile |    2 ++
 libavformat/Makefile |    2 ++
 libavutil/Makefile   |    2 ++
 libpostproc/Makefile |    2 ++
 libswscale/Makefile  |    2 ++
 7 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index deff279..b6103af 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -1,3 +1,5 @@
+include $(SUBDIR)../config.mak
+
 NAME = avcodec
 FFLIBS = avutil
 
diff --git a/libavdevice/Makefile b/libavdevice/Makefile
index 63153bb..60103a4 100644
--- a/libavdevice/Makefile
+++ b/libavdevice/Makefile
@@ -1,3 +1,5 @@
+include $(SUBDIR)../config.mak
+
 NAME    = avdevice
 FFLIBS  = avformat avcodec avutil
 
diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index 93f852d..461df37 100644
--- a/libavfilter/Makefile
+++ b/libavfilter/Makefile
@@ -1,3 +1,5 @@
+include $(SUBDIR)../config.mak
+
 NAME = avfilter
 FFLIBS = avutil
 FFLIBS-$(CONFIG_MOVIE_FILTER) += avformat avcodec
diff --git a/libavformat/Makefile b/libavformat/Makefile
index d11cd7e..e5ec44b 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -1,3 +1,5 @@
+include $(SUBDIR)../config.mak
+
 NAME = avformat
 FFLIBS = avcodec avutil
 
diff --git a/libavutil/Makefile b/libavutil/Makefile
index 304b288..0d8f01d 100644
--- a/libavutil/Makefile
+++ b/libavutil/Makefile
@@ -1,3 +1,5 @@
+include $(SUBDIR)../config.mak
+
 NAME = avutil
 
 HEADERS = adler32.h                                                     \
diff --git a/libpostproc/Makefile b/libpostproc/Makefile
index 7b35970..bd0b71e 100644
--- a/libpostproc/Makefile
+++ b/libpostproc/Makefile
@@ -1,3 +1,5 @@
+include $(SUBDIR)../config.mak
+
 NAME = postproc
 FFLIBS = avutil
 
diff --git a/libswscale/Makefile b/libswscale/Makefile
index b291411..8bb06ba 100644
--- a/libswscale/Makefile
+++ b/libswscale/Makefile
@@ -1,3 +1,5 @@
+include $(SUBDIR)../config.mak
+
 NAME = swscale
 FFLIBS = avutil