[gst-cvs] thaytan gstreamer: gstreamer/ gstreamer/docs/libs/

[<th...@ke...>]

CVS Root:       /cvs/gstreamer
Module:         gstreamer
Changes by:     thaytan
Date:           Thu Jul 26 2007  14:05:37 UTC

Log message:
* docs/libs/Makefile.am:
Include our build-prefix libs and includes before the generic ones to
avoid linking against the installed libs when we want the build-tree
ones.

Modified files:
    .               : ChangeLog
    docs/libs       : Makefile.am

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.3344&r2=1.3345
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/docs/libs/Makefile.am.diff?r1=1.54&r2=1.55

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v
retrieving revision 1.3344
retrieving revision 1.3345
diff -u -d -r1.3344 -r1.3345
--- ChangeLog	26 Jul 2007 08:46:46 -0000	1.3344
+++ ChangeLog	26 Jul 2007 14:05:23 -0000	1.3345
@@ -1,3 +1,10 @@
+2007-07-26  Jan Schmidt  <th...@ma...>
+
+	* docs/libs/Makefile.am:
+	Include our build-prefix libs and includes before the generic ones to
+	avoid linking against the installed libs when we want the build-tree
+	ones.
 2007-07-26  Tim-Philipp Müller  <tim at centricular dot net>
 
 	Patch by: Steve Fink  <sphink gmail com>
Index: Makefile.am
RCS file: /cvs/gstreamer/gstreamer/docs/libs/Makefile.am,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- Makefile.am	5 Jul 2007 08:42:42 -0000	1.54
+++ Makefile.am	26 Jul 2007 14:05:23 -0000	1.55
@@ -81,8 +81,8 @@
 # CFLAGS and LDFLAGS for compiling scan program. Only needed if your app/lib
 # contains GtkObjects/GObjects and you want to document signals and properties.
-GTKDOC_CFLAGS = $(GST_OBJ_CFLAGS) -I$(top_builddir) -I$(top_builddir)/libs
-GTKDOC_LIBS = $(GST_OBJ_LIBS) $(SCANOBJ_DEPS)
+GTKDOC_CFLAGS = -I$(top_builddir) -I$(top_builddir)/libs $(GST_OBJ_CFLAGS)
+GTKDOC_LIBS = $(SCANOBJ_DEPS) $(GST_OBJ_LIBS)
 GTKDOC_CC=$(LIBTOOL) --mode=compile $(CC)
 GTKDOC_LD=$(LIBTOOL) --mode=link $(CC)