Renaming libprocfs to libprocps

The library used to be called libprocps but it was renamed to make sure
there was only one. However the formatting of the library SONAME has
changed so there cannot be any confusion.

libprocps makes it clear that its a library from this project and not a
set of functions directly on the filesystem.

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

diff --git a/Makefile.am b/Makefile.am
index 3c5be856cb2e3c7e71fa156bf488efc122bd95fa..e246d026fd39fd06084cec2d6d51f26da4a61575 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/libprocfs.la
+AM_LDFLAGS = ./proc/libprocps.la
 
 sbin_PROGRAMS = \
        sysctl

diff --git a/configure.ac b/configure.ac
index 63a3c37a1600747e1cb28b35b7a1682893f0f116..85afd0e1157b890b37afe1e9e5030ceffa19fd22 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -169,7 +169,7 @@ AC_SUBST(DEJAGNU)
 AC_CONFIG_FILES([
 Makefile
 proc/Makefile
-proc/libprocfs.pc
+proc/libprocps.pc
 ps/Makefile
 testsuite/Makefile
 ])

diff --git a/proc/Makefile.am b/proc/Makefile.am
index 633f8b9362cc36283cdede1642c07dad0143c8d7..f76d96cdfa017d8cd252f7a8019cf2c952cf5d10 100644 (file)
--- a/proc/Makefile.am
+++ b/proc/Makefile.am
@@ -1,27 +1,27 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 AM_CPPFLAGS = -include $(top_builddir)/config.h
 
-LIBPROCFS_CURRENT=0
-LIBPROCFS_REVISION=0
-LIBPROCFS_AGE=0
+LIBprocps_CURRENT=0
+LIBprocps_REVISION=0
+LIBprocps_AGE=0
 
-lib_LTLIBRARIES = libprocfs.la
+lib_LTLIBRARIES = libprocps.la
 
-libprocfs_ladir = $(ladir)
-libprocfs_la_LIBADD = $(LIB_KPARTS)
-libprocfs_la_LDFLAGS = \
+libprocps_ladir = $(ladir)
+libprocps_la_LIBADD = $(LIB_KPARTS)
+libprocps_la_LDFLAGS = \
        $(AM_LDFLAGS) \
        $(all_libraries) \
-       -version-info $(LIBPROCFS_CURRENT):$(LIBPROCFS_REVISION):$(LIBPROCFS_AGE) \
+       -version-info $(LIBprocps_CURRENT):$(LIBprocps_REVISION):$(LIBprocps_AGE) \
        -no-undefined \
-       -Wl,--version-script=$(top_srcdir)/proc/libprocfs.sym
+       -Wl,--version-script=$(top_srcdir)/proc/libprocps.sym
 
 EXTRA_DIST = library.map
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libprocfs.pc
+pkgconfig_DATA = libprocps.pc
 
-libprocfs_la_SOURCES = \
+libprocps_la_SOURCES = \
        alloc.c \
        alloc.h \
        devname.c \
@@ -46,8 +46,8 @@ libprocfs_la_SOURCES = \
        whattime.c \
        whattime.h
 
-libprocfs_la_includedir = $(includedir)/proc/
-libprocfs_la_include_HEADERS =  \
+libprocps_la_includedir = $(includedir)/proc/
+libprocps_la_include_HEADERS =  \
        alloc.h \
        devname.h \
        escape.h \

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

diff --git a/proc/libprocfs.sym b/proc/libprocps.sym
similarity index 98%
rename from proc/libprocfs.sym
rename to proc/libprocps.sym
index d8bf6b73ea8333d5d12c4d80b1e3673d36a816c3..3e4f9a22bf8c4e0e4ff53f06606f9f85a62545ed 100644 (file)
--- a/proc/libprocfs.sym
+++ b/proc/libprocps.sym
@@ -1,4 +1,4 @@
-LIBPROCFS_0 {
+LIBPROCPS_0 {
 global:
        Hertz;
        __cyg_profile_func_enter;

diff --git a/ps/Makefile.am b/ps/Makefile.am
index 84df5c239bb080729937c59ff1b947e15346c0bb..b3bd9874d42604270eb69a55048fe1e477c55077 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/libprocfs.la
+AM_LDFLAGS = ../proc/libprocps.la
 
 dist_man_MANS = ps.1