diff --git a/.gitignore b/.gitignore index 7b0c2ad6..bc3a9396 100644 --- a/.gitignore +++ b/.gitignore @@ -45,8 +45,8 @@ pmap pidwait procps-ng-*.tar.xz proc/.depend -proc/libprocps.la -proc/libprocps.pc +proc/libproc-2.la +proc/libproc-2.pc proc/Makefile proc/Makefile.in ps/Makefile diff --git a/Makefile.am b/Makefile.am index fdd844f4..454a04ff 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,10 +26,10 @@ SUBDIRS = \ testsuite AM_CFLAGS = -Iproc -LDADD = ./proc/libprocps.la $(CYGWINFLAGS) +LDADD = ./proc/libproc-2.la $(CYGWINFLAGS) if CYGWIN -AM_LDFLAGS += ./proc/libprocps.la $(CYGWINFLAGS) +AM_LDFLAGS += ./proc/libproc-2.la $(CYGWINFLAGS) endif transform = @@ -70,7 +70,7 @@ usrbin_exec_PROGRAMS += \ endif lib_LTLIBRARIES = \ - proc/libprocps.la + proc/libproc-2.la dist_man_MANS = \ free.1 \ @@ -225,25 +225,24 @@ uptime_SOURCES = uptime.c lib/fileutils.c vmstat_SOURCES = vmstat.c lib/strutils.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 -LIBprocps_CURRENT=7 -LIBprocps_REVISION=0 -LIBprocps_AGE=1 +LIBproc_2_CURRENT=0 +LIBproc_2_REVISION=0 +LIBproc_2_AGE=0 -proc_libprocps_la_LIBADD = $(LIB_KPARTS) +proc_libproc_2_la_LIBADD = $(LIB_KPARTS) if WITH_SYSTEMD -proc_libprocps_la_LIBADD += @SYSTEMD_LIBS@ +proc_libproc_2_la_LIBADD += @SYSTEMD_LIBS@ endif -proc_libprocps_la_LDFLAGS = \ - -version-info $(LIBprocps_CURRENT):$(LIBprocps_REVISION):$(LIBprocps_AGE) \ +proc_libproc_2_la_LDFLAGS = \ + -version-info $(LIBproc_2_CURRENT):$(LIBproc_2_REVISION):$(LIBproc_2_AGE) \ -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.h \ proc/diskstats.c \ @@ -276,8 +275,8 @@ proc_libprocps_la_SOURCES = \ proc/uptime.c \ proc/xtra-procps-debug.h -proc_libprocps_la_includedir = $(includedir)/procps/ -proc_libprocps_la_include_HEADERS = \ +proc_libproc_2_la_includedir = $(includedir)/procps/ +proc_libproc_2_la_include_HEADERS = \ proc/diskstats.h \ proc/meminfo.h \ proc/misc.h \ @@ -289,9 +288,9 @@ proc_libprocps_la_include_HEADERS = \ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = \ - proc/libprocps.pc + proc/libproc-2.pc -EXTRA_DIST += proc/libprocps.sym +EXTRA_DIST += proc/libproc-2.sym # ps/pscommand @@ -334,17 +333,17 @@ check_PROGRAMS += \ proc/test_namespace 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_LDADD = proc/libprocps.la +proc_test_pids_LDADD = proc/libproc-2.la 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_LDADD = proc/libprocps.la +proc_test_sysinfo_LDADD = proc/libproc-2.la 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_LDADD = proc/libprocps.la +proc_test_namespace_LDADD = proc/libproc-2.la if CYGWIN skill_LDADD = $(CYGWINFLAGS) diff --git a/NEWS b/NEWS index 7352ae8e..6f9a3b67 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,7 @@ procps-ng-NEXT --------------- * Rename pwait to pidwait + * library: renamed to libproc-2 and reset to 0:0:0 procps-ng-3.3.17 --------------- diff --git a/configure.ac b/configure.ac index 1ce1dbf5..61bb3536 100644 --- a/configure.ac +++ b/configure.ac @@ -334,6 +334,6 @@ AC_CONFIG_FILES([Makefile include/Makefile man-po/Makefile po/Makefile.in - proc/libprocps.pc + proc/libproc-2.pc testsuite/Makefile]) AC_OUTPUT diff --git a/doc/procps.3 b/doc/procps.3 index 0e92a406..749e8729 100644 --- a/doc/procps.3 +++ b/doc/procps.3 @@ -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 an appended `.h' suffix. -Link with \fI\-lprocps\fP. +Link with \fI\-lproc-2\fP. .SH DESCRIPTION .SS Overview diff --git a/proc/libprocps.pc.in b/proc/libproc-2.pc.in similarity index 82% rename from proc/libprocps.pc.in rename to proc/libproc-2.pc.in index 1f9c1339..4ac2a597 100644 --- a/proc/libprocps.pc.in +++ b/proc/libproc-2.pc.in @@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -Name: libprocps +Name: libproc-2 Description: Library to control and query process state Version: @VERSION@ -Libs: -L${libdir} -lprocps +Libs: -L${libdir} -lproc-2 Libs.private: Cflags: -I${includedir} diff --git a/proc/libprocps.sym b/proc/libproc-2.sym similarity index 98% rename from proc/libprocps.sym rename to proc/libproc-2.sym index 9cdbd248..bb84ba9a 100644 --- a/proc/libprocps.sym +++ b/proc/libproc-2.sym @@ -1,4 +1,4 @@ -LIBPROCPS_0 { +LIBPROC_2 { global: fatal_proc_unmounted; procps_cpu_count;