Rename library and use proper versioning

Previously the version of libproc always tracked the version of procps.
This doesn't work when other non-procps programs link to the library as
they are always playing catch up.

This change makes the library version independent of the procps version.
It will only be incremented when needed.

diff --git a/.gitignore b/.gitignore
index ea304da7a3c090ca54437cc36791f989265b950e..2e20e98e6f0b11b8727148468decf78c2f9b1034 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -28,8 +28,8 @@ pkill
 pmap
 procps-ng-*.tar.gz
 proc/.depend
-proc/libproc-ng.la
-proc/libproc-ng.pc
+proc/libprocfs.la
+proc/libprocfs.pc
 proc/Makefile
 proc/Makefile.in
 ps/Makefile

diff --git a/Makefile.am b/Makefile.am
index a748c7e8a0afdd290dc82921aaac578acfd597b1..3d31da8c20e1fb1baf83262e94f36faa198cf846 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@ ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = proc ps testsuite
 
 AM_CFLAGS = -Iproc
-AM_LDFLAGS = ./proc/libproc-ng.la
+AM_LDFLAGS = ./proc/libprocfs.la
 
 sbin_PROGRAMS = \
        sysctl

diff --git a/configure.ac b/configure.ac
index c581d3695e7067253ee6e531f2a688acb44fa89d..7b6bd66843e1ae51fb7b5605a9ea6b109c959bdb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -145,7 +145,7 @@ AC_SUBST(DEJAGNU)
 AC_CONFIG_FILES([
 Makefile
 proc/Makefile
-proc/libproc-ng.pc
+proc/libprocfs.pc
 ps/Makefile
 testsuite/Makefile
 ])

diff --git a/proc/Makefile.am b/proc/Makefile.am
index e101734c648b30fcad7a7d3ebee4100263d1d8ac..633f8b9362cc36283cdede1642c07dad0143c8d7 100644 (file)
--- a/proc/Makefile.am
+++ b/proc/Makefile.am
@@ -1,22 +1,27 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 AM_CPPFLAGS = -include $(top_builddir)/config.h
-lib_LTLIBRARIES = libproc-ng.la
 
-libproc_ng_ladir = $(ladir)
-libproc_ng_la_LIBADD = $(LIB_KPARTS)
-libproc_ng_la_LDFLAGS = \
+LIBPROCFS_CURRENT=0
+LIBPROCFS_REVISION=0
+LIBPROCFS_AGE=0
+
+lib_LTLIBRARIES = libprocfs.la
+
+libprocfs_ladir = $(ladir)
+libprocfs_la_LIBADD = $(LIB_KPARTS)
+libprocfs_la_LDFLAGS = \
        $(AM_LDFLAGS) \
        $(all_libraries) \
-       -release $(PACKAGE_VERSION) \
+       -version-info $(LIBPROCFS_CURRENT):$(LIBPROCFS_REVISION):$(LIBPROCFS_AGE) \
        -no-undefined \
-       -Wl,--version-script=$(top_srcdir)/proc/library.map
+       -Wl,--version-script=$(top_srcdir)/proc/libprocfs.sym
 
 EXTRA_DIST = library.map
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libproc-ng.pc
+pkgconfig_DATA = libprocfs.pc
 
-libproc_ng_la_SOURCES = \
+libprocfs_la_SOURCES = \
        alloc.c \
        alloc.h \
        devname.c \
@@ -41,8 +46,8 @@ libproc_ng_la_SOURCES = \
        whattime.c \
        whattime.h
 
-libproc_ng_la_includedir = $(includedir)/proc/
-libproc_ng_la_include_HEADERS =  \
+libprocfs_la_includedir = $(includedir)/proc/
+libprocfs_la_include_HEADERS =  \
        alloc.h \
        devname.h \
        escape.h \

diff --git a/proc/libproc-ng.pc.in b/proc/libprocfs.pc.in
similarity index 81%
rename from proc/libproc-ng.pc.in
rename to proc/libprocfs.pc.in
index 863904394b9bbafc25c7d3607da178e327a8a501..0167c66afda91cbfa918bd6772e416ff8b701ebe 100644 (file)
--- a/proc/libproc-ng.pc.in
+++ b/proc/libprocfs.pc.in
@@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: libproc-ng
+Name: libprocfs
 Description: Library to control and query process state
 Version: @VERSION@
-Libs: -L${libdir} -lproc-ng
+Libs: -L${libdir} -lprocfs
 Libs.private:
 Cflags: -I${includedir}

diff --git a/proc/library.map b/proc/libprocfs.sym
similarity index 100%
rename from proc/library.map
rename to proc/libprocfs.sym

diff --git a/ps/Makefile.am b/ps/Makefile.am
index ced42f23383975bce008940a0eca9363965a6224..84df5c239bb080729937c59ff1b947e15346c0bb 100644 (file)
--- a/ps/Makefile.am
+++ b/ps/Makefile.am
@@ -1,7 +1,7 @@
 AM_CPPFLAGS = -include $(top_builddir)/config.h
 
 AM_CFLAGS = -I../proc
-AM_LDFLAGS = ../proc/libproc-ng.la
+AM_LDFLAGS = ../proc/libprocfs.la
 
 dist_man_MANS = ps.1