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

Diego Biurrun git at videolan.org
Sun Jun 26 02:39:26 CEST 2011


ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Sat Jun 25 00:19:39 2011 +0200| [a6213f3dce4006e0d47bd938e15832987d95efef] | committer: Diego Biurrun

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.

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

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

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 0cfa08c..64a2862 100644
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/libswscale/Makefile
+++ b/libswscale/Makefile
@@ -1,5 +1,3 @@
-include $(SUBDIR)../config.mak
-
 NAME = swscale
 FFLIBS = avutil
 



More information about the ffmpeg-cvslog mailing list