GNOME.org
 

[seed] Change soname and install directory when building gtk3 version

commit f74599d7db79b61615b0cd26e5f3e2e1863b8857
Author: Frederic Crozat <fcrozat novell com>
Date:   Wed Feb 2 17:18:02 2011 +0100

    Change soname and install directory when building gtk3 version
    
    https://bugzilla.gnome.org/show_bug.cgi?id=639896

 configure.ac                        |    2 ++
 extensions/Makefile.am              |    6 +++---
 libseed/Makefile.am                 |   12 ++++++------
 modules/DynamicObject/Makefile.am   |    2 +-
 modules/cairo/Makefile.am           |    4 ++--
 modules/canvas/Makefile.am          |    4 ++--
 modules/dbus/Makefile.am            |    6 +++---
 modules/example/Makefile.am         |    4 ++--
 modules/ffi/Makefile.am             |    4 ++--
 modules/gettext/Makefile.am         |    4 ++--
 modules/gtkbuilder/Makefile.am      |    4 ++--
 modules/libxml/Makefile.am          |    6 +++---
 modules/mpfr/Makefile.am            |    4 ++--
 modules/multiprocessing/Makefile.am |    4 ++--
 modules/os/Makefile.am              |    4 ++--
 modules/readline/Makefile.am        |    4 ++--
 modules/sandbox/Makefile.am         |    4 ++--
 modules/sqlite/Makefile.am          |    4 ++--
 seed.pc.in                          |    4 ++--
 src/Makefile.am                     |    2 +-
 tests/c/Makefile.am                 |    2 +-
 21 files changed, 46 insertions(+), 44 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index e716a1b..091f49f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -85,6 +85,8 @@ dnl=== support both 1.0 and 3.0 (default 3.0) ==
 AS_CASE([$with_webkit],
 	[3.0], [
 		WEBKIT_PC=webkitgtk-3.0
+		SEED_GTK_VERSION=-gtk3
+		AC_SUBST(SEED_GTK_VERSION)
 	],
 	[1.0], [
 		save_LIBS=$LIBSma
diff --git a/extensions/Makefile.am b/extensions/Makefile.am
index 6f30f2e..24c9979 100644
--- a/extensions/Makefile.am
+++ b/extensions/Makefile.am
@@ -1,10 +1,10 @@
 EXTRA_DIST= Gio.js Seed.js.in Gtk.js GObject.js Clutter.js Gst.js repl.js
 
-extensiondir=$(datadir)/seed/extensions
+extensiondir=$(datadir)/seed SEED_GTK_VERSION@/extensions
 extension_DATA = Gio.js Seed.js Gtk.js GObject.js Clutter.js Gst.js
 
-repldir=$(datadir)/seed
+repldir=$(datadir)/seed SEED_GTK_VERSION@
 repl_DATA = repl.js
 
 Seed.js: Seed.js.in
-	$(AM_V_GEN) $(SED) -e "s|%pkglibdir%|$(pkglibdir)|" -e "s|%pkgdatadir%|$(pkgdatadir)|" -e "s|%gnomejsdir%|$(GNOME_JS_DIR)|" $< > $@
+	$(AM_V_GEN) $(SED) -e "s|%pkglibdir%|$(pkglibdir)@SEED_GTK_VERSION@|" -e "s|%pkgdatadir%|$(pkgdatadir)@SEED_GTK_VERSION@|" -e "s|%gnomejsdir%|$(GNOME_JS_DIR)|" $< > $@
diff --git a/libseed/Makefile.am b/libseed/Makefile.am
index 0b2d2b1..b45c893 100644
--- a/libseed/Makefile.am
+++ b/libseed/Makefile.am
@@ -1,7 +1,7 @@
 lib_LTLIBRARIES = \
-	libseed.la
+	libseed SEED_GTK_VERSION@.la
 
-libseed_la_SOURCES = \
+libseed SEED_GTK_VERSION@_la_SOURCES = \
 	seed-closure.c \
 	seed-api.c \
 	seed-closure.h \
@@ -25,7 +25,7 @@ libseed_la_SOURCES = \
 	seed-importer.h \
 	seed-path.h
 
-libseed_la_CFLAGS = \
+libseed SEED_GTK_VERSION@_la_CFLAGS = \
 	-Wall \
 	$(GOBJECT_INTROSPECTION_CFLAGS) \
 	$(WEBKIT_CFLAGS) \
@@ -35,10 +35,10 @@ libseed_la_CFLAGS = \
 	$(FFI_CFLAGS) \
 	-DGOBJECT_INTROSPECTION_VERSION=$(GOBJECT_INTROSPECTION_VERSION)
 
-libseed_la_LDFLAGS = \
+libseed SEED_GTK_VERSION@_la_LDFLAGS = \
 	$(FFI_LDFLAGS)
 
-libseed_la_LIBADD = \
+libseed SEED_GTK_VERSION@_la_LIBADD = \
 	$(GOBJECT_INTROSPECTION_LIBS) \
 	$(WEBKIT_LIBS) \
 	$(SEED_PROFILE_LIBS) \
@@ -47,5 +47,5 @@ libseed_la_LIBADD = \
 
 seedheaders_HEADERS = seed.h seed-debug.h seed-module.h
 
-seedheadersdir = $(pkgincludedir)
+seedheadersdir = $(pkgincludedir)@SEED_GTK_VERSION@
 
diff --git a/modules/DynamicObject/Makefile.am b/modules/DynamicObject/Makefile.am
index 6eb7814..56536cb 100644
--- a/modules/DynamicObject/Makefile.am
+++ b/modules/DynamicObject/Makefile.am
@@ -1,6 +1,6 @@
 if BUILD_DYNAMICOBJECT_MODULE
 
-seedlibdir = ${libdir}/seed
+seedlibdir = ${libdir}/seed SEED_GTK_VERSION@
 
 seedlib_LTLIBRARIES = \
 	libseed_DynamicObject.la
diff --git a/modules/cairo/Makefile.am b/modules/cairo/Makefile.am
index 33e6ab4..54082f3 100644
--- a/modules/cairo/Makefile.am
+++ b/modules/cairo/Makefile.am
@@ -8,7 +8,7 @@ EXTRA_DIST = seed-cairo-enums.h \
              seed-cairo-pdf-surface.h \
              seed-cairo-surface.h
 
-seedlibdir = ${libdir}/seed
+seedlibdir = ${libdir}/seed SEED_GTK_VERSION@
 
 seedlib_LTLIBRARIES = \
 	libseed_cairo.la
@@ -38,7 +38,7 @@ libseed_cairo_la_LDFLAGS = \
 	$(CAIRO_LDFLAGS)
 
 libseed_cairo_la_LIBADD = \
-	$(top_builddir)/libseed/libseed.la
+	$(top_builddir)/libseed/libseed SEED_GTK_VERSION@.la
 	$(SEED_PROFILE_LIBS)
 
 endif
diff --git a/modules/canvas/Makefile.am b/modules/canvas/Makefile.am
index 5154da4..27e1382 100644
--- a/modules/canvas/Makefile.am
+++ b/modules/canvas/Makefile.am
@@ -1,6 +1,6 @@
 if BUILD_CANVAS_MODULE
 
-seedlibdir = ${libdir}/seed
+seedlibdir = ${libdir}/seed SEED_GTK_VERSION@
 EXTRA_DIST=run-tests.js
 
 seedlib_LTLIBRARIES = \
@@ -22,7 +22,7 @@ libseed_canvas_la_LDFLAGS = \
 	$(CAIRO_LDFLAGS)
 
 libseed_canvas_la_LIBADD = \
-	$(top_builddir)/libseed/libseed.la \
+	$(top_builddir)/libseed/libseed SEED_GTK_VERSION@.la \
 	$(SEED_PROFILE_LIBS)
 
 endif
diff --git a/modules/dbus/Makefile.am b/modules/dbus/Makefile.am
index aa1376f..83a5349 100644
--- a/modules/dbus/Makefile.am
+++ b/modules/dbus/Makefile.am
@@ -8,10 +8,10 @@ EXTRA_DIST = dbus2js.py \
 			 lang.js \
 			 dbus-exports.h
 
-moduledir = $(datadir)/seed
+moduledir = $(datadir)/seed SEED_GTK_VERSION@
 module_DATA = dbus.js lang.js
 
-seedlibdir = ${libdir}/seed
+seedlibdir = ${libdir}/seed SEED_GTK_VERSION@
 
 seedlib_LTLIBRARIES = \
 	libseed_dbusnative.la
@@ -43,7 +43,7 @@ libseed_dbusnative_la_LDFLAGS = \
 libseed_dbusnative_la_LIBADD = \
 	-ldbus-1 \
 	-ldbus-glib-1 \
-	$(top_builddir)/libseed/libseed.la \
+	$(top_builddir)/libseed/libseed SEED_GTK_VERSION@.la \
 	$(SEED_PROFILE_LIBS)
 
 
diff --git a/modules/example/Makefile.am b/modules/example/Makefile.am
index 4b360a1..eebda2f 100644
--- a/modules/example/Makefile.am
+++ b/modules/example/Makefile.am
@@ -1,6 +1,6 @@
 if BUILD_EXAMPLE_MODULE
 
-seedlibdir = ${libdir}/seed
+seedlibdir = ${libdir}/seed SEED_GTK_VERSION@
 
 seedlib_LTLIBRARIES = \
 	libseed_example.la
@@ -19,7 +19,7 @@ libseed_example_la_LDFLAGS = \
 	$(GOBJECT_INTROSPECTION_LDFLAGS)
 
 libseed_example_la_LIBADD = \
-	$(top_builddir)/libseed/libseed.la \
+	$(top_builddir)/libseed/libseed SEED_GTK_VERSION@.la \
 	$(SEED_PROFILE_LIBS)
 
 endif
diff --git a/modules/ffi/Makefile.am b/modules/ffi/Makefile.am
index 4280cef..4064d45 100644
--- a/modules/ffi/Makefile.am
+++ b/modules/ffi/Makefile.am
@@ -1,6 +1,6 @@
 if BUILD_FFI_MODULE
 
-seedlibdir = ${libdir}/seed
+seedlibdir = ${libdir}/seed SEED_GTK_VERSION@
 
 EXTRA_DIST = \
 	test-sin.js \
@@ -28,7 +28,7 @@ libseed_ffi_la_LDFLAGS = \
 	$(FFI_LDFLAGS)
 
 libseed_ffi_la_LIBADD = \
-	$(top_builddir)/libseed/libseed.la \
+	$(top_builddir)/libseed/libseed SEED_GTK_VERSION@.la \
 	$(SEED_PROFILE_LIBS)
 
 endif
diff --git a/modules/gettext/Makefile.am b/modules/gettext/Makefile.am
index 318fc91..2a686cd 100644
--- a/modules/gettext/Makefile.am
+++ b/modules/gettext/Makefile.am
@@ -1,6 +1,6 @@
 if BUILD_GETTEXT_MODULE
 
-seedlibdir = ${libdir}/seed
+seedlibdir = ${libdir}/seed SEED_GTK_VERSION@
 
 seedlib_LTLIBRARIES = \
 	libseed_gettext.la
@@ -19,7 +19,7 @@ libseed_gettext_la_LDFLAGS = \
 	$(GOBJECT_INTROSPECTION_LDFLAGS)
 
 libseed_gettext_la_LIBADD = \
-	$(top_builddir)/libseed/libseed.la \
+	$(top_builddir)/libseed/libseed SEED_GTK_VERSION@.la \
 	$(SEED_PROFILE_LIBS)
 
 endif
diff --git a/modules/gtkbuilder/Makefile.am b/modules/gtkbuilder/Makefile.am
index 1d6abe2..09ab294 100644
--- a/modules/gtkbuilder/Makefile.am
+++ b/modules/gtkbuilder/Makefile.am
@@ -1,6 +1,6 @@
 if BUILD_GTKBUILDER_MODULE
 
-seedlibdir = ${libdir}/seed
+seedlibdir = ${libdir}/seed SEED_GTK_VERSION@
 
 seedlib_LTLIBRARIES = \
 	libseed_gtkbuilder.la
@@ -22,7 +22,7 @@ libseed_gtkbuilder_la_LDFLAGS = \
 	$(GOBJECT_INTROSPECTION_LDFLAGS)
 
 libseed_gtkbuilder_la_LIBADD = \
-	$(top_builddir)/libseed/libseed.la \
+	$(top_builddir)/libseed/libseed SEED_GTK_VERSION@.la \
 	$(SEED_PROFILE_LIBS)
 
 endif
diff --git a/modules/libxml/Makefile.am b/modules/libxml/Makefile.am
index edfdb5f..ef7f902 100644
--- a/modules/libxml/Makefile.am
+++ b/modules/libxml/Makefile.am
@@ -2,7 +2,7 @@ if BUILD_LIBXML_MODULE
 
 EXTRA_DIST = xml.js
 
-seedlibdir = ${libdir}/seed
+seedlibdir = ${libdir}/seed SEED_GTK_VERSION@
 
 seedlib_LTLIBRARIES = \
 	libseed_libxml.la
@@ -23,10 +23,10 @@ libseed_libxml_la_LDFLAGS = \
 	$(GOBJECT_INTROSPECTION_LDFLAGS)
 
 libseed_libxml_la_LIBADD = \
-	$(top_builddir)/libseed/libseed.la \
+	$(top_builddir)/libseed/libseed SEED_GTK_VERSION@.la \
 	$(SEED_PROFILE_LIBS)
 
-extensionsdir=$(datadir)/seed/extensions
+extensionsdir=$(datadir)/seed SEED_GTK_VERSION@/extensions
 extensions_DATA=xml.js
 
 endif
diff --git a/modules/mpfr/Makefile.am b/modules/mpfr/Makefile.am
index 8a926ed..7924a05 100644
--- a/modules/mpfr/Makefile.am
+++ b/modules/mpfr/Makefile.am
@@ -1,6 +1,6 @@
 if BUILD_MPFR_MODULE
 
-seedlibdir = ${libdir}/seed
+seedlibdir = ${libdir}/seed SEED_GTK_VERSION@
 
 seedlib_LTLIBRARIES = \
 	libseed_mpfr.la
@@ -22,7 +22,7 @@ libseed_mpfr_la_LDFLAGS = \
 	$(GOBJECT_INTROSPECTION_LDFLAGS)
 
 libseed_mpfr_la_LIBADD = -lmpfr -lgmp \
-	$(top_builddir)/libseed/libseed.la \
+	$(top_builddir)/libseed/libseed SEED_GTK_VERSION@.la \
 	$(SEED_PROFILE_LIBS)
 
 EXTRA_DIST = seed-mpfr.h
diff --git a/modules/multiprocessing/Makefile.am b/modules/multiprocessing/Makefile.am
index b94d489..e340817 100644
--- a/modules/multiprocessing/Makefile.am
+++ b/modules/multiprocessing/Makefile.am
@@ -2,7 +2,7 @@ if BUILD_MULTIPROCESSING_MODULE
 
 EXTRA_DIST = fork.js bi.js
 
-seedlibdir = ${libdir}/seed
+seedlibdir = ${libdir}/seed SEED_GTK_VERSION@
 
 seedlib_LTLIBRARIES = \
 	libseed_multiprocessing.la
@@ -21,7 +21,7 @@ libseed_multiprocessing_la_LDFLAGS = \
 	$(GOBJECT_INTROSPECTION_LDFLAGS)
 
 libseed_multiprocessing_la_LIBADD = \
-	$(top_builddir)/libseed/libseed.la \
+	$(top_builddir)/libseed/libseed SEED_GTK_VERSION@.la \
 	$(SEED_PROFILE_LIBS)
 
 endif
diff --git a/modules/os/Makefile.am b/modules/os/Makefile.am
index cb97e6d..018f7e5 100644
--- a/modules/os/Makefile.am
+++ b/modules/os/Makefile.am
@@ -1,6 +1,6 @@
 if BUILD_OS_MODULE
 
-seedlibdir = ${libdir}/seed
+seedlibdir = ${libdir}/seed SEED_GTK_VERSION@
 
 seedlib_LTLIBRARIES = \
 	libseed_os.la
@@ -20,7 +20,7 @@ libseed_os_la_LDFLAGS = \
 	$(SEED_DEBUG_LDFLAGS)
 
 libseed_os_la_LIBADD = \
-	$(top_builddir)/libseed/libseed.la \
+	$(top_builddir)/libseed/libseed SEED_GTK_VERSION@.la \
 	-lutil \
 	$(SEED_PROFILE_LIBS)
 
diff --git a/modules/readline/Makefile.am b/modules/readline/Makefile.am
index b0698f7..6ceb55f 100644
--- a/modules/readline/Makefile.am
+++ b/modules/readline/Makefile.am
@@ -1,6 +1,6 @@
 if BUILD_READLINE_MODULE
 
-seedlibdir = ${libdir}/seed
+seedlibdir = ${libdir}/seed SEED_GTK_VERSION@
 
 seedlib_LTLIBRARIES = \
 	libseed_readline.la
@@ -21,7 +21,7 @@ libseed_readline_la_LDFLAGS = \
 	$(FFI_LDFLAGS)
 
 libseed_readline_la_LIBADD = \
-	$(top_builddir)/libseed/libseed.la \
+	$(top_builddir)/libseed/libseed SEED_GTK_VERSION@.la \
 	-lreadline \
 	$(SEED_PROFILE_LIBS) 
 
diff --git a/modules/sandbox/Makefile.am b/modules/sandbox/Makefile.am
index 96c186f..17d4864 100644
--- a/modules/sandbox/Makefile.am
+++ b/modules/sandbox/Makefile.am
@@ -1,4 +1,4 @@
-seedlibdir = ${libdir}/seed
+seedlibdir = ${libdir}/seed SEED_GTK_VERSION@
 
 seedlib_LTLIBRARIES = \
 	libseed_sandbox.la
@@ -18,7 +18,7 @@ libseed_sandbox_la_LDFLAGS = \
 	$(GOBJECT_INTROSPECTION_LDFLAGS)
 
 libseed_sandbox_la_LIBADD = \
-	$(top_builddir)/libseed/libseed.la \
+	$(top_builddir)/libseed/libseed SEED_GTK_VERSION@.la \
 	$(SEED_PROFILE_LIBS)
 
 
diff --git a/modules/sqlite/Makefile.am b/modules/sqlite/Makefile.am
index 70823dd..b8a3bd6 100644
--- a/modules/sqlite/Makefile.am
+++ b/modules/sqlite/Makefile.am
@@ -1,6 +1,6 @@
 if BUILD_SQLITE_MODULE
 
-seedlibdir = ${libdir}/seed
+seedlibdir = ${libdir}/seed SEED_GTK_VERSION@
 EXTRA_DIST = example.js
 
 seedlib_LTLIBRARIES = \
@@ -23,7 +23,7 @@ libseed_sqlite_la_LDFLAGS = \
 	$(SEED_DEBUG_LDFLAGS)
 
 libseed_sqlite_la_LIBADD = \
-	$(top_builddir)/libseed/libseed.la \
+	$(top_builddir)/libseed/libseed SEED_GTK_VERSION@.la \
 	$(SQLITE_LIBS) \
 	$(SEED_PROFILE_LIBS)
 
diff --git a/seed.pc.in b/seed.pc.in
index b3eb12a..380b750 100644
--- a/seed.pc.in
+++ b/seed.pc.in
@@ -4,9 +4,9 @@ libdir= libdir@
 bindir= bindir@
 includedir= includedir@
 
-Cflags: -I${includedir}/seed
+Cflags: -I${includedir}/seed SEED_GTK_VERSION@
 Requires: @WEBKIT_PC@ gobject-introspection-1.0 glib-2.0 gobject-2.0 gmodule-2.0 gthread-2.0
-Libs: -L${libdir} -lseed
+Libs: -L${libdir} -lseed SEED_GTK_VERSION@
 
 Name: Seed
 Description: Seed Javascript Interpreter.
diff --git a/src/Makefile.am b/src/Makefile.am
index d67ba85..ed4cb26 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,4 +24,4 @@ seed_LDFLAGS = \
 	$(GTHREAD_LIBS)
 
 seed_LDADD = \
-	../libseed/libseed.la
+	../libseed/libseed SEED_GTK_VERSION@.la
diff --git a/tests/c/Makefile.am b/tests/c/Makefile.am
index cb72d00..954c6ea 100644
--- a/tests/c/Makefile.am
+++ b/tests/c/Makefile.am
@@ -20,5 +20,5 @@ test_LDFLAGS = \
 	$(GOBJECT_INTROSPECTION_LIBS)
 
 test_LDADD = \
-	../../libseed/libseed.la
+	../../libseed/libseed SEED_GTK_VERSION@.la
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]