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.
This commit is contained in:
parent
5a991f0444
commit
38763ede40
4
.gitignore
vendored
4
.gitignore
vendored
@ -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
|
||||
|
@ -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
|
||||
|
@ -145,7 +145,7 @@ AC_SUBST(DEJAGNU)
|
||||
AC_CONFIG_FILES([
|
||||
Makefile
|
||||
proc/Makefile
|
||||
proc/libproc-ng.pc
|
||||
proc/libprocfs.pc
|
||||
ps/Makefile
|
||||
testsuite/Makefile
|
||||
])
|
||||
|
@ -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 \
|
||||
|
@ -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}
|
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user