diff options
| author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2011-06-26 09:46:05 +0200 |
|---|---|---|
| committer | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2011-06-26 09:49:36 +0200 |
| commit | 11096804340ac2cec37ef1bce828105bd0a7dfbe (patch) | |
| tree | 6fe72598f348431548894c2c2eac280fa3a0f4b2 | |
| parent | b3ca11f07feb08738128f6b7127ccf8eb3f72ede (diff) | |
| download | ffmpeg-11096804340ac2cec37ef1bce828105bd0a7dfbe.tar.gz | |
Revert "build: Remove redundant config.mak includes from subdirectory Makefiles."
This reverts commit a6213f3dce4006e0d47bd938e15832987d95efef.
| -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, 14 insertions, 0 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index deff279627..b6103af3c0 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 63153bb18b..60103a4864 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 93f852d9d8..461df37a10 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 d11cd7eca7..e5ec44bfb6 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 304b288851..0d8f01dd8d 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 7b359709dc..bd0b71e3d4 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 b2914113c0..8bb06baae2 100644 --- a/libswscale/Makefile +++ b/libswscale/Makefile @@ -1,3 +1,5 @@ +include $(SUBDIR)../config.mak + NAME = swscale FFLIBS = avutil |