diff --git a/.gitignore b/.gitignore index 2e20e98e..43387054 100644 --- a/.gitignore +++ b/.gitignore @@ -28,8 +28,8 @@ pkill pmap procps-ng-*.tar.gz proc/.depend -proc/libprocfs.la -proc/libprocfs.pc +proc/libprocps.la +proc/libprocps.pc proc/Makefile proc/Makefile.in ps/Makefile diff --git a/Makefile.am b/Makefile.am index 3c5be856..e246d026 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/libprocfs.la +AM_LDFLAGS = ./proc/libprocps.la sbin_PROGRAMS = \ sysctl diff --git a/configure.ac b/configure.ac index 63a3c37a..85afd0e1 100644 --- a/configure.ac +++ b/configure.ac @@ -169,7 +169,7 @@ AC_SUBST(DEJAGNU) AC_CONFIG_FILES([ Makefile proc/Makefile -proc/libprocfs.pc +proc/libprocps.pc ps/Makefile testsuite/Makefile ]) diff --git a/proc/Makefile.am b/proc/Makefile.am index 633f8b93..f76d96cd 100644 --- a/proc/Makefile.am +++ b/proc/Makefile.am @@ -1,27 +1,27 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ AM_CPPFLAGS = -include $(top_builddir)/config.h -LIBPROCFS_CURRENT=0 -LIBPROCFS_REVISION=0 -LIBPROCFS_AGE=0 +LIBprocps_CURRENT=0 +LIBprocps_REVISION=0 +LIBprocps_AGE=0 -lib_LTLIBRARIES = libprocfs.la +lib_LTLIBRARIES = libprocps.la -libprocfs_ladir = $(ladir) -libprocfs_la_LIBADD = $(LIB_KPARTS) -libprocfs_la_LDFLAGS = \ +libprocps_ladir = $(ladir) +libprocps_la_LIBADD = $(LIB_KPARTS) +libprocps_la_LDFLAGS = \ $(AM_LDFLAGS) \ $(all_libraries) \ - -version-info $(LIBPROCFS_CURRENT):$(LIBPROCFS_REVISION):$(LIBPROCFS_AGE) \ + -version-info $(LIBprocps_CURRENT):$(LIBprocps_REVISION):$(LIBprocps_AGE) \ -no-undefined \ - -Wl,--version-script=$(top_srcdir)/proc/libprocfs.sym + -Wl,--version-script=$(top_srcdir)/proc/libprocps.sym EXTRA_DIST = library.map pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libprocfs.pc +pkgconfig_DATA = libprocps.pc -libprocfs_la_SOURCES = \ +libprocps_la_SOURCES = \ alloc.c \ alloc.h \ devname.c \ @@ -46,8 +46,8 @@ libprocfs_la_SOURCES = \ whattime.c \ whattime.h -libprocfs_la_includedir = $(includedir)/proc/ -libprocfs_la_include_HEADERS = \ +libprocps_la_includedir = $(includedir)/proc/ +libprocps_la_include_HEADERS = \ alloc.h \ devname.h \ escape.h \ diff --git a/proc/libprocfs.pc.in b/proc/libprocps.pc.in similarity index 82% rename from proc/libprocfs.pc.in rename to proc/libprocps.pc.in index 0167c66a..1f9c1339 100644 --- a/proc/libprocfs.pc.in +++ b/proc/libprocps.pc.in @@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -Name: libprocfs +Name: libprocps Description: Library to control and query process state Version: @VERSION@ -Libs: -L${libdir} -lprocfs +Libs: -L${libdir} -lprocps Libs.private: Cflags: -I${includedir} diff --git a/proc/libprocfs.sym b/proc/libprocps.sym similarity index 98% rename from proc/libprocfs.sym rename to proc/libprocps.sym index d8bf6b73..3e4f9a22 100644 --- a/proc/libprocfs.sym +++ b/proc/libprocps.sym @@ -1,4 +1,4 @@ -LIBPROCFS_0 { +LIBPROCPS_0 { global: Hertz; __cyg_profile_func_enter; diff --git a/ps/Makefile.am b/ps/Makefile.am index 84df5c23..b3bd9874 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/libprocfs.la +AM_LDFLAGS = ../proc/libprocps.la dist_man_MANS = ps.1