[rhythmbox/gobject-introspection: 3/34] fix up scanner paths and flags, add missing files

[Jonathan Matthew <jmatthew src gnome org>]

commit 19c6c6f76ae4a993da9d64105c5dfe430cf0f824
Author: Jonathan Matthew <jonathan d14n org>
Date:   Sun Mar 7 07:56:23 2010 +1000

    fix up scanner paths and flags, add missing files

 configure.ac      |    2 ++
 shell/Makefile.am |   12 ++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 60563b7..c207827 100644
--- a/configure.ac
+++ b/configure.ac
@@ -548,6 +548,8 @@ else
 	set_more_warnings=no
 fi
 ])
+RHYTHMBOX_CFLAGS_NOWARN=$RHYTHMBOX_CFLAGS
+AC_SUBST(RHYTHMBOX_CFLAGS_NOWARN)
 AC_MSG_CHECKING(for more warnings, including -Werror)
 if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
 	AC_MSG_RESULT(yes)
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 34011f6..6a0aa81 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -172,8 +172,8 @@ endif
 
 -include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_GIRS =
-INTROSPECTION_SCANNER_ARGS = --add-include-dir=$(srcdir)
-INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
+INTROSPECTION_SCANNER_ARGS = --add-include-path=$(top_srcdir)
+INTROSPECTION_COMPILER_ARGS = --includedir=$(top_srcdir)
 
 if HAVE_INTROSPECTION
 introspection_sources = \
@@ -192,15 +192,16 @@ introspection_sources = \
 		lib/rb-file-helpers.h \
 		lib/rb-file-helpers.c \
 		lib/rb-preferences.h \
-		lib/rb-preferences.c \
 		lib/rb-stock-icons.h \
 		lib/rb-stock-icons.c \
 		lib/rb-string-value-map.h \
 		lib/rb-string-value-map.c \
 		lib/rb-util.h \
 		lib/rb-util.c \
+		lib/libmediaplayerid/mediaplayerid.h \
+		lib/libmediaplayerid/mpid-device.c \
 		metadata/rb-metadata.h \
-		metadata/rb-metadata.c \
+		metadata/rb-metadata-dbus-client.c \
 		podcast/rb-podcast-manager.h \
 		podcast/rb-podcast-manager.c \
 		podcast/rb-podcast-parse.h \
@@ -254,7 +255,6 @@ introspection_sources = \
 		sources/rb-playlist-source.h \
 		sources/rb-playlist-source.c \
 		sources/rb-playlist-xml.h \
-		sources/rb-playlist-xml.c \
 		sources/rb-auto-playlist-source.h \
 		sources/rb-auto-playlist-source.c \
 		sources/rb-static-playlist-source.h \
@@ -284,7 +284,7 @@ introspection_sources = \
 
 Rhythmbox-0.12.gir: librhythmbox-core.la
 Rhythmbox_0_12_gir_INCLUDES = GObject-2.0 Gio-2.0 Gtk-2.0 Gst-0.10 libxml2-2.0
-Rhythmbox_0_12_gir_CFLAGS = $(INCLUDES)
+Rhythmbox_0_12_gir_CFLAGS = $(RHYTHMBOX_CFLAGS_NOWARN) $(TOTEM_PLPARSER_CFLAGS) $(DBUS_CFLAGS) $(GUDEV_CFLAGS) -I..
 Rhythmbox_0_12_gir_LIBS = librhythmbox-core.la
 Rhythmbox_0_12_gir_FILES = $(addprefix $(top_srcdir)/,$(introspection_sources))
 INTROSPECTION_GIRS += Rhythmbox-0.12.gir