[gtk+/gtk-2-22] Various srcdir != builddir fixes

[Colin Walters <walters src gnome org>]

commit 9f4d990702594ed3b3ec6cd2532366bcb831edd0
Author: Colin Walters <walters verbum org>
Date:   Mon Nov 15 11:44:42 2010 -0500

    Various srcdir != builddir fixes
    
    Some of the header files have #include <gdk/foo.h> where foo.h is
    built, so we should put it in our base INCLUDES.
    
    Filter out non-pubilc gtkmarshal.h from introspection set.
    
    Also just for GdkX11.gir, we need to include the builddir/gdk.

 gdk/Makefile.am |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 96e3616..9f327dd 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -36,6 +36,7 @@ INCLUDES =                              \
 	-DG_LOG_DOMAIN=\"Gdk\"		\
 	-DGDK_COMPILATION		\
 	-I$(top_srcdir)			\
+	-I$(top_builddir)		\
 	-I$(top_builddir)/gdk		\
 	$(GTK_DEBUG_FLAGS) 		\
 	$(GDK_DEP_CFLAGS)
@@ -191,7 +192,7 @@ libgdk_win32_2_0_la_LDFLAGS = -Wl,win32/rc/gdk-win32-res.o -export-symbols $(src
 if HAVE_INTROSPECTION
 
 introspection_files = 		\
-	$(filter-out gdkkeysyms-compat.h, $(gdk_public_h_sources))	\
+	$(filter-out gtkmarshal.h gdkkeysyms-compat.h, $(gdk_public_h_sources))	\
 	$(gdk_c_sources)	\
         gdkenumtypes.c		\
         gdkenumtypes.h
@@ -242,7 +243,7 @@ GdkX11_2_0_gir_SCANNERFLAGS = --warn-all --strip-prefix=Gdk
 GdkX11_2_0_gir_INCLUDES = Gio-2.0 Gdk-2.0 GdkPixbuf-2.0 Pango-1.0 xlib-2.0
 GdkX11_2_0_gir_LIBS = $(gdktargetlib)
 GdkX11_2_0_gir_FILES = $(x11_introspection_files)
-GdkX11_2_0_gir_CFLAGS = $(INCLUDES) -L$(top_builddir)/gdk
+GdkX11_2_0_gir_CFLAGS = $(INCLUDES) -I$(top_srcdir)/gdk -L$(top_builddir)/gdk
 INTROSPECTION_GIRS += GdkX11-2.0.gir
 
 introspection_files += $(filter-out x11/gdkx.h, $(x11_introspection_files))