[gdm] build: Fix srcdir != builddir issues with previous commit

[Colin Walters <walters src gnome org>]

commit 2294058e9f4ca8f91650f7f6503c6bf1d2271c8d
Author: Colin Walters <walters verbum org>
Date:   Mon Apr 1 08:35:38 2013 -0400

    build: Fix srcdir != builddir issues with previous commit
    
    We need top_srcdir.

 gui/libgdm/Makefile.am |    9 +++++----
 utils/Makefile.am      |    6 ++++--
 2 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/gui/libgdm/Makefile.am b/gui/libgdm/Makefile.am
index 4d9c198..99ada9a 100644
--- a/gui/libgdm/Makefile.am
+++ b/gui/libgdm/Makefile.am
@@ -32,10 +32,11 @@ gdm-client-glue.c gdm-client-glue.h : $(top_srcdir)/daemon/gdm-session.xml Makef
                $(top_srcdir)/daemon/gdm-session.xml
 
 AM_CPPFLAGS = \
-        -I.                                                                   \
-        -I..                                                                  \
-        -I$(srcdir)                                                           \
-        -DG_LOG_DOMAIN=\"Gdm\"                                         \
+        -I$(srcdir)                                                     \
+        -I$(builddir)                                                   \
+        -I$(top_srcdir)                                                 \
+        -I$(top_builddir)                                               \
+        -DG_LOG_DOMAIN=\"Gdm\"                                          \
         -DDMCONFDIR=\""$(dmconfdir)"\"                                        \
         -DDATADIR=\""$(datadir)"\"                                            \
         $(END_OF_LIST)
diff --git a/utils/Makefile.am b/utils/Makefile.am
index 1cda413..8b400f4 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -1,8 +1,10 @@
 NULL =
 
 AM_CPPFLAGS = \
-       -I.                                             \
-       -I..                                            \
+       -I$(srcdir)                                     \
+       -I$(builddir)                                   \
+       -I$(top_srcdir)                                 \
+       -I$(top_builddir)                               \
        -DLOCALSTATEDIR=\""$(localstatedir)"\"          \
        -DGDM_SCREENSHOT_DIR=\""$(GDM_SCREENSHOT_DIR)"\"\
        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \