From: Matthias Clasen <mclasen@redhat.com>
Date: Tue, 8 Jun 2010 19:15:59 +0000 (-0400)
Subject: Distcheck fixes
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=4bf5a171e2533a518d2b50d1f494cbd84f2fb76e;p=~andy%2Fgtk

Distcheck fixes
---

diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 7db3e9a7b..756d9b025 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -223,7 +223,7 @@ GdkX11_3_0_gir_SCANNERFLAGS = --strip-prefix=gdk_x11 --add-include-path=../gdk-p
 GdkX11_3_0_gir_INCLUDES = Gio-2.0 Gdk-3.0 GdkPixbuf-3.0 Pango-1.0 xlib-2.0
 GdkX11_3_0_gir_LIBS = $(gdktargetlib)
 GdkX11_3_0_gir_FILES = $(addprefix $(srcdir)/,$(x11_introspection_files))
-GdkX11_3_0_gir_CFLAGS = $(INCLUDES)
+GdkX11_3_0_gir_CFLAGS = $(INCLUDES) -L$(top_builddir)/gdk
 INTROSPECTION_GIRS += GdkX11-3.0.gir
 endif # USE_X11
 
@@ -274,6 +274,7 @@ gdkalias.h: gdk.symbols
 gdkaliasdef.c: gdk.symbols
 	 $(PERL) $(srcdir)/makegdkalias.pl -def < $(srcdir)/gdk.symbols > gdkaliasdef.c
 
+TESTS_ENVIRONMENT = srcdir="$(srcdir)"
 if OS_LINUX
 TESTS = abicheck.sh pltcheck.sh
 endif
diff --git a/gdk/abicheck.sh b/gdk/abicheck.sh
index 422cee9a2..f4e9ace9e 100755
--- a/gdk/abicheck.sh
+++ b/gdk/abicheck.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
 
-cpp -DINCLUDE_VARIABLES -P -DALL_FILES -DGDK_ENABLE_BROKEN -include ${srcdir:-.}/../config.h -include ${srcdir:-.}/gdkconfig.h ${srcdir:-.}/gdk.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' | sort | uniq > expected-abi
+cpp -DINCLUDE_VARIABLES -P -DALL_FILES -DGDK_ENABLE_BROKEN -include ../config.h -include ./gdkconfig.h ${srcdir:-.}/gdk.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' | sort | uniq > expected-abi
 nm -D -g --defined-only .libs/libgdk-x11-3.0.so | cut -d ' ' -f 3 | egrep -v '^(__bss_start|_edata|_end)' | sort > actual-abi
 diff -u expected-abi actual-abi && rm -f expected-abi actual-abi
diff --git a/gtk/tests/defaultvalue.c b/gtk/tests/defaultvalue.c
index bab518e48..0c90e33d4 100644
--- a/gtk/tests/defaultvalue.c
+++ b/gtk/tests/defaultvalue.c
@@ -75,6 +75,7 @@ test_type (gconstpointer data)
 
   /* These can't be freely constructed/destroyed */
   if (g_type_is_a (type, GTK_TYPE_PRINT_JOB) ||
+      g_type_is_a (type, GTK_TYPE_APPLICATION) ||
       g_type_is_a (type, GDK_TYPE_PIXBUF_LOADER) ||
       g_type_is_a (type, gdk_pixbuf_simple_anim_iter_get_type ()))
     return;