library: Rename to libproc-2
What to call the new library? Keep using libprocps wouldn't do, its a very different library from the programs' point of view. It would also mean we could have some clashes around the packages (two package names, same library name). The ancient procps used libproc or libproc-a.b.c where a.b.c was the package version. Kept the revision numbers down (it was always 0.0.0) but the name of the library changed. So if we use libproc-2 is there a clash with an ancient procps? procps v 2.0.0 was around in 1999 so it was 22 years ago, also the name of the library would have been libproc-2.0.0.so not libproc-2.so so we're fine with that. libproc-2 seems to fit, our second major re-work of the procps library. Signed-off-by: Craig Small <csmall@dropbear.xyz>
This commit is contained in:
parent
aaa0cd48b0
commit
9aa09d8862
4
.gitignore
vendored
4
.gitignore
vendored
@ -45,8 +45,8 @@ pmap
|
|||||||
pidwait
|
pidwait
|
||||||
procps-ng-*.tar.xz
|
procps-ng-*.tar.xz
|
||||||
proc/.depend
|
proc/.depend
|
||||||
proc/libprocps.la
|
proc/libproc-2.la
|
||||||
proc/libprocps.pc
|
proc/libproc-2.pc
|
||||||
proc/Makefile
|
proc/Makefile
|
||||||
proc/Makefile.in
|
proc/Makefile.in
|
||||||
ps/Makefile
|
ps/Makefile
|
||||||
|
45
Makefile.am
45
Makefile.am
@ -26,10 +26,10 @@ SUBDIRS = \
|
|||||||
testsuite
|
testsuite
|
||||||
|
|
||||||
AM_CFLAGS = -Iproc
|
AM_CFLAGS = -Iproc
|
||||||
LDADD = ./proc/libprocps.la $(CYGWINFLAGS)
|
LDADD = ./proc/libproc-2.la $(CYGWINFLAGS)
|
||||||
|
|
||||||
if CYGWIN
|
if CYGWIN
|
||||||
AM_LDFLAGS += ./proc/libprocps.la $(CYGWINFLAGS)
|
AM_LDFLAGS += ./proc/libproc-2.la $(CYGWINFLAGS)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
transform =
|
transform =
|
||||||
@ -70,7 +70,7 @@ usrbin_exec_PROGRAMS += \
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
lib_LTLIBRARIES = \
|
lib_LTLIBRARIES = \
|
||||||
proc/libprocps.la
|
proc/libproc-2.la
|
||||||
|
|
||||||
dist_man_MANS = \
|
dist_man_MANS = \
|
||||||
free.1 \
|
free.1 \
|
||||||
@ -225,25 +225,24 @@ uptime_SOURCES = uptime.c lib/fileutils.c
|
|||||||
vmstat_SOURCES = vmstat.c lib/strutils.c lib/fileutils.c
|
vmstat_SOURCES = vmstat.c lib/strutils.c lib/fileutils.c
|
||||||
w_SOURCES = w.c lib/fileutils.c
|
w_SOURCES = w.c lib/fileutils.c
|
||||||
|
|
||||||
# proc/libprocps.la
|
|
||||||
|
|
||||||
# See http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
|
# See http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
|
||||||
LIBprocps_CURRENT=7
|
LIBproc_2_CURRENT=0
|
||||||
LIBprocps_REVISION=0
|
LIBproc_2_REVISION=0
|
||||||
LIBprocps_AGE=1
|
LIBproc_2_AGE=0
|
||||||
|
|
||||||
proc_libprocps_la_LIBADD = $(LIB_KPARTS)
|
proc_libproc_2_la_LIBADD = $(LIB_KPARTS)
|
||||||
|
|
||||||
if WITH_SYSTEMD
|
if WITH_SYSTEMD
|
||||||
proc_libprocps_la_LIBADD += @SYSTEMD_LIBS@
|
proc_libproc_2_la_LIBADD += @SYSTEMD_LIBS@
|
||||||
endif
|
endif
|
||||||
|
|
||||||
proc_libprocps_la_LDFLAGS = \
|
proc_libproc_2_la_LDFLAGS = \
|
||||||
-version-info $(LIBprocps_CURRENT):$(LIBprocps_REVISION):$(LIBprocps_AGE) \
|
-version-info $(LIBproc_2_CURRENT):$(LIBproc_2_REVISION):$(LIBproc_2_AGE) \
|
||||||
-no-undefined \
|
-no-undefined \
|
||||||
-Wl,--version-script=$(top_srcdir)/proc/libprocps.sym
|
-Wl,--version-script=$(top_srcdir)/proc/libproc-2.sym
|
||||||
|
|
||||||
proc_libprocps_la_SOURCES = \
|
proc_libproc_2_la_SOURCES = \
|
||||||
proc/devname.c \
|
proc/devname.c \
|
||||||
proc/devname.h \
|
proc/devname.h \
|
||||||
proc/diskstats.c \
|
proc/diskstats.c \
|
||||||
@ -276,8 +275,8 @@ proc_libprocps_la_SOURCES = \
|
|||||||
proc/uptime.c \
|
proc/uptime.c \
|
||||||
proc/xtra-procps-debug.h
|
proc/xtra-procps-debug.h
|
||||||
|
|
||||||
proc_libprocps_la_includedir = $(includedir)/procps/
|
proc_libproc_2_la_includedir = $(includedir)/procps/
|
||||||
proc_libprocps_la_include_HEADERS = \
|
proc_libproc_2_la_include_HEADERS = \
|
||||||
proc/diskstats.h \
|
proc/diskstats.h \
|
||||||
proc/meminfo.h \
|
proc/meminfo.h \
|
||||||
proc/misc.h \
|
proc/misc.h \
|
||||||
@ -289,9 +288,9 @@ proc_libprocps_la_include_HEADERS = \
|
|||||||
|
|
||||||
pkgconfigdir = $(libdir)/pkgconfig
|
pkgconfigdir = $(libdir)/pkgconfig
|
||||||
pkgconfig_DATA = \
|
pkgconfig_DATA = \
|
||||||
proc/libprocps.pc
|
proc/libproc-2.pc
|
||||||
|
|
||||||
EXTRA_DIST += proc/libprocps.sym
|
EXTRA_DIST += proc/libproc-2.sym
|
||||||
|
|
||||||
# ps/pscommand
|
# ps/pscommand
|
||||||
|
|
||||||
@ -334,17 +333,17 @@ check_PROGRAMS += \
|
|||||||
proc/test_namespace
|
proc/test_namespace
|
||||||
|
|
||||||
proc_test_Itemtables_SOURCES = proc/test_Itemtables.c
|
proc_test_Itemtables_SOURCES = proc/test_Itemtables.c
|
||||||
proc_test_Itemtables_LDADD = proc/libprocps.la
|
proc_test_Itemtables_LDADD = proc/libproc-2.la
|
||||||
proc_test_pids_SOURCES = proc/test_pids.c
|
proc_test_pids_SOURCES = proc/test_pids.c
|
||||||
proc_test_pids_LDADD = proc/libprocps.la
|
proc_test_pids_LDADD = proc/libproc-2.la
|
||||||
proc_test_uptime_SOURCES = proc/test_uptime.c
|
proc_test_uptime_SOURCES = proc/test_uptime.c
|
||||||
proc_test_uptime_LDADD = proc/libprocps.la
|
proc_test_uptime_LDADD = proc/libproc-2.la
|
||||||
proc_test_sysinfo_SOURCES = proc/test_sysinfo.c
|
proc_test_sysinfo_SOURCES = proc/test_sysinfo.c
|
||||||
proc_test_sysinfo_LDADD = proc/libprocps.la
|
proc_test_sysinfo_LDADD = proc/libproc-2.la
|
||||||
proc_test_version_SOURCES = proc/test_version.c
|
proc_test_version_SOURCES = proc/test_version.c
|
||||||
proc_test_version_LDADD = proc/libprocps.la
|
proc_test_version_LDADD = proc/libproc-2.la
|
||||||
proc_test_namespace_SOURCES = proc/test_namespace.c
|
proc_test_namespace_SOURCES = proc/test_namespace.c
|
||||||
proc_test_namespace_LDADD = proc/libprocps.la
|
proc_test_namespace_LDADD = proc/libproc-2.la
|
||||||
|
|
||||||
if CYGWIN
|
if CYGWIN
|
||||||
skill_LDADD = $(CYGWINFLAGS)
|
skill_LDADD = $(CYGWINFLAGS)
|
||||||
|
1
NEWS
1
NEWS
@ -1,6 +1,7 @@
|
|||||||
procps-ng-NEXT
|
procps-ng-NEXT
|
||||||
---------------
|
---------------
|
||||||
* Rename pwait to pidwait
|
* Rename pwait to pidwait
|
||||||
|
* library: renamed to libproc-2 and reset to 0:0:0
|
||||||
|
|
||||||
procps-ng-3.3.17
|
procps-ng-3.3.17
|
||||||
---------------
|
---------------
|
||||||
|
@ -334,6 +334,6 @@ AC_CONFIG_FILES([Makefile
|
|||||||
include/Makefile
|
include/Makefile
|
||||||
man-po/Makefile
|
man-po/Makefile
|
||||||
po/Makefile.in
|
po/Makefile.in
|
||||||
proc/libprocps.pc
|
proc/libproc-2.pc
|
||||||
testsuite/Makefile])
|
testsuite/Makefile])
|
||||||
AC_OUTPUT
|
AC_OUTPUT
|
||||||
|
@ -70,7 +70,7 @@ and `info' would really be `\fBdiskstats\fR_info', etc.
|
|||||||
The same \fBnamed_interface\fR is used in each header file name with
|
The same \fBnamed_interface\fR is used in each header file name with
|
||||||
an appended `.h' suffix.
|
an appended `.h' suffix.
|
||||||
|
|
||||||
Link with \fI\-lprocps\fP.
|
Link with \fI\-lproc-2\fP.
|
||||||
|
|
||||||
.SH DESCRIPTION
|
.SH DESCRIPTION
|
||||||
.SS Overview
|
.SS Overview
|
||||||
|
@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
|
|||||||
libdir=@libdir@
|
libdir=@libdir@
|
||||||
includedir=@includedir@
|
includedir=@includedir@
|
||||||
|
|
||||||
Name: libprocps
|
Name: libproc-2
|
||||||
Description: Library to control and query process state
|
Description: Library to control and query process state
|
||||||
Version: @VERSION@
|
Version: @VERSION@
|
||||||
Libs: -L${libdir} -lprocps
|
Libs: -L${libdir} -lproc-2
|
||||||
Libs.private:
|
Libs.private:
|
||||||
Cflags: -I${includedir}
|
Cflags: -I${includedir}
|
@ -1,4 +1,4 @@
|
|||||||
LIBPROCPS_0 {
|
LIBPROC_2 {
|
||||||
global:
|
global:
|
||||||
fatal_proc_unmounted;
|
fatal_proc_unmounted;
|
||||||
procps_cpu_count;
|
procps_cpu_count;
|
Loading…
Reference in New Issue
Block a user