library: Rename to libproc2

The newlib library used to be called libproc-2 but the new
name is preferred.

References:
 https://www.freelists.org/post/procps/Next-for-newlib,3

Signed-off-by: Craig Small <csmall@dropbear.xyz>

diff --git a/.gitignore b/.gitignore
index cb085bf9bcb5f6d2bf7d61371a4433372885a427..e5ebba3b2c46126d9b2946f772e745c1ac36d706 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -44,11 +44,11 @@ src/pkill
 src/pmap
 src/pidwait
 procps-ng-*.tar.xz
-proc/.depend
-proc/libproc-2.la
-proc/libproc-2.pc
-proc/Makefile
-proc/Makefile.in
+library/.depend
+library/libproc2.la
+library/libproc2.pc
+library/Makefile
+library/Makefile.in
 src/ps/Makefile
 src/ps/Makefile.in
 src/ps/pscommand

diff --git a/Makefile.am b/Makefile.am
index 14af9a1098c2f9a51cab75a15b7ca11b865e215d..25f1a6af31aa03110027002a01af1fed73f4aea1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,10 +25,10 @@ SUBDIRS = \
        testsuite
 
 AM_CFLAGS = -Ilibrary/include
-LDADD = ./library/libproc-2.la $(CYGWINFLAGS)
+LDADD = ./library/libproc2.la $(CYGWINFLAGS)
 
 if CYGWIN
-AM_LDFLAGS += ./library/libproc-2.la $(CYGWINFLAGS)
+AM_LDFLAGS += ./library/libproc2.la $(CYGWINFLAGS)
 endif
 
 transform =
@@ -67,7 +67,7 @@ usrbin_exec_PROGRAMS += \
 endif
 
 lib_LTLIBRARIES = \
-       library/libproc-2.la
+       library/libproc2.la
 
 dist_man_MANS = \
        man/free.1 \
@@ -235,26 +235,26 @@ src_vmstat_SOURCES = src/vmstat.c local/strutils.c local/fileutils.c
 
 
 # See http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-LIBproc_2_CURRENT=0
-LIBproc_2_REVISION=0
-LIBproc_2_AGE=0
+LIBproc2_CURRENT=0
+LIBproc2_REVISION=0
+LIBproc2_AGE=0
 
-library_libproc_2_la_LIBADD = $(LIB_KPARTS)
+library_libproc2_la_LIBADD = $(LIB_KPARTS)
 
 if WITH_SYSTEMD
-library_libproc_2_la_LIBADD += @SYSTEMD_LIBS@
+library_libproc2_la_LIBADD += @SYSTEMD_LIBS@
 endif
 
 if WITH_ELOGIND
-library_libproc_2_la_LIBADD += @ELOGIND_LIBS@
+library_libproc2_la_LIBADD += @ELOGIND_LIBS@
 endif
 
-library_libproc_2_la_LDFLAGS = \
-       -version-info $(LIBproc_2_CURRENT):$(LIBproc_2_REVISION):$(LIBproc_2_AGE) \
+library_libproc2_la_LDFLAGS = \
+       -version-info $(LIBproc2_CURRENT):$(LIBproc2_REVISION):$(LIBproc2_AGE) \
        -no-undefined \
-       -Wl,--version-script=$(top_srcdir)/library/libproc-2.sym
+       -Wl,--version-script=$(top_srcdir)/library/libproc2.sym
 
-library_libproc_2_la_SOURCES = \
+library_libproc2_la_SOURCES = \
        library/devname.c \
        library/include/devname.h \
        library/diskstats.c \
@@ -287,8 +287,8 @@ library_libproc_2_la_SOURCES = \
        library/uptime.c \
        library/include/xtra-procps-debug.h
 
-library_libproc_2_la_includedir = $(includedir)/procps/
-library_libproc_2_la_include_HEADERS = \
+library_libproc2_la_includedir = $(includedir)/procps/
+library_libproc2_la_include_HEADERS = \
        library/include/diskstats.h \
        library/include/meminfo.h \
        library/include/misc.h \
@@ -300,9 +300,9 @@ library_libproc_2_la_include_HEADERS = \
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = \
-       library/libproc-2.pc
+       library/libproc2.pc
 
-EXTRA_DIST += library/libproc-2.sym
+EXTRA_DIST += library/libproc2.sym
 
 # ps/pscommand
 
@@ -348,17 +348,17 @@ check_PROGRAMS += \
        library/tests/test_namespace
 
 library_tests_test_Itemtables_SOURCES = library/tests/test_Itemtables.c
-library_tests_test_Itemtables_LDADD = library/libproc-2.la
+library_tests_test_Itemtables_LDADD = library/libproc2.la
 library_tests_test_pids_SOURCES = library/tests/test_pids.c
-library_tests_test_pids_LDADD = library/libproc-2.la
+library_tests_test_pids_LDADD = library/libproc2.la
 library_tests_test_uptime_SOURCES = library/tests/test_uptime.c
-library_tests_test_uptime_LDADD = library/libproc-2.la
+library_tests_test_uptime_LDADD = library/libproc2.la
 library_tests_test_sysinfo_SOURCES = library/tests/test_sysinfo.c
-library_tests_test_sysinfo_LDADD = library/libproc-2.la
+library_tests_test_sysinfo_LDADD = library/libproc2.la
 library_tests_test_version_SOURCES = library/tests/test_version.c
-library_tests_test_version_LDADD = library/libproc-2.la
+library_tests_test_version_LDADD = library/libproc2.la
 library_tests_test_namespace_SOURCES = library/tests/test_namespace.c
-library_tests_test_namespace_LDADD = library/libproc-2.la
+library_tests_test_namespace_LDADD = library/libproc2.la
 
 if CYGWIN
        src_skill_LDADD = $(CYGWINFLAGS)

diff --git a/NEWS b/NEWS
index d395bc087bf01bf288fa10224e1c06f939cede91..e394233e9f8ef96f04fe86f85404bb63d44e958e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@ procps-ng-NEXT
   * library
     Re-add elogind support                                 merge #151
     Used memory is Total - Available
+    Renaming, it is now libproc2
   * pidwait: Better warning if pidfd_open not implemented
   * pmap: Dont reuse stdin filehandle                      issue #231
   * ps: threads again display when -L is used with -q      issue #234

diff --git a/configure.ac b/configure.ac
index 9ee03982f1638c9010ab3e7ae3478a7c1bc45504..7c9ade6529fc589fac26b3c5ee6f61c661c1826e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -395,6 +395,6 @@ AC_CONFIG_FILES([Makefile
                  local/Makefile
                  po-man/Makefile
                  po/Makefile.in
-                 library/libproc-2.pc
+                 library/libproc2.pc
                  testsuite/Makefile])
 AC_OUTPUT

diff --git a/library/libproc-2.pc.in b/library/libproc2.pc.in
similarity index 100%
rename from library/libproc-2.pc.in
rename to library/libproc2.pc.in

diff --git a/library/libproc-2.sym b/library/libproc2.sym
similarity index 100%
rename from library/libproc-2.sym
rename to library/libproc2.sym