Mercurial > pidgin3 / changeset

--- a/doc/reference/libpurple/Makefile.am	Thu Apr 24 16:12:06 2014 +0200
+++ b/doc/reference/libpurple/Makefile.am	Thu Apr 24 19:00:45 2014 +0200
@@ -56,7 +56,10 @@
 
 # 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 @@
 	internal.h \
 	marshallers.h \
 	purple-client.h \
-	purple-client-bindings.h
+	purple-client-bindings.h \
 	valgrind.h
 
 # Images to copy into HTML directory.

--- a/libpurple/Makefile.am	Thu Apr 24 16:12:06 2014 +0200
+++ b/libpurple/Makefile.am	Thu Apr 24 19:00:45 2014 +0200
@@ -246,14 +246,14 @@
 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 @@
 	$(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 \