-HFILE_GLOB=$(top_srcdir)/shell/*.h
-CFILE_GLOB=$(top_srcdir)/shell/*.c
-
-# Header files to ignore when scanning.
+HFILE_GLOB = \
+ $(top_srcdir)/shell/*.h \
+ $(top_builddir)/shell/*.h \
+ $(top_srcdir)/libmisc/*.h \
+ $(top_builddir)/libmisc/*.h
+
+CFILE_GLOB = \
+ $(top_srcdir)/shell/*.c \
+ $(top_srcdir)/libmisc/*.c
+
+# Extra header to include when scanning, which are not under DOC_SOURCE_DIR
+# e.g. EXTRA_HFILES=$(top_srcdir}/contrib/extra.h
+# EXTRA_HFILES = $(top_builddir)/evince/ev-version.h
+EXTRA_HFILES =
+
+# Header files to ignore when scanning. Use base file name, no paths