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>

diff --git a/Makefile.in b/Makefile.in
index 056cca1ed79159fa124c58f2dbca9d9239db5faf..77f7ded1c620bcfd572cbd0bbda1c03ba80ca463 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -108,7 +108,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@

diff --git a/configure b/configure
index 86fdf3d1eaed80b60a3f524b99231f9092b9c76b..19cedb5c7511fd6e565e0cf120a171556ba3bec9 100755 (executable)
--- a/configure
+++ b/configure
@@ -828,7 +828,9 @@ am__leading_dot
 AMTAR
 am__tar
 am__untar
-LIBRARY_VERSION
+LIBRARY_VERSION_MAJOR
+LIBRARY_VERSION_MINOR
+LIBRARY_VERSION_RELEASE
 CXX
 CXXFLAGS
 LDFLAGS
@@ -2427,9 +2429,12 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
 
 
 
-# set library version (X:Y:Z gets transfromed to libcgroup.so.X.Y.Z,
-# soname is libcgroup.so.X
-LIBRARY_VERSION=1:0:34
+# set library version, soname is libcgroup.so.MAJOR
+LIBRARY_VERSION_MAJOR=1
+
+LIBRARY_VERSION_MINOR=0
+
+LIBRARY_VERSION_RELEASE=34
 
 
 # we do not want static libraries
@@ -5075,7 +5080,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5078 "configure"' > conftest.$ac_ext
+  echo '#line 5083 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7346,11 +7351,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7349: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7354: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7353: \$? = $ac_status" >&5
+   echo "$as_me:7358: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7636,11 +7641,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7639: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7644: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7643: \$? = $ac_status" >&5
+   echo "$as_me:7648: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7740,11 +7745,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7743: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7748: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7747: \$? = $ac_status" >&5
+   echo "$as_me:7752: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -10091,7 +10096,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10094 "configure"
+#line 10099 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10191,7 +10196,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10194 "configure"
+#line 10199 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12611,11 +12616,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12614: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12619: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:12618: \$? = $ac_status" >&5
+   echo "$as_me:12623: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -12715,11 +12720,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12718: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12723: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:12722: \$? = $ac_status" >&5
+   echo "$as_me:12727: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -14279,11 +14284,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14282: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14287: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14286: \$? = $ac_status" >&5
+   echo "$as_me:14291: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -14383,11 +14388,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14386: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14391: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14390: \$? = $ac_status" >&5
+   echo "$as_me:14395: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -16572,11 +16577,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16575: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16580: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16579: \$? = $ac_status" >&5
+   echo "$as_me:16584: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -16862,11 +16867,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16865: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16870: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16869: \$? = $ac_status" >&5
+   echo "$as_me:16874: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -16966,11 +16971,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16969: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16974: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16973: \$? = $ac_status" >&5
+   echo "$as_me:16978: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -22620,7 +22625,9 @@ am__leading_dot!$am__leading_dot$ac_delim
 AMTAR!$AMTAR$ac_delim
 am__tar!$am__tar$ac_delim
 am__untar!$am__untar$ac_delim
-LIBRARY_VERSION!$LIBRARY_VERSION$ac_delim
+LIBRARY_VERSION_MAJOR!$LIBRARY_VERSION_MAJOR$ac_delim
+LIBRARY_VERSION_MINOR!$LIBRARY_VERSION_MINOR$ac_delim
+LIBRARY_VERSION_RELEASE!$LIBRARY_VERSION_RELEASE$ac_delim
 CXX!$CXX$ac_delim
 CXXFLAGS!$CXXFLAGS$ac_delim
 LDFLAGS!$LDFLAGS$ac_delim
@@ -22656,8 +22663,6 @@ host!$host$ac_delim
 host_cpu!$host_cpu$ac_delim
 host_vendor!$host_vendor$ac_delim
 host_os!$host_os$ac_delim
-SED!$SED$ac_delim
-GREP!$GREP$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -22699,6 +22704,8 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+SED!$SED$ac_delim
+GREP!$GREP$ac_delim
 EGREP!$EGREP$ac_delim
 LN_S!$LN_S$ac_delim
 ECHO!$ECHO$ac_delim
@@ -22714,7 +22721,7 @@ LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 13; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 15; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

diff --git a/configure.in b/configure.in
index 7f44ea6709ee2be85b21ed209f549dd39da70f06..c0ab521650c17acca357a06c415cdfd3309e061f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -18,9 +18,10 @@ AC_PREREQ(2.61)
 AC_INIT([control groups library and utilities], 0.34,
        [http://sourceforge.net/tracker/?group_id=218421&atid=1043649])
 AM_INIT_AUTOMAKE(libcgroup, 0.34)
-# set library version (X:Y:Z gets transfromed to libcgroup.so.X.Y.Z,
-# soname is libcgroup.so.X
-AC_SUBST(LIBRARY_VERSION, 1:0:34)
+# set library version, soname is libcgroup.so.MAJOR
+AC_SUBST(LIBRARY_VERSION_MAJOR, 1)
+AC_SUBST(LIBRARY_VERSION_MINOR, 0)
+AC_SUBST(LIBRARY_VERSION_RELEASE, 34)
 
 # we do not want static libraries
 AC_DISABLE_STATIC

diff --git a/dist/Makefile.in b/dist/Makefile.in
index a8ec4c48b35eaa9dcfffcc466ff6a1f053259197..705070c1c6c21b09a59aad6b5735f7e4b4fafc90 100644 (file)
--- a/dist/Makefile.in
+++ b/dist/Makefile.in
@@ -82,7 +82,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@
@@ -169,9 +171,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
              exit 1;; \
          esac; \
        done; \
-       echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  dist/Makefile'; \
+       echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  dist/Makefile'; \
        cd $(top_srcdir) && \
-         $(AUTOMAKE) --gnu  dist/Makefile
+         $(AUTOMAKE) --foreign  dist/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
        @case '$?' in \

diff --git a/doc/Makefile.in b/doc/Makefile.in
index b1e6fa1e005e0e8ac2d876f548d8bd681b097691..fbe71e088586fde3ef1ff41453f0aa99aef127b3 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -93,7 +93,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@
@@ -180,9 +182,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
              exit 1;; \
          esac; \
        done; \
-       echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/Makefile'; \
+       echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/Makefile'; \
        cd $(top_srcdir) && \
-         $(AUTOMAKE) --gnu  doc/Makefile
+         $(AUTOMAKE) --foreign  doc/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
        @case '$?' in \

diff --git a/doc/man/Makefile.in b/doc/man/Makefile.in
index d58a270e1d2fd881e6694cd63f5198a5247efed9..faad63f2d987b436b9de8ca3ac736d555c12776b 100644 (file)
--- a/doc/man/Makefile.in
+++ b/doc/man/Makefile.in
@@ -88,7 +88,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@
@@ -178,9 +180,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
              exit 1;; \
          esac; \
        done; \
-       echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/man/Makefile'; \
+       echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/man/Makefile'; \
        cd $(top_srcdir) && \
-         $(AUTOMAKE) --gnu  doc/man/Makefile
+         $(AUTOMAKE) --foreign  doc/man/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
        @case '$?' in \

diff --git a/include/Makefile.in b/include/Makefile.in
index 7285a1d510ebc78af87aac7fd2323ff6f41b74ed..aa26b4201a008f1ac32781d4c939b9b86f8b0e0f 100644 (file)
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -94,7 +94,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@
@@ -181,9 +183,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
              exit 1;; \
          esac; \
        done; \
-       echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  include/Makefile'; \
+       echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  include/Makefile'; \
        cd $(top_srcdir) && \
-         $(AUTOMAKE) --gnu  include/Makefile
+         $(AUTOMAKE) --foreign  include/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
        @case '$?' in \

diff --git a/samples/Makefile.in b/samples/Makefile.in
index bef275f3b35a6c9fe597a4308b383b1dab86c5a3..2d3c89b2a57146b7584a486aa115b1a6a44d155a 100644 (file)
--- a/samples/Makefile.in
+++ b/samples/Makefile.in
@@ -81,7 +81,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@
@@ -168,9 +170,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
              exit 1;; \
          esac; \
        done; \
-       echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  samples/Makefile'; \
+       echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  samples/Makefile'; \
        cd $(top_srcdir) && \
-         $(AUTOMAKE) --gnu  samples/Makefile
+         $(AUTOMAKE) --foreign  samples/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
        @case '$?' in \

diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index adf93e60560aad2085edd27c76d30b491bec7e5b..afc87463c9c478185e20f75bf7b8af978cc37487 100644 (file)
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -81,7 +81,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@
@@ -168,9 +170,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
              exit 1;; \
          esac; \
        done; \
-       echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  scripts/Makefile'; \
+       echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  scripts/Makefile'; \
        cd $(top_srcdir) && \
-         $(AUTOMAKE) --gnu  scripts/Makefile
+         $(AUTOMAKE) --foreign  scripts/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
        @case '$?' in \

diff --git a/src/Makefile.am b/src/Makefile.am
index c30393a616fbcd70b0f73493b62ff5519ad6eb54..93d07e9345b85e5239b9d4fd0002eaa60328c347 100644 (file)
--- 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 01fa4c60311515baf729b4fdf64556b7cca723b3..5583fcf859044d2520c7ac43b748be40d7d6aa25 100644 (file)
--- 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 279d7a4471bf33223569bfaad0970b6e54f7f235..3006ee4a2981198f7bf440ea1d7a1cd45af469ec 100644 (file)
--- 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 205e1bc59654192b4d83f7968fa275aecf7eb894..9b8a0fc8a1ae8b305730594f50e6bb0bef5a2400 100644 (file)
--- 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 4fa4f336070d9f41074f94d988b3b1222596863a..c34ca7b7c5b28705373aa74b81c84f9be0670876 100644 (file)
--- 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 \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index da3cac7674b4245cc9ebdc7ed42ce2e4874d267a..dae7a12618e03941d862915cd59a592a0604426c 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -131,7 +131,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@
@@ -227,9 +229,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
              exit 1;; \
          esac; \
        done; \
-       echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tests/Makefile'; \
+       echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tests/Makefile'; \
        cd $(top_srcdir) && \
-         $(AUTOMAKE) --gnu  tests/Makefile
+         $(AUTOMAKE) --foreign  tests/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
        @case '$?' in \