/pidgin/main: 8c90f5d9def3: Fix out-of-tree build

[Tomasz Wasilczyk]

Changeset: 8c90f5d9def346668e9ec1e9947aa245c81eee62
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2014-04-24 19:00 +0200
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/8c90f5d9def3

Description:

Fix out-of-tree build

diffstat:

 doc/reference/libpurple/Makefile.am |   7 +++++--
 libpurple/Makefile.am               |  24 ++++++++++++------------
 2 files changed, 17 insertions(+), 14 deletions(-)

diffs (66 lines):

diff --git a/doc/reference/libpurple/Makefile.am b/doc/reference/libpurple/Makefile.am
--- a/doc/reference/libpurple/Makefile.am
+++ b/doc/reference/libpurple/Makefile.am
@@ -56,7 +56,10 @@ CFILE_GLOB=$(top_srcdir)/$(DOC_MODULE)/*
 
 # Extra header to include when scanning, which are not under DOC_SOURCE_DIR
 # e.g. EXTRA_HFILES=$(top_srcdir}/contrib/extra.h
-EXTRA_HFILES=
+# TODO: those files are not properly scanned when building out-of-tree
+EXTRA_HFILES = \
+	$(top_builddir)/$(DOC_MODULE)/version.h \
+	$(top_builddir)/$(DOC_MODULE)/purple.h
 
 # Header files or dirs to ignore when scanning. Use base file/dir names
 # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h private_code
@@ -74,7 +77,7 @@ IGNORE_HFILES=\
 	internal.h \
 	marshallers.h \
 	purple-client.h \
-	purple-client-bindings.h
+	purple-client-bindings.h \
 	valgrind.h
 
 # Images to copy into HTML directory.
diff --git a/libpurple/Makefile.am b/libpurple/Makefile.am
--- a/libpurple/Makefile.am
+++ b/libpurple/Makefile.am
@@ -246,14 +246,14 @@ purple_cipherheaders = \
 purple_builtheaders = purple.h version.h enums.h marshallers.h
 
 purple_enumheaders = \
-	account.h \
-	cipher.h \
-	connection.h \
-	conversation.h \
-	conversationtypes.h \
-	roomlist.h \
-	status.h \
-	xfer.h
+	$(srcdir)/account.h \
+	$(srcdir)/cipher.h \
+	$(srcdir)/connection.h \
+	$(srcdir)/conversation.h \
+	$(srcdir)/conversationtypes.h \
+	$(srcdir)/roomlist.h \
+	$(srcdir)/status.h \
+	$(srcdir)/xfer.h
 
 marshallers.h: marshallers.list
 	$(AM_V_GEN)$(GLIB_GENMARSHAL) --prefix=purple_smarshal $(srcdir)/marshallers.list --header > marshallers.h
@@ -262,11 +262,11 @@ marshallers.c: marshallers.list marshall
 	$(AM_V_GEN)echo "#include \"marshallers.h\"" > marshallers.c
 	$(AM_V_at)$(GLIB_GENMARSHAL) --prefix=purple_smarshal $(srcdir)/marshallers.list --body >> marshallers.c
 
-enums.h: enums.h.in $(purple_enumheaders)
-	$(AM_V_GEN)$(GLIB_MKENUMS) --template enums.h.in $(purple_enumheaders) > $@
+enums.h: $(srcdir)/enums.h.in $(purple_enumheaders)
+	$(AM_V_GEN)$(GLIB_MKENUMS) --template $(srcdir)/enums.h.in $(purple_enumheaders) > $@
 
-enums.c: enums.c.in $(purple_enumheaders)
-	$(AM_V_GEN)$(GLIB_MKENUMS) --template enums.c.in $(purple_enumheaders) > $@
+enums.c: $(srcdir)/enums.c.in $(purple_enumheaders)
+	$(AM_V_GEN)$(GLIB_MKENUMS) --template $(srcdir)/enums.c.in $(purple_enumheaders) > $@
 
 CLEANFILES = \
 	enums.c \