gegl r2012 - in trunk/docs: . gallery

[ok svn gnome org]

Author: ok
Date: Tue Feb 12 22:52:10 2008
New Revision: 2012
URL: http://svn.gnome.org/viewvc/gegl?rev=2012&view=rev

Log:
* gallery/Makefile.am:
* Makefile.am: circumvent libtool when running tools from in-tree, we
want to make sure we are using the in-tree gegl library and not the
system installed one.


Modified:
   trunk/docs/ChangeLog
   trunk/docs/Makefile.am
   trunk/docs/gallery/Makefile.am

Modified: trunk/docs/Makefile.am
==============================================================================
--- trunk/docs/Makefile.am	(original)
+++ trunk/docs/Makefile.am	Tue Feb 12 22:52:10 2008
@@ -40,12 +40,14 @@
 all-local: $(HTML_FILES) api.html
 
 operations.html: $(top_builddir)/tools/operation_reference $(top_srcdir)/operations/*/*.c
+	LD_PRELOAD=$(top_builddir)/gegl/.libs/libgegl- GEGL_API_VERSION@.so \
 	GEGL_PATH=$(top_builddir)/operations \
-	$(top_builddir)/tools/operation_reference --ops-html > $@
+	$(top_builddir)/tools/.libs/operation_reference --ops-html > $@
 
 class-hierarchy.html: $(top_builddir)/tools/introspect $(top_srcdir)/operations/*/*.c $(top_srcdir)/gegl/*.c
+	LD_PRELOAD=$(top_builddir)/gegl/.libs/libgegl- GEGL_API_VERSION@.so \
 	GEGL_PATH=$(top_builddir)/operations \
-	$(top_builddir)/tools/introspect > $@
+	$(top_builddir)/tools/.libs/introspect > $@
 
 gegl.h.html: $(top_srcdir)/gegl/gegl.h
 if HAVE_ENSCRIPT

Modified: trunk/docs/gallery/Makefile.am
==============================================================================
--- trunk/docs/gallery/Makefile.am	(original)
+++ trunk/docs/gallery/Makefile.am	Tue Feb 12 22:52:10 2008
@@ -37,13 +37,14 @@
 all-local: pngs index.html
 
 %.png:%.xml $(wildcard $(top_builddir)/operations/*/*$(SHREXT))\
-	    $(top_builddir)/gegl/libgegl- GEGL_API_VERSION@.la\
+	    $(top_builddir)/gegl/.libs/libgegl- GEGL_API_VERSION@.so \
 	    $(top_builddir)/bin/gegl
 	@GEGL_DEBUG_TIME=yes GEGL_PATH=$(top_builddir)/operations \
 	$(top_builddir)/bin/gegl $< -o `echo $@ | sed s?$(srcdir)/??` > `echo $@ | sed s?$(srcdir)/?? | sed -e s/png/txt/`;
 if HAVE_GRAPHVIZ
 	@GEGL_PATH=$(top_builddir)/operations \
-	$(top_builddir)/bin/gegl --dot $< | $(GRAPHVIZ) -Tpng -o `echo $@ | sed s?$(srcdir)/?? | sed s/.png/-graph.png/` >/dev/null
+	LD_PRELOAD=$(top_builddir)/gegl/.libs/libgegl- GEGL_API_VERSION@.so \
+	$(top_builddir)/bin/.libs/gegl --dot $< | $(GRAPHVIZ) -Tpng -o `echo $@ | sed s?$(srcdir)/?? | sed s/.png/-graph.png/` >/dev/null
 endif
 
 clean-local: