From ce3c96049edd0fe52b93c3a7696e3c2852532ee6 Mon Sep 17 00:00:00 2001 From: Jan Schmidt Date: Thu, 26 Jul 2007 14:05:23 +0000 Subject: [PATCH] docs/libs/Makefile.am: Include our build-prefix libs and includes before the generic ones to avoid linking against th... Original commit message from CVS: * 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. --- ChangeLog | 7 +++++++ docs/libs/Makefile.am | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 42c68d7a39..f79b8125ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-07-26 Jan Schmidt + + * 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 Patch by: Steve Fink diff --git a/docs/libs/Makefile.am b/docs/libs/Makefile.am index 96d90f759d..d8230f210d 100644 --- a/docs/libs/Makefile.am +++ b/docs/libs/Makefile.am @@ -81,8 +81,8 @@ extra_files = # 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)