Patchwork gst-fsl-plugin fails to compile in current master

login
register
mail settings
Submitter Boszormenyi Zoltan
Date May 5, 2014, 10:16 a.m.
Message ID <53676515.5020205@pr.hu>
Download mbox | patch
Permalink /patch/71505/
State Not Applicable
Delegated to: Otavio Salvador
Headers show

Comments

Boszormenyi Zoltan - May 5, 2014, 10:16 a.m.
Hi,

for about a week now gst-fsl-plugin fails to compile.
"repo sync" was run several times since then.

The symptom of the problem is that the compiler complains about header files that do
exist, like:

/home/zozo/fsl-community-bsp-retry/build-master/tmp/work/imx6qsabresd-poky-linux-gnueabi/gst-fsl-plugin/3.0.11-r0/gst-fsl-plugins-3.0.11/libs/vss/mfw_gst_vss_common.c:52:23:
fatal error: fsl_debug.h: No such file or directory
 #include "fsl_debug.h"
                       ^
compilation terminated.

The problem is that a lot of Makefile.am files use relative addressing, like:
somelib_CFLAGS = -I../../../../inc/common

The proper term is -I$(top_srcdir)/inc/common, like in the attached patch.
Using this patch needs overriding do_configure():

do_configure() {
    (cd ${S} ; autoreconf)
    oe_runconf
}

Now, do_compile() succeeds. However, the package fails QA:

ERROR: QA Issue: gst-fsl-plugin: The install log indicates that host include and/or
library paths were used.
         Please check the log
'/home/zozo/fsl-community-bsp-retry/build-master/tmp/work/imx6qsabresd-poky-linux-gnueabi/gst-fsl-plugin/3.0.11-r0/temp/log.do_install'
for more information.
ERROR: QA Issue: package gst-fsl-plugin-libgplaycore contains bad RPATH
/home/zozo/fsl-community-bsp-retry/build-master/tmp/sysroots/imx6qsabresd/usr/lib in file
/home/zozo/fsl-community-bsp-retry/build-master/tmp/work/imx6qsabresd-poky-linux-gnueabi/gst-fsl-plugin/3.0.11-r0/packages-split/gst-fsl-plugin-libgplaycore/usr/lib/libgplaycore.so.0.0.1
ERROR: QA Issue: package gst-fsl-plugin-libgstfsl contains bad RPATH
/home/zozo/fsl-community-bsp-retry/build-master/tmp/sysroots/imx6qsabresd/usr/lib in file
/home/zozo/fsl-community-bsp-retry/build-master/tmp/work/imx6qsabresd-poky-linux-gnueabi/gst-fsl-plugin/3.0.11-r0/packages-split/gst-fsl-plugin-libgstfsl/usr/lib/libgstfsl-0.10.so.0.0.1
ERROR: QA Issue: package gst-fsl-plugin contains bad RPATH
/home/zozo/fsl-community-bsp-retry/build-master/tmp/sysroots/imx6qsabresd/usr/lib in file
/home/zozo/fsl-community-bsp-retry/build-master/tmp/work/imx6qsabresd-poky-linux-gnueabi/gst-fsl-plugin/3.0.11-r0/packages-split/gst-fsl-plugin/usr/lib/gstreamer-0.10/libmfw_gst_amrdec.so
ERROR: QA Issue: package gst-fsl-plugin contains bad RPATH
/home/zozo/fsl-community-bsp-retry/build-master/tmp/sysroots/imx6qsabresd/usr/lib in file
/home/zozo/fsl-community-bsp-retry/build-master/tmp/work/imx6qsabresd-poky-linux-gnueabi/gst-fsl-plugin/3.0.11-r0/packages-split/gst-fsl-plugin/usr/lib/gstreamer-0.10/libmfw_gst_mp3enc.so
ERROR: QA Issue: package gst-fsl-plugin contains bad RPATH
/home/zozo/fsl-community-bsp-retry/build-master/tmp/sysroots/imx6qsabresd/usr/lib in file
/home/zozo/fsl-community-bsp-retry/build-master/tmp/work/imx6qsabresd-poky-linux-gnueabi/gst-fsl-plugin/3.0.11-r0/packages-split/gst-fsl-plugin/usr/lib/gstreamer-0.10/libmfw_gst_audio_pp.so
ERROR: QA run found fatal errors. Please consider fixing them.
ERROR: Function failed: do_package_qa
ERROR: Logfile of failure stored in:
/home/zozo/fsl-community-bsp-retry/build-master/tmp/work/imx6qsabresd-poky-linux-gnueabi/gst-fsl-plugin/3.0.11-r0/temp/log.do_package.4304
ERROR: Task 10
(/home/zozo/fsl-community-bsp-retry/sources/meta-fsl-arm/recipes-multimedia/gstreamer/gst-fsl-plugin_3.0.11.bb,
do_package) failed with exit code '1'

How can I fix these "bad RPATH" errors?

Thanks in advance,
Zoltán Böszörményi
Otavio Salvador - May 5, 2014, 12:35 p.m.
On Mon, May 5, 2014 at 7:16 AM, Boszormenyi Zoltan <zboszor@pr.hu> wrote:
> for about a week now gst-fsl-plugin fails to compile.
> "repo sync" was run several times since then.

I had a similar patch in my queue and it seems to solve the error.
Could you test it and confirm it works for you?
Boszormenyi Zoltan - May 5, 2014, 1:05 p.m.
2014-05-05 14:35 keltezéssel, Otavio Salvador írta:
> On Mon, May 5, 2014 at 7:16 AM, Boszormenyi Zoltan <zboszor@pr.hu> wrote:
>> for about a week now gst-fsl-plugin fails to compile.
>> "repo sync" was run several times since then.
> I had a similar patch in my queue and it seems to solve the error.
> Could you test it and confirm it works for you?

Where can I find that patch queue?

Thanks in advance,
Zoltán Böszörményi
Otavio Salvador - May 5, 2014, 1:09 p.m.
On Mon, May 5, 2014 at 10:05 AM, Boszormenyi Zoltan <zboszor@pr.hu> wrote:
> 2014-05-05 14:35 keltezéssel, Otavio Salvador írta:
>> On Mon, May 5, 2014 at 7:16 AM, Boszormenyi Zoltan <zboszor@pr.hu> wrote:
>>> for about a week now gst-fsl-plugin fails to compile.
>>> "repo sync" was run several times since then.
>> I had a similar patch in my queue and it seems to solve the error.
>> Could you test it and confirm it works for you?
>
> Where can I find that patch queue?

I pushed to master-next.
Boszormenyi Zoltan - May 5, 2014, 4:35 p.m.
2014-05-05 15:09 keltezéssel, Otavio Salvador írta:
> On Mon, May 5, 2014 at 10:05 AM, Boszormenyi Zoltan <zboszor@pr.hu> wrote:
>> 2014-05-05 14:35 keltezéssel, Otavio Salvador írta:
>>> On Mon, May 5, 2014 at 7:16 AM, Boszormenyi Zoltan <zboszor@pr.hu> wrote:
>>>> for about a week now gst-fsl-plugin fails to compile.
>>>> "repo sync" was run several times since then.
>>> I had a similar patch in my queue and it seems to solve the error.
>>> Could you test it and confirm it works for you?
>> Where can I find that patch queue?
> I pushed to master-next.

You can cherry-pick into master, it works.

Thanks,
Zoltán Böszörményi
Xh Xiao - May 6, 2014, 3:30 a.m.
I'm seeing compile issues with sabrelite@gstreamer, are the patches in
master-next:
 e39dc2c1dc05f9a25bb1f80a3926d932e99beb8e gst-fsl-plugin: Remove unused
patches
and
700af12aa8e2fe7b739c246abd5b1cb237b2eb06 gst-fsl-plugin: Fix out of tree
build
?

when will they be merged into master?

The error I saw is:
 In file included from pxp_lib.c:26:0:
| pxp_lib.h:19:30: fatal error: linux/pxp_device.h: No such file or
directory
|  #include <linux/pxp_device.h>
|                               ^
| compilation terminated.


Thanks,


On Mon, May 5, 2014 at 11:35 AM, Boszormenyi Zoltan <zboszor@pr.hu> wrote:

> 2014-05-05 15:09 keltezéssel, Otavio Salvador írta:
> > On Mon, May 5, 2014 at 10:05 AM, Boszormenyi Zoltan <zboszor@pr.hu>
> wrote:
> >> 2014-05-05 14:35 keltezéssel, Otavio Salvador írta:
> >>> On Mon, May 5, 2014 at 7:16 AM, Boszormenyi Zoltan <zboszor@pr.hu>
> wrote:
> >>>> for about a week now gst-fsl-plugin fails to compile.
> >>>> "repo sync" was run several times since then.
> >>> I had a similar patch in my queue and it seems to solve the error.
> >>> Could you test it and confirm it works for you?
> >> Where can I find that patch queue?
> > I pushed to master-next.
>
> You can cherry-pick into master, it works.
>
> Thanks,
> Zoltán Böszörményi
>
> --
> _______________________________________________
> meta-freescale mailing list
> meta-freescale@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-freescale
>
Otavio Salvador - May 6, 2014, 3:32 a.m.
On Tue, May 6, 2014 at 12:30 AM, Xh Xiao <xxiao8@fosiao.com> wrote:
> I'm seeing compile issues with sabrelite@gstreamer, are the patches in
> master-next:
>  e39dc2c1dc05f9a25bb1f80a3926d932e99beb8e gst-fsl-plugin: Remove unused
> patches
> and
> 700af12aa8e2fe7b739c246abd5b1cb237b2eb06 gst-fsl-plugin: Fix out of tree
> build
> ?
>
> when will they be merged into master?

They were already, also in Daisy.

> The error I saw is:
>  In file included from pxp_lib.c:26:0:
> | pxp_lib.h:19:30: fatal error: linux/pxp_device.h: No such file or
> directory
> |  #include <linux/pxp_device.h>
> |                               ^
> | compilation terminated.

If I recall correct this comes from Linux kernel (from FSL). Please check.
Xh Xiao - May 6, 2014, 3:37 a.m.
yeah I saw them in daisy/master now, so my issue is a different one then.

sabrelite is still on 3.0.x kernel correct? which is basically FSL kernel,
does daisy work with 3.0.x kernel in general?

thanks,


On Mon, May 5, 2014 at 10:32 PM, Otavio Salvador <otavio@ossystems.com.br>wrote:

> On Tue, May 6, 2014 at 12:30 AM, Xh Xiao <xxiao8@fosiao.com> wrote:
> > I'm seeing compile issues with sabrelite@gstreamer, are the patches in
> > master-next:
> >  e39dc2c1dc05f9a25bb1f80a3926d932e99beb8e gst-fsl-plugin: Remove unused
> > patches
> > and
> > 700af12aa8e2fe7b739c246abd5b1cb237b2eb06 gst-fsl-plugin: Fix out of tree
> > build
> > ?
> >
> > when will they be merged into master?
>
> They were already, also in Daisy.
>
> > The error I saw is:
> >  In file included from pxp_lib.c:26:0:
> > | pxp_lib.h:19:30: fatal error: linux/pxp_device.h: No such file or
> > directory
> > |  #include <linux/pxp_device.h>
> > |                               ^
> > | compilation terminated.
>
> If I recall correct this comes from Linux kernel (from FSL). Please check.
>
> --
> Otavio Salvador                             O.S. Systems
> http://www.ossystems.com.br        http://code.ossystems.com.br
> Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750
>
Xh Xiao - May 6, 2014, 12:23 p.m.
something is indeed wrong when compile sabrelite with imx-lib, I search
3.0.* and 3.10.x kernel and could not find the mentioned pxp header file,
I'm not familiar with this driver, is it in imx6Q ? all google search
points to imx6Solo.

below is the log:

| make[1]: Leaving directory
`/home/xxiao/devel/yocto/buildlite/tmp/work/imx6qsabrelite-poky-linux-gnueabi/imx-lib/1_3.10.17-1.0.0-r0/imx-lib-3.10.17-1.0.0/hdmi-cec'
| make -C ipu all
| make[1]: Entering directory
`/home/xxiao/devel/yocto/buildlite/tmp/work/imx6qsabrelite-poky-linux-gnueabi/imx-lib/1_3.10.17-1.0.0-r0/imx-lib-3.10.17-1.0.0/ipu'
| make[1]: Nothing to be done for `all'.
| make[1]: Leaving directory
`/home/xxiao/devel/yocto/buildlite/tmp/work/imx6qsabrelite-poky-linux-gnueabi/imx-lib/1_3.10.17-1.0.0-r0/imx-lib-3.10.17-1.0.0/ipu'
| make -C pxp all
| make[1]: Entering directory
`/home/xxiao/devel/yocto/buildlite/tmp/work/imx6qsabrelite-poky-linux-gnueabi/imx-lib/1_3.10.17-1.0.0-r0/imx-lib-3.10.17-1.0.0/pxp'
| arm-poky-linux-gnueabi-gcc  -march=armv7-a -mthumb-interwork
-mfloat-abi=hard -mfpu=neon -mtune=cortex-a9
--sysroot=/home/xxiao/devel/yocto/buildlite/tmp/sysroots/imx6qsabrelite
-DIMX6Q
-I/home/xxiao/devel/yocto/buildlite/tmp/sysroots/imx6qsabrelite/usr/src/kernel/include/uapi
-I/home/xxiao/devel/yocto/buildlite/tmp/sysroots/imx6qsabrelite/usr/src/kernel/include
-I/home/xxiao/devel/yocto/buildlite/tmp/sysroots/imx6qsabrelite/usr/src/kernel/drivers/mxc/security/rng/include
-I/home/xxiao/devel/yocto/buildlite/tmp/sysroots/imx6qsabrelite/usr/src/kernel/drivers/mxc/security/sahara2/include
-Wall -O2 -fPIC -c pxp_lib.c -o pxp_lib.o
| In file included from pxp_lib.c:26:0:
| pxp_lib.h:19:30: fatal error: linux/pxp_device.h: No such file or
directory
|  #include <linux/pxp_device.h>
|                               ^
| compilation terminated.
| make[1]: *** [pxp_lib.o] Error 1
| make[1]: Leaving directory
`/home/xxiao/devel/yocto/buildlite/tmp/work/imx6qsabrelite-poky-linux-gnueabi/imx-lib/1_3.10.17-1.0.0-r0/imx-lib-3.10.17-1.0.0/pxp'
| make: *** [pxp] Error 2
| ERROR: oe_runmake failed
| WARNING: exit code 1 from a shell command.
| ERROR: Function failed: do_compile (log file is located at
/home/xxiao/devel/yocto/buildlite/tmp/work/imx6qsabrelite-poky-linux-gnueabi/imx-lib/1_3.10.17-1.0.0-r0/temp/log.do_compile.15488)
ERROR: Task 2348
(/home/xxiao/devel/yocto/sources/meta-fsl-arm/recipes-bsp/imx-lib/
imx-lib_3.10.17-1.0.0.bb, do_compile) failed with exit code '1'
NOTE: Tasks Summary: Attempted 2053 tasks of which 2046 didn't need to be
rerun and 1 failed.
Waiting for 0 running tasks to finish:

Summary: 1 task failed:
  /home/xxiao/devel/yocto/sources/meta-fsl-arm/recipes-bsp/imx-lib/
imx-lib_3.10.17-1.0.0.bb, do_compile
Summary: There was 1 ERROR message shown, returning a non-zero exit code.



On Mon, May 5, 2014 at 10:37 PM, Xh Xiao <xxiao8@fosiao.com> wrote:

> yeah I saw them in daisy/master now, so my issue is a different one then.
>
> sabrelite is still on 3.0.x kernel correct? which is basically FSL kernel,
> does daisy work with 3.0.x kernel in general?
>
> thanks,
>
>
> On Mon, May 5, 2014 at 10:32 PM, Otavio Salvador <otavio@ossystems.com.br>wrote:
>
>> On Tue, May 6, 2014 at 12:30 AM, Xh Xiao <xxiao8@fosiao.com> wrote:
>> > I'm seeing compile issues with sabrelite@gstreamer, are the patches in
>> > master-next:
>> >  e39dc2c1dc05f9a25bb1f80a3926d932e99beb8e gst-fsl-plugin: Remove unused
>> > patches
>> > and
>> > 700af12aa8e2fe7b739c246abd5b1cb237b2eb06 gst-fsl-plugin: Fix out of tree
>> > build
>> > ?
>> >
>> > when will they be merged into master?
>>
>> They were already, also in Daisy.
>>
>> > The error I saw is:
>> >  In file included from pxp_lib.c:26:0:
>> > | pxp_lib.h:19:30: fatal error: linux/pxp_device.h: No such file or
>> > directory
>> > |  #include <linux/pxp_device.h>
>> > |                               ^
>> > | compilation terminated.
>>
>> If I recall correct this comes from Linux kernel (from FSL). Please check.
>>
>> --
>> Otavio Salvador                             O.S. Systems
>> http://www.ossystems.com.br        http://code.ossystems.com.br
>> Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750
>>
>
>
Eric Nelson - May 8, 2014, 1:39 a.m.
Hi Xiao,

On 05/05/2014 08:37 PM, Xh Xiao wrote:
> yeah I saw them in daisy/master now, so my issue is a different one then.
>
> sabrelite is still on 3.0.x kernel correct? which is basically FSL
> kernel, does daisy work with 3.0.x kernel in general?
>

You can use 3.10.17 on both the "daisy" and "master" branches.

It looks like we need to bump the setting for the
PREFERRED_VERSION though, and you'll need to set this
in your local.conf:

	PREFERRED_VERSION_linux-boundary = "3.10.17"

Regards,


Eric

Patch

--- gst-fsl-plugins-3.0.11/libs/Makefile.am~	2014-03-10 11:54:28.000000000 +0100
+++ gst-fsl-plugins-3.0.11/libs/Makefile.am	2014-05-05 11:27:24.489211341 +0200
@@ -35,7 +35,7 @@ 
 endif
 
 
-libgstfsl_@GST_MAJORMINOR@_la_CFLAGS  = $(GST_BASE_CFLAGS) $(IPU_CFLAGS) -I../inc/common
+libgstfsl_@GST_MAJORMINOR@_la_CFLAGS  = $(GST_BASE_CFLAGS) $(IPU_CFLAGS) -I$(top_srcdir)/inc/common
 
 if PLATFORM_IS_MX5X
 libgstfsl_@GST_MAJORMINOR@_la_CFLAGS  += -DIPULIB
--- gst-fsl-plugins-3.0.11/src/misc/i_sink/src/Makefile.am~	2014-05-05 11:55:41.736510777 +0200
+++ gst-fsl-plugins-3.0.11/src/misc/i_sink/src/Makefile.am	2014-05-05 11:57:13.655706697 +0200
@@ -6,7 +6,7 @@ 
 plugin_LTLIBRARIES = libmfw_gst_isink.la 
 
 libmfw_gst_isink_la_SOURCES =  mfw_gst_isink.c 
-libmfw_gst_isink_la_CFLAGS = -O2 $(GST_BASE_CFLAGS) -fPIC -fno-omit-frame-pointer $(IPU_CFLAGS) -D_$(PLATFORM) -I../../../../inc/plugin -I../../../../inc/common -I../../../../libs/vss -I../../../../libs/gstbufmeta -I../../../../libs/hbuf_alloc -I$(FBHEADER_PATH) -I. -I/usr/src/linux-headers-2.6.35-1000-linaro-imx5/include
+libmfw_gst_isink_la_CFLAGS = -O2 $(GST_BASE_CFLAGS) -fPIC -fno-omit-frame-pointer $(IPU_CFLAGS) -D_$(PLATFORM) -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/inc/common -I$(top_srcdir)/libs/vss -I$(top_srcdir)/libs/gstbufmeta -I$(top_srcdir)/libs/hbuf_alloc -I$(FBHEADER_PATH) -I. -I/usr/src/linux-headers-2.6.35-1000-linaro-imx5/include
 libmfw_gst_isink_la_LIBADD = $(GST_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) -lgstinterfaces-$(GST_MAJORMINOR) 
 libmfw_gst_isink_la_LIBADD += ../../../../libs/libgstfsl-@GST_MAJORMINOR@.la
 libmfw_gst_isink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) 
--- gst-fsl-plugins-3.0.11/src/misc/tvsrc/src/Makefile.am~	2014-05-05 11:55:41.740510786 +0200
+++ gst-fsl-plugins-3.0.11/src/misc/tvsrc/src/Makefile.am	2014-05-05 11:57:13.657706603 +0200
@@ -7,7 +7,7 @@ 
 plugin_LTLIBRARIES = libmfw_gst_tvsrc.la 
 
 libmfw_gst_tvsrc_la_SOURCES =  mfw_gst_tvsrc.c 
-libmfw_gst_tvsrc_la_CFLAGS = $(GST_BASE_CFLAGS) -fno-omit-frame-pointer $(IPU_CFLAGS) -D$(PLATFORM) -I$(FBHEADER_PATH) -I. -I../../../../inc/plugin -I../../../../libs/gstbufmeta 
+libmfw_gst_tvsrc_la_CFLAGS = $(GST_BASE_CFLAGS) -fno-omit-frame-pointer $(IPU_CFLAGS) -D$(PLATFORM) -I$(FBHEADER_PATH) -I. -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/libs/gstbufmeta 
 libmfw_gst_tvsrc_la_LIBADD = $(GST_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) -lgstinterfaces-$(GST_MAJORMINOR) ../../../../libs/libgstfsl-@GST_MAJORMINOR@.la
 libmfw_gst_tvsrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
--- gst-fsl-plugins-3.0.11/src/misc/v4l_sink/src/Makefile.am~	2014-05-05 11:55:41.744510794 +0200
+++ gst-fsl-plugins-3.0.11/src/misc/v4l_sink/src/Makefile.am	2014-05-05 11:57:13.660706480 +0200
@@ -3,32 +3,32 @@ 
 libmfw_gst_v4lsink_la_SOURCES =  mfw_gst_fb.c mfw_gst_v4l.c mfw_gst_v4l_buffer.c mfw_gst_v4lsink.c
 libmfw_gst_v4lsink_la_CFLAGS = -I/usr/src/linux-headers-2.6.35-1000-linaro-imx5/include
 if PLATFORM_IS_MX233
-libmfw_gst_v4lsink_la_CFLAGS += -O2 $(GST_BASE_CFLAGS) -fPIC -fno-omit-frame-pointer -D_$(PLATFORM) -I../../../../inc/plugin -I../../../../inc/misc -march=armv5te
+libmfw_gst_v4lsink_la_CFLAGS += -O2 $(GST_BASE_CFLAGS) -fPIC -fno-omit-frame-pointer -D_$(PLATFORM) -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/inc/misc -march=armv5te
 endif
 if PLATFORM_IS_MX25
-libmfw_gst_v4lsink_la_CFLAGS += -O2 $(GST_BASE_CFLAGS) -fPIC -fno-omit-frame-pointer -D_$(PLATFORM) -I../../../../inc/plugin -I../../../../inc/misc -march=armv5te
+libmfw_gst_v4lsink_la_CFLAGS += -O2 $(GST_BASE_CFLAGS) -fPIC -fno-omit-frame-pointer -D_$(PLATFORM) -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/inc/misc -march=armv5te
 endif
 if PLATFORM_IS_MX27
-libmfw_gst_v4lsink_la_CFLAGS += -O2 $(GST_BASE_CFLAGS) -fPIC -fno-omit-frame-pointer -DENABLE_TVOUT -D_$(PLATFORM) -I../../../../inc/plugin -I../../../../inc/misc -march=armv5te
+libmfw_gst_v4lsink_la_CFLAGS += -O2 $(GST_BASE_CFLAGS) -fPIC -fno-omit-frame-pointer -DENABLE_TVOUT -D_$(PLATFORM) -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/inc/misc -march=armv5te
 endif
 if PLATFORM_IS_MX28
-libmfw_gst_v4lsink_la_CFLAGS += -O2 $(GST_BASE_CFLAGS) -fPIC -fno-omit-frame-pointer -D_$(PLATFORM) -I../../../../inc/plugin -I../../../../inc/misc -march=armv5te
+libmfw_gst_v4lsink_la_CFLAGS += -O2 $(GST_BASE_CFLAGS) -fPIC -fno-omit-frame-pointer -D_$(PLATFORM) -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/inc/misc -march=armv5te
 endif
 
 if PLATFORM_IS_MX3X
-libmfw_gst_v4lsink_la_CFLAGS += -O2 $(GST_BASE_CFLAGS) -fPIC -fno-omit-frame-pointer -DENABLE_TVOUT -D_$(PLATFORM) -I../../../../inc/plugin -I../../../../inc/misc
+libmfw_gst_v4lsink_la_CFLAGS += -O2 $(GST_BASE_CFLAGS) -fPIC -fno-omit-frame-pointer -DENABLE_TVOUT -D_$(PLATFORM) -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/inc/misc
 endif
 if PLATFORM_IS_MX5X
-libmfw_gst_v4lsink_la_CFLAGS += -O2 $(GST_BASE_CFLAGS) -fPIC -fno-omit-frame-pointer -DENABLE_TVOUT -D_$(PLATFORM) -I../../../../inc/plugin -I../../../../inc/misc
+libmfw_gst_v4lsink_la_CFLAGS += -O2 $(GST_BASE_CFLAGS) -fPIC -fno-omit-frame-pointer -DENABLE_TVOUT -D_$(PLATFORM) -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/inc/misc
 endif
 if PLATFORM_IS_MX6X
-libmfw_gst_v4lsink_la_CFLAGS += -O2 $(GST_BASE_CFLAGS) -fPIC -fno-omit-frame-pointer -DENABLE_TVOUT -D_$(PLATFORM) -I../../../../inc/plugin -I../../../../inc/misc
+libmfw_gst_v4lsink_la_CFLAGS += -O2 $(GST_BASE_CFLAGS) -fPIC -fno-omit-frame-pointer -DENABLE_TVOUT -D_$(PLATFORM) -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/inc/misc
 endif
 
 libmfw_gst_v4lsink_la_LIBADD = $(GST_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) -lgstinterfaces-$(GST_MAJORMINOR) ../../../../libs/libgstfsl-@GST_MAJORMINOR@.la
 
 
-libmfw_gst_v4lsink_la_CFLAGS += $(IPU_CFLAGS) -I. -I../../../../libs/gstbufmeta
+libmfw_gst_v4lsink_la_CFLAGS += $(IPU_CFLAGS) -I. -I$(top_srcdir)/libs/gstbufmeta
 
 if USE_X11
 libmfw_gst_v4lsink_la_SOURCES +=  mfw_gst_v4l_xlib.c mfw_gst_xlib.c mfw_gst_v4l_suspend.c
--- gst-fsl-plugins-3.0.11/src/misc/v4l_source/src/Makefile.am~	2014-05-05 11:55:41.748510803 +0200
+++ gst-fsl-plugins-3.0.11/src/misc/v4l_source/src/Makefile.am	2014-05-05 11:57:13.662706412 +0200
@@ -7,7 +7,7 @@ 
 plugin_LTLIBRARIES = libmfw_gst_v4lsrc.la 
 
 libmfw_gst_v4lsrc_la_SOURCES =  mfw_gst_v4lsrc.c 
-libmfw_gst_v4lsrc_la_CFLAGS = $(GST_BASE_CFLAGS) -fno-omit-frame-pointer $(IPU_CFLAGS) -D$(PLATFORM) -I$(FBHEADER_PATH) -I. -I../../../../inc/plugin -I../../../../libs/gstbufmeta 
+libmfw_gst_v4lsrc_la_CFLAGS = $(GST_BASE_CFLAGS) -fno-omit-frame-pointer $(IPU_CFLAGS) -D$(PLATFORM) -I$(FBHEADER_PATH) -I. -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/libs/gstbufmeta 
 libmfw_gst_v4lsrc_la_LIBADD = $(GST_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) -lgstinterfaces-$(GST_MAJORMINOR) ../../../../libs/libgstfsl-@GST_MAJORMINOR@.la
 libmfw_gst_v4lsrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
--- gst-fsl-plugins-3.0.11/src/video/vpu_dec.full/src/Makefile.am~	2014-05-05 11:55:41.774510858 +0200
+++ gst-fsl-plugins-3.0.11/src/video/vpu_dec.full/src/Makefile.am	2014-05-05 11:57:13.673706154 +0200
@@ -27,7 +27,7 @@ 
 
 # flags used to compile this plugin
 # we use the GST_LIBS flags because we might be using plug-in libs
-libmfw_gst_vpu_dec_la_CFLAGS = $(GST_BASE_CFLAGS)  -O2 $(VPU_CFLAGS) -I../../../../inc/plugin $(GST_PLATFORM_FLAGS) -DREALMEDIA -DDIVX -I../../../../libs/me -I../../../../libs/gstbufmeta 
+libmfw_gst_vpu_dec_la_CFLAGS = $(GST_BASE_CFLAGS)  -O2 $(VPU_CFLAGS) -I$(top_srcdir)/inc/plugin $(GST_PLATFORM_FLAGS) -DREALMEDIA -DDIVX -I$(top_srcdir)/libs/me -I$(top_srcdir)/libs/gstbufmeta 
 libmfw_gst_vpu_dec_la_LIBADD =  $(GST_BASE_LIBS) $(GST_LIBS) -lvpu -lgstvideo-0.10
 libmfw_gst_vpu_dec_la_LIBADD += ../../../../libs/libgstfsl-@GST_MAJORMINOR@.la
 libmfw_gst_vpu_dec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(VPU_LIBS)
--- gst-fsl-plugins-3.0.11/src/video/vpu/src/Makefile.am~	2014-05-05 11:55:41.781510873 +0200
+++ gst-fsl-plugins-3.0.11/src/video/vpu/src/Makefile.am	2014-05-05 11:57:13.677706071 +0200
@@ -8,7 +8,7 @@ 
 # flags used to compile this plugin
 # we use the GST_LIBS flags because we might be using plug-in libs
 
-libmfw_vpu_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin  -I../../../../libs/me -I../../../../libs/gstbufmeta -I../../../../libs/gstsutils -I../../../../libs/gstnext -I../../../../inc/core_lib
+libmfw_vpu_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin  -I$(top_srcdir)/libs/me -I$(top_srcdir)/libs/gstbufmeta -I$(top_srcdir)/libs/gstsutils -I$(top_srcdir)/libs/gstnext -I$(top_srcdir)/inc/core_lib
 libmfw_vpu_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS)  -lgstriff-@GST_MAJORMINOR@ -lgsttag-@GST_MAJORMINOR@  
 
 libmfw_vpu_la_LIBADD += ../../../../libs/libgstfsl-@GST_MAJORMINOR@.la
--- gst-fsl-plugins-3.0.11/src/video/vpu_enc/src/Makefile.am~	2014-05-05 11:55:41.778510867 +0200
+++ gst-fsl-plugins-3.0.11/src/video/vpu_enc/src/Makefile.am	2014-05-05 11:57:13.675706106 +0200
@@ -10,7 +10,7 @@ 
 
 # flags used to compile this plugin
 # we use the GST_LIBS flags because we might be using plug-in libs
-libmfw_gst_vpu_enc_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 $(VPU_CFLAGS) -I../../../../inc/plugin -DVPU_$(PLATFORM) -I../../../../libs/gstbufmeta -I../../../../libs/vss -I../../../../libs/hbuf_alloc -I../../../../libs/me 
+libmfw_gst_vpu_enc_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 $(VPU_CFLAGS) -I$(top_srcdir)/inc/plugin -DVPU_$(PLATFORM) -I$(top_srcdir)/libs/gstbufmeta -I$(top_srcdir)/libs/vss -I$(top_srcdir)/libs/hbuf_alloc -I$(top_srcdir)/libs/me 
 
 libmfw_gst_vpu_enc_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) -lvpu 
 libmfw_gst_vpu_enc_la_LIBADD += ../../../../libs/libgstfsl-@GST_MAJORMINOR@.la
--- gst-fsl-plugins-3.0.11/src/video/ipu_csc/src/Makefile.am~	2014-05-05 11:55:41.763510834 +0200
+++ gst-fsl-plugins-3.0.11/src/video/ipu_csc/src/Makefile.am	2014-05-05 11:55:41.765510839 +0200
@@ -6,7 +6,7 @@ 
 plugin_LTLIBRARIES = libmfw_gst_ipu_csc.la 
 
 libmfw_gst_ipu_csc_la_SOURCES =  mfw_gst_ipu_csc.c 
-libmfw_gst_ipu_csc_la_CFLAGS = -O2 $(GST_BASE_CFLAGS) -fPIC -fno-omit-frame-pointer  -I../../../../inc/plugin   -I../../../../  
+libmfw_gst_ipu_csc_la_CFLAGS = -O2 $(GST_BASE_CFLAGS) -fPIC -fno-omit-frame-pointer  -I$(top_srcdir)/inc/plugin   -I$(top_srcdir) 
 libmfw_gst_ipu_csc_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) $(IPU_LIBS) ../../../../libs/libgstfsl-@GST_MAJORMINOR@.la
 libmfw_gst_ipu_csc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
--- gst-fsl-plugins-3.0.11/src/video/mpeg4asp_dec/src/Makefile.am~	2014-05-05 11:55:41.770510850 +0200
+++ gst-fsl-plugins-3.0.11/src/video/mpeg4asp_dec/src/Makefile.am	2014-05-05 11:57:13.671706211 +0200
@@ -28,19 +28,19 @@ 
 # flags used to compile this plugin
 # we use the GST_LIBS flags because we might be using plug-in libs
 if PLATFORM_IS_MX2X
-libmfw_gst_mpeg4aspdec_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer -fPIC -DPADDED_OUTPUT -DOUTPUT_BUFFER_CHANGES $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin -I../../../../inc/core_lib -DDIRECT_RENDER_VERSION=2 -DFRAMEDROPING_ENALBED -march=armv5te -mcpu=arm926ej-s -I../../../../libs/me -I../../../../libs/gstbufmeta
+libmfw_gst_mpeg4aspdec_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer -fPIC -DPADDED_OUTPUT -DOUTPUT_BUFFER_CHANGES $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/inc/core_lib -DDIRECT_RENDER_VERSION=2 -DFRAMEDROPING_ENALBED -march=armv5te -mcpu=arm926ej-s -I$(top_srcdir)/libs/me -I$(top_srcdir)/libs/gstbufmeta
 endif
 
 if PLATFORM_IS_MX3X
-libmfw_gst_mpeg4aspdec_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer -fPIC -DPADDED_OUTPUT -DOUTPUT_BUFFER_CHANGES $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin -I../../../../inc/core_lib -DDIRECT_RENDER_VERSION=2 -DFRAMEDROPING_ENALBED -I../../../../libs/me -I../../../../libs/gstbufmeta
+libmfw_gst_mpeg4aspdec_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer -fPIC -DPADDED_OUTPUT -DOUTPUT_BUFFER_CHANGES $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/inc/core_lib -DDIRECT_RENDER_VERSION=2 -DFRAMEDROPING_ENALBED -I$(top_srcdir)/libs/me -I$(top_srcdir)/libs/gstbufmeta
 endif
 
 if PLATFORM_IS_MX5X
-libmfw_gst_mpeg4aspdec_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer -fPIC -DPADDED_OUTPUT -DOUTPUT_BUFFER_CHANGES $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin -I../../../../inc/core_lib -DDIRECT_RENDER_VERSION=2 -DFRAMEDROPING_ENALBED -I../../../../libs/me -I../../../../libs/gstbufmeta
+libmfw_gst_mpeg4aspdec_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer -fPIC -DPADDED_OUTPUT -DOUTPUT_BUFFER_CHANGES $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/inc/core_lib -DDIRECT_RENDER_VERSION=2 -DFRAMEDROPING_ENALBED -I$(top_srcdir)/libs/me -I$(top_srcdir)/libs/gstbufmeta
 endif
 
 if PLATFORM_IS_MX6X
-libmfw_gst_mpeg4aspdec_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer -fPIC -DPADDED_OUTPUT -DOUTPUT_BUFFER_CHANGES $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin -I../../../../inc/core_lib -DDIRECT_RENDER_VERSION=2 -DFRAMEDROPING_ENALBED -I../../../../libs/me -I../../../../libs/gstbufmeta
+libmfw_gst_mpeg4aspdec_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer -fPIC -DPADDED_OUTPUT -DOUTPUT_BUFFER_CHANGES $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/inc/core_lib -DDIRECT_RENDER_VERSION=2 -DFRAMEDROPING_ENALBED -I$(top_srcdir)/libs/me -I$(top_srcdir)/libs/gstbufmeta
 endif
 
 
--- gst-fsl-plugins-3.0.11/src/video/wmv9mp_dec/src/Makefile.am~	2014-05-05 11:55:41.785510881 +0200
+++ gst-fsl-plugins-3.0.11/src/video/wmv9mp_dec/src/Makefile.am	2014-05-05 11:57:13.680706041 +0200
@@ -7,7 +7,7 @@ 
 
 # flags used to compile this plugin
 # we use the GST_LIBS flags because we might be using plug-in libs
-libmfw_gst_wmv9mpdec_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer -fPIC -DOUTPUT_BUFFER_CHANGES -DPADDED_OUTPUT $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin -I../../../../inc/core_lib -DDIRECT_RENDER_VERSION=2 -DFRAMEDROPING_ENALBED -I../../../../libs/gstbufmeta 
+libmfw_gst_wmv9mpdec_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer -fPIC -DOUTPUT_BUFFER_CHANGES -DPADDED_OUTPUT $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/inc/core_lib -DDIRECT_RENDER_VERSION=2 -DFRAMEDROPING_ENALBED -I$(top_srcdir)/libs/gstbufmeta 
 libmfw_gst_wmv9mpdec_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) -l_WMV9MP_dec_MP_arm11_elinux ../../../../libs/libgstfsl-@GST_MAJORMINOR@.la
 libmfw_gst_wmv9mpdec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(FSL_MM_CORE_LIBS) -lgstriff-@GST_MAJORMINOR@
 
--- gst-fsl-plugins-3.0.11/src/video/wmv_dec/src/Makefile.am~	2014-05-05 11:55:41.789510890 +0200
+++ gst-fsl-plugins-3.0.11/src/video/wmv_dec/src/Makefile.am	2014-05-05 11:55:41.791510894 +0200
@@ -7,7 +7,7 @@ 
 
 # flags used to compile this plugin
 # we use the GST_LIBS flags because we might be using plug-in libs
-libmfw_gst_wmvdec_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer -fPIC -DOUTPUT_BUFFER_CHANGES -DWMV9_SIMPLE_ONLY -DPADDED_OUTPUT $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin -I../../../../inc/core_lib
+libmfw_gst_wmvdec_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer -fPIC -DOUTPUT_BUFFER_CHANGES -DWMV9_SIMPLE_ONLY -DPADDED_OUTPUT $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/inc/core_lib
 libmfw_gst_wmvdec_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) -l_WMV789_dec_arm11_elinux
 libmfw_gst_wmvdec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(FSL_MM_CORE_LIBS) -lgstriff-@GST_MAJORMINOR@
 
--- gst-fsl-plugins-3.0.11/src/video/h264_dec/src/Makefile.am~	2014-05-05 11:55:41.759510826 +0200
+++ gst-fsl-plugins-3.0.11/src/video/h264_dec/src/Makefile.am	2014-05-05 11:57:13.666706302 +0200
@@ -28,21 +28,21 @@ 
 # flags used to compile this plugin
 # we use the GST_LIBS flags because we might be using plug-in libs
 if PLATFORM_IS_MX2X
-libmfw_gst_h264dec_la_CFLAGS = $(GST_BASE_CFLAGS) -fno-omit-frame-pointer $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin -O2 -DDPB_FIX -D_$(PLATFORM) -DDIRECT_RENDER_VERSION=2 -DFRAMEDROPING_ENALBED -march=armv5te -mcpu=arm926ej-s  -I../../../../libs/me -I../../../../libs/gstbufmeta 
+libmfw_gst_h264dec_la_CFLAGS = $(GST_BASE_CFLAGS) -fno-omit-frame-pointer $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin -O2 -DDPB_FIX -D_$(PLATFORM) -DDIRECT_RENDER_VERSION=2 -DFRAMEDROPING_ENALBED -march=armv5te -mcpu=arm926ej-s  -I$(top_srcdir)/libs/me -I$(top_srcdir)/libs/gstbufmeta 
 endif
 
 
 if PLATFORM_IS_MX3X
-libmfw_gst_h264dec_la_CFLAGS = $(GST_BASE_CFLAGS) -fno-omit-frame-pointer $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin -I../../../../inc/core_lib -O2 -DDPB_FIX -DDIRECT_RENDER_VERSION=2 -DFRAMEDROPING_ENALBED  -I../../../../libs/me -I../../../../libs/gstbufmeta
+libmfw_gst_h264dec_la_CFLAGS = $(GST_BASE_CFLAGS) -fno-omit-frame-pointer $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/inc/core_lib -O2 -DDPB_FIX -DDIRECT_RENDER_VERSION=2 -DFRAMEDROPING_ENALBED  -I$(top_srcdir)/libs/me -I$(top_srcdir)/libs/gstbufmeta
 endif
 
 
 if PLATFORM_IS_MX5X
-libmfw_gst_h264dec_la_CFLAGS = $(GST_BASE_CFLAGS) -fno-omit-frame-pointer $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin -I../../../../inc/core_lib -O2 -DDPB_FIX -DDIRECT_RENDER_VERSION=2 -DFRAMEDROPING_ENALBED  -I../../../../libs/me -I../../../../libs/gstbufmeta
+libmfw_gst_h264dec_la_CFLAGS = $(GST_BASE_CFLAGS) -fno-omit-frame-pointer $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/inc/core_lib -O2 -DDPB_FIX -DDIRECT_RENDER_VERSION=2 -DFRAMEDROPING_ENALBED  -I$(top_srcdir)/libs/me -I$(top_srcdir)/libs/gstbufmeta
 endif
 
 if PLATFORM_IS_MX6X
-libmfw_gst_h264dec_la_CFLAGS = $(GST_BASE_CFLAGS) -fno-omit-frame-pointer $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin -I../../../../inc/core_lib -O2 -DDPB_FIX -DDIRECT_RENDER_VERSION=2 -DFRAMEDROPING_ENALBED  -I../../../../libs/me -I../../../../libs/gstbufmeta
+libmfw_gst_h264dec_la_CFLAGS = $(GST_BASE_CFLAGS) -fno-omit-frame-pointer $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/inc/core_lib -O2 -DDPB_FIX -DDIRECT_RENDER_VERSION=2 -DFRAMEDROPING_ENALBED  -I$(top_srcdir)/libs/me -I$(top_srcdir)/libs/gstbufmeta
 endif
 
 libmfw_gst_h264dec_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) -l$(CORELIB)
--- gst-fsl-plugins-3.0.11/src/video/mpeg2_dec/src/Makefile.am~	2014-05-05 11:55:41.766510841 +0200
+++ gst-fsl-plugins-3.0.11/src/video/mpeg2_dec/src/Makefile.am	2014-05-05 11:57:13.668706261 +0200
@@ -7,7 +7,7 @@ 
 
 # flags used to compile this plugin
 # we use the GST_LIBS flags because we might be using plug-in libs
-libmfw_gst_mpeg2dec_la_CFLAGS = $(GST_BASE_CFLAGS) -fno-omit-frame-pointer $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin -I../../../../inc/core_lib -DDIRECT_RENDER_VERSION=2 -I../../../../libs/me -I../../../../libs/gstbufmeta
+libmfw_gst_mpeg2dec_la_CFLAGS = $(GST_BASE_CFLAGS) -fno-omit-frame-pointer $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/inc/core_lib -DDIRECT_RENDER_VERSION=2 -I$(top_srcdir)/libs/me -I$(top_srcdir)/libs/gstbufmeta
 libmfw_gst_mpeg2dec_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) -l_mpeg2_dec_arm11_elinux
 libmfw_gst_mpeg2dec_la_LIBADD +=  ../../../../libs/libgstfsl-@GST_MAJORMINOR@.la
 libmfw_gst_mpeg2dec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(FSL_MM_CORE_LIBS)
--- gst-fsl-plugins-3.0.11/src/video/deinterlace/src/Makefile.am~	2014-05-05 11:55:41.755510817 +0200
+++ gst-fsl-plugins-3.0.11/src/video/deinterlace/src/Makefile.am	2014-05-05 11:55:41.757510822 +0200
@@ -1,7 +1,7 @@ 
 plugin_LTLIBRARIES = libmfw_gst_deinterlace.la 
 
 libmfw_gst_deinterlace_la_SOURCES =  mfw_gst_deinterlace.c 
-libmfw_gst_deinterlace_la_CFLAGS = -O2 $(GST_BASE_CFLAGS) -fPIC -fno-omit-frame-pointer -I../../../../inc/plugin -I../../../../inc/core_lib $(FSL_MM_CORE_CFLAGS)
+libmfw_gst_deinterlace_la_CFLAGS = -O2 $(GST_BASE_CFLAGS) -fPIC -fno-omit-frame-pointer -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/inc/core_lib $(FSL_MM_CORE_CFLAGS)
 libmfw_gst_deinterlace_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) -l_deinterlace_arm11_elinux
 libmfw_gst_deinterlace_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(FSL_MM_CORE_LIBS)
 
--- gst-fsl-plugins-3.0.11/src/audio/spdif_rx/src/Makefile.am~	2014-05-05 11:55:41.718510739 +0200
+++ gst-fsl-plugins-3.0.11/src/audio/spdif_rx/src/Makefile.am	2014-05-05 11:55:41.720510743 +0200
@@ -1,7 +1,7 @@ 
 plugin_LTLIBRARIES = libmfw_gst_spdifrx.la 
 
 libmfw_gst_spdifrx_la_SOURCES =  mfw_gst_spdifrx.c 
-libmfw_gst_spdifrx_la_CFLAGS = -O2 $(GST_BASE_CFLAGS) -fPIC -fno-omit-frame-pointer -I../../../../inc/plugin
+libmfw_gst_spdifrx_la_CFLAGS = -O2 $(GST_BASE_CFLAGS) -fPIC -fno-omit-frame-pointer -I$(top_srcdir)/inc/plugin
 libmfw_gst_spdifrx_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS)
 libmfw_gst_spdifrx_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -lgstriff-@GST_MAJORMINOR@
 
--- gst-fsl-plugins-3.0.11/src/audio/aac_dec/src/Makefile.am~	2014-05-05 11:55:41.680511185 +0200
+++ gst-fsl-plugins-3.0.11/src/audio/aac_dec/src/Makefile.am	2014-05-05 11:55:41.682511123 +0200
@@ -22,7 +22,7 @@ 
 # flags used to compile this plugin
 # we use the GST_LIBS flags because we might be using plug-in libs
 libmfw_gst_aacdec_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -DMPEG4 -DARM_OPT_MACROS -DLC -DPUSH_MODE -fno-omit-frame-pointer -fPIC
-libmfw_gst_aacdec_la_CPPFLAGS = $(GST_LIBS_CPPFLAGS) $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin
+libmfw_gst_aacdec_la_CPPFLAGS = $(GST_LIBS_CPPFLAGS) $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin
 
 
 if PLATFORM_IS_MX2X
--- gst-fsl-plugins-3.0.11/src/audio/vorbis_dec/src/Makefile.am~	2014-05-05 11:55:41.725510753 +0200
+++ gst-fsl-plugins-3.0.11/src/audio/vorbis_dec/src/Makefile.am	2014-05-05 11:55:41.727510758 +0200
@@ -10,7 +10,7 @@ 
 # flags used to compile this plugin
 # we use the GST_LIBS flags because we might be using plug-in libs
 libmfw_gst_vorbisdec_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -DMPEG4 -DARM_OPT_MACROS -DLC -DPUSH_MODE -fno-omit-frame-pointer -fPIC
-libmfw_gst_vorbisdec_la_CPPFLAGS = $(GST_LIBS_CPPFLAGS) $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin
+libmfw_gst_vorbisdec_la_CPPFLAGS = $(GST_LIBS_CPPFLAGS) $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin
 
 
 libmfw_gst_vorbisdec_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) -lgstaudio-$(GST_MAJORMINOR) -l$(CORELIB)
--- gst-fsl-plugins-3.0.11/src/audio/wma10_dec/src/Makefile.am~	2014-05-05 11:55:41.729510762 +0200
+++ gst-fsl-plugins-3.0.11/src/audio/wma10_dec/src/Makefile.am	2014-05-05 11:55:41.731510766 +0200
@@ -26,21 +26,21 @@ 
 # flags used to compile this plugin
 # we use the GST_LIBS flags because we might be using plug-in libs
 if PLATFORM_IS_MX2X
-libmfw_gst_wma10dec_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer -DGST_API -DGST_RAW_DECODER $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin -march=armv5te -mcpu=arm926ej-s
+libmfw_gst_wma10dec_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer -DGST_API -DGST_RAW_DECODER $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin -march=armv5te -mcpu=arm926ej-s
 endif
 
 
 if PLATFORM_IS_MX3X
-libmfw_gst_wma10dec_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer -DGST_API -DGST_RAW_DECODER $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin
+libmfw_gst_wma10dec_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer -DGST_API -DGST_RAW_DECODER $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin
 endif
 
 
 
 if PLATFORM_IS_MX5X
-libmfw_gst_wma10dec_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer -DGST_API -DGST_RAW_DECODER $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin
+libmfw_gst_wma10dec_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer -DGST_API -DGST_RAW_DECODER $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin
 endif
 if PLATFORM_IS_MX6X
-libmfw_gst_wma10dec_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer -DGST_API -DGST_RAW_DECODER $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin
+libmfw_gst_wma10dec_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer -DGST_API -DGST_RAW_DECODER $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin
 endif
 
 
--- gst-fsl-plugins-3.0.11/src/audio/beep/src/Makefile.am~	2014-05-05 11:55:41.703510734 +0200
+++ gst-fsl-plugins-3.0.11/src/audio/beep/src/Makefile.am	2014-05-05 11:57:13.653706811 +0200
@@ -8,24 +8,24 @@ 
 # flags used to compile this plugin
 # we use the GST_LIBS flags because we might be using plug-in libs
 if PLATFORM_IS_MX2X
-libmfw_gst_beep_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin -I../../../../libs -I../../../../inc/core_lib/uni_audio -D_ARM9 -march=armv5te -mcpu=arm926ej-s
+libmfw_gst_beep_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/libs -I$(top_srcdir)/inc/core_lib/uni_audio -D_ARM9 -march=armv5te -mcpu=arm926ej-s
 libmfw_gst_beep_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) -lgstaudio-$(GST_MAJORMINOR) -lgstriff-@GST_MAJORMINOR@ -lgsttag-@GST_MAJORMINOR@ -ldl ../../../../libs/libgstfsl-@GST_MAJORMINOR@.la
 endif
 
 
 if PLATFORM_IS_MX3X
-libmfw_gst_beep_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin -I../../../../libs -I../../../../inc/core_lib/uni_audio -D_ARM11
+libmfw_gst_beep_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/libs -I$(top_srcdir)/inc/core_lib/uni_audio -D_ARM11
 libmfw_gst_beep_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) -lgstaudio-$(GST_MAJORMINOR) -lgstriff-@GST_MAJORMINOR@ -lgsttag-@GST_MAJORMINOR@ -ldl ../../../../libs/libgstfsl-@GST_MAJORMINOR@.la
 endif
 
 
 if PLATFORM_IS_MX5X
-libmfw_gst_beep_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin -I../../../../libs -I../../../../inc/core_lib/uni_audio -D_ARM12
+libmfw_gst_beep_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/libs -I$(top_srcdir)/inc/core_lib/uni_audio -D_ARM12
 libmfw_gst_beep_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) -lgstaudio-$(GST_MAJORMINOR) -lgstriff-@GST_MAJORMINOR@ -lgsttag-@GST_MAJORMINOR@ -ldl ../../../../libs/libgstfsl-@GST_MAJORMINOR@.la
 endif
 
 if PLATFORM_IS_MX6X
-libmfw_gst_beep_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin -I../../../../libs -I../../../../inc/core_lib/uni_audio -D_ARM12
+libmfw_gst_beep_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/libs -I$(top_srcdir)/inc/core_lib/uni_audio -D_ARM12
 libmfw_gst_beep_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) -lgstaudio-$(GST_MAJORMINOR) -lgstriff-@GST_MAJORMINOR@ -lgsttag-@GST_MAJORMINOR@ -ldl ../../../../libs/libgstfsl-@GST_MAJORMINOR@.la
 endif
 
--- gst-fsl-plugins-3.0.11/src/audio/mp3_dec/src/Makefile.am~	2014-05-05 11:55:41.710510722 +0200
+++ gst-fsl-plugins-3.0.11/src/audio/mp3_dec/src/Makefile.am	2014-05-05 11:55:41.712510726 +0200
@@ -27,23 +27,23 @@ 
 # flags used to compile this plugin
 # we use the GST_LIBS flags because we might be using plug-in libs
 if PLATFORM_IS_MX2X
-libmfw_gst_mp3dec_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer -DMP3D_HUF_DEQ_BYTEBUF_OPT_C -DMPEGLAYER2 -DPUSH_MODE  $(FSL_MM_CORE_CFLAGS)  -I../../../../inc/plugin -march=armv5te -mcpu=arm926ej-s
+libmfw_gst_mp3dec_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer -DMP3D_HUF_DEQ_BYTEBUF_OPT_C -DMPEGLAYER2 -DPUSH_MODE  $(FSL_MM_CORE_CFLAGS)  -I$(top_srcdir)/inc/plugin -march=armv5te -mcpu=arm926ej-s
 libmfw_gst_mp3dec_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) -l$(CORELIB) -l_mp3_parser_arm9_elinux
 endif
 
 
 
 if PLATFORM_IS_MX3X
-libmfw_gst_mp3dec_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer -DMP3D_HUF_DEQ_BYTEBUF_OPT_C -DMPEGLAYER2 -DPUSH_MODE  $(FSL_MM_CORE_CFLAGS)  -I../../../../inc/plugin
+libmfw_gst_mp3dec_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer -DMP3D_HUF_DEQ_BYTEBUF_OPT_C -DMPEGLAYER2 -DPUSH_MODE  $(FSL_MM_CORE_CFLAGS)  -I$(top_srcdir)/inc/plugin
 libmfw_gst_mp3dec_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) -l$(CORELIB) -l_mp3_parser_arm11_elinux
 endif
 
 if PLATFORM_IS_MX5X
-libmfw_gst_mp3dec_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer -DMP3D_HUF_DEQ_BYTEBUF_OPT_C -DMPEGLAYER2 -DPUSH_MODE  $(FSL_MM_CORE_CFLAGS)  -I../../../../inc/plugin
+libmfw_gst_mp3dec_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer -DMP3D_HUF_DEQ_BYTEBUF_OPT_C -DMPEGLAYER2 -DPUSH_MODE  $(FSL_MM_CORE_CFLAGS)  -I$(top_srcdir)/inc/plugin
 libmfw_gst_mp3dec_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) -l$(CORELIB) -l_mp3_parser_arm11_elinux
 endif
 if PLATFORM_IS_MX6X
-libmfw_gst_mp3dec_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer -DMP3D_HUF_DEQ_BYTEBUF_OPT_C -DMPEGLAYER2 -DPUSH_MODE  $(FSL_MM_CORE_CFLAGS)  -I../../../../inc/plugin
+libmfw_gst_mp3dec_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer -DMP3D_HUF_DEQ_BYTEBUF_OPT_C -DMPEGLAYER2 -DPUSH_MODE  $(FSL_MM_CORE_CFLAGS)  -I$(top_srcdir)/inc/plugin
 libmfw_gst_mp3dec_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) -l$(CORELIB) -l_mp3_parser_arm11_elinux
 endif
  
--- gst-fsl-plugins-3.0.11/src/audio/amr_dec/src/Makefile.am~	2014-05-05 11:55:41.691510925 +0200
+++ gst-fsl-plugins-3.0.11/src/audio/amr_dec/src/Makefile.am	2014-05-05 11:55:41.693510872 +0200
@@ -19,7 +19,7 @@ 
 # flags used to compile this plugin
 # we use the GST_LIBS flags because we might be using plug-in libs
 libmfw_gst_amrdec_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -DMPEG4 -DARM_OPT_MACROS -DLC -fno-omit-frame-pointer -fPIC 
-libmfw_gst_amrdec_la_CPPFLAGS = $(GST_LIBS_CPPFLAGS) $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin -I../../../../inc/core_lib
+libmfw_gst_amrdec_la_CPPFLAGS = $(GST_LIBS_CPPFLAGS) $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/inc/core_lib
 libmfw_gst_amrdec_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) $(CORELIB) -lgstaudio-$(GST_MAJORMINOR)
 libmfw_gst_amrdec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(FSL_MM_CORE_LIBS) -lgstriff-@GST_MAJORMINOR@
 
--- gst-fsl-plugins-3.0.11/src/audio/aacplus_dec/src/Makefile.am~	2014-05-05 11:55:41.684511069 +0200
+++ gst-fsl-plugins-3.0.11/src/audio/aacplus_dec/src/Makefile.am	2014-05-05 11:55:41.686511024 +0200
@@ -35,7 +35,7 @@ 
 # flags used to compile this plugin
 # we use the GST_LIBS flags because we might be using plug-in libs
 libmfw_gst_aacplusdec_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -DMPEG4 -DARM_OPT_MACROS -DLC -DPUSH_MODE -fno-omit-frame-pointer -fPIC 
-libmfw_gst_aacplusdec_la_CPPFLAGS = $(GST_LIBS_CPPFLAGS) $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin
+libmfw_gst_aacplusdec_la_CPPFLAGS = $(GST_LIBS_CPPFLAGS) $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin
 if PLATFORM_IS_MX2X
 libmfw_gst_aacplusdec_la_CFLAGS += -march=armv5te -mcpu=arm926ej-s
 libmfw_gst_aacplusdec_la_CPPFLAGS += -march=armv5te -mcpu=arm926ej-s
--- gst-fsl-plugins-3.0.11/src/audio/wma8_enc/src/Makefile.am~	2014-05-05 11:55:41.733510771 +0200
+++ gst-fsl-plugins-3.0.11/src/audio/wma8_enc/src/Makefile.am	2014-05-05 11:55:41.735510775 +0200
@@ -11,7 +11,7 @@ 
 
 # flags used to compile this plugin
 # add other _CFLAGS and _LIBS as needed
-libmfw_gst_wma8enc_la_CFLAGS = $(GST_CFLAGS) $(FSL_MM_CORE_CFLAGS)  -I../../../../inc/plugin -I../../../../inc/core_lib
+libmfw_gst_wma8enc_la_CFLAGS = $(GST_CFLAGS) $(FSL_MM_CORE_CFLAGS)  -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/inc/core_lib
 libmfw_gst_wma8enc_la_LIBADD = $(GST_LIBS) -l_wma_muxer_arm11_ELINUX -lgstbase-$(GST_MAJORMINOR) -l_wma8_enc_arm11_elinux 
 libmfw_gst_wma8enc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(FSL_MM_CORE_LIBS) 
 
--- gst-fsl-plugins-3.0.11/src/audio/mp3_enc/src/Makefile.am~	2014-05-05 11:55:41.714510730 +0200
+++ gst-fsl-plugins-3.0.11/src/audio/mp3_enc/src/Makefile.am	2014-05-05 11:55:41.716510734 +0200
@@ -26,19 +26,19 @@ 
 # flags used to compile this plugin
 # add other _CFLAGS and _LIBS as needed
 if PLATFORM_IS_MX2X
-libmfw_gst_mp3enc_la_CFLAGS = $(GST_CFLAGS) $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin -I../../../../inc/core_lib -march=armv5te -mcpu=arm926ej-s
+libmfw_gst_mp3enc_la_CFLAGS = $(GST_CFLAGS) $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/inc/core_lib -march=armv5te -mcpu=arm926ej-s
 endif
 
 
 if PLATFORM_IS_MX3X
-libmfw_gst_mp3enc_la_CFLAGS = $(GST_CFLAGS) $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin -I../../../../inc/core_lib 
+libmfw_gst_mp3enc_la_CFLAGS = $(GST_CFLAGS) $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/inc/core_lib 
 endif
 
 if PLATFORM_IS_MX5X
-libmfw_gst_mp3enc_la_CFLAGS = $(GST_CFLAGS) $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin -I../../../../inc/core_lib 
+libmfw_gst_mp3enc_la_CFLAGS = $(GST_CFLAGS) $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/inc/core_lib 
 endif
 if PLATFORM_IS_MX6X
-libmfw_gst_mp3enc_la_CFLAGS = $(GST_CFLAGS) $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin -I../../../../inc/core_lib 
+libmfw_gst_mp3enc_la_CFLAGS = $(GST_CFLAGS) $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/inc/core_lib 
 endif
 
 
--- gst-fsl-plugins-3.0.11/src/audio/audio_pp/src/Makefile.am~	2014-05-05 11:55:41.699510774 +0200
+++ gst-fsl-plugins-3.0.11/src/audio/audio_pp/src/Makefile.am	2014-05-05 11:55:41.701510755 +0200
@@ -1,7 +1,7 @@ 
 plugin_LTLIBRARIES = libmfw_gst_audio_pp.la 
 
 libmfw_gst_audio_pp_la_SOURCES =  mfw_gst_audio_pp.c 
-libmfw_gst_audio_pp_la_CFLAGS = -O2 $(GST_BASE_CFLAGS) -fPIC -fno-omit-frame-pointer $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin -I../../../../inc/core_lib
+libmfw_gst_audio_pp_la_CFLAGS = -O2 $(GST_BASE_CFLAGS) -fPIC -fno-omit-frame-pointer $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/inc/core_lib
 libmfw_gst_audio_pp_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) -l_peq_arm11_elinux
 libmfw_gst_audio_pp_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(FSL_MM_CORE_LIBS)
 
--- gst-fsl-plugins-3.0.11/src/audio/amr_enc/src/Makefile.am~	2014-05-05 11:55:41.695510829 +0200
+++ gst-fsl-plugins-3.0.11/src/audio/amr_enc/src/Makefile.am	2014-05-05 11:55:41.697510797 +0200
@@ -19,7 +19,7 @@ 
 # flags used to compile this plugin
 # we use the GST_LIBS flags because we might be using plug-in libs
 libmfw_gst_amrenc_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -DMPEG4 -DARM_OPT_MACROS -DLC -fno-omit-frame-pointer -fPIC 
-libmfw_gst_amrenc_la_CPPFLAGS = $(GST_LIBS_CPPFLAGS) $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin
+libmfw_gst_amrenc_la_CPPFLAGS = $(GST_LIBS_CPPFLAGS) $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin
 libmfw_gst_amrenc_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) $(CORELIB) -lgstaudio-$(GST_MAJORMINOR)
 libmfw_gst_amrenc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(FSL_MM_CORE_LIBS) -lgstriff-@GST_MAJORMINOR@
 
--- gst-fsl-plugins-3.0.11/src/audio/ac3_dec/src/Makefile.am~	2014-05-05 11:55:41.688510983 +0200
+++ gst-fsl-plugins-3.0.11/src/audio/ac3_dec/src/Makefile.am	2014-05-05 11:55:41.690510950 +0200
@@ -10,7 +10,7 @@ 
 
 # flags used to compile this plugin
 # we use the GST_LIBS flags because we might be using plug-in libs
-libmfw_gst_ac3dec_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_BASE_CFLAGS) -fno-omit-frame-pointer $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin
+libmfw_gst_ac3dec_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_BASE_CFLAGS) -fno-omit-frame-pointer $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin
 libmfw_gst_ac3dec_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) -lgstaudio-$(GST_MAJORMINOR) -l_ac3_dec_arm11_elinux 
 libmfw_gst_ac3dec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)   $(FSL_MM_CORE_LIBS) -lgstriff-@GST_MAJORMINOR@
 # headers we need but don't want installed
--- gst-fsl-plugins-3.0.11/src/audio/spdif_tx/src/Makefile.am~	2014-05-05 11:55:41.721510745 +0200
+++ gst-fsl-plugins-3.0.11/src/audio/spdif_tx/src/Makefile.am	2014-05-05 11:55:41.723510749 +0200
@@ -1,7 +1,7 @@ 
 plugin_LTLIBRARIES = libmfw_gst_spdiftx.la 
 
 libmfw_gst_spdiftx_la_SOURCES =  mfw_gst_spdiftx.c 
-libmfw_gst_spdiftx_la_CFLAGS = -O2 $(GST_BASE_CFLAGS) -fPIC -fno-omit-frame-pointer -I../../../../inc/plugin
+libmfw_gst_spdiftx_la_CFLAGS = -O2 $(GST_BASE_CFLAGS) -fPIC -fno-omit-frame-pointer -I$(top_srcdir)/inc/plugin
 libmfw_gst_spdiftx_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS)
 libmfw_gst_spdiftx_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -lgstriff-@GST_MAJORMINOR@
 
--- gst-fsl-plugins-3.0.11/src/audio/down_mix/src/Makefile.am~	2014-05-05 11:55:41.706510712 +0200
+++ gst-fsl-plugins-3.0.11/src/audio/down_mix/src/Makefile.am	2014-05-05 11:55:41.708510717 +0200
@@ -1,7 +1,7 @@ 
 plugin_LTLIBRARIES = libmfw_gst_downmix.la 
 
 libmfw_gst_downmix_la_SOURCES =  mfw_gst_downmix.c 
-libmfw_gst_downmix_la_CFLAGS = -O2 $(GST_BASE_CFLAGS) -fPIC -fno-omit-frame-pointer $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin -I../../../../inc/core_lib
+libmfw_gst_downmix_la_CFLAGS = -O2 $(GST_BASE_CFLAGS) -fPIC -fno-omit-frame-pointer $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/inc/core_lib
 libmfw_gst_downmix_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) -l_downmix_arm11_elinux
 libmfw_gst_downmix_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(FSL_MM_CORE_LIBS)
 
--- gst-fsl-plugins-3.0.11/src/parser/aiur/src/Makefile.am~	2014-05-05 11:55:41.751510809 +0200
+++ gst-fsl-plugins-3.0.11/src/parser/aiur/src/Makefile.am	2014-05-05 11:57:13.664706353 +0200
@@ -4,7 +4,7 @@ 
 # for the next set of variables, rename the prefix if you renamed the .la
 # sources used to compile this plug-in
 libmfw_gst_aiur_demux_la_SOURCES =  aiur.c aiurregistry.c aiurstreamcache.c aiuridxtab.c aiurdemux.c aiurtypefind.c
-libmfw_gst_aiur_demux_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer -DFSL_AVI_DRM_SUPPORT $(FSL_MM_CORE_CFLAGS) -I../../../../inc/plugin -I../../../../inc/core_lib/parser -I../../../../libs
+libmfw_gst_aiur_demux_la_CFLAGS = $(GST_BASE_CFLAGS) -O2 -fno-omit-frame-pointer -DFSL_AVI_DRM_SUPPORT $(FSL_MM_CORE_CFLAGS) -I$(top_srcdir)/inc/plugin -I$(top_srcdir)/inc/core_lib/parser -I$(top_srcdir)/libs
 libmfw_gst_aiur_demux_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS)  -lgstriff-@GST_MAJORMINOR@ -lgsttag-@GST_MAJORMINOR@ -ldl ../../../../libs/libgstfsl-@GST_MAJORMINOR@.la
 libmfw_gst_aiur_demux_la_CPPFLAGS = $(GST_LIBS_CPPFLAGS) 
 libmfw_gst_aiur_demux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(FSL_MM_CORE_LIBS)