GNOME.org
 

[seed] [modules] Prefix all module .sos with seed_ (libseed_readline.so)

commit 8041f4719aed21ebc1066bc95cd86b601eaaf2e3
Author: Tim Horton <hortont svn gnome org>
Date:   Sat Jul 4 16:13:30 2009 -0400

    [modules] Prefix all module .sos with seed_ (libseed_readline.so)
    
    This cuts down on confusion and ambiguous library names, and fixes the
    need-to-clean-every-time issue with mpfr and readline.
    
    However, if you currently have a seed checkout, you need to remove the
    .libs directory from modules/[readline,mpfr] before the problem will be solved.

 libseed/seed-importer.c             |    2 +-
 modules/Multiprocessing/Makefile.am |    8 ++++----
 modules/cairo/Makefile.am           |    8 ++++----
 modules/canvas/Makefile.am          |    8 ++++----
 modules/dbus/Makefile.am            |    8 ++++----
 modules/example/Makefile.am         |    6 +++---
 modules/gettext/Makefile.am         |    6 +++---
 modules/gtkbuilder/Makefile.am      |    6 +++---
 modules/libxml/Makefile.am          |    6 +++---
 modules/mpfr/Makefile.am            |    8 ++++----
 modules/os/Makefile.am              |    8 ++++----
 modules/readline/Makefile.am        |   10 +++++-----
 modules/sandbox/Makefile.am         |    6 +++---
 modules/sqlite/Makefile.am          |    8 ++++----
 14 files changed, 49 insertions(+), 49 deletions(-)
---
diff --git a/libseed/seed-importer.c b/libseed/seed-importer.c
index ad8a88b..41513f9 100644
--- a/libseed/seed-importer.c
+++ b/libseed/seed-importer.c
@@ -662,7 +662,7 @@ seed_importer_search (JSContextRef ctx,
 		      JSValueRef *exception)
 {
   GSList *path, *walk;
-  gchar *prop_as_lib = g_strconcat ("lib", prop, ".", G_MODULE_SUFFIX, NULL);
+  gchar *prop_as_lib = g_strconcat ("libseed_", prop, ".", G_MODULE_SUFFIX, NULL);
 
   path = seed_importer_get_search_path (ctx, exception);
 
diff --git a/modules/Multiprocessing/Makefile.am b/modules/Multiprocessing/Makefile.am
index cf2798e..8736a61 100644
--- a/modules/Multiprocessing/Makefile.am
+++ b/modules/Multiprocessing/Makefile.am
@@ -5,19 +5,19 @@ EXTRA_DIST = fork.js bi.js
 seedlibdir = ${libdir}/seed
 
 seedlib_LTLIBRARIES = \
-	libmultiprocessing.la
+	libseed_multiprocessing.la
 
-libmultiprocessing_la_SOURCES = \
+libseed_multiprocessing_la_SOURCES = \
 	seed-Multiprocessing.c
 
-libmultiprocessing_la_CFLAGS = \
+libseed_multiprocessing_la_CFLAGS = \
 	$(GOBJECT_INTROSPECTION_CFLAGS) \
 	-I top_srcdir@/libseed/ \
 	-I top_srcdir@/modules/ \
 	$(SEED_DEBUG_CFLAGS) \
 	$(SEED_PROFILE_CFLAGS)
 
-libmultiprocessing_la_LDFLAGS = \
+libseed_multiprocessing_la_LDFLAGS = \
 	$(GOBJECT_INTROSPECTION_LDFLAGS) \
 	$(SEED_PROFILE_LIBS)
 
diff --git a/modules/cairo/Makefile.am b/modules/cairo/Makefile.am
index 4d87927..8a1e205 100644
--- a/modules/cairo/Makefile.am
+++ b/modules/cairo/Makefile.am
@@ -11,9 +11,9 @@ EXTRA_DIST = seed-cairo-enums.h \
 seedlibdir = ${libdir}/seed
 
 seedlib_LTLIBRARIES = \
-	libcairo.la
+	libseed_cairo.la
 
-libcairo_la_SOURCES = \
+libseed_cairo_la_SOURCES = \
 	seed-cairo.c \
 	seed-cairo-surface.c \
 	seed-cairo-image-surface.c \
@@ -22,7 +22,7 @@ libcairo_la_SOURCES = \
 	seed-cairo-pattern.c \
 	seed-cairo-enums.c 
 
-libcairo_la_CFLAGS = \
+libseed_cairo_la_CFLAGS = \
 	-Wall \
 	$(GOBJECT_INTROSPECTION_CFLAGS) \
 	-I top_srcdir@/libseed/ \
@@ -32,7 +32,7 @@ libcairo_la_CFLAGS = \
 	$(SEED_DEBUG_CFLAGS) \
 	$(SEED_PROFILE_CFLAGS)
 
-libcairo_la_LDFLAGS = \
+libseed_cairo_la_LDFLAGS = \
 	$(GOBJECT_INTROSPECTION_LDFLAGS) \
 	$(GDK_LDFLAGS) \
 	$(CAIRO_LDFLAGS) \
diff --git a/modules/canvas/Makefile.am b/modules/canvas/Makefile.am
index 04e6bdd..d66c1d1 100644
--- a/modules/canvas/Makefile.am
+++ b/modules/canvas/Makefile.am
@@ -4,12 +4,12 @@ seedlibdir = ${libdir}/seed
 EXTRA_DIST=run-tests.js
 
 seedlib_LTLIBRARIES = \
-	libcanvas.la
+	libseed_canvas.la
 
-libcanvas_la_SOURCES = \
+libseed_canvas_la_SOURCES = \
 	seed-canvas.c
 
-libcanvas_la_CFLAGS = \
+libseed_canvas_la_CFLAGS = \
 	$(GOBJECT_INTROSPECTION_CFLAGS) \
 	-I top_srcdir@/libseed/ \
 	-I top_srcdir@/modules/ \
@@ -17,7 +17,7 @@ libcanvas_la_CFLAGS = \
 	$(SEED_DEBUG_CFLAGS) \
 	$(SEED_PROFILE_CFLAGS)
 
-libcanvas_la_LDFLAGS = \
+libseed_canvas_la_LDFLAGS = \
 	$(GOBJECT_INTROSPECTION_LDFLAGS) \
 	$(CAIRO_LDFLAGS) \
 	$(SEED_PROFILE_LIBS)
diff --git a/modules/dbus/Makefile.am b/modules/dbus/Makefile.am
index 4514fdb..d366526 100644
--- a/modules/dbus/Makefile.am
+++ b/modules/dbus/Makefile.am
@@ -14,9 +14,9 @@ module_DATA = dbus.js lang.js
 seedlibdir = ${libdir}/seed
 
 seedlib_LTLIBRARIES = \
-	libdbusnative.la
+	libseed_dbusnative.la
 
-libdbusnative_la_SOURCES = \
+libseed_dbusnative_la_SOURCES = \
 	module.c \
 	util/dbus.c \
 	util/dbus-proxy.c \
@@ -25,7 +25,7 @@ libdbusnative_la_SOURCES = \
 	dbus-exports.c 
 
 
-libdbusnative_la_CFLAGS = \
+libseed_dbusnative_la_CFLAGS = \
 	-Wall \
 	-I top_srcdir@/libseed/ \
 	-I top_srcdir@/modules/ \
@@ -35,7 +35,7 @@ libdbusnative_la_CFLAGS = \
 	$(SEED_PROFILE_CFLAGS)
 
 
-libdbusnative_la_LDFLAGS = \
+libseed_dbusnative_la_LDFLAGS = \
 	$(GOBJECT_INTROSPECTION_LDFLAGS) \
 	-L/lib \
 	-ldbus-1 \
diff --git a/modules/example/Makefile.am b/modules/example/Makefile.am
index 0df6387..908a48e 100644
--- a/modules/example/Makefile.am
+++ b/modules/example/Makefile.am
@@ -3,9 +3,9 @@ if BUILD_EXAMPLE_MODULE
 seedlibdir = ${libdir}/seed
 
 seedlib_LTLIBRARIES = \
-	libexample.la
+	libseed_example.la
 
-libexample_la_SOURCES = \
+libseed_example_la_SOURCES = \
 	seed-example.c
 
 
@@ -16,7 +16,7 @@ AM_CPPFLAGS = \
 	$(SEED_DEBUG_CFLAGS) \
 	$(SEED_PROFILE_CFLAGS)
 
-libexample_la_LDFLAGS = \
+libseed_example_la_LDFLAGS = \
 	$(GOBJECT_INTROSPECTION_LDFLAGS) \
 	$(SEED_PROFILE_LIBS)
 
diff --git a/modules/gettext/Makefile.am b/modules/gettext/Makefile.am
index 7ae8abf..ffd7b9e 100644
--- a/modules/gettext/Makefile.am
+++ b/modules/gettext/Makefile.am
@@ -3,9 +3,9 @@ if BUILD_GETTEXT_MODULE
 seedlibdir = ${libdir}/seed
 
 seedlib_LTLIBRARIES = \
-	libgettext.la
+	libseed_gettext.la
 
-libgettext_la_SOURCES = \
+libseed_gettext_la_SOURCES = \
 	seed-gettext.c
 
 AM_CPPFLAGS = \
@@ -15,7 +15,7 @@ AM_CPPFLAGS = \
 	$(SEED_DEBUG_CFLAGS) \
 	$(SEED_PROFILE_CFLAGS)
 
-libgettext_la_LDFLAGS = \
+libseed_gettext_la_LDFLAGS = \
 	$(GOBJECT_INTROSPECTION_LDFLAGS) \
 	$(SEED_PROFILE_LIBS)
 
diff --git a/modules/gtkbuilder/Makefile.am b/modules/gtkbuilder/Makefile.am
index b469e27..eb6d2af 100644
--- a/modules/gtkbuilder/Makefile.am
+++ b/modules/gtkbuilder/Makefile.am
@@ -3,9 +3,9 @@ if BUILD_GTKBUILDER_MODULE
 seedlibdir = ${libdir}/seed
 
 seedlib_LTLIBRARIES = \
-	libgtkbuilder.la
+	libseed_gtkbuilder.la
 
-libgtkbuilder_la_SOURCES = \
+libseed_gtkbuilder_la_SOURCES = \
 	seed-gtkbuilder.c
 
 
@@ -17,7 +17,7 @@ AM_CPPFLAGS = \
 	$(SEED_DEBUG_CFLAGS) \
 	$(SEED_PROFILE_CFLAGS)
 
-libgtkbuilder_la_LDFLAGS = \
+libseed_gtkbuilder_la_LDFLAGS = \
 	$(GTK_LDFLAGS) \
 	$(GOBJECT_INTROSPECTION_LDFLAGS) \
 	$(SEED_PROFILE_LIBS)
diff --git a/modules/libxml/Makefile.am b/modules/libxml/Makefile.am
index 19d56b7..95202e3 100644
--- a/modules/libxml/Makefile.am
+++ b/modules/libxml/Makefile.am
@@ -5,9 +5,9 @@ EXTRA_DIST = xml.js
 seedlibdir = ${libdir}/seed
 
 seedlib_LTLIBRARIES = \
-	liblibxml.la
+	libseed_libxml.la
 
-liblibxml_la_SOURCES = \
+libseed_libxml_la_SOURCES = \
 	seed-libxml.c
 
 AM_CPPFLAGS = \
@@ -18,7 +18,7 @@ AM_CPPFLAGS = \
 	$(SEED_DEBUG_CFLAGS) \
 	$(SEED_PROFILE_CFLAGS)
 
-liblibxml_la_LDFLAGS = \
+libseed_libxml_la_LDFLAGS = \
 	$(LIBXML_LDFLAGS) \
 	$(GOBJECT_INTROSPECTION_LDFLAGS) \
 	$(SEED_PROFILE_LIBS)
diff --git a/modules/mpfr/Makefile.am b/modules/mpfr/Makefile.am
index 999c638..ae15fd7 100644
--- a/modules/mpfr/Makefile.am
+++ b/modules/mpfr/Makefile.am
@@ -3,9 +3,9 @@ if BUILD_MPFR_MODULE
 seedlibdir = ${libdir}/seed
 
 seedlib_LTLIBRARIES = \
-	libmpfr.la
+	libseed_mpfr.la
 
-libmpfr_la_SOURCES = \
+libseed_mpfr_la_SOURCES = \
 	seed-mpfr.c
 
 AM_CPPFLAGS = \
@@ -15,11 +15,11 @@ AM_CPPFLAGS = \
 	$(SEED_DEBUG_CFLAGS) \
 	$(SEED_PROFILE_CFLAGS)
 
-libmpfr_la_LDFLAGS = \
+libseed_mpfr_la_LDFLAGS = \
 	$(GOBJECT_INTROSPECTION_LDFLAGS) \
 	$(SEED_PROFILE_LIBS)
 
-libmpfr_la_LIBADD = -lmpfr -lgmp
+libseed_mpfr_la_LIBADD = -lmpfr -lgmp
 
 endif
 
diff --git a/modules/os/Makefile.am b/modules/os/Makefile.am
index 4816958..528804f 100644
--- a/modules/os/Makefile.am
+++ b/modules/os/Makefile.am
@@ -3,19 +3,19 @@ if BUILD_OS_MODULE
 seedlibdir = ${libdir}/seed
 
 seedlib_LTLIBRARIES = \
-	libos.la
+	libseed_os.la
 
-libos_la_SOURCES = \
+libseed_os_la_SOURCES = \
 	seed-os.c
 
-libos_la_CFLAGS = \
+libseed_os_la_CFLAGS = \
 	$(GOBJECT_INTROSPECTION_CFLAGS) \
 	-I top_srcdir@/libseed/ \
 	-I top_srcdir@/modules/ \
 	$(SEED_DEBUG_CFLAGS) \
 	$(SEED_PROFILE_CFLAGS)
 
-libos_la_LDFLAGS = \
+libseed_os_la_LDFLAGS = \
 	$(GOBJECT_INTROSPECTION_LDFLAGS) \
 	-lutil \
 	$(SEED_DEBUG_LDFLAGS) \
diff --git a/modules/readline/Makefile.am b/modules/readline/Makefile.am
index e2383a0..3380d04 100644
--- a/modules/readline/Makefile.am
+++ b/modules/readline/Makefile.am
@@ -3,22 +3,22 @@ if BUILD_READLINE_MODULE
 seedlibdir = ${libdir}/seed
 
 seedlib_LTLIBRARIES = \
-	libreadline.la
+	libseed_readline.la
 
-libreadline_la_SOURCES = \
+libseed_readline_la_SOURCES = \
 	seed-readline.c
 
-libreadline_la_CFLAGS = \
+libseed_readline_la_CFLAGS = \
 	$(GOBJECT_INTROSPECTION_CFLAGS) \
 	$(FFI_CFLAGS) \
 	-I top_srcdir@/modules/ \
 	$(SEED_DEBUG_CFLAGS) \
 	$(SEED_PROFILE_CFLAGS)
 
-libreadline_la_LDFLAGS = \
+libseed_readline_la_LDFLAGS = \
+	-lreadline \
 	$(GOBJECT_INTROSPECTION_LDFLAGS) \
 	$(FFI_LDFLAGS) \
-	-lreadline \
 	$(SEED_PROFILE_LIBS) 
 
 endif
diff --git a/modules/sandbox/Makefile.am b/modules/sandbox/Makefile.am
index 7441192..39e60b1 100644
--- a/modules/sandbox/Makefile.am
+++ b/modules/sandbox/Makefile.am
@@ -1,9 +1,9 @@
 seedlibdir = ${libdir}/seed
 
 seedlib_LTLIBRARIES = \
-	libsandbox.la
+	libseed_sandbox.la
 
-libsandbox_la_SOURCES = \
+libseed_sandbox_la_SOURCES = \
 	seed-sandbox.c
 
 
@@ -14,7 +14,7 @@ AM_CPPFLAGS = \
 	$(SEED_DEBUG_CFLAGS) \
 	$(SEED_PROFILE_CFLAGS)
 
-libsandbox_la_LDFLAGS = \
+libseed_sandbox_la_LDFLAGS = \
 	$(GOBJECT_INTROSPECTION_LDFLAGS) \
 	$(SEED_PROFILE_LIBS)
 
diff --git a/modules/sqlite/Makefile.am b/modules/sqlite/Makefile.am
index 0903585..8732d09 100644
--- a/modules/sqlite/Makefile.am
+++ b/modules/sqlite/Makefile.am
@@ -4,12 +4,12 @@ seedlibdir = ${libdir}/seed
 EXTRA_DIST = example.js
 
 seedlib_LTLIBRARIES = \
-	libsqlite.la
+	libseed_sqlite.la
 
-libsqlite_la_SOURCES = \
+libseed_sqlite_la_SOURCES = \
 	seed-sqlite.c
 
-libsqlite_la_CFLAGS = \
+libseed_sqlite_la_CFLAGS = \
 	-I top_srcdir@/modules/ \
 	$(GOBJECT_INTROSPECTION_CFLAGS) \
 	$(SQLITE_CFLAGS) \
@@ -17,7 +17,7 @@ libsqlite_la_CFLAGS = \
 	$(SEED_PROFILE_CFLAGS)
 	
 
-libsqlite_la_LDFLAGS = \
+libseed_sqlite_la_LDFLAGS = \
 	$(GOBJECT_INTROSPECTION_CFLAGS) \
 	$(SQLITE_LDFLAGS) \
 	$(SEED_DEBUG_LDFLAGS) \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]