diff options
| author | Diego Biurrun <diego@biurrun.de> | 2011-06-25 00:19:39 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2011-06-25 13:02:51 +0200 |
| commit | a6213f3dce4006e0d47bd938e15832987d95efef (patch) | |
| tree | fe28da743bb3729a037a6e8e7427e909c7975ab5 | |
| parent | 3a0d0ff5e60a8245f672fedd2aa49fa937aa875a (diff) | |
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.
| -rw-r--r-- | libavcodec/Makefile | 2 | ||||
| -rw-r--r-- | libavdevice/Makefile | 2 | ||||
| -rw-r--r-- | libavfilter/Makefile | 2 | ||||
| -rw-r--r-- | libavformat/Makefile | 2 | ||||
| -rw-r--r-- | libavutil/Makefile | 2 | ||||
| -rw-r--r-- | libpostproc/Makefile | 2 | ||||
| -rw-r--r-- | libswscale/Makefile | 2 |
7 files changed, 0 insertions, 14 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 0cfa08c1c3..64a286289d 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 5cfc5e8ecc..cbe20d6d57 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 2ed1f937a3..e22527ae49 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 c2fa8af466..5041fe0dc9 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 0d8f01dd8d..304b288851 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 bd0b71e3d4..7b359709dc 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 8bb06baae2..b2914113c0 100644 --- a/libswscale/Makefile +++ b/libswscale/Makefile @@ -1,5 +1,3 @@ -include $(SUBDIR)../config.mak - NAME = swscale FFLIBS = avutil |