emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity
063838a7f5
procps/Makefile.am

359 lines
6.8 KiB
Makefile
Raw Normal View History

Added Cygwin build support strverscmp is included to satisfy a dependency in Cygwin. Excluded utmp and prctl functions that are not supported currently.
2016-03-11 04:34:27 +05:30
CYGWINFLAGS =
if CYGWIN
Consolidated patch of previously merged CYGWIN support The combined results of merge request #49 without that overhead plus distortion in this repository's history. Prototyped-by: Wayne Porter <wporter82@gmail.com>
2017-08-31 01:45:15 +05:30
CYGWINFLAGS += -lintl
usrbin_exec_PROGRAMS =
Added Cygwin build support strverscmp is included to satisfy a dependency in Cygwin. Excluded utmp and prctl functions that are not supported currently.
2016-03-11 04:34:27 +05:30
endif
build-sys: correct all Makefile.am files for LOCALEDIR, etc Some of the latest changes to Makefile.am files are missing. This patch restores the LOCALEDIR variable, among others, and dispenses with the include directives in the ps/ and top/ subdirectories since they're no longer needed.
2012-01-02 20:38:58 +05:30
AM_CPPFLAGS = \
-include $(top_builddir)/config.h \
build-sys: add $(top_srcdir) to include search dir This is required for out-of-tree build to work, since many source files include e.g. proc/*.h which is not under the include/ directory. Tested that `make distcheck` starts working after this patch. Signed-off-by: Filipe Brandenburger <filbranden@google.com>
2015-05-02 05:39:39 +05:30
-I$(top_srcdir) \
build-sys: correct all Makefile.am files for LOCALEDIR, etc Some of the latest changes to Makefile.am files are missing. This patch restores the LOCALEDIR variable, among others, and dispenses with the include directives in the ps/ and top/ subdirectories since they're no longer needed.
2012-01-02 20:38:58 +05:30
-I$(top_srcdir)/include \
-DLOCALEDIR=\"$(localedir)\"
build-sys: take autotools in use again This will revert change at Oct 2002 when autotools support was removed. Unlike before the package developers are expected to use ./autogen.sh to generate ./configure script, and run make after that. The build system is also able to create, with make dist, a tar ball release which compiles correctly, and has files which seemed to be important to have. The patch removes few unnecessary files, but no everything. Files procps.lsm and procps.spec in git repository are useless as is, but I left them lying around for someone who can make more justified call about removal of them. Last, but not least package version number is set 3.3.0 to distinct this procps from the sourceforge's upstream procps. Please notice that libproc relese is kept as 3.2.8. Signed-off-by: Sami Kerola <kerolasa@iki.fi>
2011-06-04 19:56:58 +05:30
build-sys: merge automake subdirs into toplevel This will be required for subdir-objects, otherwise automake will have problems with more than one Makefile.am having rules to build the same files. Tested that it builds and both `make check` and `make distcheck` work. Tested `make install` and compared the tree with the one installed before this commit, both installed the binaries to the same locations. The binaries are also in the same location in the build tree (for instance, ps/pscommand is still there.) Checked the binaries for the correct libraries linked into them. Binary sizes matched before and after this change. Signed-off-by: Filipe Brandenburger <filbranden@google.com>
2015-05-02 09:58:53 +05:30
PACKAGE_VERSION = @PACKAGE_VERSION@
build-sys: take autotools in use again This will revert change at Oct 2002 when autotools support was removed. Unlike before the package developers are expected to use ./autogen.sh to generate ./configure script, and run make after that. The build system is also able to create, with make dist, a tar ball release which compiles correctly, and has files which seemed to be important to have. The patch removes few unnecessary files, but no everything. Files procps.lsm and procps.spec in git repository are useless as is, but I left them lying around for someone who can make more justified call about removal of them. Last, but not least package version number is set 3.3.0 to distinct this procps from the sourceforge's upstream procps. Please notice that libproc relese is kept as 3.2.8. Signed-off-by: Sami Kerola <kerolasa@iki.fi>
2011-06-04 19:56:58 +05:30
ACLOCAL_AMFLAGS = -I m4
build-sys: add NLS support Add GNU gettext internationalization and localization support. Signed-off-by: Sami Kerola <kerolasa@iki.fi>
2011-10-09 00:44:21 +05:30
SUBDIRS = \
build-sys: add missing files to distribution Signed-off-by: Sami Kerola <kerolasa@iki.fi>
2011-10-19 14:07:03 +05:30
include \
Manpage translations in Makefiles The translated manpage generation has moved from scripts to Makefiles. This asists with conditional building as well, no need to regenerate the German pgrep man page if both the original pgrep.1 and man-po/de.po is not changed. My Makefile-fu fails me on producing a cross-product or double iteration for languages and man pages. Until that is solved each man page is explicitly built. No big deal but it doesn't look elegant in the Makefile. Languages will be picked up automatically if they are found in man-po, man-po/top or man-po/ps The README describes the three-step process for translating the files, incase I forget or someone else wants to update them.
2014-06-28 19:08:13 +05:30
man-po \
build-sys: add NLS support Add GNU gettext internationalization and localization support. Signed-off-by: Sami Kerola <kerolasa@iki.fi>
2011-10-09 00:44:21 +05:30
po \
build-sys: merge automake subdirs into toplevel This will be required for subdir-objects, otherwise automake will have problems with more than one Makefile.am having rules to build the same files. Tested that it builds and both `make check` and `make distcheck` work. Tested `make install` and compared the tree with the one installed before this commit, both installed the binaries to the same locations. The binaries are also in the same location in the build tree (for instance, ps/pscommand is still there.) Checked the binaries for the correct libraries linked into them. Binary sizes matched before and after this change. Signed-off-by: Filipe Brandenburger <filbranden@google.com>
2015-05-02 09:58:53 +05:30
testsuite
build-sys: take autotools in use again This will revert change at Oct 2002 when autotools support was removed. Unlike before the package developers are expected to use ./autogen.sh to generate ./configure script, and run make after that. The build system is also able to create, with make dist, a tar ball release which compiles correctly, and has files which seemed to be important to have. The patch removes few unnecessary files, but no everything. Files procps.lsm and procps.spec in git repository are useless as is, but I left them lying around for someone who can make more justified call about removal of them. Last, but not least package version number is set 3.3.0 to distinct this procps from the sourceforge's upstream procps. Please notice that libproc relese is kept as 3.2.8. Signed-off-by: Sami Kerola <kerolasa@iki.fi>
2011-06-04 19:56:58 +05:30
AM_CFLAGS = -Iproc
Added Cygwin build support strverscmp is included to satisfy a dependency in Cygwin. Excluded utmp and prctl functions that are not supported currently.
2016-03-11 04:34:27 +05:30
LDADD = ./proc/libprocps.la $(CYGWINFLAGS)
build-sys: take autotools in use again This will revert change at Oct 2002 when autotools support was removed. Unlike before the package developers are expected to use ./autogen.sh to generate ./configure script, and run make after that. The build system is also able to create, with make dist, a tar ball release which compiles correctly, and has files which seemed to be important to have. The patch removes few unnecessary files, but no everything. Files procps.lsm and procps.spec in git repository are useless as is, but I left them lying around for someone who can make more justified call about removal of them. Last, but not least package version number is set 3.3.0 to distinct this procps from the sourceforge's upstream procps. Please notice that libproc relese is kept as 3.2.8. Signed-off-by: Sami Kerola <kerolasa@iki.fi>
2011-06-04 19:56:58 +05:30
Consolidated patch of previously merged CYGWIN support The combined results of merge request #49 without that overhead plus distortion in this repository's history. Prototyped-by: Wayne Porter <wporter82@gmail.com>
2017-08-31 01:45:15 +05:30
if CYGWIN
AM_LDFLAGS = ./proc/libprocps.la $(CYGWINFLAGS)
endif
transform =
if !CYGWIN
transform += s/pscommand/ps/; $(program_transform_name)
sbin_PROGRAMS = \
sysctl
else
transform += s/pscommand/procps/; $(program_transform_name)
endif
build-sys: merge automake subdirs into toplevel This will be required for subdir-objects, otherwise automake will have problems with more than one Makefile.am having rules to build the same files. Tested that it builds and both `make check` and `make distcheck` work. Tested `make install` and compared the tree with the one installed before this commit, both installed the binaries to the same locations. The binaries are also in the same location in the build tree (for instance, ps/pscommand is still there.) Checked the binaries for the correct libraries linked into them. Binary sizes matched before and after this change. Signed-off-by: Filipe Brandenburger <filbranden@google.com>
2015-05-02 09:58:53 +05:30
Consolidated patch of previously merged CYGWIN support The combined results of merge request #49 without that overhead plus distortion in this repository's history. Prototyped-by: Wayne Porter <wporter82@gmail.com>
2017-08-31 01:45:15 +05:30
if !CYGWIN
build-sys: merge automake subdirs into toplevel This will be required for subdir-objects, otherwise automake will have problems with more than one Makefile.am having rules to build the same files. Tested that it builds and both `make check` and `make distcheck` work. Tested `make install` and compared the tree with the one installed before this commit, both installed the binaries to the same locations. The binaries are also in the same location in the build tree (for instance, ps/pscommand is still there.) Checked the binaries for the correct libraries linked into them. Binary sizes matched before and after this change. Signed-off-by: Filipe Brandenburger <filbranden@google.com>
2015-05-02 09:58:53 +05:30
bin_PROGRAMS = \
build-sys: install binaries in bindir (get rid of usrbin_execdir) The "usrbin_execdir" hack meant to install some binaries in /bin and others in /usr/bin. However: - It is very inflexible: not much control on the final directory name and it is not possible to get rid of the usr/bin suffix without patching the build system. - It is hard to use: it requires configure to receive --exec_prefix=/ and other settings do not make much sense. It is not very obvious that that setting needs to be passed and it takes a while to figure it out. - It produces garbage with the default setup: the default prefix of /usr/local ends up installing the binaries under /usr/local/usr/bin which does not make any sense. Furthermore, the requirement to split binaries in /bin and /usr/bin is not that strong since some distributions adopted the /usr merge and so would agree to just deploy all binaries to /usr/bin directly. Distributions that would still like to split /bin from /usr/bin should actually move binaries such as `ps` and `kill` to /bin after the install of procps-ng is complete. After all, they are the ones responsible for determining what are the binaries that need to be in the root partition and that list depends on their early boot init scripts, so it is possible that the list must be augmented with other binaries from this package. Therefore, I propose here to get rid of that hack and simply install all the binaries to bindir instead, which solves the problems described above and simplifies the build and install of procps-ng. Tested that it builds and both `make check` and `make distcheck` work. Tested that `make install` works and produces the expected tree, the only difference being the absence of the bogus /usr/local/usr/bin directory and now all binaries are merged into /usr/local/bin as expected. Signed-off-by: Filipe Brandenburger <filbranden@google.com>
2015-05-02 11:57:13 +05:30
ps/pscommand \
build-sys: take autotools in use again This will revert change at Oct 2002 when autotools support was removed. Unlike before the package developers are expected to use ./autogen.sh to generate ./configure script, and run make after that. The build system is also able to create, with make dist, a tar ball release which compiles correctly, and has files which seemed to be important to have. The patch removes few unnecessary files, but no everything. Files procps.lsm and procps.spec in git repository are useless as is, but I left them lying around for someone who can make more justified call about removal of them. Last, but not least package version number is set 3.3.0 to distinct this procps from the sourceforge's upstream procps. Please notice that libproc relese is kept as 3.2.8. Signed-off-by: Sami Kerola <kerolasa@iki.fi>
2011-06-04 19:56:58 +05:30
free \
pgrep \
pkill \
pmap \
pwdx \
tload \
uptime \
vmstat \
w
Consolidated patch of previously merged CYGWIN support The combined results of merge request #49 without that overhead plus distortion in this repository's history. Prototyped-by: Wayne Porter <wporter82@gmail.com>
2017-08-31 01:45:15 +05:30
else
usrbin_exec_PROGRAMS += \
ps/pscommand \
free \
pgrep \
pkill \
pmap \
uptime \
vmstat \
w
endif
build-sys: install binaries in bindir (get rid of usrbin_execdir) The "usrbin_execdir" hack meant to install some binaries in /bin and others in /usr/bin. However: - It is very inflexible: not much control on the final directory name and it is not possible to get rid of the usr/bin suffix without patching the build system. - It is hard to use: it requires configure to receive --exec_prefix=/ and other settings do not make much sense. It is not very obvious that that setting needs to be passed and it takes a while to figure it out. - It produces garbage with the default setup: the default prefix of /usr/local ends up installing the binaries under /usr/local/usr/bin which does not make any sense. Furthermore, the requirement to split binaries in /bin and /usr/bin is not that strong since some distributions adopted the /usr merge and so would agree to just deploy all binaries to /usr/bin directly. Distributions that would still like to split /bin from /usr/bin should actually move binaries such as `ps` and `kill` to /bin after the install of procps-ng is complete. After all, they are the ones responsible for determining what are the binaries that need to be in the root partition and that list depends on their early boot init scripts, so it is possible that the list must be augmented with other binaries from this package. Therefore, I propose here to get rid of that hack and simply install all the binaries to bindir instead, which solves the problems described above and simplifies the build and install of procps-ng. Tested that it builds and both `make check` and `make distcheck` work. Tested that `make install` works and produces the expected tree, the only difference being the absence of the bogus /usr/local/usr/bin directory and now all binaries are merged into /usr/local/bin as expected. Signed-off-by: Filipe Brandenburger <filbranden@google.com>
2015-05-02 11:57:13 +05:30
lib_LTLIBRARIES = \
proc/libprocps.la
build-sys: take autotools in use again This will revert change at Oct 2002 when autotools support was removed. Unlike before the package developers are expected to use ./autogen.sh to generate ./configure script, and run make after that. The build system is also able to create, with make dist, a tar ball release which compiles correctly, and has files which seemed to be important to have. The patch removes few unnecessary files, but no everything. Files procps.lsm and procps.spec in git repository are useless as is, but I left them lying around for someone who can make more justified call about removal of them. Last, but not least package version number is set 3.3.0 to distinct this procps from the sourceforge's upstream procps. Please notice that libproc relese is kept as 3.2.8. Signed-off-by: Sami Kerola <kerolasa@iki.fi>
2011-06-04 19:56:58 +05:30
dist_man_MANS = \
free.1 \
pgrep.1 \
pkill.1 \
pmap.1 \
uptime.1 \
vmstat.8 \
build-sys: merge automake subdirs into toplevel This will be required for subdir-objects, otherwise automake will have problems with more than one Makefile.am having rules to build the same files. Tested that it builds and both `make check` and `make distcheck` work. Tested `make install` and compared the tree with the one installed before this commit, both installed the binaries to the same locations. The binaries are also in the same location in the build tree (for instance, ps/pscommand is still there.) Checked the binaries for the correct libraries linked into them. Binary sizes matched before and after this change. Signed-off-by: Filipe Brandenburger <filbranden@google.com>
2015-05-02 09:58:53 +05:30
w.1 \
Consolidated patch of previously merged CYGWIN support The combined results of merge request #49 without that overhead plus distortion in this repository's history. Prototyped-by: Wayne Porter <wporter82@gmail.com>
2017-08-31 01:45:15 +05:30
ps/procps.1
if !CYGWIN
dist_man_MANS += \
pwdx.1 \
tload.1 \
sysctl.8 \
sysctl.conf.5 \
build-sys: merge automake subdirs into toplevel This will be required for subdir-objects, otherwise automake will have problems with more than one Makefile.am having rules to build the same files. Tested that it builds and both `make check` and `make distcheck` work. Tested `make install` and compared the tree with the one installed before this commit, both installed the binaries to the same locations. The binaries are also in the same location in the build tree (for instance, ps/pscommand is still there.) Checked the binaries for the correct libraries linked into them. Binary sizes matched before and after this change. Signed-off-by: Filipe Brandenburger <filbranden@google.com>
2015-05-02 09:58:53 +05:30
ps/ps.1
Consolidated patch of previously merged CYGWIN support The combined results of merge request #49 without that overhead plus distortion in this repository's history. Prototyped-by: Wayne Porter <wporter82@gmail.com>
2017-08-31 01:45:15 +05:30
endif
build-sys: take autotools in use again This will revert change at Oct 2002 when autotools support was removed. Unlike before the package developers are expected to use ./autogen.sh to generate ./configure script, and run make after that. The build system is also able to create, with make dist, a tar ball release which compiles correctly, and has files which seemed to be important to have. The patch removes few unnecessary files, but no everything. Files procps.lsm and procps.spec in git repository are useless as is, but I left them lying around for someone who can make more justified call about removal of them. Last, but not least package version number is set 3.3.0 to distinct this procps from the sourceforge's upstream procps. Please notice that libproc relese is kept as 3.2.8. Signed-off-by: Sami Kerola <kerolasa@iki.fi>
2011-06-04 19:56:58 +05:30
Makefile.am fixes Two problems. 1) skill/snice : distribution doesnt mean install If you don't set your configure flags right, you dont install the skill/snice man pages which means you will break any subsequent compiles with the flags enabled. Man pages not to be installed should still be distributed. 2) The git version into Makefile.am breaks under certain conditions. The easy break for this is: touch aclocal.m4 make We need this script added plus some dist hook magic that got left out.
2012-05-20 12:57:14 +05:30
EXTRA_DIST = \
build-sys: include .version in EXTRA_DIST .version is created in the top_srdir which when building normally doesn't present a problem. When make distcheck is run, the source directory is made read-only and it fails with permission denied. The version of misc/git-version-gen is old and is missing the instruction to add .version to EXTRA_DIST. This commit does just that. make distcheck now passes. References: https://github.com/gagern/gnulib/blob/master/build-aux/git-version-gen https://lists.gnu.org/archive/html/bug-gnulib/2011-08/msg00000.html Signed-off-by: Craig Small <csmall@enc.com.au>
2015-08-09 11:57:37 +05:30
.version \
Makefile.am fixes Two problems. 1) skill/snice : distribution doesnt mean install If you don't set your configure flags right, you dont install the skill/snice man pages which means you will break any subsequent compiles with the flags enabled. Man pages not to be installed should still be distributed. 2) The git version into Makefile.am breaks under certain conditions. The easy break for this is: touch aclocal.m4 make We need this script added plus some dist hook magic that got left out.
2012-05-20 12:57:14 +05:30
autogen.sh \
contrib \
COPYING.LIB \
misc/git-version-gen \
docs: Update filenames in Makefile too
2015-05-10 13:19:11 +05:30
Documentation/CodingStyle.md \
Makefile.am fixes Two problems. 1) skill/snice : distribution doesnt mean install If you don't set your configure flags right, you dont install the skill/snice man pages which means you will break any subsequent compiles with the flags enabled. Man pages not to be installed should still be distributed. 2) The git version into Makefile.am breaks under certain conditions. The easy break for this is: touch aclocal.m4 make We need this script added plus some dist hook magic that got left out.
2012-05-20 12:57:14 +05:30
Documentation/TODO \
build-sys: merge automake subdirs into toplevel This will be required for subdir-objects, otherwise automake will have problems with more than one Makefile.am having rules to build the same files. Tested that it builds and both `make check` and `make distcheck` work. Tested `make install` and compared the tree with the one installed before this commit, both installed the binaries to the same locations. The binaries are also in the same location in the build tree (for instance, ps/pscommand is still there.) Checked the binaries for the correct libraries linked into them. Binary sizes matched before and after this change. Signed-off-by: Filipe Brandenburger <filbranden@google.com>
2015-05-02 09:58:53 +05:30
ps/HACKING \
ps/regression \
Moved man-po pot file creation into Makefile The pot files for man-po are part of the extra_dist target so are built at dist time. These used to be created as part of the dist-hook. However it is better to control their builds in the Makefile so they are conditionally built. It also means distcheck doesn't complain when they are added to the CLEANFILES.
2014-06-25 18:41:15 +05:30
$(DIST_MAN_POTS)
Makefile.am fixes Two problems. 1) skill/snice : distribution doesnt mean install If you don't set your configure flags right, you dont install the skill/snice man pages which means you will break any subsequent compiles with the flags enabled. Man pages not to be installed should still be distributed. 2) The git version into Makefile.am breaks under certain conditions. The easy break for this is: touch aclocal.m4 make We need this script added plus some dist hook magic that got left out.
2012-05-20 12:57:14 +05:30
build-sys: merge automake subdirs into toplevel This will be required for subdir-objects, otherwise automake will have problems with more than one Makefile.am having rules to build the same files. Tested that it builds and both `make check` and `make distcheck` work. Tested `make install` and compared the tree with the one installed before this commit, both installed the binaries to the same locations. The binaries are also in the same location in the build tree (for instance, ps/pscommand is still there.) Checked the binaries for the correct libraries linked into them. Binary sizes matched before and after this change. Signed-off-by: Filipe Brandenburger <filbranden@google.com>
2015-05-02 09:58:53 +05:30
procpsngdir = $(docdir)
dist_procpsng_DATA = \
docs: Update filenames in Makefile too
2015-05-10 13:19:11 +05:30
Documentation/bugs.md \
build-sys: merge automake subdirs into toplevel This will be required for subdir-objects, otherwise automake will have problems with more than one Makefile.am having rules to build the same files. Tested that it builds and both `make check` and `make distcheck` work. Tested `make install` and compared the tree with the one installed before this commit, both installed the binaries to the same locations. The binaries are also in the same location in the build tree (for instance, ps/pscommand is still there.) Checked the binaries for the correct libraries linked into them. Binary sizes matched before and after this change. Signed-off-by: Filipe Brandenburger <filbranden@google.com>
2015-05-02 09:58:53 +05:30
Documentation/FAQ
Consolidated patch of previously merged CYGWIN support The combined results of merge request #49 without that overhead plus distortion in this repository's history. Prototyped-by: Wayne Porter <wporter82@gmail.com>
2017-08-31 01:45:15 +05:30
if !CYGWIN
EXTRA_DIST += \
sysctl.conf
endif
pidof: reimplemented from scratch (replacing sysvinit pidof) As the sysvinit becomes obsolete, some of the bundled tools need to find a new home. The procps-ng project seems to be the most suitable project for adopting the pidof tool. This commit introduces a redesigned version of pidof that satisfies the LSB requirements. In corner cases the behaviour might differ from the former one as the new version doesn't use any stat(2) calls.
2013-10-05 00:05:01 +05:30
if BUILD_PIDOF
Consolidated patch of previously merged CYGWIN support The combined results of merge request #49 without that overhead plus distortion in this repository's history. Prototyped-by: Wayne Porter <wporter82@gmail.com>
2017-08-31 01:45:15 +05:30
if !CYGWIN
build-sys: install binaries in bindir (get rid of usrbin_execdir) The "usrbin_execdir" hack meant to install some binaries in /bin and others in /usr/bin. However: - It is very inflexible: not much control on the final directory name and it is not possible to get rid of the usr/bin suffix without patching the build system. - It is hard to use: it requires configure to receive --exec_prefix=/ and other settings do not make much sense. It is not very obvious that that setting needs to be passed and it takes a while to figure it out. - It produces garbage with the default setup: the default prefix of /usr/local ends up installing the binaries under /usr/local/usr/bin which does not make any sense. Furthermore, the requirement to split binaries in /bin and /usr/bin is not that strong since some distributions adopted the /usr merge and so would agree to just deploy all binaries to /usr/bin directly. Distributions that would still like to split /bin from /usr/bin should actually move binaries such as `ps` and `kill` to /bin after the install of procps-ng is complete. After all, they are the ones responsible for determining what are the binaries that need to be in the root partition and that list depends on their early boot init scripts, so it is possible that the list must be augmented with other binaries from this package. Therefore, I propose here to get rid of that hack and simply install all the binaries to bindir instead, which solves the problems described above and simplifies the build and install of procps-ng. Tested that it builds and both `make check` and `make distcheck` work. Tested that `make install` works and produces the expected tree, the only difference being the absence of the bogus /usr/local/usr/bin directory and now all binaries are merged into /usr/local/bin as expected. Signed-off-by: Filipe Brandenburger <filbranden@google.com>
2015-05-02 11:57:13 +05:30
bin_PROGRAMS += pidof
Consolidated patch of previously merged CYGWIN support The combined results of merge request #49 without that overhead plus distortion in this repository's history. Prototyped-by: Wayne Porter <wporter82@gmail.com>
2017-08-31 01:45:15 +05:30
else
usrbin_exec_PROGRAMS += pidof
endif
pidof: reimplemented from scratch (replacing sysvinit pidof) As the sysvinit becomes obsolete, some of the bundled tools need to find a new home. The procps-ng project seems to be the most suitable project for adopting the pidof tool. This commit introduces a redesigned version of pidof that satisfies the LSB requirements. In corner cases the behaviour might differ from the former one as the new version doesn't use any stat(2) calls.
2013-10-05 00:05:01 +05:30
dist_man_MANS += pidof.1
build-sys: drop unneeded $(top_srcdir) from source paths This is cleaner and we need to match paths exactly when we enable the subdir-objects automake option. Out-of-tree builds still work since automake is smart to know these are source files and that it needs to look for them in $(top_srcdir), so there is no need to make this explicit. Tested that it builds and both `make check` and `make distcheck` work. Signed-off-by: Filipe Brandenburger <filbranden@google.com>
2015-05-02 10:06:40 +05:30
pidof_SOURCES = pidof.c lib/fileutils.c
pidof: reimplemented from scratch (replacing sysvinit pidof) As the sysvinit becomes obsolete, some of the bundled tools need to find a new home. The procps-ng project seems to be the most suitable project for adopting the pidof tool. This commit introduces a redesigned version of pidof that satisfies the LSB requirements. In corner cases the behaviour might differ from the former one as the new version doesn't use any stat(2) calls.
2013-10-05 00:05:01 +05:30
else
EXTRA_DIST += pidof.1
endif
build-sys: add --disable-kill build option The kill from procps-ng is not always wanted. For example RedHat seems to prefer kill from util-linux package. Reported-by: Jaromir Capik <jcapik@redhat.com> Signed-off-by: Sami Kerola <kerolasa@iki.fi>
2011-10-04 23:46:46 +05:30
if BUILD_KILL
Consolidated patch of previously merged CYGWIN support The combined results of merge request #49 without that overhead plus distortion in this repository's history. Prototyped-by: Wayne Porter <wporter82@gmail.com>
2017-08-31 01:45:15 +05:30
if CYGWIN
transform += ;s/^kill/prockill/; $(program_transform_name)
usrbin_exec_PROGRAMS += kill
else
build-sys: merge automake subdirs into toplevel This will be required for subdir-objects, otherwise automake will have problems with more than one Makefile.am having rules to build the same files. Tested that it builds and both `make check` and `make distcheck` work. Tested `make install` and compared the tree with the one installed before this commit, both installed the binaries to the same locations. The binaries are also in the same location in the build tree (for instance, ps/pscommand is still there.) Checked the binaries for the correct libraries linked into them. Binary sizes matched before and after this change. Signed-off-by: Filipe Brandenburger <filbranden@google.com>
2015-05-02 09:58:53 +05:30
bin_PROGRAMS += kill
Consolidated patch of previously merged CYGWIN support The combined results of merge request #49 without that overhead plus distortion in this repository's history. Prototyped-by: Wayne Porter <wporter82@gmail.com>
2017-08-31 01:45:15 +05:30
endif
build-sys: add --disable-kill build option The kill from procps-ng is not always wanted. For example RedHat seems to prefer kill from util-linux package. Reported-by: Jaromir Capik <jcapik@redhat.com> Signed-off-by: Sami Kerola <kerolasa@iki.fi>
2011-10-04 23:46:46 +05:30
dist_man_MANS += kill.1
build-sys: drop unneeded $(top_srcdir) from source paths This is cleaner and we need to match paths exactly when we enable the subdir-objects automake option. Out-of-tree builds still work since automake is smart to know these are source files and that it needs to look for them in $(top_srcdir), so there is no need to make this explicit. Tested that it builds and both `make check` and `make distcheck` work. Signed-off-by: Filipe Brandenburger <filbranden@google.com>
2015-05-02 10:06:40 +05:30
kill_SOURCES = skill.c lib/strutils.c lib/fileutils.c lib/nsutils.c
Makefile.am fixes Two problems. 1) skill/snice : distribution doesnt mean install If you don't set your configure flags right, you dont install the skill/snice man pages which means you will break any subsequent compiles with the flags enabled. Man pages not to be installed should still be distributed. 2) The git version into Makefile.am breaks under certain conditions. The easy break for this is: touch aclocal.m4 make We need this script added plus some dist hook magic that got left out.
2012-05-20 12:57:14 +05:30
else
EXTRA_DIST += kill.1
build-sys: add --disable-kill build option The kill from procps-ng is not always wanted. For example RedHat seems to prefer kill from util-linux package. Reported-by: Jaromir Capik <jcapik@redhat.com> Signed-off-by: Sami Kerola <kerolasa@iki.fi>
2011-10-04 23:46:46 +05:30
endif
ncurses and configure again Another fix to link properly to ncurses Some minor top fixes Added *~ to gitignore because these files crop up sometimes
2011-10-27 03:23:55 +05:30
if WITH_NCURSES
Consolidated patch of previously merged CYGWIN support The combined results of merge request #49 without that overhead plus distortion in this repository's history. Prototyped-by: Wayne Porter <wporter82@gmail.com>
2017-08-31 01:45:15 +05:30
if !CYGWIN
build-sys: install binaries in bindir (get rid of usrbin_execdir) The "usrbin_execdir" hack meant to install some binaries in /bin and others in /usr/bin. However: - It is very inflexible: not much control on the final directory name and it is not possible to get rid of the usr/bin suffix without patching the build system. - It is hard to use: it requires configure to receive --exec_prefix=/ and other settings do not make much sense. It is not very obvious that that setting needs to be passed and it takes a while to figure it out. - It produces garbage with the default setup: the default prefix of /usr/local ends up installing the binaries under /usr/local/usr/bin which does not make any sense. Furthermore, the requirement to split binaries in /bin and /usr/bin is not that strong since some distributions adopted the /usr merge and so would agree to just deploy all binaries to /usr/bin directly. Distributions that would still like to split /bin from /usr/bin should actually move binaries such as `ps` and `kill` to /bin after the install of procps-ng is complete. After all, they are the ones responsible for determining what are the binaries that need to be in the root partition and that list depends on their early boot init scripts, so it is possible that the list must be augmented with other binaries from this package. Therefore, I propose here to get rid of that hack and simply install all the binaries to bindir instead, which solves the problems described above and simplifies the build and install of procps-ng. Tested that it builds and both `make check` and `make distcheck` work. Tested that `make install` works and produces the expected tree, the only difference being the absence of the bogus /usr/local/usr/bin directory and now all binaries are merged into /usr/local/bin as expected. Signed-off-by: Filipe Brandenburger <filbranden@google.com>
2015-05-02 11:57:13 +05:30
bin_PROGRAMS += \
build-sys: take autotools in use again This will revert change at Oct 2002 when autotools support was removed. Unlike before the package developers are expected to use ./autogen.sh to generate ./configure script, and run make after that. The build system is also able to create, with make dist, a tar ball release which compiles correctly, and has files which seemed to be important to have. The patch removes few unnecessary files, but no everything. Files procps.lsm and procps.spec in git repository are useless as is, but I left them lying around for someone who can make more justified call about removal of them. Last, but not least package version number is set 3.3.0 to distinct this procps from the sourceforge's upstream procps. Please notice that libproc relese is kept as 3.2.8. Signed-off-by: Sami Kerola <kerolasa@iki.fi>
2011-06-04 19:56:58 +05:30
slabtop \
build-sys: merge automake subdirs into toplevel This will be required for subdir-objects, otherwise automake will have problems with more than one Makefile.am having rules to build the same files. Tested that it builds and both `make check` and `make distcheck` work. Tested `make install` and compared the tree with the one installed before this commit, both installed the binaries to the same locations. The binaries are also in the same location in the build tree (for instance, ps/pscommand is still there.) Checked the binaries for the correct libraries linked into them. Binary sizes matched before and after this change. Signed-off-by: Filipe Brandenburger <filbranden@google.com>
2015-05-02 09:58:53 +05:30
watch \
top/top
Consolidated patch of previously merged CYGWIN support The combined results of merge request #49 without that overhead plus distortion in this repository's history. Prototyped-by: Wayne Porter <wporter82@gmail.com>
2017-08-31 01:45:15 +05:30
else
usrbin_exec_PROGRAMS += \
watch \
top/top
endif
build-sys: take autotools in use again This will revert change at Oct 2002 when autotools support was removed. Unlike before the package developers are expected to use ./autogen.sh to generate ./configure script, and run make after that. The build system is also able to create, with make dist, a tar ball release which compiles correctly, and has files which seemed to be important to have. The patch removes few unnecessary files, but no everything. Files procps.lsm and procps.spec in git repository are useless as is, but I left them lying around for someone who can make more justified call about removal of them. Last, but not least package version number is set 3.3.0 to distinct this procps from the sourceforge's upstream procps. Please notice that libproc relese is kept as 3.2.8. Signed-off-by: Sami Kerola <kerolasa@iki.fi>
2011-06-04 19:56:58 +05:30
dist_man_MANS += \
build-sys: merge automake subdirs into toplevel This will be required for subdir-objects, otherwise automake will have problems with more than one Makefile.am having rules to build the same files. Tested that it builds and both `make check` and `make distcheck` work. Tested `make install` and compared the tree with the one installed before this commit, both installed the binaries to the same locations. The binaries are also in the same location in the build tree (for instance, ps/pscommand is still there.) Checked the binaries for the correct libraries linked into them. Binary sizes matched before and after this change. Signed-off-by: Filipe Brandenburger <filbranden@google.com>
2015-05-02 09:58:53 +05:30
watch.1 \
top/top.1
build-sys: drop unneeded $(top_srcdir) from source paths This is cleaner and we need to match paths exactly when we enable the subdir-objects automake option. Out-of-tree builds still work since automake is smart to know these are source files and that it needs to look for them in $(top_srcdir), so there is no need to make this explicit. Tested that it builds and both `make check` and `make distcheck` work. Signed-off-by: Filipe Brandenburger <filbranden@google.com>
2015-05-02 10:06:40 +05:30
watch_SOURCES = watch.c lib/strutils.c lib/fileutils.c
Added Cygwin build support strverscmp is included to satisfy a dependency in Cygwin. Excluded utmp and prctl functions that are not supported currently.
2016-03-11 04:34:27 +05:30
watch_LDADD = @WATCH_NCURSES_LIBS@ $(CYGWINFLAGS)
configure.ac: use pkg-config to get ncursesw header location Don't assume ncursesw headers are in ../usr/include/ncursesw/.. On a pure build/system without legacy ncurses that may not be true. Since we're using pkg-config let it provide the correct include path. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-08-07 15:05:20 +05:30
watch_CFLAGS = @WATCH_NCURSES_CFLAGS@
build-sys: merge automake subdirs into toplevel This will be required for subdir-objects, otherwise automake will have problems with more than one Makefile.am having rules to build the same files. Tested that it builds and both `make check` and `make distcheck` work. Tested `make install` and compared the tree with the one installed before this commit, both installed the binaries to the same locations. The binaries are also in the same location in the build tree (for instance, ps/pscommand is still there.) Checked the binaries for the correct libraries linked into them. Binary sizes matched before and after this change. Signed-off-by: Filipe Brandenburger <filbranden@google.com>
2015-05-02 09:58:53 +05:30
top_top_SOURCES = \
top/top.h \
top/top.c \
top/top_nls.h \
top/top_nls.c \
lib/fileutils.c
Consolidated patch of previously merged CYGWIN support The combined results of merge request #49 without that overhead plus distortion in this repository's history. Prototyped-by: Wayne Porter <wporter82@gmail.com>
2017-08-31 01:45:15 +05:30
Added Cygwin build support strverscmp is included to satisfy a dependency in Cygwin. Excluded utmp and prctl functions that are not supported currently.
2016-03-11 04:34:27 +05:30
if CYGWIN
Consolidated patch of previously merged CYGWIN support The combined results of merge request #49 without that overhead plus distortion in this repository's history. Prototyped-by: Wayne Porter <wporter82@gmail.com>
2017-08-31 01:45:15 +05:30
top_top_SOURCES += lib/strverscmp.c
else
dist_man_MANS += \
slabtop.1
slabtop_SOURCES = slabtop.c lib/strutils.c lib/fileutils.c
slabtop_LDADD = $(LDADD) @NCURSES_LIBS@
Added Cygwin build support strverscmp is included to satisfy a dependency in Cygwin. Excluded utmp and prctl functions that are not supported currently.
2016-03-11 04:34:27 +05:30
endif
build-sys: use proper dependencies on libproc.la Use LDADD or *_LDADD instead of AM_LDFLAGS to refer to libproc.la. Otherwise, parallel builds will break as there is no explicit dependency to ensure the library is built before the binaries that try to link to it. v2: Added empty rules lib_test_*_LDADD to remove the dependency on libproc which is not used by the lib/test_* binaries. Tested by running `make -jNN` repeatedly for different levels of parallelism to ensure the build works. Also checked that `make check` and `make distcheck` still work as expected. Also made sure that a parallel make invocation works with `make -j distcheck`. Reported-by: Jim Warner <james.warner@comcast.net> Signed-off-by: Filipe Brandenburger <filbranden@google.com>
2015-05-12 01:01:59 +05:30
top_top_LDADD = $(LDADD) @NCURSES_LIBS@ $(DL_LIB)
build-sys: take autotools in use again This will revert change at Oct 2002 when autotools support was removed. Unlike before the package developers are expected to use ./autogen.sh to generate ./configure script, and run make after that. The build system is also able to create, with make dist, a tar ball release which compiles correctly, and has files which seemed to be important to have. The patch removes few unnecessary files, but no everything. Files procps.lsm and procps.spec in git repository are useless as is, but I left them lying around for someone who can make more justified call about removal of them. Last, but not least package version number is set 3.3.0 to distinct this procps from the sourceforge's upstream procps. Please notice that libproc relese is kept as 3.2.8. Signed-off-by: Sami Kerola <kerolasa@iki.fi>
2011-06-04 19:56:58 +05:30
endif
skill, snice: do not encourage building these utilities Both skill and snice are are mentioned in manual page to be 'obsolete and unportable'. This commit discourages distributors to keep these commands part of default system. Signed-off-by: Sami Kerola <kerolasa@iki.fi>
2012-03-16 01:59:13 +05:30
if BUILD_SKILL
Consolidated patch of previously merged CYGWIN support The combined results of merge request #49 without that overhead plus distortion in this repository's history. Prototyped-by: Wayne Porter <wporter82@gmail.com>
2017-08-31 01:45:15 +05:30
if !CYGWIN
build-sys: install binaries in bindir (get rid of usrbin_execdir) The "usrbin_execdir" hack meant to install some binaries in /bin and others in /usr/bin. However: - It is very inflexible: not much control on the final directory name and it is not possible to get rid of the usr/bin suffix without patching the build system. - It is hard to use: it requires configure to receive --exec_prefix=/ and other settings do not make much sense. It is not very obvious that that setting needs to be passed and it takes a while to figure it out. - It produces garbage with the default setup: the default prefix of /usr/local ends up installing the binaries under /usr/local/usr/bin which does not make any sense. Furthermore, the requirement to split binaries in /bin and /usr/bin is not that strong since some distributions adopted the /usr merge and so would agree to just deploy all binaries to /usr/bin directly. Distributions that would still like to split /bin from /usr/bin should actually move binaries such as `ps` and `kill` to /bin after the install of procps-ng is complete. After all, they are the ones responsible for determining what are the binaries that need to be in the root partition and that list depends on their early boot init scripts, so it is possible that the list must be augmented with other binaries from this package. Therefore, I propose here to get rid of that hack and simply install all the binaries to bindir instead, which solves the problems described above and simplifies the build and install of procps-ng. Tested that it builds and both `make check` and `make distcheck` work. Tested that `make install` works and produces the expected tree, the only difference being the absence of the bogus /usr/local/usr/bin directory and now all binaries are merged into /usr/local/bin as expected. Signed-off-by: Filipe Brandenburger <filbranden@google.com>
2015-05-02 11:57:13 +05:30
bin_PROGRAMS += \
skill, snice: do not encourage building these utilities Both skill and snice are are mentioned in manual page to be 'obsolete and unportable'. This commit discourages distributors to keep these commands part of default system. Signed-off-by: Sami Kerola <kerolasa@iki.fi>
2012-03-16 01:59:13 +05:30
skill \
snice
Consolidated patch of previously merged CYGWIN support The combined results of merge request #49 without that overhead plus distortion in this repository's history. Prototyped-by: Wayne Porter <wporter82@gmail.com>
2017-08-31 01:45:15 +05:30
else
usrbin_exec_PROGRAMS += \
skill \
snice
endif
build-sys: drop unneeded $(top_srcdir) from source paths This is cleaner and we need to match paths exactly when we enable the subdir-objects automake option. Out-of-tree builds still work since automake is smart to know these are source files and that it needs to look for them in $(top_srcdir), so there is no need to make this explicit. Tested that it builds and both `make check` and `make distcheck` work. Signed-off-by: Filipe Brandenburger <filbranden@google.com>
2015-05-02 10:06:40 +05:30
skill_SOURCES = skill.c lib/strutils.c lib/fileutils.c lib/nsutils.c
snice_SOURCES = skill.c lib/strutils.c lib/fileutils.c lib/nsutils.c
skill, snice: do not encourage building these utilities Both skill and snice are are mentioned in manual page to be 'obsolete and unportable'. This commit discourages distributors to keep these commands part of default system. Signed-off-by: Sami Kerola <kerolasa@iki.fi>
2012-03-16 01:59:13 +05:30
dist_man_MANS += \
skill.1 \
snice.1
Makefile.am fixes Two problems. 1) skill/snice : distribution doesnt mean install If you don't set your configure flags right, you dont install the skill/snice man pages which means you will break any subsequent compiles with the flags enabled. Man pages not to be installed should still be distributed. 2) The git version into Makefile.am breaks under certain conditions. The easy break for this is: touch aclocal.m4 make We need this script added plus some dist hook magic that got left out.
2012-05-20 12:57:14 +05:30
else
EXTRA_DIST += \
skill.1 \
snice.1
skill, snice: do not encourage building these utilities Both skill and snice are are mentioned in manual page to be 'obsolete and unportable'. This commit discourages distributors to keep these commands part of default system. Signed-off-by: Sami Kerola <kerolasa@iki.fi>
2012-03-16 01:59:13 +05:30
endif
build-sys: drop unneeded $(top_srcdir) from source paths This is cleaner and we need to match paths exactly when we enable the subdir-objects automake option. Out-of-tree builds still work since automake is smart to know these are source files and that it needs to look for them in $(top_srcdir), so there is no need to make this explicit. Tested that it builds and both `make check` and `make distcheck` work. Signed-off-by: Filipe Brandenburger <filbranden@google.com>
2015-05-02 10:06:40 +05:30
free_SOURCES = free.c lib/strutils.c lib/fileutils.c
pgrep_SOURCES = pgrep.c lib/fileutils.c lib/nsutils.c
pkill_SOURCES = pgrep.c lib/fileutils.c lib/nsutils.c
pmap_SOURCES = pmap.c lib/fileutils.c
Consolidated patch of previously merged CYGWIN support The combined results of merge request #49 without that overhead plus distortion in this repository's history. Prototyped-by: Wayne Porter <wporter82@gmail.com>
2017-08-31 01:45:15 +05:30
if !CYGWIN
build-sys: drop unneeded $(top_srcdir) from source paths This is cleaner and we need to match paths exactly when we enable the subdir-objects automake option. Out-of-tree builds still work since automake is smart to know these are source files and that it needs to look for them in $(top_srcdir), so there is no need to make this explicit. Tested that it builds and both `make check` and `make distcheck` work. Signed-off-by: Filipe Brandenburger <filbranden@google.com>
2015-05-02 10:06:40 +05:30
pwdx_SOURCES = pwdx.c lib/fileutils.c
Added Cygwin build support strverscmp is included to satisfy a dependency in Cygwin. Excluded utmp and prctl functions that are not supported currently.
2016-03-11 04:34:27 +05:30
pwdx_LDADD= $(CYGWINFLAGS)
build-sys: drop unneeded $(top_srcdir) from source paths This is cleaner and we need to match paths exactly when we enable the subdir-objects automake option. Out-of-tree builds still work since automake is smart to know these are source files and that it needs to look for them in $(top_srcdir), so there is no need to make this explicit. Tested that it builds and both `make check` and `make distcheck` work. Signed-off-by: Filipe Brandenburger <filbranden@google.com>
2015-05-02 10:06:40 +05:30
sysctl_SOURCES = sysctl.c lib/fileutils.c
Consolidated patch of previously merged CYGWIN support The combined results of merge request #49 without that overhead plus distortion in this repository's history. Prototyped-by: Wayne Porter <wporter82@gmail.com>
2017-08-31 01:45:15 +05:30
endif
build-sys: drop unneeded $(top_srcdir) from source paths This is cleaner and we need to match paths exactly when we enable the subdir-objects automake option. Out-of-tree builds still work since automake is smart to know these are source files and that it needs to look for them in $(top_srcdir), so there is no need to make this explicit. Tested that it builds and both `make check` and `make distcheck` work. Signed-off-by: Filipe Brandenburger <filbranden@google.com>
2015-05-02 10:06:40 +05:30
tload_SOURCES = tload.c lib/strutils.c lib/fileutils.c
uptime_SOURCES = uptime.c lib/fileutils.c
vmstat_SOURCES = vmstat.c lib/strutils.c lib/fileutils.c
w_SOURCES = w.c lib/fileutils.c
build-sys: take autotools in use again This will revert change at Oct 2002 when autotools support was removed. Unlike before the package developers are expected to use ./autogen.sh to generate ./configure script, and run make after that. The build system is also able to create, with make dist, a tar ball release which compiles correctly, and has files which seemed to be important to have. The patch removes few unnecessary files, but no everything. Files procps.lsm and procps.spec in git repository are useless as is, but I left them lying around for someone who can make more justified call about removal of them. Last, but not least package version number is set 3.3.0 to distinct this procps from the sourceforge's upstream procps. Please notice that libproc relese is kept as 3.2.8. Signed-off-by: Sami Kerola <kerolasa@iki.fi>
2011-06-04 19:56:58 +05:30
build-sys: merge automake subdirs into toplevel This will be required for subdir-objects, otherwise automake will have problems with more than one Makefile.am having rules to build the same files. Tested that it builds and both `make check` and `make distcheck` work. Tested `make install` and compared the tree with the one installed before this commit, both installed the binaries to the same locations. The binaries are also in the same location in the build tree (for instance, ps/pscommand is still there.) Checked the binaries for the correct libraries linked into them. Binary sizes matched before and after this change. Signed-off-by: Filipe Brandenburger <filbranden@google.com>
2015-05-02 09:58:53 +05:30
# proc/libprocps.la
# See http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
6:0:0 lbirary API bump
2016-07-10 04:25:45 +05:30
LIBprocps_CURRENT=6
build-sys: merge automake subdirs into toplevel This will be required for subdir-objects, otherwise automake will have problems with more than one Makefile.am having rules to build the same files. Tested that it builds and both `make check` and `make distcheck` work. Tested `make install` and compared the tree with the one installed before this commit, both installed the binaries to the same locations. The binaries are also in the same location in the build tree (for instance, ps/pscommand is still there.) Checked the binaries for the correct libraries linked into them. Binary sizes matched before and after this change. Signed-off-by: Filipe Brandenburger <filbranden@google.com>
2015-05-02 09:58:53 +05:30
LIBprocps_REVISION=0
LIBprocps_AGE=0
proc_libprocps_la_LIBADD = $(LIB_KPARTS)
if WITH_SYSTEMD
proc_libprocps_la_LIBADD += @SYSTEMD_LIBS@
endif
Add support for elogind A session manager similar to logind from systemd. See https://github.com/elogind/elogind Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
2017-05-30 20:03:28 +05:30
if WITH_ELOGIND
proc_libprocps_la_LIBADD += @ELOGIND_LIBS@
endif
build-sys: merge automake subdirs into toplevel This will be required for subdir-objects, otherwise automake will have problems with more than one Makefile.am having rules to build the same files. Tested that it builds and both `make check` and `make distcheck` work. Tested `make install` and compared the tree with the one installed before this commit, both installed the binaries to the same locations. The binaries are also in the same location in the build tree (for instance, ps/pscommand is still there.) Checked the binaries for the correct libraries linked into them. Binary sizes matched before and after this change. Signed-off-by: Filipe Brandenburger <filbranden@google.com>
2015-05-02 09:58:53 +05:30
proc_libprocps_la_LDFLAGS = \
-version-info $(LIBprocps_CURRENT):$(LIBprocps_REVISION):$(LIBprocps_AGE) \
-no-undefined \
-Wl,--version-script=$(top_srcdir)/proc/libprocps.sym
proc_libprocps_la_SOURCES = \
proc/alloc.c \
proc/alloc.h \
proc/devname.c \
proc/devname.h \
proc/escape.c \
proc/escape.h \
library: set stage for NUMA node field display support In response to that suggestion referenced below, these changes allow display of task/thread level NUMA nodes. Currently, only the 'top' program offers any NUMA type support and it is limited to the Summary Area display. With this commit both the 'top' and 'ps' programs will be able to display NUMA nodes associated with threads. [ this patch has been adapted from the newlib branch ] [ and implemented so as to preserve the existing ABI ] Reference(s): https://gitlab.com/procps-ng/procps/issues/58 Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-05-13 10:32:00 +05:30
proc/numa.c \
proc/numa.h \
Add flexible buffered I/O based on fopencookie(3) to be able to read and write large buffers below /proc. The buffers and file offsets are handled dynamically on the required buffer size at read, that is lseek(2) is used to determine this size. Large buffers at write are split at a delimeter into pieces and also lseek(2) is used to write each of them. Signed-off-by: Werner Fink <werner@suse.de>
2018-01-18 15:56:37 +05:30
proc/procio.c \
proc/procio.h \
build-sys: fix oversight for a newly added header file Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-06-19 19:04:12 +05:30
proc/procps-private.h \
build-sys: merge automake subdirs into toplevel This will be required for subdir-objects, otherwise automake will have problems with more than one Makefile.am having rules to build the same files. Tested that it builds and both `make check` and `make distcheck` work. Tested `make install` and compared the tree with the one installed before this commit, both installed the binaries to the same locations. The binaries are also in the same location in the build tree (for instance, ps/pscommand is still there.) Checked the binaries for the correct libraries linked into them. Binary sizes matched before and after this change. Signed-off-by: Filipe Brandenburger <filbranden@google.com>
2015-05-02 09:58:53 +05:30
proc/procps.h \
proc/pwcache.c \
proc/pwcache.h \
proc/readproc.c \
proc/readproc.h \
proc/sig.c \
proc/sig.h \
proc/slab.c \
proc/slab.h \
proc/sysinfo.c \
proc/sysinfo.h \
proc/version.c \
proc/version.h \
library: refactor and rely on modern kernels for wchan Several Debian based distributions were recently found to have omitted a kernel configuration option that had the effect of rendering /proc/#/stat and /proc/#/wchan useless for providing any 'sleeping in function' info. That problem also prompted a reevaluation of the whole approach to wchan matters which had grown increasingly complex as our library evolved over the last 13 years. The net result was a decision to rely on /proc/#/wchan which arrived along with the 2.5 kernel. This then let us vastly simplify the internal code plus the external interface which will benefit both the top and ps pgms. Reference(s): http://www.freelists.org/post/procps/WCHAN,11 https://lkml.org/lkml/2008/11/6/12 https://bugs.debian.org/711592 Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-06-18 10:30:00 +05:30
proc/wchan.c \
build-sys: merge automake subdirs into toplevel This will be required for subdir-objects, otherwise automake will have problems with more than one Makefile.am having rules to build the same files. Tested that it builds and both `make check` and `make distcheck` work. Tested `make install` and compared the tree with the one installed before this commit, both installed the binaries to the same locations. The binaries are also in the same location in the build tree (for instance, ps/pscommand is still there.) Checked the binaries for the correct libraries linked into them. Binary sizes matched before and after this change. Signed-off-by: Filipe Brandenburger <filbranden@google.com>
2015-05-02 09:58:53 +05:30
proc/wchan.h \
proc/whattime.c \
proc/whattime.h
proc_libprocps_la_includedir = $(includedir)/proc/
proc_libprocps_la_include_HEADERS = \
proc/alloc.h \
proc/devname.h \
proc/escape.h \
library: set stage for NUMA node field display support In response to that suggestion referenced below, these changes allow display of task/thread level NUMA nodes. Currently, only the 'top' program offers any NUMA type support and it is limited to the Summary Area display. With this commit both the 'top' and 'ps' programs will be able to display NUMA nodes associated with threads. [ this patch has been adapted from the newlib branch ] [ and implemented so as to preserve the existing ABI ] Reference(s): https://gitlab.com/procps-ng/procps/issues/58 Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-05-13 10:32:00 +05:30
proc/numa.h \
Add flexible buffered I/O based on fopencookie(3) to be able to read and write large buffers below /proc. The buffers and file offsets are handled dynamically on the required buffer size at read, that is lseek(2) is used to determine this size. Large buffers at write are split at a delimeter into pieces and also lseek(2) is used to write each of them. Signed-off-by: Werner Fink <werner@suse.de>
2018-01-18 15:56:37 +05:30
proc/procio.h \
build-sys: merge automake subdirs into toplevel This will be required for subdir-objects, otherwise automake will have problems with more than one Makefile.am having rules to build the same files. Tested that it builds and both `make check` and `make distcheck` work. Tested `make install` and compared the tree with the one installed before this commit, both installed the binaries to the same locations. The binaries are also in the same location in the build tree (for instance, ps/pscommand is still there.) Checked the binaries for the correct libraries linked into them. Binary sizes matched before and after this change. Signed-off-by: Filipe Brandenburger <filbranden@google.com>
2015-05-02 09:58:53 +05:30
proc/procps.h \
proc/pwcache.h \
proc/readproc.h \
proc/sig.h \
proc/slab.h \
proc/sysinfo.h \
proc/version.h \
proc/wchan.h \
proc/whattime.h
dist_man_MANS += \
docs: Change name of fprocopen man page Add NEWS for sysctl large buffers Rename manpage to fprocopen References: be6b048a41b0a47ebed602d9e0993fe18c9de237 procps-ng/procps!56
2018-02-28 15:54:03 +05:30
proc/fprocopen.3 \
build-sys: merge automake subdirs into toplevel This will be required for subdir-objects, otherwise automake will have problems with more than one Makefile.am having rules to build the same files. Tested that it builds and both `make check` and `make distcheck` work. Tested `make install` and compared the tree with the one installed before this commit, both installed the binaries to the same locations. The binaries are also in the same location in the build tree (for instance, ps/pscommand is still there.) Checked the binaries for the correct libraries linked into them. Binary sizes matched before and after this change. Signed-off-by: Filipe Brandenburger <filbranden@google.com>
2015-05-02 09:58:53 +05:30
proc/openproc.3 \
proc/readproc.3 \
proc/readproctab.3
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = \
proc/libprocps.pc
EXTRA_DIST += proc/libprocps.sym
# ps/pscommand
ps_pscommand_SOURCES = \
ps/common.h \
ps/display.c \
ps/global.c \
ps/help.c \
ps/output.c \
ps/parser.c \
ps/select.c \
ps/sortformat.c \
ps/stacktrace.c \
lib/fileutils.c
build-sys: Re vert noinst and check programs Previously there was a commit to change all noinst_PROGRAMS into check_PROGRAMS. This was not a good idea. check_PROGRAMS are built before TESTS are run. However they are NOT build before the dejagnu tests are run, causing those tests to fail. So: If the program is required for dejagnu, it needs to go into noinst_PROGRAMS If the program is required for TESTS or is one of those TESTS, it needs to go into check_PROGRAMS
2016-07-09 10:05:06 +05:30
# Test programs not used by dejagnu but run directly
misc: fix strtod_nol_err tests A better way of implementing the string to double conversion and a better way of testing it. Signed-off-by: Craig Small <csmall@enc.com.au>
2016-07-13 15:38:51 +05:30
TESTS = \
lib/test_strtod_nol
check_PROGRAMS = $(TESTS)
A locale-independent strtod There is a need in some utilities to have a way of accepting both types of decimal points "." and ",". The only way seems to be to rebuild strtod(). This new function will accept "123.456" and "123,456" as 123.456 and considers them the same number. It means we lose thousands separator, but this is rarely used. test scripts are added to check the function returns the proper values. There was simpler predecessor that got stuck on negative 0 or -0.123 which these tests flushed out. References:
2016-03-03 15:54:08 +05:30
build-sys: Re vert noinst and check programs Previously there was a commit to change all noinst_PROGRAMS into check_PROGRAMS. This was not a good idea. check_PROGRAMS are built before TESTS are run. However they are NOT build before the dejagnu tests are run, causing those tests to fail. So: If the program is required for dejagnu, it needs to go into noinst_PROGRAMS If the program is required for TESTS or is one of those TESTS, it needs to go into check_PROGRAMS
2016-07-09 10:05:06 +05:30
# Test programs required for dejagnu
noinst_PROGRAMS = \
Create test process For the test suite, procps used to use sleep which would just create a process or two to test the tools against. Some setups coreutils creates all programs including sleep into one blob which means a lot of the tests fail, see issue #2 procps has its own sleep program now.
2015-06-13 10:34:31 +05:30
lib/test_strutils \
lib/test_fileutils \
lib/test_nsutils \
build-sys: Re vert noinst and check programs Previously there was a commit to change all noinst_PROGRAMS into check_PROGRAMS. This was not a good idea. check_PROGRAMS are built before TESTS are run. However they are NOT build before the dejagnu tests are run, causing those tests to fail. So: If the program is required for dejagnu, it needs to go into noinst_PROGRAMS If the program is required for TESTS or is one of those TESTS, it needs to go into check_PROGRAMS
2016-07-09 10:05:06 +05:30
lib/test_process
build-sys: merge automake subdirs into toplevel This will be required for subdir-objects, otherwise automake will have problems with more than one Makefile.am having rules to build the same files. Tested that it builds and both `make check` and `make distcheck` work. Tested `make install` and compared the tree with the one installed before this commit, both installed the binaries to the same locations. The binaries are also in the same location in the build tree (for instance, ps/pscommand is still there.) Checked the binaries for the correct libraries linked into them. Binary sizes matched before and after this change. Signed-off-by: Filipe Brandenburger <filbranden@google.com>
2015-05-02 09:58:53 +05:30
lib_test_strutils_SOURCES = lib/test_strutils.c lib/strutils.c
Added Cygwin build support strverscmp is included to satisfy a dependency in Cygwin. Excluded utmp and prctl functions that are not supported currently.
2016-03-11 04:34:27 +05:30
lib_test_strutils_LDADD = $(CYGWINFLAGS)
build-sys: merge automake subdirs into toplevel This will be required for subdir-objects, otherwise automake will have problems with more than one Makefile.am having rules to build the same files. Tested that it builds and both `make check` and `make distcheck` work. Tested `make install` and compared the tree with the one installed before this commit, both installed the binaries to the same locations. The binaries are also in the same location in the build tree (for instance, ps/pscommand is still there.) Checked the binaries for the correct libraries linked into them. Binary sizes matched before and after this change. Signed-off-by: Filipe Brandenburger <filbranden@google.com>
2015-05-02 09:58:53 +05:30
lib_test_fileutils_SOURCES = lib/test_fileutils.c lib/fileutils.c
Added Cygwin build support strverscmp is included to satisfy a dependency in Cygwin. Excluded utmp and prctl functions that are not supported currently.
2016-03-11 04:34:27 +05:30
lib_test_fileutils_LDADD = $(CYGWINFLAGS)
build-sys: merge automake subdirs into toplevel This will be required for subdir-objects, otherwise automake will have problems with more than one Makefile.am having rules to build the same files. Tested that it builds and both `make check` and `make distcheck` work. Tested `make install` and compared the tree with the one installed before this commit, both installed the binaries to the same locations. The binaries are also in the same location in the build tree (for instance, ps/pscommand is still there.) Checked the binaries for the correct libraries linked into them. Binary sizes matched before and after this change. Signed-off-by: Filipe Brandenburger <filbranden@google.com>
2015-05-02 09:58:53 +05:30
lib_test_nsutils_SOURCES = lib/test_nsutils.c lib/nsutils.c
Added Cygwin build support strverscmp is included to satisfy a dependency in Cygwin. Excluded utmp and prctl functions that are not supported currently.
2016-03-11 04:34:27 +05:30
lib_test_nsutils_LDADD = $(CYGWINFLAGS)
Do not link test process to libprocps The test process introduced at 420cd9c7 incorrectly linked to libprocps which made the CI runner fail.
2015-06-14 04:24:59 +05:30
lib_test_process_SOURCES = lib/test_process.c
Added Cygwin build support strverscmp is included to satisfy a dependency in Cygwin. Excluded utmp and prctl functions that are not supported currently.
2016-03-11 04:34:27 +05:30
lib_test_process_LDADD = $(CYGWINFLAGS)
build-sys: merge automake subdirs into toplevel This will be required for subdir-objects, otherwise automake will have problems with more than one Makefile.am having rules to build the same files. Tested that it builds and both `make check` and `make distcheck` work. Tested `make install` and compared the tree with the one installed before this commit, both installed the binaries to the same locations. The binaries are also in the same location in the build tree (for instance, ps/pscommand is still there.) Checked the binaries for the correct libraries linked into them. Binary sizes matched before and after this change. Signed-off-by: Filipe Brandenburger <filbranden@google.com>
2015-05-02 09:58:53 +05:30
A locale-independent strtod There is a need in some utilities to have a way of accepting both types of decimal points "." and ",". The only way seems to be to rebuild strtod(). This new function will accept "123.456" and "123,456" as 123.456 and considers them the same number. It means we lose thousands separator, but this is rarely used. test scripts are added to check the function returns the proper values. There was simpler predecessor that got stuck on negative 0 or -0.123 which these tests flushed out. References:
2016-03-03 15:54:08 +05:30
lib_test_strtod_nol_SOURCES = lib/test_strtod_nol.c lib/strutils.c
Added Cygwin build support strverscmp is included to satisfy a dependency in Cygwin. Excluded utmp and prctl functions that are not supported currently.
2016-03-11 04:34:27 +05:30
lib_test_strtod_nol_LDADD = $(CYGWINFLAGS)
A locale-independent strtod There is a need in some utilities to have a way of accepting both types of decimal points "." and ",". The only way seems to be to rebuild strtod(). This new function will accept "123.456" and "123,456" as 123.456 and considers them the same number. It means we lose thousands separator, but this is rarely used. test scripts are added to check the function returns the proper values. There was simpler predecessor that got stuck on negative 0 or -0.123 which these tests flushed out. References:
2016-03-03 15:54:08 +05:30
Consolidated patch of previously merged CYGWIN support The combined results of merge request #49 without that overhead plus distortion in this repository's history. Prototyped-by: Wayne Porter <wporter82@gmail.com>
2017-08-31 01:45:15 +05:30
if CYGWIN
skill_LDADD = $(CYGWINFLAGS)
kill_LDADD = $(CYGWINFLAGS)
free_LDADD = $(CYGWINFLAGS)
pgrep_LDADD = $(CYGWINFLAGS)
pkill_LDADD = $(CYGWINFLAGS)
pidof_LDADD = $(CYGWINFLAGS)
pmap_LDADD = $(CYGWINFLAGS)
snice_LDADD = $(CYGWINFLAGS)
tload_LDADD = $(CYGWINFLAGS)
uptime_LDADD = $(CYGWINFLAGS)
w_LDADD = $(CYGWINFLAGS)
vmstat_LDADD = $(CYGWINFLAGS)
endif
build-sys: allow packagers to choose what is installed Distribution maintainers may not want to use upstream example files in their procps-ng package. Reference: http://permalink.gmane.org/gmane.linux.arch.devel/17440 Signed-off-by: Sami Kerola <kerolasa@iki.fi>
2012-04-29 20:52:29 +05:30
if EXAMPLE_FILES
Consolidated patch of previously merged CYGWIN support The combined results of merge request #49 without that overhead plus distortion in this repository's history. Prototyped-by: Wayne Porter <wporter82@gmail.com>
2017-08-31 01:45:15 +05:30
if !CYGWIN
build-sys: take autotools in use again This will revert change at Oct 2002 when autotools support was removed. Unlike before the package developers are expected to use ./autogen.sh to generate ./configure script, and run make after that. The build system is also able to create, with make dist, a tar ball release which compiles correctly, and has files which seemed to be important to have. The patch removes few unnecessary files, but no everything. Files procps.lsm and procps.spec in git repository are useless as is, but I left them lying around for someone who can make more justified call about removal of them. Last, but not least package version number is set 3.3.0 to distinct this procps from the sourceforge's upstream procps. Please notice that libproc relese is kept as 3.2.8. Signed-off-by: Sami Kerola <kerolasa@iki.fi>
2011-06-04 19:56:58 +05:30
sysconf_DATA = sysctl.conf
build-sys: allow packagers to choose what is installed Distribution maintainers may not want to use upstream example files in their procps-ng package. Reference: http://permalink.gmane.org/gmane.linux.arch.devel/17440 Signed-off-by: Sami Kerola <kerolasa@iki.fi>
2012-04-29 20:52:29 +05:30
endif
Consolidated patch of previously merged CYGWIN support The combined results of merge request #49 without that overhead plus distortion in this repository's history. Prototyped-by: Wayne Porter <wporter82@gmail.com>
2017-08-31 01:45:15 +05:30
endif
build-sys: take autotools in use again This will revert change at Oct 2002 when autotools support was removed. Unlike before the package developers are expected to use ./autogen.sh to generate ./configure script, and run make after that. The build system is also able to create, with make dist, a tar ball release which compiles correctly, and has files which seemed to be important to have. The patch removes few unnecessary files, but no everything. Files procps.lsm and procps.spec in git repository are useless as is, but I left them lying around for someone who can make more justified call about removal of them. Last, but not least package version number is set 3.3.0 to distinct this procps from the sourceforge's upstream procps. Please notice that libproc relese is kept as 3.2.8. Signed-off-by: Sami Kerola <kerolasa@iki.fi>
2011-06-04 19:56:58 +05:30
build-sys: earlier patch broke the build The commit 47cc1b6ccfd1e6e10aafbf21e932991a10c97f7e might have fixed an issue when distribution is built, but it broke make after running ./configure which this commit fixes. Reference: http://www.delorie.com/gnu/docs/automake/automake_66.html Signed-off-by: Sami Kerola <kerolasa@iki.fi>
2012-06-24 16:21:18 +05:30
BUILT_SOURCES = $(top_srcdir)/.version
Fix some man-po stuff for distcheck distcheck failed because the man-po scripts weren't sourcing or escaping the directories correctly. This is a partial fix, but at least distcheck is happy.
2014-06-24 17:50:13 +05:30
Makefile.am fixes Two problems. 1) skill/snice : distribution doesnt mean install If you don't set your configure flags right, you dont install the skill/snice man pages which means you will break any subsequent compiles with the flags enabled. Man pages not to be installed should still be distributed. 2) The git version into Makefile.am breaks under certain conditions. The easy break for this is: touch aclocal.m4 make We need this script added plus some dist hook magic that got left out.
2012-05-20 12:57:14 +05:30
$(top_srcdir)/.version:
build-sys: earlier patch broke the build The commit 47cc1b6ccfd1e6e10aafbf21e932991a10c97f7e might have fixed an issue when distribution is built, but it broke make after running ./configure which this commit fixes. Reference: http://www.delorie.com/gnu/docs/automake/automake_66.html Signed-off-by: Sami Kerola <kerolasa@iki.fi>
2012-06-24 16:21:18 +05:30
touch $(top_srcdir)/.version
Makefile.am fixes Two problems. 1) skill/snice : distribution doesnt mean install If you don't set your configure flags right, you dont install the skill/snice man pages which means you will break any subsequent compiles with the flags enabled. Man pages not to be installed should still be distributed. 2) The git version into Makefile.am breaks under certain conditions. The easy break for this is: touch aclocal.m4 make We need this script added plus some dist hook magic that got left out.
2012-05-20 12:57:14 +05:30
echo $(VERSION) > $@-t && mv $@-t $@
dist-hook:
echo $(VERSION) > $(distdir)/.tarball-version
Moved man-po pot file creation into Makefile The pot files for man-po are part of the extra_dist target so are built at dist time. These used to be created as part of the dist-hook. However it is better to control their builds in the Makefile so they are conditionally built. It also means distcheck doesn't complain when they are added to the CLEANFILES.
2014-06-25 18:41:15 +05:30
Added get-trans target to Makefile The get-trans target rsyncs the latest copies of translation files from the translation project. I put this target in because I always forget the exact syntax of the command. Signed-off-by: Craig Small <csmall@enc.com.au>
2014-02-22 06:04:53 +05:30
get-trans:
Translated man page scripts Mario sent some scripts to maintain translated man pages. This commit is almost the same scripts with minor adjustments. Reference: http://www.freelists.org/post/procps/Translations-for-man-pages,17
2014-05-28 15:21:37 +05:30
echo "Getting the latest translations from translationproject.org..."
fix url for rsync Signed-off-by: Trần Ngọc Quân <vnwildman@gmail.com>
2014-04-17 12:42:01 +05:30
rsync -Lrtvz translationproject.org::tp/latest/procps-ng/ po
Translated man page scripts Mario sent some scripts to maintain translated man pages. This commit is almost the same scripts with minor adjustments. Reference: http://www.freelists.org/post/procps/Translations-for-man-pages,17
2014-05-28 15:21:37 +05:30
rsync -Lrtvz translationproject.org::tp/latest/procps-ng-man/ man-po
rsync -Lrtvz translationproject.org::tp/latest/procps-ng-man-ps/ man-po/ps
rsync -Lrtvz translationproject.org::tp/latest/procps-ng-man-top/ man-po/top
Reference in New Issue Copy Permalink