summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDodji Seketeli <dodji@gnome.org>2003-12-11 14:40:48 +0000
committerDodji Seketeli <dodji@src.gnome.org>2003-12-11 14:40:48 +0000
commitf34e699a7c8566e76b8e3180429d16799c906881 (patch)
treed2e8cd4f339c02bc58ed274f0daf66b6a13f9fe1
parentf1f8ac3f1a3cb2f65a531ceabc4aec8ff5fc5359 (diff)
downloadlibcroco-f34e699a7c8566e76b8e3180429d16799c906881.tar.gz
Provides libcrseleng and libcrlayeng with version info different from the
2003-12-11 Dodji Seketeli <dodji@gnome.org> * configure.in,src/layeng/Makefile.am,src/seleng/Makefile.am: Provides libcrseleng and libcrlayeng with version info different from the one of libcroco.
-rw-r--r--ChangeLog5
-rw-r--r--configure.in13
-rw-r--r--src/layeng/Makefile.am2
-rw-r--r--src/seleng/Makefile.am2
4 files changed, 19 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index e2fd4f4..ea4c8ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -33,7 +33,10 @@
removed ref to cr-parser-input.h
* src/seleng/Makefile.am: cleanup, make distcheck is happier.
* tests/testctl: exclude makefiles when diffing outputs and re outputs.
-
+ * configure.in,src/layeng/Makefile.am,src/seleng/Makefile.am:
+ Provides libcrseleng and libcrlayeng with version info
+ different from the one of libcroco.
+
2003-08-17 Gaël CHAMOULAUD <strider@gnome.org>
* src/layeng/cr-lay-eng.c: (layout_block_box):
diff --git a/configure.in b/configure.in
index 7c12762..ca5a336 100644
--- a/configure.in
+++ b/configure.in
@@ -11,12 +11,23 @@ LIBCROCO_CURRENT=1
LIBCROCO_REVISION=1
LIBCROCO_AGE=0
+LIBCRSELENG_CURRENT=2
+LIBCRSELENG_REVISION=0
+LIBCRSELENG_AGE=0
+
+LIBCRLAYENG_CURRENT=2
+LIBCRLAYENG_REVISION=0
+LIBCRLAYENG_AGE=1
+
#LIBCROCO_VERSION_INFO=`expr $LIBCROCO_MAJOR_VERSION + $LIBCROCO_MINOR_VERSION`:$LIBCROCO_MICRO_VERSION:$LIBCROCO_MINOR_VERSION
LIBCROCO_VERSION_INFO="$LIBCROCO_CURRENT:$LIBCROCO_REVISION:$LIBCROCO_AGE"
LIBCROCO_VERSION=$LIBCROCO_MAJOR_VERSION.$LIBCROCO_MINOR_VERSION.$LIBCROCO_MICRO_VERSION
LIBCROCO_VERSION_NUMBER=`expr $LIBCROCO_MAJOR_VERSION \* 10000 + $LIBCROCO_MINOR_VERSION \* 100 + $LIBCROCO_MICRO_VERSION`
VERSION=$LIBCROCO_VERSION
+LIBCRSELENG_VERSION_INFO="$LIBCRSELENG_CURRENT:$LIBCRSELENG_REVISION:$LIBCRSELENG_AGE"
+LIBCRLAYENG_VERSION_INFO="$LIBCRLAYENG_CURRENT:$LIBCRLAYENG_REVISION:$LIBCRLAYENG_AGE"
+
AC_SUBST(LIBCROCO_MAJOR_VERSION)
AC_SUBST(LIBCROCO_MINOR_VERSION)
AC_SUBST(LIBCROCO_MICRO_VERSION)
@@ -24,6 +35,8 @@ AC_SUBST(LIBCROCO_VERSION)
AC_SUBST(LIBCROCO_VERSION_INFO)
AC_SUBST(LIBCROCO_VERSION_NUMBER)
AC_SUBST(VERSION)
+AC_SUBST(LIBCRLAYENG_VERSION_INFO)
+AC_SUBST(LIBCRSELENG_VERSION_INFO)
AM_INIT_AUTOMAKE($PACKAGE, $LIBCROCO_VERSION)
AM_CONFIG_HEADER(config.h)
diff --git a/src/layeng/Makefile.am b/src/layeng/Makefile.am
index c4214b6..fff072f 100644
--- a/src/layeng/Makefile.am
+++ b/src/layeng/Makefile.am
@@ -15,6 +15,6 @@ INCLUDES=-I$(top_srcdir) -I$(top_srcdir)/src/parser \
LDADD=$(top_srcdir)/src/parser/@CROCO_PARSER_LIB@
-libcrlayeng_la_LDFLAGS=-version-info @LIBCROCO_VERSION_INFO@ \
+libcrlayeng_la_LDFLAGS=-version-info @LIBCRLAYENG_VERSION_INFO@ \
$(top_srcdir)/src/seleng/@CROCO_SELENG_LIB@ @LIBXML2_LIBS@ \
@LIBGNOMEUI2_LIBS@
diff --git a/src/seleng/Makefile.am b/src/seleng/Makefile.am
index 06e6b34..eb74907 100644
--- a/src/seleng/Makefile.am
+++ b/src/seleng/Makefile.am
@@ -14,4 +14,4 @@ INCLUDES=-I$(top_srcdir) -I$(top_srcdir)/src/parser -I$(top_srcdir)/intl \
LDADD=$(top_srcdir)/src/parser/libcroco.la
-libcrseleng_la_LDFLAGS=-version-info @LIBCROCO_VERSION_INFO@ @LIBXML2_LIBS@
+libcrseleng_la_LDFLAGS=-version-info @LIBCRSELENG_VERSION_INFO@ @LIBXML2_LIBS@