> I'm open to patches for bumping lib versions.
>
Here you go.
-Angus
Signed-off-by: Angus Salkeld <asalk...@redhat.com>
---
configure.ac | 6 ++++++
lib/Makefile.am | 18 ++++++++++--------
2 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/configure.ac b/configure.ac
index 32cf293..cd27f72 100644
--- a/configure.ac
+++ b/configure.ac
@@ -156,6 +156,9 @@ SOMAJOR="3"
SOMINOR="0"
SOMICRO="0"
SONAME="${SOMAJOR}.${SOMINOR}.${SOMICRO}"
+# Special for libSaMsg
+MSG_SOMAJOR="4"
+MSG_SONAME="${MSG_SOMAJOR}.${SOMINOR}.${SOMICRO}"
# local options
AC_ARG_ENABLE([fatal-warnings],
@@ -323,6 +326,8 @@ AC_SUBST([SOMAJOR])
AC_SUBST([SOMINOR])
AC_SUBST([SOMICRO])
AC_SUBST([SONAME])
+AC_SUBST([MSG_SONAME])
+AC_SUBST([MSG_SOMAJOR])
AC_SUBST([OS_DYFLAGS])
@@ -363,6 +368,7 @@ AC_MSG_RESULT([ Features =
${PACKAGE_FEATURES}])
AC_MSG_RESULT([])
AC_MSG_RESULT([$PACKAGE build info:])
AC_MSG_RESULT([ Library SONAME = ${SONAME}])
+AC_MSG_RESULT([ MSG Library SONAME = ${MSG_SONAME}])
AC_MSG_RESULT([ Default optimization = ${OPT_CFLAGS}])
AC_MSG_RESULT([ Default debug options = ${GDB_CFLAGS}])
AC_MSG_RESULT([ Extra compiler warnings = ${EXTRA_WARNING}])
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 02dd8df..9f4133c 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -40,9 +40,11 @@ INCLUDES = -I$(top_builddir)/include
-I$(top_srcdir)/include
lib_LIBRARIES = libSaAmf.a libSaCkpt.a libSaClm.a libSaEvt.a \
libSaLck.a libSaMsg.a libSaTmr.a
Signed-off-by: Angus Salkeld <asalk...@redhat.com>
---
configure.ac | 6 ++++++
lib/Makefile.am | 18 ++++++++++--------
2 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/configure.ac b/configure.ac
index 32cf293..cd27f72 100644
--- a/configure.ac
+++ b/configure.ac
@@ -156,6 +156,9 @@ SOMAJOR="3"
SOMINOR="0"
SOMICRO="0"
SONAME="${SOMAJOR}.${SOMINOR}.${SOMICRO}"
+# Special for libSaMsg
+MSG_SOMAJOR="4"
+MSG_SONAME="${MSG_SOMAJOR}.${SOMINOR}.${SOMICRO}"
# local options
AC_ARG_ENABLE([fatal-warnings],
@@ -323,6 +326,8 @@ AC_SUBST([SOMAJOR])
AC_SUBST([SOMINOR])
AC_SUBST([SOMICRO])
AC_SUBST([SONAME])
+AC_SUBST([MSG_SONAME])
+AC_SUBST([MSG_SOMAJOR])
AC_SUBST([OS_DYFLAGS])
@@ -363,6 +368,7 @@ AC_MSG_RESULT([ Features =
${PACKAGE_FEATURES}])
AC_MSG_RESULT([])
AC_MSG_RESULT([$PACKAGE build info:])
AC_MSG_RESULT([ Library SONAME = ${SONAME}])
+AC_MSG_RESULT([ MSG Library SONAME = ${MSG_SONAME}])
AC_MSG_RESULT([ Default optimization = ${OPT_CFLAGS}])
AC_MSG_RESULT([ Default debug options = ${GDB_CFLAGS}])
AC_MSG_RESULT([ Extra compiler warnings = ${EXTRA_WARNING}])
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 02dd8df..9f4133c 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -40,9 +40,11 @@ INCLUDES = -I$(top_builddir)/include
-I$(top_srcdir)/include
lib_LIBRARIES = libSaAmf.a libSaCkpt.a libSaClm.a libSaEvt.a \
libSaLck.a libSaMsg.a libSaTmr.a
-SHARED_LIBS = $(lib_LIBRARIES:%.a=%.so.$(SONAME))
+LIBS_BASE_GENERAL = $(filter-out libSaMsg,$(basename $(lib_LIBRARIES)))
+SHARED_LIBS = $(addsuffix .so.$(SONAME),$(LIBS_BASE_GENERAL)) \
+ $(addsuffix .so.$(MSG_SONAME),libSaMsg)
SHARED_LIBS_SO = $(lib_LIBRARIES:%.a=%.so)
-SHARED_LIBS_SO_TWO = $(lib_LIBRARIES:%.a=%.so.$(SOMAJOR))
+SHARED_LIBS_SO_TWO = $(lib_LIBRARIES:%.a=%.so.$(SOMAJOR))
libSaMsg.$(MSG_SOMAJOR)
libSaAmf_a_SOURCES = util.c amf.c
libSaCkpt_a_SOURCES = util.c ckpt.c
@@ -70,7 +72,7 @@ libSaEvt.so.$(SONAME): util.o evt.o
libSaLck.so.$(SONAME): util.o lck.o
$(CC) $(DARWIN_OPTS) $(coroipcc_LIBS) $^ -o $@ $(AM_LDFLAGS)
-libSaMsg.so.$(SONAME): util.o msg.o
+libSaMsg.so.$(MSG_SONAME): util.o msg.o
$(CC) $(DARWIN_OPTS) $(coroipcc_LIBS) $^ -o $@ $(AM_LDFLAGS)
libSaTmr.so.$(SONAME): util.o tmr.o
@@ -95,7 +97,7 @@ libSaEvt.so.$(SONAME): util.o evt.o
libSaLck.so.$(SONAME): util.o lck.o
$(LD) $(LDFLAGS) $(SOLARIS_OPTS) -G $(coroipcc_LIBS) $^ -o $@
$(AM_LDFLAGS)
-libSaMsg.so.$(SONAME): util.o msg.o
+libSaMsg.so.$(MSG_SONAME): util.o msg.o
$(LD) $(LDFLAGS) $(SOLARIS_OPTS) -G $(coroipcc_LIBS) $^ -o $@
$(AM_LDFLAGS)
libSaTmr.so.$(SONAME): util.o tmr.o
@@ -143,13 +145,13 @@ libSaLck.so.$(SONAME): util.o lck.o
ln -sf libSaLck.so.$(SONAME) libSaLck.so
ln -sf libSaLck.so.$(SONAME) libSaLck.so.$(SOMAJOR)
-libSaMsg.so.$(SONAME): util.o msg.o
+libSaMsg.so.$(MSG_SONAME): util.o msg.o
$(CC) -shared -o $@ \
- -Wl,-soname=libSaMsg.so.$(SOMAJOR) \
+ -Wl,-soname=libSaMsg.so.$(MSG_SOMAJOR) \
-Wl,-version-script=$(srcdir)/libSaMsg.versions \
$^ $(LDFLAGS) $(coroipcc_LIBS) $(AM_LDFLAGS)
- ln -sf libSaMsg.so.$(SONAME) libSaMsg.so
- ln -sf libSaMsg.so.$(SONAME) libSaMsg.so.$(SOMAJOR)
+ ln -sf libSaMsg.so.$(MSG_SONAME) libSaMsg.so
+ ln -sf libSaMsg.so.$(MSG_SONAME) libSaMsg.so.$(MSG_SOMAJOR)
libSaTmr.so.$(SONAME): util.o tmr.o
$(CC) $(LDFLAGS) -shared -o $@ \
--
1.6.6
-SHARED_LIBS = $(lib_LIBRARIES:%.a=%.so.$(SONAME))
+LIBS_BASE_GENERAL = $(filter-out libSaMsg,$(basename $(lib_LIBRARIES)))
+SHARED_LIBS = $(addsuffix .so.$(SONAME),$(LIBS_BASE_GENERAL)) \
+ $(addsuffix .so.$(MSG_SONAME),libSaMsg)
SHARED_LIBS_SO = $(lib_LIBRARIES:%.a=%.so)
-SHARED_LIBS_SO_TWO = $(lib_LIBRARIES:%.a=%.so.$(SOMAJOR))
+SHARED_LIBS_SO_TWO = $(lib_LIBRARIES:%.a=%.so.$(SOMAJOR))
libSaMsg.$(MSG_SOMAJOR)
libSaAmf_a_SOURCES = util.c amf.c
libSaCkpt_a_SOURCES = util.c ckpt.c
@@ -70,7 +72,7 @@ libSaEvt.so.$(SONAME): util.o evt.o
libSaLck.so.$(SONAME): util.o lck.o
$(CC) $(DARWIN_OPTS) $(coroipcc_LIBS) $^ -o $@ $(AM_LDFLAGS)
-libSaMsg.so.$(SONAME): util.o msg.o
+libSaMsg.so.$(MSG_SONAME): util.o msg.o
$(CC) $(DARWIN_OPTS) $(coroipcc_LIBS) $^ -o $@ $(AM_LDFLAGS)
libSaTmr.so.$(SONAME): util.o tmr.o
@@ -95,7 +97,7 @@ libSaEvt.so.$(SONAME): util.o evt.o
libSaLck.so.$(SONAME): util.o lck.o
$(LD) $(LDFLAGS) $(SOLARIS_OPTS) -G $(coroipcc_LIBS) $^ -o $@
$(AM_LDFLAGS)
-libSaMsg.so.$(SONAME): util.o msg.o
+libSaMsg.so.$(MSG_SONAME): util.o msg.o
$(LD) $(LDFLAGS) $(SOLARIS_OPTS) -G $(coroipcc_LIBS) $^ -o $@
$(AM_LDFLAGS)
libSaTmr.so.$(SONAME): util.o tmr.o
@@ -143,13 +145,13 @@ libSaLck.so.$(SONAME): util.o lck.o
ln -sf libSaLck.so.$(SONAME) libSaLck.so
ln -sf libSaLck.so.$(SONAME) libSaLck.so.$(SOMAJOR)
-libSaMsg.so.$(SONAME): util.o msg.o
+libSaMsg.so.$(MSG_SONAME): util.o msg.o
$(CC) -shared -o $@ \
- -Wl,-soname=libSaMsg.so.$(SOMAJOR) \
+ -Wl,-soname=libSaMsg.so.$(MSG_SOMAJOR) \
-Wl,-version-script=$(srcdir)/libSaMsg.versions \
$^ $(LDFLAGS) $(coroipcc_LIBS) $(AM_LDFLAGS)
- ln -sf libSaMsg.so.$(SONAME) libSaMsg.so
- ln -sf libSaMsg.so.$(SONAME) libSaMsg.so.$(SOMAJOR)
+ ln -sf libSaMsg.so.$(MSG_SONAME) libSaMsg.so
+ ln -sf libSaMsg.so.$(MSG_SONAME) libSaMsg.so.$(MSG_SOMAJOR)
libSaTmr.so.$(SONAME): util.o tmr.o
$(CC) $(LDFLAGS) -shared -o $@ \
--
1.6.6
_______________________________________________
Openais mailing list
Openais@lists.linux-foundation.org
https://lists.linux-foundation.org/mailman/listinfo/openais
