GNOME.org
 

gegl r2112 - in trunk: . docs docs/gallery tools

Author: neo
Date: Mon Feb 25 09:41:08 2008
New Revision: 2112
URL: http://svn.gnome.org/viewvc/gegl?rev=2112&view=rev

Log:
2008-02-25  Sven Neumann  <sven gimp org>

	* docs/Makefile.am
	* docs/gallery/Makefile.am: don't execute binaries created in
	.libs directory but run the libtool wrapper script instead.
	Removed LD_PRELOAD hacks which are now not any longer needed.

	* tools/Makefile.am: minor cleanup.


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

Modified: trunk/docs/Makefile.am
==============================================================================
--- trunk/docs/Makefile.am	(original)
+++ trunk/docs/Makefile.am	Mon Feb 25 09:41:08 2008
@@ -17,9 +17,9 @@
 
 if HAVE_ENSCRIPT
 ENSCRIPT_FILES = \
-	brightness-contrast.c.html \
-	gegl.h.html \
-	gegl-operation.h.html \
+	brightness-contrast.c.html	\
+	gegl.h.html			\
+	gegl-operation.h.html		\
 	gegl-plugin.h.html
 
 HTML_FILES += $(ENSCRIPT_FILES)
@@ -48,14 +48,12 @@
 all-local: $(HTML_FILES)
 
 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/.libs/operation_reference --ops-html > $@
+	$(top_builddir)/tools/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/.libs/introspect > $@
+	$(top_builddir)/tools/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	Mon Feb 25 09:41:08 2008
@@ -4,7 +4,7 @@
 
 index.html: Makefile.am pngs 
 	@echo "<html><head><title>GEGL gallery</title><style type='text/css'>@import url(../gegl.css);</style><link rel='shortcut icon' href='../images/gegl.ico'/></head><body><div id='toc'><ul><li><a href='../index.html'>GEGL</a></li><li>&nbsp;</li><li><a href='#'>Gallery</a></li>" > index.html
-	
+
 	@for XML in $(srcdir)/*.xml;do echo "<li><a href='#$$XML'>&nbsp;&nbsp;"`echo $$XML|sed -e 's/.xml//' -e 's/-/ /g'`"</a></li>">>index.html;done;
 	@echo "</ul></div><div class='paper'><div class='content'>" >> index.html
 	@echo "<p>This gallery shows samples of GEGL output it is used to both document current capabilities, and help spot regressions.</p>" >> index.html
@@ -36,15 +36,14 @@
 
 all-local: pngs index.html
 
-%.png:%.xml $(wildcard $(top_builddir)/operations/*/*$(SHREXT))\
-	    $(top_builddir)/gegl/.libs/libgegl- GEGL_API_VERSION@.so \
+%.png:%.xml $(wildcard $(top_builddir)/operations/*/*$(SHREXT)) \
+	    $(top_builddir)/gegl/libgegl-$(GEGL_API_VERSION).la \
 	    $(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 \
-	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
+	$(top_builddir)/bin/gegl --dot $< | $(GRAPHVIZ) -Tpng -o `echo $@ | sed s?$(srcdir)/?? | sed s/.png/-graph.png/` >/dev/null
 endif
 
 clean-local:

Modified: trunk/tools/Makefile.am
==============================================================================
--- trunk/tools/Makefile.am	(original)
+++ trunk/tools/Makefile.am	Mon Feb 25 09:41:08 2008
@@ -13,4 +13,8 @@
 	   -I$(top_srcdir)/gegl/module	\
 	   -I$(top_srcdir)/gegl/property-types\
 	   @DEP_CFLAGS@ @BABL_CFLAGS@
-AM_LDFLAGS =  @DEP_LIBS@ @BABL_LIBS@ $(top_builddir)/gegl/libgegl-$(GEGL_API_VERSION).la
+
+AM_LDFLAGS = \
+	@DEP_LIBS@	\
+	@BABL_LIBS@	\
+	$(top_builddir)/gegl/libgegl-$(GEGL_API_VERSION).la
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]