From dd60d6d6e811a88a1969b2254df543866ec707e4 Mon Sep 17 00:00:00 2001 From: Craig Small Date: Mon, 29 Aug 2022 18:29:28 +1000 Subject: [PATCH] misc: Move all binaries to src *.c -> src/ ps/* src/ps/ top/* src/top/ Signed-off-by: Craig Small --- .gitignore | 56 ++++++------ Makefile.am | 174 ++++++++++++++++++------------------ autogen.sh | 2 +- configure.ac | 2 +- free.c => src/free.c | 0 kill.c => src/kill.c | 0 pgrep.c => src/pgrep.c | 0 pidof.c => src/pidof.c | 0 pmap.c => src/pmap.c | 0 {ps => src/ps}/COPYING | 0 {ps => src/ps}/HACKING | 0 {ps => src/ps}/common.h | 0 {ps => src/ps}/display.c | 0 {ps => src/ps}/global.c | 0 {ps => src/ps}/help.c | 0 {ps => src/ps}/output.c | 0 {ps => src/ps}/parser.c | 0 {ps => src/ps}/regression | 0 {ps => src/ps}/select.c | 0 {ps => src/ps}/sortformat.c | 0 {ps => src/ps}/stacktrace.c | 0 pwdx.c => src/pwdx.c | 0 skill.c => src/skill.c | 0 slabtop.c => src/slabtop.c | 0 sysctl.c => src/sysctl.c | 0 tload.c => src/tload.c | 0 {top => src/top}/README.top | 0 {top => src/top}/top.c | 0 {top => src/top}/top.h | 0 {top => src/top}/top_nls.c | 0 {top => src/top}/top_nls.h | 0 uptime.c => src/uptime.c | 0 vmstat.c => src/vmstat.c | 0 w.c => src/w.c | 0 watch.c => src/watch.c | 0 35 files changed, 117 insertions(+), 117 deletions(-) rename free.c => src/free.c (100%) rename kill.c => src/kill.c (100%) rename pgrep.c => src/pgrep.c (100%) rename pidof.c => src/pidof.c (100%) rename pmap.c => src/pmap.c (100%) rename {ps => src/ps}/COPYING (100%) rename {ps => src/ps}/HACKING (100%) rename {ps => src/ps}/common.h (100%) rename {ps => src/ps}/display.c (100%) rename {ps => src/ps}/global.c (100%) rename {ps => src/ps}/help.c (100%) rename {ps => src/ps}/output.c (100%) rename {ps => src/ps}/parser.c (100%) rename {ps => src/ps}/regression (100%) rename {ps => src/ps}/select.c (100%) rename {ps => src/ps}/sortformat.c (100%) rename {ps => src/ps}/stacktrace.c (100%) rename pwdx.c => src/pwdx.c (100%) rename skill.c => src/skill.c (100%) rename slabtop.c => src/slabtop.c (100%) rename sysctl.c => src/sysctl.c (100%) rename tload.c => src/tload.c (100%) rename {top => src/top}/README.top (100%) rename {top => src/top}/top.c (100%) rename {top => src/top}/top.h (100%) rename {top => src/top}/top_nls.c (100%) rename {top => src/top}/top_nls.h (100%) rename uptime.c => src/uptime.c (100%) rename vmstat.c => src/vmstat.c (100%) rename w.c => src/w.c (100%) rename watch.c => src/watch.c (100%) diff --git a/.gitignore b/.gitignore index bc3a9396..3cce3f84 100644 --- a/.gitignore +++ b/.gitignore @@ -22,51 +22,51 @@ config.sub configure cov-int depcomp -free +src/free INSTALL install-sh -kill +src/kill libtool ltmain.sh m4/ -man-po/translated -man-po/*.pot -man-po/man.stamp -man-po/??/* -man-po/??_??/* +po-man/translated +po-man/*.pot +po-man/man.stamp +po-man/??/* +po-man/??_??/* Makefile Makefile.in missing mkinstalldirs -pgrep -pidof -pkill -pmap -pidwait +src/pgrep +src/pidof +src/pkill +src/pmap +src/pidwait procps-ng-*.tar.xz proc/.depend proc/libproc-2.la proc/libproc-2.pc proc/Makefile proc/Makefile.in -ps/Makefile -ps/Makefile.in -ps/pscommand -pwdx -skill -slabtop -snice +src/ps/Makefile +src/ps/Makefile.in +src/ps/pscommand +src/pwdx +src/skill +src/slabtop +src/snice stamp-h1 -sysctl +src/sysctl test-driver -tload -top/Makefile -top/Makefile.in -top/top -uptime -vmstat -w -watch +src/tload +src/top/Makefile +src/top/Makefile.in +src/top/top +src/uptime +src/vmstat +src/w +src/watch *~ *.log *.sum diff --git a/Makefile.am b/Makefile.am index ca6102f9..202e0870 100644 --- a/Makefile.am +++ b/Makefile.am @@ -36,34 +36,34 @@ transform = if !CYGWIN transform += s/pscommand/ps/; $(program_transform_name) sbin_PROGRAMS = \ - sysctl + src/sysctl else transform += s/pscommand/procps/; $(program_transform_name) endif if !CYGWIN bin_PROGRAMS = \ - ps/pscommand \ - free \ - pgrep \ - pkill \ - pmap \ - pwdx \ - tload \ - uptime \ - vmstat + src/ps/pscommand \ + src/free \ + src/pgrep \ + src/pkill \ + src/pmap \ + src/pwdx \ + src/tload \ + src/uptime \ + src/vmstat if BUILD_PIDWAIT -bin_PROGRAMS += pidwait +bin_PROGRAMS += src/pidwait endif else usrbin_exec_PROGRAMS += \ - ps/pscommand \ - free \ - pgrep \ - pkill \ - pmap \ - uptime \ - vmstat + src/ps/pscommand \ + src/free \ + src/pgrep \ + src/pkill \ + src/pmap \ + src/uptime \ + src/vmstat endif lib_LTLIBRARIES = \ @@ -100,8 +100,8 @@ EXTRA_DIST = \ misc/git-version-gen \ Documentation/CodingStyle.md \ Documentation/TODO \ - ps/HACKING \ - ps/regression \ + src/ps/HACKING \ + src/ps/regression \ $(DIST_MAN_POTS) if !CYGWIN @@ -117,12 +117,12 @@ dist_procpsng_DATA = \ if BUILD_PIDOF if !CYGWIN -bin_PROGRAMS += pidof +bin_PROGRAMS += src/pidof else -usrbin_exec_PROGRAMS += pidof +usrbin_exec_PROGRAMS += src/pidof endif dist_man_MANS += man/pidof.1 -pidof_SOURCES = man/pidof.c lib/fileutils.c +src_pidof_SOURCES = src/pidof.c lib/fileutils.c else EXTRA_DIST += man/pidof.1 endif @@ -130,26 +130,26 @@ endif if BUILD_KILL if CYGWIN transform += ;s/^kill/prockill/; $(program_transform_name) -usrbin_exec_PROGRAMS += kill +usrbin_exec_PROGRAMS += src/kill else -bin_PROGRAMS += kill +bin_PROGRAMS += src/kill endif dist_man_MANS += man/kill.1 -kill_SOURCES = kill.c lib/strutils.c lib/fileutils.c lib/signals.c -kill_LDADD = +src_kill_SOURCES = src/kill.c lib/strutils.c lib/fileutils.c lib/signals.c +src_kill_LDADD = else EXTRA_DIST += man/kill.1 endif if BUILD_W if CYGWIN -usrbin_exec_PROGRAMS += w +usrbin_exec_PROGRAMS += src/w else -bin_PROGRAMS += w +bin_PROGRAMS += src/w endif dist_man_MANS += man/w.1 -w_SOURCES = w.c lib/fileutils.c +src_w_SOURCES = src/w.c lib/fileutils.c else EXTRA_DIST += man/w.1 endif @@ -157,12 +157,12 @@ endif if WITH_NCURSES if !CYGWIN bin_PROGRAMS += \ - watch \ - top/top + src/watch \ + src/top/top else usrbin_exec_PROGRAMS += \ - watch \ - top/top + src/watch \ + src/top/top endif dist_man_MANS += \ @@ -170,40 +170,40 @@ dist_man_MANS += \ man/top.1 if !CYGWIN bin_PROGRAMS += \ - slabtop + src/slabtop dist_man_MANS += \ man/slabtop.1 -slabtop_SOURCES = slabtop.c lib/strutils.c lib/fileutils.c -slabtop_LDADD = $(LDADD) @NCURSES_LIBS@ +src_slabtop_SOURCES = src/slabtop.c lib/strutils.c lib/fileutils.c +src_slabtop_LDADD = $(LDADD) @NCURSES_LIBS@ endif -watch_SOURCES = watch.c lib/strutils.c lib/fileutils.c -watch_LDADD = @NCURSES_LIBS@ $(CYGWINFLAGS) -top_top_SOURCES = \ - top/top.h \ - top/top.c \ - top/top_nls.h \ - top/top_nls.c \ +src_watch_SOURCES = src/watch.c lib/strutils.c lib/fileutils.c +src_watch_LDADD = @NCURSES_LIBS@ $(CYGWINFLAGS) +src_top_top_SOURCES = \ + src/top/top.h \ + src/top/top.c \ + src/top/top_nls.h \ + src/top/top_nls.c \ lib/fileutils.c \ lib/signals.c if CYGWIN -top_top_SOURCES += lib/strverscmp.c +src_top_top_SOURCES += lib/strverscmp.c endif -top_top_LDADD = $(LDADD) @NCURSES_LIBS@ $(DL_LIB) +src_top_top_LDADD = $(LDADD) @NCURSES_LIBS@ $(DL_LIB) endif if BUILD_SKILL if !CYGWIN bin_PROGRAMS += \ - skill \ - snice + src/skill \ + src/snice else usrbin_exec_PROGRAMS += \ - skill \ - snice + src/skill \ + src/snice endif -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 +src_skill_SOURCES = src/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 += \ man/skill.1 \ man/snice.1 @@ -213,25 +213,25 @@ else man/snice.1 endif -free_SOURCES = free.c lib/strutils.c lib/fileutils.c -pgrep_SOURCES = pgrep.c lib/fileutils.c lib/signals.c -pkill_SOURCES = pgrep.c lib/fileutils.c lib/signals.c -pmap_SOURCES = pmap.c lib/fileutils.c +src_free_SOURCES = src/free.c lib/strutils.c lib/fileutils.c +src_pgrep_SOURCES = src/pgrep.c lib/fileutils.c lib/signals.c +src_pkill_SOURCES = src/pgrep.c lib/fileutils.c lib/signals.c +src_pmap_SOURCES = src/pmap.c lib/fileutils.c 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 if !CYGWIN -pwdx_SOURCES = pwdx.c lib/fileutils.c -pwdx_LDADD= $(CYGWINFLAGS) -sysctl_SOURCES = \ - sysctl.c \ +src_pwdx_SOURCES = src/pwdx.c lib/fileutils.c +src_pwdx_LDADD= $(CYGWINFLAGS) +src_sysctl_SOURCES = \ + src/sysctl.c \ lib/fileutils.c \ lib/procio.c -sysctl_LDADD= +src_sysctl_LDADD= endif -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 +src_tload_SOURCES = src/tload.c lib/strutils.c lib/fileutils.c +src_uptime_SOURCES = src/uptime.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 @@ -306,16 +306,16 @@ EXTRA_DIST += proc/libproc-2.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 \ +src_ps_pscommand_SOURCES = \ + src/ps/common.h \ + src/ps/display.c \ + src/ps/global.c \ + src/ps/help.c \ + src/ps/output.c \ + src/ps/parser.c \ + src/ps/select.c \ + src/ps/sortformat.c \ + src/ps/stacktrace.c \ lib/fileutils.c \ lib/signals.c @@ -361,18 +361,18 @@ proc_test_namespace_SOURCES = proc/test_namespace.c proc_test_namespace_LDADD = proc/libproc-2.la 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) + src_skill_LDADD = $(CYGWINFLAGS) + src_kill_LDADD = $(CYGWINFLAGS) + src_free_LDADD = $(CYGWINFLAGS) + src_pgrep_LDADD = $(CYGWINFLAGS) + src_pkill_LDADD = $(CYGWINFLAGS) + src_pidof_LDADD = $(CYGWINFLAGS) + src_pmap_LDADD = $(CYGWINFLAGS) + src_snice_LDADD = $(CYGWINFLAGS) + src_tload_LDADD = $(CYGWINFLAGS) + src_uptime_LDADD = $(CYGWINFLAGS) + src_w_LDADD = $(CYGWINFLAGS) + src_vmstat_LDADD = $(CYGWINFLAGS) endif if EXAMPLE_FILES diff --git a/autogen.sh b/autogen.sh index d87289d5..bd1b8223 100755 --- a/autogen.sh +++ b/autogen.sh @@ -10,7 +10,7 @@ THEDIR=$(pwd) cd ${SRCDIR} DIE=0 -test -f free.c || { +test -f autogen.sh || { echo "You must run this script in the top-level procps-ng directory" DIE=1 } diff --git a/configure.ac b/configure.ac index 1b6c8b67..01add327 100644 --- a/configure.ac +++ b/configure.ac @@ -8,7 +8,7 @@ AC_INIT([procps-ng], [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_SILENT_RULES([yes]) -AC_CONFIG_SRCDIR([free.c]) +AC_CONFIG_SRCDIR([src/free.c]) AC_CONFIG_HEADERS([config.h]) AC_LANG([C]) diff --git a/free.c b/src/free.c similarity index 100% rename from free.c rename to src/free.c diff --git a/kill.c b/src/kill.c similarity index 100% rename from kill.c rename to src/kill.c diff --git a/pgrep.c b/src/pgrep.c similarity index 100% rename from pgrep.c rename to src/pgrep.c diff --git a/pidof.c b/src/pidof.c similarity index 100% rename from pidof.c rename to src/pidof.c diff --git a/pmap.c b/src/pmap.c similarity index 100% rename from pmap.c rename to src/pmap.c diff --git a/ps/COPYING b/src/ps/COPYING similarity index 100% rename from ps/COPYING rename to src/ps/COPYING diff --git a/ps/HACKING b/src/ps/HACKING similarity index 100% rename from ps/HACKING rename to src/ps/HACKING diff --git a/ps/common.h b/src/ps/common.h similarity index 100% rename from ps/common.h rename to src/ps/common.h diff --git a/ps/display.c b/src/ps/display.c similarity index 100% rename from ps/display.c rename to src/ps/display.c diff --git a/ps/global.c b/src/ps/global.c similarity index 100% rename from ps/global.c rename to src/ps/global.c diff --git a/ps/help.c b/src/ps/help.c similarity index 100% rename from ps/help.c rename to src/ps/help.c diff --git a/ps/output.c b/src/ps/output.c similarity index 100% rename from ps/output.c rename to src/ps/output.c diff --git a/ps/parser.c b/src/ps/parser.c similarity index 100% rename from ps/parser.c rename to src/ps/parser.c diff --git a/ps/regression b/src/ps/regression similarity index 100% rename from ps/regression rename to src/ps/regression diff --git a/ps/select.c b/src/ps/select.c similarity index 100% rename from ps/select.c rename to src/ps/select.c diff --git a/ps/sortformat.c b/src/ps/sortformat.c similarity index 100% rename from ps/sortformat.c rename to src/ps/sortformat.c diff --git a/ps/stacktrace.c b/src/ps/stacktrace.c similarity index 100% rename from ps/stacktrace.c rename to src/ps/stacktrace.c diff --git a/pwdx.c b/src/pwdx.c similarity index 100% rename from pwdx.c rename to src/pwdx.c diff --git a/skill.c b/src/skill.c similarity index 100% rename from skill.c rename to src/skill.c diff --git a/slabtop.c b/src/slabtop.c similarity index 100% rename from slabtop.c rename to src/slabtop.c diff --git a/sysctl.c b/src/sysctl.c similarity index 100% rename from sysctl.c rename to src/sysctl.c diff --git a/tload.c b/src/tload.c similarity index 100% rename from tload.c rename to src/tload.c diff --git a/top/README.top b/src/top/README.top similarity index 100% rename from top/README.top rename to src/top/README.top diff --git a/top/top.c b/src/top/top.c similarity index 100% rename from top/top.c rename to src/top/top.c diff --git a/top/top.h b/src/top/top.h similarity index 100% rename from top/top.h rename to src/top/top.h diff --git a/top/top_nls.c b/src/top/top_nls.c similarity index 100% rename from top/top_nls.c rename to src/top/top_nls.c diff --git a/top/top_nls.h b/src/top/top_nls.h similarity index 100% rename from top/top_nls.h rename to src/top/top_nls.h diff --git a/uptime.c b/src/uptime.c similarity index 100% rename from uptime.c rename to src/uptime.c diff --git a/vmstat.c b/src/vmstat.c similarity index 100% rename from vmstat.c rename to src/vmstat.c diff --git a/w.c b/src/w.c similarity index 100% rename from w.c rename to src/w.c diff --git a/watch.c b/src/watch.c similarity index 100% rename from watch.c rename to src/watch.c