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 <pisa@cmp.felk.cvut.cz>

diff --git a/libavcodec/Makefile.omk b/libavcodec/Makefile.omk
index 902c7b1a2738adf9197a0dc254b1b0872a5b2abf..09b31ef80fc2a62d61ab2baefc8af804319ec120 100644 (file)
--- 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 87ac26f457970142305fcff672daeac1955d5f3e..0eb39b57724b645d21192410a953cbf6a356c43f 100644 (file)
--- 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 24df46dbf8407d8d73f01aa9785e1680030f7af4..0fa090a5b722e2c8e87294292b45da9c9e0c73a0 100644 (file)
--- 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 279cc2f6b131562948c23ead0ee0dd9c0d5139cb..ecd38bfcf4e36e7318f625f0c2999c58c250ea61 100644 (file)
--- 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 9de389dd99e121c69d06416a02ff446f3144160f..fcd6bcbcf922ceb2d122adb315482ac1267bdd41 100644 (file)
--- 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 5863d33c1f7dde29b29d751787fa40764d0218cc..95e2eb20726f3aface4cee54fc9ef38aeb2b66bd 100644 (file)
--- 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 c7e479a44f16c56f8d67953a9de4d4c5b1bcadab..01c174ff607c71eca462278351480c6ab5284ddf 100644 (file)
--- a/libswscale-omk/Makefile.omk
+++ b/libswscale-omk/Makefile.omk
@@ -1,3 +1,6 @@
+include $(srcdir)/../config.mak-omk
+
+
 NAME = swscale
 FFLIBS = avutil