diff --git a/.gitignore b/.gitignore index f46326d3..45d85b08 100644 --- a/.gitignore +++ b/.gitignore @@ -27,7 +27,7 @@ pgrep pkill pmap proc/.depend -proc/libproc.la +proc/libproc-ng.la proc/Makefile proc/Makefile.in ps/Makefile diff --git a/Makefile.am b/Makefile.am index 3bf1516f..890f71bc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,7 +4,7 @@ ACLOCAL_AMFLAGS = -I m4 SUBDIRS = proc ps AM_CFLAGS = -Iproc -AM_LDFLAGS = ./proc/libproc.la +AM_LDFLAGS = ./proc/libproc-ng.la sbin_PROGRAMS = \ sysctl diff --git a/proc/Makefile.am b/proc/Makefile.am index 2f31b572..391ac2b0 100644 --- a/proc/Makefile.am +++ b/proc/Makefile.am @@ -1,12 +1,12 @@ +PACKAGE_VERSION = @PACKAGE_VERSION@ AM_CPPFLAGS = -include $(top_builddir)/config.h +lib_LTLIBRARIES = libproc-ng.la -lib_LTLIBRARIES = libproc.la +libproc_ng_ladir = $(ladir) +libproc_ng_la_LIBADD = $(LIB_KPARTS) +libproc_ng_la_LDFLAGS = $(all_libraries) -release $(PACKAGE_VERSION) -no-undefined -libproc_ladir = $(ladir) -libproc_la_LIBADD = $(LIB_KPARTS) -libproc_la_LDFLAGS = $(all_libraries) -release 3.2.8 -no-undefined - -libproc_la_SOURCES = \ +libproc_ng_la_SOURCES = \ alloc.c \ alloc.h \ devname.c \ @@ -31,8 +31,8 @@ libproc_la_SOURCES = \ whattime.c \ whattime.h -libproc_la_includedir = $(includedir)/proc/ -libproc_la_include_HEADERS = \ +libproc_ng_la_includedir = $(includedir)/proc/ +libproc_ng_la_include_HEADERS = \ alloc.h \ devname.h \ escape.h \ diff --git a/ps/Makefile.am b/ps/Makefile.am index 43af2cfe..ced42f23 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.la +AM_LDFLAGS = ../proc/libproc-ng.la dist_man_MANS = ps.1