From 7fa0fc772a5085ba7997b03f3f674bbe474341a3 Mon Sep 17 00:00:00 2001 From: Pavel Pisa Date: Thu, 14 May 2009 10:19:45 +0200 Subject: [PATCH] Makefile.omk sucks in config generated by config4omk. This is not long term optimal solution, but it is least intrusive solution for our actual needs. Signed-off-by: Pavel Pisa --- libavcodec/Makefile.omk | 2 ++ libavdevice/Makefile.omk | 2 ++ libavfilter/Makefile.omk | 2 ++ libavformat/Makefile.omk | 2 ++ libavutil/Makefile.omk | 2 ++ libpostproc/Makefile.omk | 2 ++ libswscale-omk/Makefile.omk | 3 +++ 7 files changed, 15 insertions(+) diff --git a/libavcodec/Makefile.omk b/libavcodec/Makefile.omk index 902c7b1a2..09b31ef80 100644 --- a/libavcodec/Makefile.omk +++ b/libavcodec/Makefile.omk @@ -1,3 +1,5 @@ +include $(srcdir)/../config.mak-omk + NAME = avcodec FFLIBS = avutil diff --git a/libavdevice/Makefile.omk b/libavdevice/Makefile.omk index 87ac26f45..0eb39b577 100644 --- a/libavdevice/Makefile.omk +++ b/libavdevice/Makefile.omk @@ -1,3 +1,5 @@ +include $(srcdir)/../config.mak-omk + NAME = avdevice FFLIBS = avformat avcodec avutil diff --git a/libavfilter/Makefile.omk b/libavfilter/Makefile.omk index 24df46dbf..0fa090a5b 100644 --- a/libavfilter/Makefile.omk +++ b/libavfilter/Makefile.omk @@ -1,3 +1,5 @@ +include $(srcdir)/../config.mak-omk + NAME = avfilter FFLIBS = avcodec avutil swscale FFLIBS-$(CONFIG_AVFILTER_LAVF) += avformat diff --git a/libavformat/Makefile.omk b/libavformat/Makefile.omk index 279cc2f6b..ecd38bfcf 100644 --- a/libavformat/Makefile.omk +++ b/libavformat/Makefile.omk @@ -1,3 +1,5 @@ +include $(srcdir)/../config.mak-omk + NAME = avformat FFLIBS = avcodec avutil diff --git a/libavutil/Makefile.omk b/libavutil/Makefile.omk index 9de389dd9..fcd6bcbcf 100644 --- a/libavutil/Makefile.omk +++ b/libavutil/Makefile.omk @@ -1,3 +1,5 @@ +include $(srcdir)/../config.mak-omk + NAME = avutil HEADERS = adler32.h \ diff --git a/libpostproc/Makefile.omk b/libpostproc/Makefile.omk index 5863d33c1..95e2eb207 100644 --- a/libpostproc/Makefile.omk +++ b/libpostproc/Makefile.omk @@ -1,3 +1,5 @@ +include $(srcdir)/../config.mak-omk + NAME = postproc FFLIBS = avutil diff --git a/libswscale-omk/Makefile.omk b/libswscale-omk/Makefile.omk index c7e479a44..01c174ff6 100644 --- a/libswscale-omk/Makefile.omk +++ b/libswscale-omk/Makefile.omk @@ -1,3 +1,6 @@ +include $(srcdir)/../config.mak-omk + + NAME = swscale FFLIBS = avutil -- 2.39.2