diff options
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | proc/Makefile.am | 25 | ||||
| -rw-r--r-- | proc/libprocfs.pc.in (renamed from proc/libproc-ng.pc.in) | 4 | ||||
| -rw-r--r-- | proc/libprocfs.sym (renamed from proc/library.map) | 0 | ||||
| -rw-r--r-- | ps/Makefile.am | 2 |
7 files changed, 22 insertions, 17 deletions
@@ -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 diff --git a/Makefile.am b/Makefile.am index a748c7e..3d31da8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 diff --git a/configure.ac b/configure.ac index c581d36..7b6bd66 100644 --- a/configure.ac +++ b/configure.ac @@ -145,7 +145,7 @@ AC_SUBST(DEJAGNU) AC_CONFIG_FILES([ Makefile proc/Makefile -proc/libproc-ng.pc +proc/libprocfs.pc ps/Makefile testsuite/Makefile ]) diff --git a/proc/Makefile.am b/proc/Makefile.am index e101734..633f8b9 100644 --- a/proc/Makefile.am +++ b/proc/Makefile.am @@ -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 \ diff --git a/proc/libproc-ng.pc.in b/proc/libprocfs.pc.in index 8639043..0167c66 100644 --- a/proc/libproc-ng.pc.in +++ b/proc/libprocfs.pc.in @@ -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} diff --git a/proc/library.map b/proc/libprocfs.sym index cde6aa9..cde6aa9 100644 --- a/proc/library.map +++ b/proc/libprocfs.sym diff --git a/ps/Makefile.am b/ps/Makefile.am index ced42f2..84df5c2 100644 --- 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/libproc-ng.la +AM_LDFLAGS = ../proc/libprocfs.la dist_man_MANS = ps.1 |