gegl r2114 - in trunk: . gegl operations operations/external
- From: ok svn gnome org
- To: svn-commits-list gnome org
- Subject: gegl r2114 - in trunk: . gegl operations operations/external
- Date: Mon, 25 Feb 2008 12:02:41 +0000 (GMT)
Author: ok
Date: Mon Feb 25 12:02:41 2008
New Revision: 2114
URL: http://svn.gnome.org/viewvc/gegl?rev=2114&view=rev
Log:
Hopefully making the build more sane and more portable at the same
time.
* gegl/Makefile.am: added -export-dynamic to LD_FLAGS since the
plug-ins needs to be able to link back with gegl at runtime
* operations/Makefile-operations.am:
* operations/external/Makefile.am: do not link with the gegl library.
Modified:
trunk/ChangeLog
trunk/gegl/Makefile.am
trunk/operations/Makefile-operations.am
trunk/operations/external/Makefile.am
Modified: trunk/gegl/Makefile.am
==============================================================================
--- trunk/gegl/Makefile.am (original)
+++ trunk/gegl/Makefile.am Mon Feb 25 12:02:41 2008
@@ -41,7 +41,7 @@
libgegl_ GEGL_API_VERSION@_la_LDFLAGS = \
@DEP_LIBS@ @BABL_LIBS@ \
- $(no_undefined) -version-info $(GEGL_LIBRARY_VERSION)
+ $(no_undefined) -export-dynamic -version-info $(GEGL_LIBRARY_VERSION)
INCLUDES = \
-I$(top_srcdir) \
Modified: trunk/operations/Makefile-operations.am
==============================================================================
--- trunk/operations/Makefile-operations.am (original)
+++ trunk/operations/Makefile-operations.am Mon Feb 25 12:02:41 2008
@@ -2,7 +2,7 @@
no_undefined = -no-undefined
endif
-libgegl = $(top_builddir)/gegl/libgegl-$(GEGL_API_VERSION).la
+#libgegl = $(top_builddir)/gegl/libgegl-$(GEGL_API_VERSION).la
CFILES = $(wildcard $(srcdir)/*.c)
SOBJS = $(subst $(srcdir)/,,$(CFILES:.c=.la))
@@ -26,9 +26,10 @@
-I$(top_srcdir)/gegl/property-types \
-I$(top_srcdir)/gegl/module
-AM_LDFLAGS = -avoid-version -module $(no_undefined)
+AM_LDFLAGS = -avoid-version -export-dynamic -module $(no_undefined)
-LDADD = @DEP_LIBS@ @BABL_LIBS@ $(libgegl)
+LDADD = @DEP_LIBS@ @BABL_LIBS@
+#$(libgegl)
%.lo: %.c $(GEGLHEADERS)
@echo $(LIBTOOL) --tag=CC --mode=compile $(CC) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o $@ $<
@@ -37,7 +38,6 @@
%.la: %.lo
@echo $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -rpath $(ext_dir) $< $(LDADD)
$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -rpath $(ext_dir) $< $(LDADD)
- perl -pi -e 's/^relink_command=.*/relink_command=/g' $@
clean-local:
Modified: trunk/operations/external/Makefile.am
==============================================================================
--- trunk/operations/external/Makefile.am (original)
+++ trunk/operations/external/Makefile.am Mon Feb 25 12:02:41 2008
@@ -18,9 +18,10 @@
AM_LDFLAGS = -avoid-version -module $(no_undefined)
-libgegl = $(top_builddir)/gegl/libgegl-$(GEGL_API_VERSION).la
+#libgegl = $(top_builddir)/gegl/libgegl-$(GEGL_API_VERSION).la
-op_libs = @DEP_LIBS@ @BABL_LIBS@ $(libgegl)
+op_libs = @DEP_LIBS@ @BABL_LIBS@
+#$(libgegl)
# start out with no ops, each if/endif block contains all the bits relevant
# for a specific dependency.
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]