[gtksourceview] GTK-Doc: clean a bit the Makefile.am



commit ed216338d71a7b1e7cebfa9e8f1c54f3d912ef9c
Author: SÃbastien Wilmet <swilmet gnome org>
Date:   Wed Dec 19 13:21:30 2012 +0100

    GTK-Doc: clean a bit the Makefile.am
    
    In the gtk-doc sources, the required Automake version in the example is
    1.6, not 1.7.
    
    Move some lines, and add some comments (from the example in gtk-doc).

 docs/reference/Makefile.am |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 9c57a78..fa6cc9e 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -1,8 +1,5 @@
-GTKDOC_CFLAGS = -I$(top_srcdir) $(DEP_CFLAGS)
-GTKDOC_LIBS = $(top_builddir)/gtksourceview/libgtksourceview-3.0.la $(DEP_LIBS)
-
 ## Process this file with automake to produce Makefile.in
-AUTOMAKE_OPTIONS = 1.7
+AUTOMAKE_OPTIONS = 1.6
 
 # The name of the module.
 DOC_MODULE = gtksourceview-3.0
@@ -14,7 +11,7 @@ DOC_MAIN_SGML_FILE = gtksourceview-docs.xml
 SCAN_OPTIONS = --deprecated-guards='GTKSOURCEVIEW_DISABLE_DEPRECATED'
 
 # The directory containing the source code. Relative to $(srcdir)
-DOC_SOURCE_DIR = ../..
+DOC_SOURCE_DIR = $(top_srcdir)
 
 # Used for dependencies
 HFILE_GLOB = $(top_srcdir)/gtksourceview/*.h
@@ -72,9 +69,15 @@ content_files =			\
 # Extra options to supply to gtkdoc-fixref
 FIXXREF_OPTIONS=
 
-# include common portion ...
-include $(top_srcdir)/gtk-doc.make
+# CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library.
+# Only needed if you are using gtkdoc-scangobj to dynamically query widget
+# signals and properties.
+GTKDOC_CFLAGS = -I$(top_srcdir) $(DEP_CFLAGS)
+GTKDOC_LIBS = $(top_builddir)/gtksourceview/libgtksourceview-3.0.la $(DEP_LIBS)
 
 MAINTAINERCLEANFILES = gtksourceview-3.0-overrides.txt
 
+# include common portion ...
+include $(top_srcdir)/gtk-doc.make
+
 -include $(top_srcdir)/git.mk



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]