summaryrefslogtreecommitdiff
blob: 419a5c3f4ded1cf4b3a5dc1320825719cedc09c7 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
Index: doc/reference/Makefile.am
===================================================================
--- doc/reference/Makefile.am	(revision 5621)
+++ doc/reference/Makefile.am	(revision 5622)
@@ -39,17 +39,23 @@
 	$(IPOD_CFLAGS) \
 	$(RHYTHMBOX_CFLAGS)
 	
+if ENABLE_PYTHON
+BINDING_LIBS = $(top_builddir)/bindings/python/rb.la
+MORE_GTKDOC_LIBS = $(PYTHON_LIBS)
+endif
+
 GTKDOC_LIBS=\
 	$(top_builddir)/shell/librbshell.la	        \
 	$(top_builddir)/sources/libsources.la	        \
 	$(top_builddir)/sources/libsourcesimpl.la	\
-	$(top_builddir)/rhythmdb/librhythmdb.la         \
 	$(top_builddir)/podcast/librbpodcast.la		\
 	$(top_builddir)/metadata/librbmetadata.la	\
 	$(top_builddir)/widgets/librbwidgets.la         \
-	$(top_builddir)/lib/librb.la	                \
 	$(top_builddir)/plugins/librbplugins.la		\
+	$(BINDING_LIBS)					\
+	$(top_builddir)/rhythmdb/librhythmdb.la         \
 	$(top_builddir)/backends/librbbackends.la	\
+	$(top_builddir)/lib/librb.la	                \
 	$(TOTEM_PLPARSER_LIBS)				\
 	$(HAL_LIBS)					\
 	$(LIBNAUTILUS_BURN_LIBS)			\
@@ -58,15 +64,13 @@
 	$(MDNS_LIBS)					\
 	$(IPOD_LIBS)					\
 	$(NOTIFY_LIBS)					\
-	$(RHYTHMBOX_LIBS)
+	$(RHYTHMBOX_LIBS)				\
+	$(MORE_GTKDOC_LIBS)
 
 if ENABLE_TRACK_TRANSFER
 GTKDOC_LIBS +=	$(GNOME_MEDIA_PROFILES_LIBS) 
 endif
 
-if ENABLE_PYTHON
-GTKDOC_LIBS += $(PYTHON_LIBS) $(top_builddir)/bindings/python/rb.la
-endif
 
 content_files =
 HTML_IMAGES =
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 5621)
+++ ChangeLog	(revision 5622)
@@ -1,3 +1,8 @@
+2008-03-17  Jonathan Matthew  <jonathan@d14n.org>
+
+	* doc/reference/Makefile.am:
+	Fix gtk-doc build (I hate link order problems), #522821.
+
 ============ Version 0.11.5
 
 2008-03-17  James Livingston  <doclivingston@gmail.com>