dee

Merge lp:~mhr3/dee/doc-fixes into lp:dee

  1. doc-fixes
  2. Merge into trunk
Proposed by Michal Hruby
Status: Merged
Merged at revision: 303
Proposed branch: lp:~mhr3/dee/doc-fixes
Merge into: lp:dee
Diff against target: 41 lines (+9/-4)
2 files modified
dee/dee-serializable-model.c (+1/-1)
doc/reference/dee-1.0/Makefile.am (+8/-3)
To merge this branch: bzr merge lp:~mhr3/dee/doc-fixes
Reviewer Review Type Date Requested Status
Mikkel Kamstrup Erlandsen (community) Approve
Review via email: mp+80263@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Mikkel Kamstrup Erlandsen (kamstrup) wrote :

Have you checked that distcheck is still passing after this - and that
out-of-tree builds also still work?

Revision history for this message
Michal Hruby (mhr3) wrote :

Yes, distcheck still successfully passes with this.

Revision history for this message
Mikkel Kamstrup Erlandsen (kamstrup) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'dee/dee-serializable-model.c'
2--- dee/dee-serializable-model.c 2011-09-23 14:14:45 +0000
3+++ dee/dee-serializable-model.c 2011-10-24 20:08:23 +0000
4@@ -19,7 +19,7 @@
5 */
6
7 /**
8- * SECTION:dee-versioned-model
9+ * SECTION:dee-serializable-model
10 * @short_description: Abstract base class for easing implementations of
11 * #DeeModel<!-- -->s providing a unique version number
12 * for each row
13
14=== modified file 'doc/reference/dee-1.0/Makefile.am'
15--- doc/reference/dee-1.0/Makefile.am 2011-03-17 14:08:59 +0000
16+++ doc/reference/dee-1.0/Makefile.am 2011-10-24 20:08:23 +0000
17@@ -15,7 +15,7 @@
18 # gtk-doc will search all .c & .h files beneath here for inline comments
19 # documenting the functions and macros.
20 # e.g. DOC_SOURCE_DIR=../../../gtk
21-DOC_SOURCE_DIR=../../../dee
22+DOC_SOURCE_DIR=$(top_srcdir)/dee
23
24 # Extra options to pass to gtkdoc-scangobj. Not normally needed.
25 SCANGOBJ_OPTIONS=
26@@ -68,8 +68,13 @@
27 # e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
28 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
29 #GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(DEE_CFLAGS)
30-INCLUDES=-I$(top_srcdir)/dee -I$(top_builddir)/dee $(DEE_CFLAGS)
31-GTKDOC_LIBS=$(top_builddir)/dee/libdee-1.0.la $(DEE_LIBS)
32+INCLUDES = \
33+ $(DEE_CFLAGS) \
34+ -I$(top_srcdir)/dee
35+
36+GTKDOC_LIBS = \
37+ $(DEE_LIBS) \
38+ $(top_builddir)/dee/libdee-1.0.la
39
40 # This includes the standard gtk-doc make rules, copied by gtkdocize.
41 include $(top_srcdir)/gtk-doc.make

Subscribers

People subscribed via source and target branches

to all changes: