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

275 lines
5.5 KiB
Makefile
Raw Normal View History

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
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
LDADD = ./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
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
transform = s/pscommand/ps/; $(program_transform_name)
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
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
sbin_PROGRAMS = \
sysctl
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 \
pwdx.1 \
sysctl.8 \
sysctl.conf.5 \
tload.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 \
ps/ps.1
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 = \
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 \
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
sysctl.conf \
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
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
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
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
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
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
kill: split out from skill/snice The first part of fixing skill/snice to use the library instead of directly readdir()ing /proc which is what it does now. Remove the kill code from the skill/snice code and put common elements into lib/signals.c Not 100% sure that is the right destination instead of a new lib file, but ok for now. kill shares some parsing logic with skill/snice but mainly around signal specifications. The "do it" code is very different. Signed-off-by: Craig Small <csmall@enc.com.au>
2015-09-26 04:43:13 +05:30
kill_SOURCES = kill.c lib/strutils.c lib/fileutils.c lib/signals.c
build-sys: unlink kill from procps kill doesn't use any symbols from libprocps so we don't need to link to it.
2015-09-26 04:49:28 +05:30
kill_LDADD =
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
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
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 += \
slabtop.1 \
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
slabtop_SOURCES = slabtop.c lib/strutils.c lib/fileutils.c
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
slabtop_LDADD = $(LDADD) @NCURSES_LIBS@
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
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
watch_LDADD = $(LDADD) @WATCH_NCURSES_LIBS@
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 \
library: Update uptime calls to standard format Changed all the uptime related functions to use the standard naming procps_uptime_*
2015-06-29 17:39:59 +05:30
lib/fileutils.c \
library: Remove signal name from library Procps library previously held functions that were about either listing or finding signal names. These are not really the right location for a library about reading procfs. This patch handles signal related functions in two ways: For functions purely found in skill, these have been moved back into this binary as they are used nowhere else. For functions used across the binaries, these have been moved into include/signals.h and lib/signals.c. Besides formatting, these functions are largely the same. To assist the skill functions, two functions to access the signal map array have been added to lib/signals.c
2015-06-29 17:22:51 +05:30
lib/signals.c
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
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
library: rework namespace calls Functions related to namespaces were half-in half-out of the procps library and didn't fit the standard naming scheme. While struct { long ns[x]} is a bit clunky, its the only way to "lock in" x. The alternative is to use ns_* variables. This work was needed before pgrep could be converted.
2015-09-03 18:02:19 +05:30
skill_SOURCES = skill.c lib/strutils.c lib/fileutils.c lib/signals.c
snice_SOURCES = skill.c lib/strutils.c lib/fileutils.c lib/signals.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
library: rework namespace calls Functions related to namespaces were half-in half-out of the procps library and didn't fit the standard naming scheme. While struct { long ns[x]} is a bit clunky, its the only way to "lock in" x. The alternative is to use ns_* variables. This work was needed before pgrep could be converted.
2015-09-03 18:02:19 +05:30
pgrep_SOURCES = pgrep.c lib/fileutils.c lib/signals.c
pkill_SOURCES = pgrep.c lib/fileutils.c lib/signals.c
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
pmap_SOURCES = pmap.c lib/fileutils.c
pwdx_SOURCES = pwdx.c lib/fileutils.c
pwdx: Do not link to libprocps pwdx doesn't actually use any of the libprocps functions but it is linked because it is the default. This specific LDADD removes that unrequired linking.
2015-06-24 17:57:24 +05:30
pwdx_LDADD=
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
sysctl: Remove links to library sysctl doesn't use any symbols from the libprocps library so this update removes those dependencies.
2015-09-01 16:27:56 +05:30
sysctl_LDADD=
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
LIBprocps_CURRENT=4
LIBprocps_REVISION=0
LIBprocps_AGE=0
proc_libprocps_la_LIBADD = $(LIB_KPARTS)
if WITH_SYSTEMD
proc_libprocps_la_LIBADD += @SYSTEMD_LIBS@
endif
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 \
library: Update diskstat API The calls for reading diskstat have been moved out of sysinfo and into new files diskstat.[ch] These new library calls follow the standard pattern for the new libprocps. vmstat is updated to use the new API and also got the weighted IO time added. vmstat -p previously would only show partitions, not disks. There does not appear to be any good reason to artifically deny a user to use this command on a disk, rather than a partition so this restriction was lifted. I also realised using int for devid means you can send the library negative numbers, the index uses unsigned int. Other similiar calls will need to be fixed too. Signed-off-by: Craig Small <csmall@enc.com.au>
2015-07-07 18:12:06 +05:30
proc/diskstat.c \
proc/diskstat.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/escape.c \
proc/escape.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 \
library: Add procps_meminfo_* functions New set of functions that read the /proc/meminfo file. Still needs work.
2015-06-20 18:38:47 +05:30
proc/meminfo.c \
proc/meminfo.h \
library: rework namespace calls Functions related to namespaces were half-in half-out of the procps library and didn't fit the standard naming scheme. While struct { long ns[x]} is a bit clunky, its the only way to "lock in" x. The alternative is to use ns_* variables. This work was needed before pgrep could be converted.
2015-09-03 18:02:19 +05:30
proc/namespace.c \
proc/namespace.h \
library: implement task/thread support via the new api This commit is the culmination of efforts to modernize the library api. It should be treated as a first blush attempt, especially since I have absolutely no library design experience. But I did have a very strong desire to lessen the new library's impact on the top program. Under this new api, a 'stack' is the equivalent of the old proc_t. It can be seen as a variable length record whose contents & order is under complete user control. That initial stack/record configuration is established at procps_pids_new() time and will probably serve most program needs. But, a dynamic & demanding program like top will later change a stack via procps_pids_reset(). For programs like top & ps, procps_pids_reap() will be the function that will retrieve all tasks and threads. Any program that needs to filter / select only certain processes or users have available other functions that can be used: procps_pids_stacks_alloc, fill & dealloc. This implementation attempts to maximize that existing proven libprocps code base. As we gain more experience such actual code can be migrated into the pids.c file. Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-08-19 10:30:00 +05:30
proc/pids.c \
proc/pids.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 \
library: sysstat and vmstat api changes Use the standard libc declarations. For protecting the headers for C++ procps used to have its own defines, this change makes them use the standard libc ones. getstat() -> procps_stat_* vminfo() -> procps_vmstat_* These two components of the library now use the newer version of the API with less exposed global variables. The old methods are there for now. Signed-off-by: Craig Small <csmall@enc.com.au>
2015-06-20 03:13:02 +05:30
proc/readstat.c \
proc/readstat.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/slab.c \
proc/slab.h \
proc/sysinfo.c \
proc/sysinfo.h \
proc/version.c \
proc/version.h \
library: sysstat and vmstat api changes Use the standard libc declarations. For protecting the headers for C++ procps used to have its own defines, this change makes them use the standard libc ones. getstat() -> procps_stat_* vminfo() -> procps_vmstat_* These two components of the library now use the newer version of the API with less exposed global variables. The old methods are there for now. Signed-off-by: Craig Small <csmall@enc.com.au>
2015-06-20 03:13:02 +05:30
proc/vmstat.c \
proc/vmstat.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 \
library: memory and vmstat API changes Created new set of functions for meminfo related calls. Liked the format of that better so changed vmstat around so the look similar. Missed the makefile change for uptime so added it in now.
2015-06-21 13:52:28 +05:30
proc/uptime.c \
proc/uptime.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_libprocps_la_includedir = $(includedir)/proc/
proc_libprocps_la_include_HEADERS = \
proc/alloc.h \
proc/devname.h \
library: Update diskstat API The calls for reading diskstat have been moved out of sysinfo and into new files diskstat.[ch] These new library calls follow the standard pattern for the new libprocps. vmstat is updated to use the new API and also got the weighted IO time added. vmstat -p previously would only show partitions, not disks. There does not appear to be any good reason to artifically deny a user to use this command on a disk, rather than a partition so this restriction was lifted. I also realised using int for devid means you can send the library negative numbers, the index uses unsigned int. Other similiar calls will need to be fixed too. Signed-off-by: Craig Small <csmall@enc.com.au>
2015-07-07 18:12:06 +05:30
proc/diskstat.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/escape.h \
library: implement task/thread support via the new api This commit is the culmination of efforts to modernize the library api. It should be treated as a first blush attempt, especially since I have absolutely no library design experience. But I did have a very strong desire to lessen the new library's impact on the top program. Under this new api, a 'stack' is the equivalent of the old proc_t. It can be seen as a variable length record whose contents & order is under complete user control. That initial stack/record configuration is established at procps_pids_new() time and will probably serve most program needs. But, a dynamic & demanding program like top will later change a stack via procps_pids_reset(). For programs like top & ps, procps_pids_reap() will be the function that will retrieve all tasks and threads. Any program that needs to filter / select only certain processes or users have available other functions that can be used: procps_pids_stacks_alloc, fill & dealloc. This implementation attempts to maximize that existing proven libprocps code base. As we gain more experience such actual code can be migrated into the pids.c file. Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-08-19 10:30:00 +05:30
proc/pids.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/slab.h \
proc/sysinfo.h \
library: Fix up stat API Adjusted vmstat to use the new API for memory and CPU statistics
2015-06-23 17:52:50 +05:30
proc/uptime.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/version.h \
library: Fix up stat API Adjusted vmstat to use the new API for memory and CPU statistics
2015-06-23 17:52:50 +05:30
proc/vmstat.h \
misc: remove yet more darn trailing whitespace buildup Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-06-29 21:46:52 +05:30
proc/wchan.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
dist_man_MANS += \
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 \
library: Remove signal name from library Procps library previously held functions that were about either listing or finding signal names. These are not really the right location for a library about reading procfs. This patch handles signal related functions in two ways: For functions purely found in skill, these have been moved back into this binary as they are used nowhere else. For functions used across the binaries, these have been moved into include/signals.h and lib/signals.c. Besides formatting, these functions are largely the same. To assist the skill functions, two functions to access the signal map array have been added to lib/signals.c
2015-06-29 17:22:51 +05:30
lib/fileutils.c \
lib/signals.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
# lib/test_* binaries
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
noinst_PROGRAMS = \
lib/test_strutils \
lib/test_fileutils \
library: tests for sysinfo First set of tests for the library API, this lot checks the two functions out of sysinfo.c Signed-off-by: Craig Small <csmall@enc.com.au>
2015-07-20 17:53:21 +05:30
lib/test_process \
library: rework namespace calls Functions related to namespaces were half-in half-out of the procps library and didn't fit the standard naming scheme. While struct { long ns[x]} is a bit clunky, its the only way to "lock in" x. The alternative is to use ns_* variables. This work was needed before pgrep could be converted.
2015-09-03 18:02:19 +05:30
proc/test_sysinfo \
proc/test_namespace
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
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
lib_test_strutils_LDADD =
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
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
lib_test_fileutils_LDADD =
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
lib_test_process_LDADD =
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
library: tests for sysinfo First set of tests for the library API, this lot checks the two functions out of sysinfo.c Signed-off-by: Craig Small <csmall@enc.com.au>
2015-07-20 17:53:21 +05:30
proc_test_sysinfo_SOURCES = proc/test_sysinfo.c
proc_test_sysinfo_LDADD = proc/libprocps.la
library: rework namespace calls Functions related to namespaces were half-in half-out of the procps library and didn't fit the standard naming scheme. While struct { long ns[x]} is a bit clunky, its the only way to "lock in" x. The alternative is to use ns_* variables. This work was needed before pgrep could be converted.
2015-09-03 18:02:19 +05:30
proc_test_namespace_SOURCES = proc/test_namespace.c
proc_test_namespace_LDADD = proc/libprocps.la
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
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
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
library: rework namespace calls Functions related to namespaces were half-in half-out of the procps library and didn't fit the standard naming scheme. While struct { long ns[x]} is a bit clunky, its the only way to "lock in" x. The alternative is to use ns_* variables. This work was needed before pgrep could be converted.
2015-09-03 18:02:19 +05:30
TESTS = proc/test_sysinfo \
proc/test_namespace
library: tests for sysinfo First set of tests for the library API, this lot checks the two functions out of sysinfo.c Signed-off-by: Craig Small <csmall@enc.com.au>
2015-07-20 17:53:21 +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