emo
/
procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

misc: Move all binaries to src 

*.c -> src/
ps/* src/ps/
top/* src/top/

Signed-off-by: Craig Small <csmall@dropbear.xyz>
This commit is contained in:
Craig Small 2022-08-29 18:29:28 +10:00
parent 8e889ae682
commit dd60d6d6e8
35 changed files with 117 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
.gitignore vendored
View File

@ -22,51 +22,51 @@ config.sub
configure configure
cov-int cov-int
depcomp depcomp
free src/free
INSTALL INSTALL
install-sh install-sh
kill src/kill
libtool libtool
ltmain.sh ltmain.sh
m4/ m4/
man-po/translated po-man/translated
man-po/*.pot po-man/*.pot
man-po/man.stamp po-man/man.stamp
man-po/??/* po-man/??/*
man-po/??_??/* po-man/??_??/*
Makefile Makefile
Makefile.in Makefile.in
missing missing
mkinstalldirs mkinstalldirs
pgrep src/pgrep
pidof src/pidof
pkill src/pkill
pmap src/pmap
pidwait src/pidwait
procps-ng-*.tar.xz procps-ng-*.tar.xz
proc/.depend proc/.depend
proc/libproc-2.la proc/libproc-2.la
proc/libproc-2.pc proc/libproc-2.pc
proc/Makefile proc/Makefile
proc/Makefile.in proc/Makefile.in
ps/Makefile src/ps/Makefile
ps/Makefile.in src/ps/Makefile.in
ps/pscommand src/ps/pscommand
pwdx src/pwdx
skill src/skill
slabtop src/slabtop
snice src/snice
stamp-h1 stamp-h1
sysctl src/sysctl
test-driver test-driver
tload src/tload
top/Makefile src/top/Makefile
top/Makefile.in src/top/Makefile.in
top/top src/top/top
uptime src/uptime
vmstat src/vmstat
w src/w
watch src/watch
*~ *~
*.log *.log
*.sum *.sum

174
Makefile.am
View File

@ -36,34 +36,34 @@ transform =
if !CYGWIN if !CYGWIN
transform += s/pscommand/ps/; $(program_transform_name) transform += s/pscommand/ps/; $(program_transform_name)
sbin_PROGRAMS = \ sbin_PROGRAMS = \
sysctl src/sysctl
else else
transform += s/pscommand/procps/; $(program_transform_name) transform += s/pscommand/procps/; $(program_transform_name)
endif endif
if !CYGWIN if !CYGWIN
bin_PROGRAMS = \ bin_PROGRAMS = \
ps/pscommand \ src/ps/pscommand \
free \ src/free \
pgrep \ src/pgrep \
pkill \ src/pkill \
pmap \ src/pmap \
pwdx \ src/pwdx \
tload \ src/tload \
uptime \ src/uptime \
vmstat src/vmstat
if BUILD_PIDWAIT if BUILD_PIDWAIT
bin_PROGRAMS += pidwait bin_PROGRAMS += src/pidwait
endif endif
else else
usrbin_exec_PROGRAMS += \ usrbin_exec_PROGRAMS += \
ps/pscommand \ src/ps/pscommand \
free \ src/free \
pgrep \ src/pgrep \
pkill \ src/pkill \
pmap \ src/pmap \
uptime \ src/uptime \
vmstat src/vmstat
endif endif
lib_LTLIBRARIES = \ lib_LTLIBRARIES = \
@ -100,8 +100,8 @@ EXTRA_DIST = \
misc/git-version-gen \ misc/git-version-gen \
Documentation/CodingStyle.md \ Documentation/CodingStyle.md \
Documentation/TODO \ Documentation/TODO \
ps/HACKING \ src/ps/HACKING \
ps/regression \ src/ps/regression \
$(DIST_MAN_POTS) $(DIST_MAN_POTS)
if !CYGWIN if !CYGWIN
@ -117,12 +117,12 @@ dist_procpsng_DATA = \
if BUILD_PIDOF if BUILD_PIDOF
if !CYGWIN if !CYGWIN
bin_PROGRAMS += pidof bin_PROGRAMS += src/pidof
else else
usrbin_exec_PROGRAMS += pidof usrbin_exec_PROGRAMS += src/pidof
endif endif
dist_man_MANS += man/pidof.1 dist_man_MANS += man/pidof.1
pidof_SOURCES = man/pidof.c lib/fileutils.c src_pidof_SOURCES = src/pidof.c lib/fileutils.c
else else
EXTRA_DIST += man/pidof.1 EXTRA_DIST += man/pidof.1
endif endif
@ -130,26 +130,26 @@ endif
if BUILD_KILL if BUILD_KILL
if CYGWIN if CYGWIN
transform += ;s/^kill/prockill/; $(program_transform_name) transform += ;s/^kill/prockill/; $(program_transform_name)
usrbin_exec_PROGRAMS += kill usrbin_exec_PROGRAMS += src/kill
else else
bin_PROGRAMS += kill bin_PROGRAMS += src/kill
endif endif
dist_man_MANS += man/kill.1 dist_man_MANS += man/kill.1
kill_SOURCES = kill.c lib/strutils.c lib/fileutils.c lib/signals.c src_kill_SOURCES = src/kill.c lib/strutils.c lib/fileutils.c lib/signals.c
kill_LDADD = src_kill_LDADD =
else else
EXTRA_DIST += man/kill.1 EXTRA_DIST += man/kill.1
endif endif
if BUILD_W if BUILD_W
if CYGWIN if CYGWIN
usrbin_exec_PROGRAMS += w usrbin_exec_PROGRAMS += src/w
else else
bin_PROGRAMS += w bin_PROGRAMS += src/w
endif endif
dist_man_MANS += man/w.1 dist_man_MANS += man/w.1
w_SOURCES = w.c lib/fileutils.c src_w_SOURCES = src/w.c lib/fileutils.c
else else
EXTRA_DIST += man/w.1 EXTRA_DIST += man/w.1
endif endif
@ -157,12 +157,12 @@ endif
if WITH_NCURSES if WITH_NCURSES
if !CYGWIN if !CYGWIN
bin_PROGRAMS += \ bin_PROGRAMS += \
watch \ src/watch \
top/top src/top/top
else else
usrbin_exec_PROGRAMS += \ usrbin_exec_PROGRAMS += \
watch \ src/watch \
top/top src/top/top
endif endif
dist_man_MANS += \ dist_man_MANS += \
@ -170,40 +170,40 @@ dist_man_MANS += \
man/top.1 man/top.1
if !CYGWIN if !CYGWIN
bin_PROGRAMS += \ bin_PROGRAMS += \
slabtop src/slabtop
dist_man_MANS += \ dist_man_MANS += \
man/slabtop.1 man/slabtop.1
slabtop_SOURCES = slabtop.c lib/strutils.c lib/fileutils.c src_slabtop_SOURCES = src/slabtop.c lib/strutils.c lib/fileutils.c
slabtop_LDADD = $(LDADD) @NCURSES_LIBS@ src_slabtop_LDADD = $(LDADD) @NCURSES_LIBS@
endif endif
watch_SOURCES = watch.c lib/strutils.c lib/fileutils.c src_watch_SOURCES = src/watch.c lib/strutils.c lib/fileutils.c
watch_LDADD = @NCURSES_LIBS@ $(CYGWINFLAGS) src_watch_LDADD = @NCURSES_LIBS@ $(CYGWINFLAGS)
top_top_SOURCES = \ src_top_top_SOURCES = \
top/top.h \ src/top/top.h \
top/top.c \ src/top/top.c \
top/top_nls.h \ src/top/top_nls.h \
top/top_nls.c \ src/top/top_nls.c \
lib/fileutils.c \ lib/fileutils.c \
lib/signals.c lib/signals.c
if CYGWIN if CYGWIN
top_top_SOURCES += lib/strverscmp.c src_top_top_SOURCES += lib/strverscmp.c
endif endif
top_top_LDADD = $(LDADD) @NCURSES_LIBS@ $(DL_LIB) src_top_top_LDADD = $(LDADD) @NCURSES_LIBS@ $(DL_LIB)
endif endif
if BUILD_SKILL if BUILD_SKILL
if !CYGWIN if !CYGWIN
bin_PROGRAMS += \ bin_PROGRAMS += \
skill \ src/skill \
snice src/snice
else else
usrbin_exec_PROGRAMS += \ usrbin_exec_PROGRAMS += \
skill \ src/skill \
snice src/snice
endif endif
skill_SOURCES = skill.c lib/strutils.c lib/fileutils.c lib/signals.c src_skill_SOURCES = src/skill.c lib/strutils.c lib/fileutils.c lib/signals.c
snice_SOURCES = skill.c lib/strutils.c lib/fileutils.c lib/signals.c src_snice_SOURCES = src/skill.c lib/strutils.c lib/fileutils.c lib/signals.c
dist_man_MANS += \ dist_man_MANS += \
man/skill.1 \ man/skill.1 \
man/snice.1 man/snice.1
@ -213,25 +213,25 @@ else
man/snice.1 man/snice.1
endif endif
free_SOURCES = free.c lib/strutils.c lib/fileutils.c src_free_SOURCES = src/free.c lib/strutils.c lib/fileutils.c
pgrep_SOURCES = pgrep.c lib/fileutils.c lib/signals.c src_pgrep_SOURCES = src/pgrep.c lib/fileutils.c lib/signals.c
pkill_SOURCES = pgrep.c lib/fileutils.c lib/signals.c src_pkill_SOURCES = src/pgrep.c lib/fileutils.c lib/signals.c
pmap_SOURCES = pmap.c lib/fileutils.c src_pmap_SOURCES = src/pmap.c lib/fileutils.c
if BUILD_PIDWAIT if BUILD_PIDWAIT
pidwait_SOURCES = pgrep.c lib/fileutils.c lib/signals.c src_pidwait_SOURCES = src/pgrep.c lib/fileutils.c lib/signals.c
endif endif
if !CYGWIN if !CYGWIN
pwdx_SOURCES = pwdx.c lib/fileutils.c src_pwdx_SOURCES = src/pwdx.c lib/fileutils.c
pwdx_LDADD= $(CYGWINFLAGS) src_pwdx_LDADD= $(CYGWINFLAGS)
sysctl_SOURCES = \ src_sysctl_SOURCES = \
sysctl.c \ src/sysctl.c \
lib/fileutils.c \ lib/fileutils.c \
lib/procio.c lib/procio.c
sysctl_LDADD= src_sysctl_LDADD=
endif endif
tload_SOURCES = tload.c lib/strutils.c lib/fileutils.c src_tload_SOURCES = src/tload.c lib/strutils.c lib/fileutils.c
uptime_SOURCES = uptime.c lib/fileutils.c src_uptime_SOURCES = src/uptime.c lib/fileutils.c
vmstat_SOURCES = vmstat.c lib/strutils.c lib/fileutils.c src_vmstat_SOURCES = src/vmstat.c lib/strutils.c lib/fileutils.c
# See http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html # See http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
@ -306,16 +306,16 @@ EXTRA_DIST += proc/libproc-2.sym
# ps/pscommand # ps/pscommand
ps_pscommand_SOURCES = \ src_ps_pscommand_SOURCES = \
ps/common.h \ src/ps/common.h \
ps/display.c \ src/ps/display.c \
ps/global.c \ src/ps/global.c \
ps/help.c \ src/ps/help.c \
ps/output.c \ src/ps/output.c \
ps/parser.c \ src/ps/parser.c \
ps/select.c \ src/ps/select.c \
ps/sortformat.c \ src/ps/sortformat.c \
ps/stacktrace.c \ src/ps/stacktrace.c \
lib/fileutils.c \ lib/fileutils.c \
lib/signals.c lib/signals.c
@ -361,18 +361,18 @@ proc_test_namespace_SOURCES = proc/test_namespace.c
proc_test_namespace_LDADD = proc/libproc-2.la proc_test_namespace_LDADD = proc/libproc-2.la
if CYGWIN if CYGWIN
skill_LDADD = $(CYGWINFLAGS) src_skill_LDADD = $(CYGWINFLAGS)
kill_LDADD = $(CYGWINFLAGS) src_kill_LDADD = $(CYGWINFLAGS)
free_LDADD = $(CYGWINFLAGS) src_free_LDADD = $(CYGWINFLAGS)
pgrep_LDADD = $(CYGWINFLAGS) src_pgrep_LDADD = $(CYGWINFLAGS)
pkill_LDADD = $(CYGWINFLAGS) src_pkill_LDADD = $(CYGWINFLAGS)
pidof_LDADD = $(CYGWINFLAGS) src_pidof_LDADD = $(CYGWINFLAGS)
pmap_LDADD = $(CYGWINFLAGS) src_pmap_LDADD = $(CYGWINFLAGS)
snice_LDADD = $(CYGWINFLAGS) src_snice_LDADD = $(CYGWINFLAGS)
tload_LDADD = $(CYGWINFLAGS) src_tload_LDADD = $(CYGWINFLAGS)
uptime_LDADD = $(CYGWINFLAGS) src_uptime_LDADD = $(CYGWINFLAGS)
w_LDADD = $(CYGWINFLAGS) src_w_LDADD = $(CYGWINFLAGS)
vmstat_LDADD = $(CYGWINFLAGS) src_vmstat_LDADD = $(CYGWINFLAGS)
endif endif
if EXAMPLE_FILES if EXAMPLE_FILES

2
autogen.sh
View File

@ -10,7 +10,7 @@ THEDIR=$(pwd)
cd ${SRCDIR} cd ${SRCDIR}
DIE=0 DIE=0
test -f free.c || { test -f autogen.sh || {
echo "You must run this script in the top-level procps-ng directory" echo "You must run this script in the top-level procps-ng directory"
DIE=1 DIE=1
} }

2
configure.ac
View File

@ -8,7 +8,7 @@ AC_INIT([procps-ng],
[procps@freelists.org],,[https://gitlab.com/procps-ng/procps]) [procps@freelists.org],,[https://gitlab.com/procps-ng/procps])
AM_INIT_AUTOMAKE([foreign 1.11 subdir-objects -Wall -Wno-portability tar-pax no-dist-gzip dist-xz]) AM_INIT_AUTOMAKE([foreign 1.11 subdir-objects -Wall -Wno-portability tar-pax no-dist-gzip dist-xz])
AM_SILENT_RULES([yes]) AM_SILENT_RULES([yes])
AC_CONFIG_SRCDIR([free.c]) AC_CONFIG_SRCDIR([src/free.c])
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([config.h])
AC_LANG([C]) AC_LANG([C])

0
free.c → src/free.c
View File

0
kill.c → src/kill.c
View File

0
pgrep.c → src/pgrep.c
View File

0
pidof.c → src/pidof.c
View File

0
pmap.c → src/pmap.c
View File

0
ps/COPYING → src/ps/COPYING
View File

0
ps/HACKING → src/ps/HACKING
View File

0
ps/common.h → src/ps/common.h
View File

0
ps/display.c → src/ps/display.c
View File

0
ps/global.c → src/ps/global.c
View File

0
ps/help.c → src/ps/help.c
View File

0
ps/output.c → src/ps/output.c
View File

0
ps/parser.c → src/ps/parser.c
View File

0
ps/regression → src/ps/regression
View File

0
ps/select.c → src/ps/select.c
View File

0
ps/sortformat.c → src/ps/sortformat.c
View File

0
ps/stacktrace.c → src/ps/stacktrace.c
View File

0
pwdx.c → src/pwdx.c
View File

0
skill.c → src/skill.c
View File

0
slabtop.c → src/slabtop.c
View File

0
sysctl.c → src/sysctl.c
View File

0
tload.c → src/tload.c
View File

0
top/README.top → src/top/README.top
View File

0
top/top.c → src/top/top.c
View File

0
top/top.h → src/top/top.h
View File

0
top/top_nls.c → src/top/top_nls.c
View File

0
top/top_nls.h → src/top/top_nls.h
View File

0
uptime.c → src/uptime.c
View File

0
vmstat.c → src/vmstat.c
View File

0
w.c → src/w.c
View File

0
watch.c → src/watch.c
View File