From 38763ede406630cb71f9ab5547350133f19fe25e Mon Sep 17 00:00:00 2001
From: Craig Small <csmall@enc.com.au>
Date: Sat, 17 Dec 2011 22:35:05 +1100
Subject: [PATCH] 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.
---
 .gitignore                                 |  4 ++--
 Makefile.am                                |  2 +-
 configure.ac                               |  2 +-
 proc/Makefile.am                           | 25 +++++++++++++---------
 proc/{libproc-ng.pc.in => libprocfs.pc.in} |  4 ++--
 proc/{library.map => libprocfs.sym}        |  0
 ps/Makefile.am                             |  2 +-
 7 files changed, 22 insertions(+), 17 deletions(-)
 rename proc/{libproc-ng.pc.in => libprocfs.pc.in} (81%)
 rename proc/{library.map => libprocfs.sym} (100%)

diff --git a/.gitignore b/.gitignore
index ea304da7..2e20e98e 100644
--- 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 a748c7e8..3d31da8c 100644
--- 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 c581d369..7b6bd668 100644
--- 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 e101734c..633f8b93 100644
--- 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 86390439..0167c66a 100644
--- 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 ced42f23..84df5c23 100644
--- 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