Rework the way how so version is defined

Make the shared object version a bit more usable, the notation with double
colons cannot be used on different places (see next patch).

Also run automake && autoconf to refresh the generated stuff.

Signed-off-by: Jan Safranek <jsafrane@redhat.com>

5 files changed, 25 insertions, 14 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index c30393a..93d07e9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,5 +7,6 @@ INCLUDES = -I$(top_srcdir)/include
 lib_LTLIBRARIES = libcgroup.la
 libcgroup_la_SOURCES = parse.y lex.l api.c config.c libcgroup-internal.h libcgroup.map wrapper.c
 libcgroup_la_LIBADD = -lpthread
-libcgroup_la_LDFLAGS = -Wl,--version-script,libcgroup.map -version-number $(LIBRARY_VERSION)
+libcgroup_la_LDFLAGS = -Wl,--version-script,libcgroup.map -version-number \
+	-version-number $(LIBRARY_VERSION_MAJOR):$(LIBRARY_VERSION_MINOR):$(LIBRARY_VERSION_RELEASE)
 
diff --git a/src/Makefile.in b/src/Makefile.in
index 01fa4c6..5583fcf 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -129,7 +129,9 @@ LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
 LIBOBJS = @LIBOBJS@
-LIBRARY_VERSION = @LIBRARY_VERSION@
+LIBRARY_VERSION_MAJOR = @LIBRARY_VERSION_MAJOR@
+LIBRARY_VERSION_MINOR = @LIBRARY_VERSION_MINOR@
+LIBRARY_VERSION_RELEASE = @LIBRARY_VERSION_RELEASE@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
@@ -211,7 +213,9 @@ INCLUDES = -I$(top_srcdir)/include
 lib_LTLIBRARIES = libcgroup.la
 libcgroup_la_SOURCES = parse.y lex.l api.c config.c libcgroup-internal.h libcgroup.map wrapper.c
 libcgroup_la_LIBADD = -lpthread
-libcgroup_la_LDFLAGS = -Wl,--version-script,libcgroup.map -version-number $(LIBRARY_VERSION)
+libcgroup_la_LDFLAGS = -Wl,--version-script,libcgroup.map -version-number \
+	-version-number $(LIBRARY_VERSION_MAJOR):$(LIBRARY_VERSION_MINOR):$(LIBRARY_VERSION_RELEASE)
+
 all: all-recursive
 
 .SUFFIXES:
@@ -225,9 +229,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/Makefile
+	  $(AUTOMAKE) --foreign  src/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/src/daemon/Makefile.in b/src/daemon/Makefile.in
index 279d7a4..3006ee4 100644
--- a/src/daemon/Makefile.in
+++ b/src/daemon/Makefile.in
@@ -106,7 +106,9 @@ LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
 LIBOBJS = @LIBOBJS@
-LIBRARY_VERSION = @LIBRARY_VERSION@
+LIBRARY_VERSION_MAJOR = @LIBRARY_VERSION_MAJOR@
+LIBRARY_VERSION_MINOR = @LIBRARY_VERSION_MINOR@
+LIBRARY_VERSION_RELEASE = @LIBRARY_VERSION_RELEASE@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
@@ -197,9 +199,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/daemon/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/daemon/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/daemon/Makefile
+	  $(AUTOMAKE) --foreign  src/daemon/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/src/pam/Makefile.in b/src/pam/Makefile.in
index 205e1bc..9b8a0fc 100644
--- a/src/pam/Makefile.in
+++ b/src/pam/Makefile.in
@@ -111,7 +111,9 @@ LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
 LIBOBJS = @LIBOBJS@
-LIBRARY_VERSION = @LIBRARY_VERSION@
+LIBRARY_VERSION_MAJOR = @LIBRARY_VERSION_MAJOR@
+LIBRARY_VERSION_MINOR = @LIBRARY_VERSION_MINOR@
+LIBRARY_VERSION_RELEASE = @LIBRARY_VERSION_RELEASE@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
@@ -203,9 +205,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/pam/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/pam/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/pam/Makefile
+	  $(AUTOMAKE) --foreign  src/pam/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/src/tools/Makefile.in b/src/tools/Makefile.in
index 4fa4f33..c34ca7b 100644
--- a/src/tools/Makefile.in
+++ b/src/tools/Makefile.in
@@ -116,7 +116,9 @@ LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
 LIBOBJS = @LIBOBJS@
-LIBRARY_VERSION = @LIBRARY_VERSION@
+LIBRARY_VERSION_MAJOR = @LIBRARY_VERSION_MAJOR@
+LIBRARY_VERSION_MINOR = @LIBRARY_VERSION_MINOR@
+LIBRARY_VERSION_RELEASE = @LIBRARY_VERSION_RELEASE@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
@@ -208,9 +210,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/tools/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/tools/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/tools/Makefile
+	  $(AUTOMAKE) --foreign  src/tools/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \