[gtkhtml] Add versioning to the installed libraries
- From: Chenthill Palanisamy <pchen src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkhtml] Add versioning to the installed libraries
- Date: Tue, 29 Jun 2010 10:32:26 +0000 (UTC)
commit 02c033ade9b069914d9107823cf99a3022274a0a
Author: Chenthill Palanisamy <pchenthill novell com>
Date: Tue Jun 29 15:59:16 2010 +0530
Add versioning to the installed libraries
components/editor/Makefile.am | 21 +++++++++++++++------
configure.ac | 3 ++-
gtkhtml/Makefile.am | 13 ++++++++++---
3 files changed, 27 insertions(+), 10 deletions(-)
---
diff --git a/components/editor/Makefile.am b/components/editor/Makefile.am
index f73debf..351652e 100644
--- a/components/editor/Makefile.am
+++ b/components/editor/Makefile.am
@@ -3,7 +3,6 @@
gtkhtml_data = $(datadir)/gtkhtml- GTKHTML_API_VERSION@
bin_PROGRAMS = gtkhtml-editor-test
-lib_LTLIBRARIES = libgtkhtml-editor.la
AM_CFLAGS = \
@GTKHTML_CFLAGS@ \
@@ -24,7 +23,7 @@ BUILT_SOURCES = \
libgtkhtml_editordir = $(includedir)/libgtkhtml- GTKHTML_API_VERSION@/editor
-libgtkhtml_editor_la_SOURCES = \
+csources = \
$(BUILT_SOURCES) \
gtkhtml-color-combo.c \
gtkhtml-color-combo.h \
@@ -64,17 +63,27 @@ libgtkhtml_editor_HEADERS = \
gtkhtml-spell-checker.h \
gtkhtml-spell-language.h
-libgtkhtml_editor_la_LIBADD = \
+if ENABLE_GTK3
+lib_LTLIBRARIES = libgtkhtml-editor-4.0.la
+libgtkhtml_editor_4_0_la_SOURCES = $(csources)
+libgtkhtml_editor_4_0_la_LIBADD = \
@GTKHTML_LIBS@ \
$(top_builddir)/gtkhtml/libgtkhtml- GTKHTML_API_VERSION@.la
-
-libgtkhtml_editor_la_LDFLAGS = -no-undefined
+libgtkhtml_editor_4_0_la_LDFLAGS = -no-undefined
+else
+lib_LTLIBRARIES = libgtkhtml-editor-3.14.la
+libgtkhtml_editor_3_14_la_SOURCES = $(csources)
+libgtkhtml_editor_3_14_la_LIBADD = \
+ @GTKHTML_LIBS@ \
+ $(top_builddir)/gtkhtml/libgtkhtml- GTKHTML_API_VERSION@.la
+libgtkhtml_editor_la_3_14_LDFLAGS = -no-undefined
+endif
gtkhtml_editor_test_SOURCES = main.c
gtkhtml_editor_test_LDADD = \
$(GTHREAD_LIBS) \
- libgtkhtml-editor.la \
+ libgtkhtml-editor- GTKHTML_API_VERSION@.la \
$(top_builddir)/gtkhtml/libgtkhtml- GTKHTML_API_VERSION@.la
gtkhtml-editor-marshal.h: gtkhtml-editor-marshal.list $(GLIB_GENMARSHAL)
diff --git a/configure.ac b/configure.ac
index 4002b51..da06758 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@ dnl **********************************
dnl GTK version
dnl **********************************
-AC_ARG_ENABLE([gtk+-3],
+AC_ARG_ENABLE([gtk3],
AS_HELP_STRING([--enable-gtk3],
[Attempt to use gtk+-3]),
[enable_gtk3=$enableval],[enable_gtk3=no])
@@ -33,6 +33,7 @@ else
GTKHTML_API_VERSION=3.14
EDITOR_API_VERSION=3.14
fi
+AM_CONDITIONAL([ENABLE_GTK3], [test "$enable_gtk3" = yes])
AC_DEFINE_UNQUOTED(GTKHTML_API_VERSION, "${GTKHTML_API_VERSION}", [GtkHTML API Version])
AC_SUBST(GTKHTML_API_VERSION)
diff --git a/gtkhtml/Makefile.am b/gtkhtml/Makefile.am
index 6ac2d02..4d9b86c 100644
--- a/gtkhtml/Makefile.am
+++ b/gtkhtml/Makefile.am
@@ -30,8 +30,6 @@ AM_CFLAGS = \
-DGTKHTML_DATADIR=\""$(gtkhtml_data)"\" \
-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
-lib_LTLIBRARIES = libgtkhtml-3.14.la
-
libgtkhtmldir = $(includedir)/libgtkhtml- GTKHTML_API_VERSION@/gtkhtml
# FIXME not all the stuff should be installed!
@@ -49,7 +47,7 @@ libgtkhtml_HEADERS = \
htmltokenizer.h \
$(NULL)
-libgtkhtml_3_14_la_SOURCES = \
+csources = \
gtkhtml-embedded.c \
gtkhtml-properties.c \
gtkhtml-search.c \
@@ -203,8 +201,17 @@ libgtkhtml_3_14_la_SOURCES = \
$(PLATFORM_DEP_SOURCES) \
$(NULL)
+if ENABLE_GTK3
+lib_LTLIBRARIES = libgtkhtml-4.0.la
+libgtkhtml_4_0_la_SOURCES = $(csources)
+libgtkhtml_4_0_la_LDFLAGS = -version-info $(GTKHTML_CURRENT):$(GTKHTML_REVISION):$(GTKHTML_AGE) -no-undefined
+libgtkhtml_4_0_la_LIBADD = $(GTKHTML_LIBS) ../a11y/libgtkhtml-a11y.la $(GAIL_LIBS) $(REGEX_LIBS)
+else
+lib_LTLIBRARIES = libgtkhtml-3.14.la
+libgtkhtml_3_14_la_SOURCES = $(csources)
libgtkhtml_3_14_la_LDFLAGS = -version-info $(GTKHTML_CURRENT):$(GTKHTML_REVISION):$(GTKHTML_AGE) -no-undefined
libgtkhtml_3_14_la_LIBADD = $(GTKHTML_LIBS) ../a11y/libgtkhtml-a11y.la $(GAIL_LIBS) $(REGEX_LIBS)
+endif
dist-hook:
mkdir $(distdir)/tests
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]