[02/29] dbus-glib: refresh patch

Message ID 20180305172046.21729-2-ross.burton@intel.com
State Superseded
Headers show
Series
  • [01/29] dbus: remove upstreamed patch
Related show

Commit Message

Ross Burton March 5, 2018, 5:20 p.m.
Signed-off-by: Ross Burton <ross.burton@intel.com>

---
 meta/recipes-core/dbus/dbus-glib/no-examples.patch | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

-- 
2.11.0

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Comments

Armin Kuster March 5, 2018, 5:24 p.m. | #1
On 03/05/2018 09:20 AM, Ross Burton wrote:
> Signed-off-by: Ross Burton <ross.burton@intel.com>


Why do this patches need to be refreshed?

- armin
> ---

>  meta/recipes-core/dbus/dbus-glib/no-examples.patch | 10 ++++++----

>  1 file changed, 6 insertions(+), 4 deletions(-)

>

> diff --git a/meta/recipes-core/dbus/dbus-glib/no-examples.patch b/meta/recipes-core/dbus/dbus-glib/no-examples.patch

> index fbb49678282..32e76117188 100644

> --- a/meta/recipes-core/dbus/dbus-glib/no-examples.patch

> +++ b/meta/recipes-core/dbus/dbus-glib/no-examples.patch

> @@ -5,11 +5,13 @@ Upstream-Status: Inappropriate [disable feature]

>  Signed-off-by: Kevin Tian <kevin.tian@intel.com>

>  Signed-off-by: Scott Garman <scott.a.garman@intel.com>

>  

> ---- dbus-glib-0.70/dbus/Makefile.am.orig	2006-07-23 16:04:43.000000000 +0200

> -+++ dbus-glib-0.70/dbus/Makefile.am	2006-07-23 16:04:52.000000000 +0200

> +Index: dbus-glib-0.108/dbus/Makefile.am

> +===================================================================

> +--- dbus-glib-0.108.orig/dbus/Makefile.am

> ++++ dbus-glib-0.108/dbus/Makefile.am

>  @@ -1,4 +1,4 @@

>  -SUBDIRS = . examples

>  +SUBDIRS = .

>   

> - INCLUDES=-I$(top_srcdir) $(DBUS_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_GLIB_TOOL_CFLAGS) -DDBUS_COMPILATION=1 -DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" 

> - 

> + AM_CPPFLAGS = \

> + 	-I$(top_srcdir)						\


-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Alexander Kanavin March 5, 2018, 5:26 p.m. | #2
On 03/05/2018 07:24 PM, akuster808 wrote:
> Why do this patches need to be refreshed?


Long story:
https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450

Short story:

we'll soon start warning users if patches are applied with fuzz (e.g. 
context lines in a patch are ignored in order to apply the patch 
somehow, somewhere). This patch series fixes up oe-core patches, so that 
none of oe-core produces these warnings. This is the commit that will 
follow the fixup patches and introduces the warning:

http://lists.openembedded.org/pipermail/openembedded-core/2017-October/143760.html


Alex
-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Alexander Kanavin March 5, 2018, 5:27 p.m. | #3
On 03/05/2018 07:26 PM, Alexander Kanavin wrote:
> On 03/05/2018 07:24 PM, akuster808 wrote:

>> Why do this patches need to be refreshed?

> 

> Long story:

> https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450

> 

> Short story:

> 

> we'll soon start warning users if patches are applied with fuzz (e.g. 

> context lines in a patch are ignored in order to apply the patch 

> somehow, somewhere). This patch series fixes up oe-core patches, so that 

> none of oe-core produces these warnings. This is the commit that will 

> follow the fixup patches and introduces the warning:

> 

> http://lists.openembedded.org/pipermail/openembedded-core/2017-October/143760.html 


Oh, and once most layers catch up, fuzz will be rejected outright:

https://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/commit/?h=akanavin/fix-patch-fuzz&id=827172d096dd62648506c0341d0207bd6353203d


Alex
-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Ross Burton March 5, 2018, 5:30 p.m. | #4
I was about to write a long email explaining all this but my dinner is
almost ready.

Short version: patch fuzz is dangerous, we've had patches apply using fuzz
which actually break the code, or doing something else stupid like repeat a
statement.

We'd like to eventually have do_patch rejecting any fuzz on these grounds,
so I wrote a nasty script to rebase all the patches and am reviewing them
bit by bit.  Note that two of these patches are deleting patches that we've
been applying although upstream have already applied the same fix...

Ross

On 5 March 2018 at 17:24, akuster808 <akuster808@gmail.com> wrote:

>

>

> On 03/05/2018 09:20 AM, Ross Burton wrote:

> > Signed-off-by: Ross Burton <ross.burton@intel.com>

>

> Why do this patches need to be refreshed?

>

> - armin

> > ---

> >  meta/recipes-core/dbus/dbus-glib/no-examples.patch | 10 ++++++----

> >  1 file changed, 6 insertions(+), 4 deletions(-)

> >

> > diff --git a/meta/recipes-core/dbus/dbus-glib/no-examples.patch

> b/meta/recipes-core/dbus/dbus-glib/no-examples.patch

> > index fbb49678282..32e76117188 100644

> > --- a/meta/recipes-core/dbus/dbus-glib/no-examples.patch

> > +++ b/meta/recipes-core/dbus/dbus-glib/no-examples.patch

> > @@ -5,11 +5,13 @@ Upstream-Status: Inappropriate [disable feature]

> >  Signed-off-by: Kevin Tian <kevin.tian@intel.com>

> >  Signed-off-by: Scott Garman <scott.a.garman@intel.com>

> >

> > ---- dbus-glib-0.70/dbus/Makefile.am.orig     2006-07-23

> 16:04:43.000000000 +0200

> > -+++ dbus-glib-0.70/dbus/Makefile.am  2006-07-23 16:04:52.000000000

> +0200

> > +Index: dbus-glib-0.108/dbus/Makefile.am

> > +===================================================================

> > +--- dbus-glib-0.108.orig/dbus/Makefile.am

> > ++++ dbus-glib-0.108/dbus/Makefile.am

> >  @@ -1,4 +1,4 @@

> >  -SUBDIRS = . examples

> >  +SUBDIRS = .

> >

> > - INCLUDES=-I$(top_srcdir) $(DBUS_CFLAGS) $(DBUS_GLIB_CFLAGS)

> $(DBUS_GLIB_TOOL_CFLAGS) -DDBUS_COMPILATION=1 -DDBUS_LOCALEDIR=\"$(prefix)/@

> DATADIRNAME@/locale\"

> > -

> > + AM_CPPFLAGS = \

> > +     -I$(top_srcdir)                                         \

>

>
<div dir="ltr">I was about to write a long email explaining all this but my dinner is almost ready.<div><br></div><div>Short version: patch fuzz is dangerous, we&#39;ve had patches apply using fuzz which actually break the code, or doing something else stupid like repeat a statement.</div><div><br></div><div>We&#39;d like to eventually have do_patch rejecting any fuzz on these grounds, so I wrote a nasty script to rebase all the patches and am reviewing them bit by bit.  Note that two of these patches are deleting patches that we&#39;ve been applying although upstream have already applied the same fix...</div><div><br></div><div>Ross</div></div><div class="gmail_extra"><br><div class="gmail_quote">On 5 March 2018 at 17:24, akuster808 <span dir="ltr">&lt;<a href="mailto:akuster808@gmail.com" target="_blank">akuster808@gmail.com</a>&gt;</span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><br>
<br>
On 03/05/2018 09:20 AM, Ross Burton wrote:<br>
&gt; Signed-off-by: Ross Burton &lt;<a href="mailto:ross.burton@intel.com">ross.burton@intel.com</a>&gt;<br>
<br>
Why do this patches need to be refreshed?<br>
<br>
- armin<br>
<div class="HOEnZb"><div class="h5">&gt; ---<br>
&gt;  meta/recipes-core/dbus/dbus-<wbr>glib/no-examples.patch | 10 ++++++----<br>
&gt;  1 file changed, 6 insertions(+), 4 deletions(-)<br>
&gt;<br>
&gt; diff --git a/meta/recipes-core/dbus/dbus-<wbr>glib/no-examples.patch b/meta/recipes-core/dbus/dbus-<wbr>glib/no-examples.patch<br>
&gt; index fbb49678282..32e76117188 100644<br>
&gt; --- a/meta/recipes-core/dbus/dbus-<wbr>glib/no-examples.patch<br>
&gt; +++ b/meta/recipes-core/dbus/dbus-<wbr>glib/no-examples.patch<br>
&gt; @@ -5,11 +5,13 @@ Upstream-Status: Inappropriate [disable feature]<br>
&gt;  Signed-off-by: Kevin Tian &lt;<a href="mailto:kevin.tian@intel.com">kevin.tian@intel.com</a>&gt;<br>
&gt;  Signed-off-by: Scott Garman &lt;<a href="mailto:scott.a.garman@intel.com">scott.a.garman@intel.com</a>&gt;<br>
&gt;<br>
&gt; ---- dbus-glib-0.70/dbus/Makefile.<wbr>am.orig     2006-07-23 16:04:43.000000000 +0200<br>
&gt; -+++ dbus-glib-0.70/dbus/Makefile.<wbr>am  2006-07-23 16:04:52.000000000 +0200<br>
&gt; +Index: dbus-glib-0.108/dbus/Makefile.<wbr>am<br>
&gt; +=============================<wbr>==============================<wbr>========<br>
&gt; +--- dbus-glib-0.108.orig/dbus/<wbr>Makefile.am<br>
&gt; ++++ dbus-glib-0.108/dbus/Makefile.<wbr>am<br>
&gt;  @@ -1,4 +1,4 @@<br>
&gt;  -SUBDIRS = . examples<br>
&gt;  +SUBDIRS = .<br>
&gt;<br>
&gt; - INCLUDES=-I$(top_srcdir) $(DBUS_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_GLIB_TOOL_CFLAGS) -DDBUS_COMPILATION=1 -DDBUS_LOCALEDIR=\&quot;$(prefix)/@<wbr>DATADIRNAME@/locale\&quot;<br>
&gt; -<br>
&gt; + AM_CPPFLAGS = \<br>
&gt; +     -I$(top_srcdir)                                         \<br>
<br>
</div></div></blockquote></div><br></div>
-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Armin Kuster March 5, 2018, 6:03 p.m. | #5
On 03/05/2018 09:30 AM, Burton, Ross wrote:
> I was about to write a long email explaining all this but my dinner is

> almost ready.


Enjoy your dinner.

>

> Short version: patch fuzz is dangerous, we've had patches apply using

> fuzz which actually break the code, or doing something else stupid

> like repeat a statement.

>

> We'd like to eventually have do_patch rejecting any fuzz on these

> grounds, so I wrote a nasty script to rebase all the patches and am

> reviewing them bit by bit.  Note that two of these patches are

> deleting patches that we've been applying although upstream have

> already applied the same fix...

Can you share your script?

- Armin
>

> Ross

>

> On 5 March 2018 at 17:24, akuster808 <akuster808@gmail.com

> <mailto:akuster808@gmail.com>> wrote:

>

>

>

>     On 03/05/2018 09:20 AM, Ross Burton wrote:

>     > Signed-off-by: Ross Burton <ross.burton@intel.com

>     <mailto:ross.burton@intel.com>>

>

>     Why do this patches need to be refreshed?

>

>     - armin

>     > ---

>     >  meta/recipes-core/dbus/dbus-glib/no-examples.patch | 10 ++++++----

>     >  1 file changed, 6 insertions(+), 4 deletions(-)

>     >

>     > diff --git a/meta/recipes-core/dbus/dbus-glib/no-examples.patch

>     b/meta/recipes-core/dbus/dbus-glib/no-examples.patch

>     > index fbb49678282..32e76117188 100644

>     > --- a/meta/recipes-core/dbus/dbus-glib/no-examples.patch

>     > +++ b/meta/recipes-core/dbus/dbus-glib/no-examples.patch

>     > @@ -5,11 +5,13 @@ Upstream-Status: Inappropriate [disable feature]

>     >  Signed-off-by: Kevin Tian <kevin.tian@intel.com

>     <mailto:kevin.tian@intel.com>>

>     >  Signed-off-by: Scott Garman <scott.a.garman@intel.com

>     <mailto:scott.a.garman@intel.com>>

>     >

>     > ---- dbus-glib-0.70/dbus/Makefile.am.orig     2006-07-23

>     16:04:43.000000000 +0200

>     > -+++ dbus-glib-0.70/dbus/Makefile.am  2006-07-23

>     16:04:52.000000000 +0200

>     > +Index: dbus-glib-0.108/dbus/Makefile.am

>     > +===================================================================

>     > +--- dbus-glib-0.108.orig/dbus/Makefile.am

>     > ++++ dbus-glib-0.108/dbus/Makefile.am

>     >  @@ -1,4 +1,4 @@

>     >  -SUBDIRS = . examples

>     >  +SUBDIRS = .

>     >

>     > - INCLUDES=-I$(top_srcdir) $(DBUS_CFLAGS) $(DBUS_GLIB_CFLAGS)

>     $(DBUS_GLIB_TOOL_CFLAGS) -DDBUS_COMPILATION=1

>     -DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\"

>     > -

>     > + AM_CPPFLAGS = \

>     > +     -I$(top_srcdir)                                         \

>

>
<html>
  <head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
  </head>
  <body text="#000000" bgcolor="#FFFFFF">
    <p><br>
    </p>
    <br>
    <div class="moz-cite-prefix">On 03/05/2018 09:30 AM, Burton, Ross
      wrote:<br>
    </div>
    <blockquote type="cite"
cite="mid:CAJTo0LZ0uoDi5Ant3zM4T4ZgR07JExQ=ZBqRszvBdRpFFKUCqQ@mail.gmail.com">
      <div dir="ltr">I was about to write a long email explaining all
        this but my dinner is almost ready.</div>
    </blockquote>
    <br>
    Enjoy your dinner.<br>
    <br>
    <blockquote type="cite"
cite="mid:CAJTo0LZ0uoDi5Ant3zM4T4ZgR07JExQ=ZBqRszvBdRpFFKUCqQ@mail.gmail.com">
      <div dir="ltr">
        <div><br>
        </div>
        <div>Short version: patch fuzz is dangerous, we've had patches
          apply using fuzz which actually break the code, or doing
          something else stupid like repeat a statement.</div>
        <div><br>
        </div>
        <div>We'd like to eventually have do_patch rejecting any fuzz on
          these grounds, so I wrote a nasty script to rebase all the
          patches and am reviewing them bit by bit.  Note that two of
          these patches are deleting patches that we've been applying
          although upstream have already applied the same fix...</div>
      </div>
    </blockquote>
    Can you share your script?<br>
    <br>
    - Armin<br>
    <blockquote type="cite"
cite="mid:CAJTo0LZ0uoDi5Ant3zM4T4ZgR07JExQ=ZBqRszvBdRpFFKUCqQ@mail.gmail.com">
      <div dir="ltr">
        <div><br>
        </div>
        <div>Ross</div>
      </div>
      <div class="gmail_extra"><br>
        <div class="gmail_quote">On 5 March 2018 at 17:24, akuster808 <span
            dir="ltr">&lt;<a href="mailto:akuster808@gmail.com"
              target="_blank" moz-do-not-send="true">akuster808@gmail.com</a>&gt;</span>
          wrote:<br>
          <blockquote class="gmail_quote" style="margin:0 0 0
            .8ex;border-left:1px #ccc solid;padding-left:1ex"><br>
            <br>
            On 03/05/2018 09:20 AM, Ross Burton wrote:<br>
            &gt; Signed-off-by: Ross Burton &lt;<a
              href="mailto:ross.burton@intel.com" moz-do-not-send="true">ross.burton@intel.com</a>&gt;<br>
            <br>
            Why do this patches need to be refreshed?<br>
            <br>
            - armin<br>
            <div class="HOEnZb">
              <div class="h5">&gt; ---<br>
                &gt;  meta/recipes-core/dbus/dbus-<wbr>glib/no-examples.patch
                | 10 ++++++----<br>
                &gt;  1 file changed, 6 insertions(+), 4 deletions(-)<br>
                &gt;<br>
                &gt; diff --git a/meta/recipes-core/dbus/dbus-<wbr>glib/no-examples.patch
                b/meta/recipes-core/dbus/dbus-<wbr>glib/no-examples.patch<br>
                &gt; index fbb49678282..32e76117188 100644<br>
                &gt; --- a/meta/recipes-core/dbus/dbus-<wbr>glib/no-examples.patch<br>
                &gt; +++ b/meta/recipes-core/dbus/dbus-<wbr>glib/no-examples.patch<br>
                &gt; @@ -5,11 +5,13 @@ Upstream-Status: Inappropriate
                [disable feature]<br>
                &gt;  Signed-off-by: Kevin Tian &lt;<a
                  href="mailto:kevin.tian@intel.com"
                  moz-do-not-send="true">kevin.tian@intel.com</a>&gt;<br>
                &gt;  Signed-off-by: Scott Garman &lt;<a
                  href="mailto:scott.a.garman@intel.com"
                  moz-do-not-send="true">scott.a.garman@intel.com</a>&gt;<br>
                &gt;<br>
                &gt; ---- dbus-glib-0.70/dbus/Makefile.<wbr>am.orig   
                 2006-07-23 16:04:43.000000000 +0200<br>
                &gt; -+++ dbus-glib-0.70/dbus/Makefile.<wbr>am 
                2006-07-23 16:04:52.000000000 +0200<br>
                &gt; +Index: dbus-glib-0.108/dbus/Makefile.<wbr>am<br>
                &gt; +=============================<wbr>==============================<wbr>========<br>
                &gt; +--- dbus-glib-0.108.orig/dbus/<wbr>Makefile.am<br>
                &gt; ++++ dbus-glib-0.108/dbus/Makefile.<wbr>am<br>
                &gt;  @@ -1,4 +1,4 @@<br>
                &gt;  -SUBDIRS = . examples<br>
                &gt;  +SUBDIRS = .<br>
                &gt;<br>
                &gt; - INCLUDES=-I$(top_srcdir) $(DBUS_CFLAGS)
                $(DBUS_GLIB_CFLAGS) $(DBUS_GLIB_TOOL_CFLAGS)
                -DDBUS_COMPILATION=1 -DDBUS_LOCALEDIR=\"$(prefix)/@<wbr>DATADIRNAME@/locale\"<br>
                &gt; -<br>
                &gt; + AM_CPPFLAGS = \<br>
                &gt; +     -I$(top_srcdir)                             
                           \<br>
                <br>
              </div>
            </div>
          </blockquote>
        </div>
        <br>
      </div>
    </blockquote>
    <br>
  </body>
</html>
-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Ross Burton March 5, 2018, 8:15 p.m. | #6
On 5 March 2018 at 18:03, akuster808 <akuster808@gmail.com> wrote:

> Can you share your script?

>


I honestly wish I could because I need to run it again against master.  It
was basically the refresh hack in ross/patchmaggeddon to force bitbake to
refresh the patches, then a bit of shell to commit per-directory, then I'm
using VSCode to review the changes.

Some can be submitted as they update the context correctly.
Some can be dropped as the refresh just changed the hunk filenames.
Some can be dropped and replaced with a patch removal as the refresh is
showing that the patch can be removed now.

Generating a massive branch is trivial, the review is boring.  I've still
got ~50 patches outstanding and that's not even all of oe-core.

Ross
<div dir="ltr">On 5 March 2018 at 18:03, akuster808 <span dir="ltr">&lt;<a href="mailto:akuster808@gmail.com" target="_blank">akuster808@gmail.com</a>&gt;</span> wrote:<br><div class="gmail_extra"><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-style:solid;border-left-color:rgb(204,204,204);padding-left:1ex">
  
    
  
  <div bgcolor="#FFFFFF"><span class="gmail-">
    <p>Can you share your script?</p></span></div></blockquote><div><br></div><div>I honestly wish I could because I need to run it again against master.  It was basically the refresh hack in ross/patchmaggeddon to force bitbake to refresh the patches, then a bit of shell to commit per-directory, then I&#39;m using VSCode to review the changes.</div><div><br></div><div>Some can be submitted as they update the context correctly.</div><div>Some can be dropped as the refresh just changed the hunk filenames.</div><div>Some can be dropped and replaced with a patch removal as the refresh is showing that the patch can be removed now.<br></div><div><br></div><div>Generating a massive branch is trivial, the review is boring.  I&#39;ve still got ~50 patches outstanding and that&#39;s not even all of oe-core.</div><div><br></div><div>Ross</div></div></div></div>
-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Paul Eggleton March 6, 2018, 2:56 a.m. | #7
On Tuesday, 6 March 2018 6:30:25 AM NZDT Burton, Ross wrote:
> I was about to write a long email explaining all this but my dinner is

> almost ready.

> 

> Short version: patch fuzz is dangerous, we've had patches apply using fuzz

> which actually break the code, or doing something else stupid like repeat a

> statement.

> 

> We'd like to eventually have do_patch rejecting any fuzz on these grounds,

> so I wrote a nasty script to rebase all the patches and am reviewing them

> bit by bit.  Note that two of these patches are deleting patches that we've

> been applying although upstream have already applied the same fix...


So, for the purposes of being able to know this looking back in the git 
history can you please put this in the commit message? Fine if every single 
one is a copy-paste, but it shouldn't be blank particularly if someone's 
asking now.

Thanks,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre


-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Patch

diff --git a/meta/recipes-core/dbus/dbus-glib/no-examples.patch b/meta/recipes-core/dbus/dbus-glib/no-examples.patch
index fbb49678282..32e76117188 100644
--- a/meta/recipes-core/dbus/dbus-glib/no-examples.patch
+++ b/meta/recipes-core/dbus/dbus-glib/no-examples.patch
@@ -5,11 +5,13 @@  Upstream-Status: Inappropriate [disable feature]
 Signed-off-by: Kevin Tian <kevin.tian@intel.com>
 Signed-off-by: Scott Garman <scott.a.garman@intel.com>
 
---- dbus-glib-0.70/dbus/Makefile.am.orig	2006-07-23 16:04:43.000000000 +0200
-+++ dbus-glib-0.70/dbus/Makefile.am	2006-07-23 16:04:52.000000000 +0200
+Index: dbus-glib-0.108/dbus/Makefile.am
+===================================================================
+--- dbus-glib-0.108.orig/dbus/Makefile.am
++++ dbus-glib-0.108/dbus/Makefile.am
 @@ -1,4 +1,4 @@
 -SUBDIRS = . examples
 +SUBDIRS = .
  
- INCLUDES=-I$(top_srcdir) $(DBUS_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_GLIB_TOOL_CFLAGS) -DDBUS_COMPILATION=1 -DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" 
- 
+ AM_CPPFLAGS = \
+ 	-I$(top_srcdir)						\