[totem-pl-parser] Fix non-source-dir build failure

[Philip Withnall <pwithnall src gnome org>]

commit ef834f5a728b439630f7314b88591915bae6d78c
Author: Theppitak Karoonboonyanan <thep linux thai net>
Date:   Sun Jul 4 22:24:37 2010 +0700

    Fix non-source-dir build failure
    
    Move to new make rule in gobject-introspection >= 0.6.14, where introspection
    source files are referenced via VPATH. Distinction between generated and manual
    sources are no longer needed.
    
    Fixes https://bugzilla.gnome.org/show_bug.cgi?id=623533
    
    Signed-off-by: Theppitak Karoonboonyanan <thep linux thai net>

 configure.in        |    2 +-
 plparse/Makefile.am |   19 +++++--------------
 2 files changed, 6 insertions(+), 15 deletions(-)
---
diff --git a/configure.in b/configure.in
index ad804c5..cf65da7 100644
--- a/configure.in
+++ b/configure.in
@@ -130,7 +130,7 @@ AC_SUBST([AM_CXXFLAGS])
 AC_SUBST([AM_LDFLAGS])
 
 GTK_DOC_CHECK(1.11)
-GOBJECT_INTROSPECTION_CHECK([0.6.7])
+GOBJECT_INTROSPECTION_CHECK([0.6.14])
 
 AC_CONFIG_FILES([
 Makefile
diff --git a/plparse/Makefile.am b/plparse/Makefile.am
index db77098..c7976c7 100644
--- a/plparse/Makefile.am
+++ b/plparse/Makefile.am
@@ -13,18 +13,13 @@ totemplparser-marshal.h: totemplparser-marshal.list
 	$(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=totemplparser_marshal --header --internal $< > $@
 
 plparserincludedir = $(pkgincludedir)/1/plparser
-plparser_headers =				\
+plparserinclude_HEADERS =			\
 	totem-pl-parser-builtins.h		\
+	totem-pl-parser-features.h		\
 	totem-pl-parser.h			\
 	totem-pl-playlist.h			\
 	totem-disc.h				\
 	totem-pl-parser-mini.h
-plparser_built_headers = 			\
-	totem-pl-parser-features.h
-
-plparserinclude_HEADERS =			\
-	$(plparser_headers)			\
-	$(plparser_built_headers)
 
 plparser_sources =				\
 	totem-pl-parser-builtins.c		\
@@ -186,10 +181,8 @@ INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
 if HAVE_INTROSPECTION
 introspection_sources = \
 	$(plparser_sources)		\
-	$(plparser_headers)
-introspection_built_sources = \
-	totemplparser-marshal.c		\
-	$(plparser_built_headers)
+	$(plparserinclude_HEADERS)	\
+	totemplparser-marshal.c
 
 TotemPlParser-1.0.gir: libtotem-plparser.la Makefile totemplparser-marshal.c totemplparser-marshal.h
 TotemPlParser_1_0_gir_SCANNERFLAGS = --namespace=TotemPlParser --strip-prefix=TotemPlParser --nsversion=1.0
@@ -205,9 +198,7 @@ TotemPlParser_1_0_gir_CFLAGS = \
 	-I$(top_builddir)/plparse	\
 	-D_GNU_SOURCE
 TotemPlParser_1_0_gir_LIBS = libtotem-plparser.la
-TotemPlParser_1_0_gir_FILES = \
-	$(addprefix $(srcdir)/,$(introspection_sources))	\
-	$(introspection_built_sources)
+TotemPlParser_1_0_gir_FILES = $(introspection_sources)
 INTROSPECTION_GIRS += TotemPlParser-1.0.gir
 
 girdir = $(datadir)/gir-1.0