[totem-pl-parser] Fix building introspection when srcdir != builddir
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [totem-pl-parser] Fix building introspection when srcdir != builddir
- Date: Fri, 7 May 2010 08:37:56 +0000 (UTC)
commit 05efbbecdbf20d8bb87096661f45a705bd78c0f1
Author: Theppitak Karoonboonyanan <thep linux thai net>
Date: Fri May 7 09:36:50 2010 +0100
Fix building introspection when srcdir != builddir
The Makefile.am snippets were making the assumption that all
the files were in the srcdir, which isn't true for generated files
with srcdir != builddir
https://bugzilla.gnome.org/show_bug.cgi?id=617892
plparse/Makefile.am | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
---
diff --git a/plparse/Makefile.am b/plparse/Makefile.am
index a556527..56e9765 100644
--- a/plparse/Makefile.am
+++ b/plparse/Makefile.am
@@ -12,20 +12,24 @@ totemplparser-marshal.h: totemplparser-marshal.list
$(AM_V_GEN) ( $(GLIB_GENMARSHAL) --prefix=totemplparser_marshal $(srcdir)/totemplparser-marshal.list --header --internal > totemplparser-marshal.h )
plparserincludedir = $(pkgincludedir)/1/plparser
-plparserinclude_HEADERS = \
+plparser_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 \
totem-disc.c \
totem-pl-parser.c \
totem-pl-parser-lines.c \
- totemplparser-marshal.c \
totem-pl-parser-media.c \
totem-pl-parser-misc.c \
totem-pl-parser-pla.c \
@@ -43,6 +47,7 @@ libtotem_plparser_la_SOURCES = \
totem-pl-parser-features.h \
totem-pl-parser.h \
totem-pl-parser-lines.h \
+ totemplparser-marshal.c \
totemplparser-marshal.h \
totem-pl-parser-media.h \
totem-pl-parser-misc.h \
@@ -179,7 +184,10 @@ INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
if HAVE_INTROSPECTION
introspection_sources = \
$(plparser_sources) \
- $(plparserinclude_HEADERS)
+ $(plparser_headers)
+introspection_built_sources = \
+ totemplparser-marshal.c \
+ $(plparser_built_headers)
TotemPlParser-1.0.gir: libtotem-plparser.la Makefile
TotemPlParser_1_0_gir_SCANNERFLAGS = --namespace=TotemPlParser --strip-prefix=TotemPlParser --nsversion=1.0
@@ -195,7 +203,9 @@ 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))
+TotemPlParser_1_0_gir_FILES = \
+ $(addprefix $(srcdir)/,$(introspection_sources)) \
+ $(introspection_built_sources)
INTROSPECTION_GIRS += TotemPlParser-1.0.gir
girdir = $(datadir)/gir-1.0
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]