From 3d0871728b4da1922cbb06585b495e55606dcf54 Mon Sep 17 00:00:00 2001 From: Craig Small Date: Mon, 29 Aug 2022 19:02:44 +1000 Subject: [PATCH] build-sys: Relocate library to library/ All the dependent programs needed to have their includes moved too Signed-off-by: Craig Small --- Makefile.am | 156 +++++++++--------- configure.ac | 2 +- {proc => library}/.gitignore | 0 {proc => library}/COPYING | 0 {proc => library}/devname.c | 0 {proc => library}/diskstats.c | 4 +- {proc => library}/escape.c | 0 {proc => library/include}/devname.h | 0 {proc => library/include}/diskstats.h | 0 {proc => library/include}/escape.h | 0 {proc => library/include}/meminfo.h | 0 {proc => library/include}/misc.h | 0 {proc => library/include}/numa.h | 0 {proc => library/include}/pids.h | 0 {proc => library/include}/procps-private.h | 0 {proc => library/include}/pwcache.h | 0 {proc => library/include}/readproc.h | 2 +- {proc => library/include}/slabinfo.h | 0 {proc => library/include}/stat.h | 0 {proc => library/include}/vmstat.h | 0 {proc => library/include}/wchan.h | 0 {proc => library/include}/xtra-procps-debug.h | 0 {proc => library}/libproc-2.pc.in | 0 {proc => library}/libproc-2.sym | 0 {proc => library}/meminfo.c | 4 +- {proc => library}/namespace.c | 4 +- {proc => library}/numa.c | 0 {proc => library}/pids.c | 14 +- {proc => library}/pwcache.c | 0 {proc => library}/readproc.c | 0 {proc => library}/slabinfo.c | 4 +- {proc => library}/stat.c | 6 +- {proc => library}/sysinfo.c | 0 {proc => library/tests}/test_Itemtables.c | 12 +- {proc => library/tests}/test_namespace.c | 2 +- {proc => library/tests}/test_pids.c | 2 +- {proc => library/tests}/test_sysinfo.c | 2 +- {proc => library/tests}/test_uptime.c | 2 +- {proc => library/tests}/test_version.c | 2 +- {proc => library}/uptime.c | 2 +- {proc => library}/version.c | 0 {proc => library}/vmstat.c | 4 +- {proc => library}/wchan.c | 0 src/free.c | 2 +- src/pgrep.c | 4 +- src/pidof.c | 2 +- src/pmap.c | 2 +- src/ps/common.h | 8 +- src/ps/sortformat.c | 2 +- src/slabtop.c | 2 +- src/tload.c | 2 +- src/top/top.c | 8 +- src/uptime.c | 2 +- src/vmstat.c | 12 +- src/w.c | 4 +- 55 files changed, 137 insertions(+), 137 deletions(-) rename {proc => library}/.gitignore (100%) rename {proc => library}/COPYING (100%) rename {proc => library}/devname.c (100%) rename {proc => library}/diskstats.c (99%) rename {proc => library}/escape.c (100%) rename {proc => library/include}/devname.h (100%) rename {proc => library/include}/diskstats.h (100%) rename {proc => library/include}/escape.h (100%) rename {proc => library/include}/meminfo.h (100%) rename {proc => library/include}/misc.h (100%) rename {proc => library/include}/numa.h (100%) rename {proc => library/include}/pids.h (100%) rename {proc => library/include}/procps-private.h (100%) rename {proc => library/include}/pwcache.h (100%) rename {proc => library/include}/readproc.h (99%) rename {proc => library/include}/slabinfo.h (100%) rename {proc => library/include}/stat.h (100%) rename {proc => library/include}/vmstat.h (100%) rename {proc => library/include}/wchan.h (100%) rename {proc => library/include}/xtra-procps-debug.h (100%) rename {proc => library}/libproc-2.pc.in (100%) rename {proc => library}/libproc-2.sym (100%) rename {proc => library}/meminfo.c (99%) rename {proc => library}/namespace.c (97%) rename {proc => library}/numa.c (100%) rename {proc => library}/pids.c (99%) rename {proc => library}/pwcache.c (100%) rename {proc => library}/readproc.c (100%) rename {proc => library}/slabinfo.c (99%) rename {proc => library}/stat.c (99%) rename {proc => library}/sysinfo.c (100%) rename {proc => library/tests}/test_Itemtables.c (93%) rename {proc => library/tests}/test_namespace.c (98%) rename {proc => library/tests}/test_pids.c (98%) rename {proc => library/tests}/test_sysinfo.c (98%) rename {proc => library/tests}/test_uptime.c (99%) rename {proc => library/tests}/test_version.c (98%) rename {proc => library}/uptime.c (99%) rename {proc => library}/version.c (100%) rename {proc => library}/vmstat.c (99%) rename {proc => library}/wchan.c (100%) diff --git a/Makefile.am b/Makefile.am index 110b9200..075638a9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,11 +24,11 @@ SUBDIRS = \ po \ testsuite -AM_CFLAGS = -Iproc -LDADD = ./proc/libproc-2.la $(CYGWINFLAGS) +AM_CFLAGS = -Ilibrary/include +LDADD = ./library/libproc-2.la $(CYGWINFLAGS) if CYGWIN -AM_LDFLAGS += ./proc/libproc-2.la $(CYGWINFLAGS) +AM_LDFLAGS += ./library/libproc-2.la $(CYGWINFLAGS) endif transform = @@ -67,7 +67,7 @@ usrbin_exec_PROGRAMS += \ endif lib_LTLIBRARIES = \ - proc/libproc-2.la + library/libproc-2.la dist_man_MANS = \ man/free.1 \ @@ -239,70 +239,70 @@ LIBproc_2_CURRENT=0 LIBproc_2_REVISION=0 LIBproc_2_AGE=0 -proc_libproc_2_la_LIBADD = $(LIB_KPARTS) +library_libproc_2_la_LIBADD = $(LIB_KPARTS) if WITH_SYSTEMD -proc_libproc_2_la_LIBADD += @SYSTEMD_LIBS@ +library_libproc_2_la_LIBADD += @SYSTEMD_LIBS@ endif if WITH_ELOGIND -proc_libproc_2_la_LIBADD += @ELOGIND_LIBS@ +library_libproc_2_la_LIBADD += @ELOGIND_LIBS@ endif -proc_libproc_2_la_LDFLAGS = \ +library_libproc_2_la_LDFLAGS = \ -version-info $(LIBproc_2_CURRENT):$(LIBproc_2_REVISION):$(LIBproc_2_AGE) \ -no-undefined \ - -Wl,--version-script=$(top_srcdir)/proc/libproc-2.sym + -Wl,--version-script=$(top_srcdir)/library/libproc-2.sym -proc_libproc_2_la_SOURCES = \ - proc/devname.c \ - proc/devname.h \ - proc/diskstats.c \ - proc/diskstats.h \ - proc/escape.c \ - proc/escape.h \ - proc/procps-private.h \ - proc/meminfo.c \ - proc/meminfo.h \ - proc/misc.h \ - proc/namespace.c \ - proc/numa.c \ - proc/numa.h \ - proc/pids.c \ - proc/pids.h \ - proc/pwcache.c \ - proc/pwcache.h \ - proc/readproc.c \ - proc/readproc.h \ - proc/slabinfo.c \ - proc/slabinfo.h \ - proc/stat.c \ - proc/stat.h \ - proc/sysinfo.c \ - proc/version.c \ - proc/vmstat.c \ - proc/vmstat.h \ - proc/wchan.c \ - proc/wchan.h \ - proc/uptime.c \ - proc/xtra-procps-debug.h +library_libproc_2_la_SOURCES = \ + library/devname.c \ + library/include/devname.h \ + library/diskstats.c \ + library/include/diskstats.h \ + library/escape.c \ + library/include/escape.h \ + library/include/procps-private.h \ + library/meminfo.c \ + library/include/meminfo.h \ + library/include/misc.h \ + library/namespace.c \ + library/numa.c \ + library/include/numa.h \ + library/pids.c \ + library/include/pids.h \ + library/pwcache.c \ + library/include/pwcache.h \ + library/readproc.c \ + library/include/readproc.h \ + library/slabinfo.c \ + library/include/slabinfo.h \ + library/stat.c \ + library/include/stat.h \ + library/sysinfo.c \ + library/version.c \ + library/vmstat.c \ + library/include/vmstat.h \ + library/wchan.c \ + library/include/wchan.h \ + library/uptime.c \ + library/include/xtra-procps-debug.h -proc_libproc_2_la_includedir = $(includedir)/procps/ -proc_libproc_2_la_include_HEADERS = \ - proc/diskstats.h \ - proc/meminfo.h \ - proc/misc.h \ - proc/pids.h \ - proc/slabinfo.h \ - proc/stat.h \ - proc/vmstat.h \ - proc/xtra-procps-debug.h +library_libproc_2_la_includedir = $(includedir)/procps/ +library_libproc_2_la_include_HEADERS = \ + library/include/diskstats.h \ + library/include/meminfo.h \ + library/include/misc.h \ + library/include/pids.h \ + library/include/slabinfo.h \ + library/include/stat.h \ + library/include/vmstat.h \ + library/include/xtra-procps-debug.h pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = \ - proc/libproc-2.pc + library/libproc-2.pc -EXTRA_DIST += proc/libproc-2.sym +EXTRA_DIST += library/libproc-2.sym # ps/pscommand @@ -340,25 +340,25 @@ lib_test_shm_SOURCES = lib/test_shm.c lib/strutils.c lib_test_shm_LDADD = $(CYGWINFLAGS) check_PROGRAMS += \ - proc/test_Itemtables \ - proc/test_pids \ - proc/test_uptime \ - proc/test_sysinfo \ - proc/test_version \ - proc/test_namespace + library/tests/test_Itemtables \ + library/tests/test_pids \ + library/tests/test_uptime \ + library/tests/test_sysinfo \ + library/tests/test_version \ + library/tests/test_namespace -proc_test_Itemtables_SOURCES = proc/test_Itemtables.c -proc_test_Itemtables_LDADD = proc/libproc-2.la -proc_test_pids_SOURCES = proc/test_pids.c -proc_test_pids_LDADD = proc/libproc-2.la -proc_test_uptime_SOURCES = proc/test_uptime.c -proc_test_uptime_LDADD = proc/libproc-2.la -proc_test_sysinfo_SOURCES = proc/test_sysinfo.c -proc_test_sysinfo_LDADD = proc/libproc-2.la -proc_test_version_SOURCES = proc/test_version.c -proc_test_version_LDADD = proc/libproc-2.la -proc_test_namespace_SOURCES = proc/test_namespace.c -proc_test_namespace_LDADD = proc/libproc-2.la +library_tests_test_Itemtables_SOURCES = library/tests/test_Itemtables.c +library_tests_test_Itemtables_LDADD = library/libproc-2.la +library_tests_test_pids_SOURCES = library/tests/test_pids.c +library_tests_test_pids_LDADD = library/libproc-2.la +library_tests_test_uptime_SOURCES = library/tests/test_uptime.c +library_tests_test_uptime_LDADD = library/libproc-2.la +library_tests_test_sysinfo_SOURCES = library/tests/test_sysinfo.c +library_tests_test_sysinfo_LDADD = library/libproc-2.la +library_tests_test_version_SOURCES = library/tests/test_version.c +library_tests_test_version_LDADD = library/libproc-2.la +library_tests_test_namespace_SOURCES = library/tests/test_namespace.c +library_tests_test_namespace_LDADD = library/libproc-2.la if CYGWIN src_skill_LDADD = $(CYGWINFLAGS) @@ -384,17 +384,17 @@ endif BUILT_SOURCES = $(top_srcdir)/.version check-lib: clean - $(MAKE) CFLAGS=-DITEMTABLE_DEBUG proc/test_Itemtables - $(top_builddir)/proc/test_Itemtables + $(MAKE) CFLAGS=-DITEMTABLE_DEBUG library/test_Itemtables + $(top_builddir)/library/test_Itemtables $(MAKE) clean &>/dev/null # Test programs not used by dejagnu but run directly TESTS = \ - proc/test_pids \ - proc/test_uptime \ - proc/test_sysinfo \ - proc/test_version \ - proc/test_namespace \ + library/tests/test_pids \ + library/tests/test_uptime \ + library/tests/test_sysinfo \ + library/tests/test_version \ + library/tests/test_namespace \ lib/test_fileutils \ lib/test_strtod_nol diff --git a/configure.ac b/configure.ac index 01add327..7acd15e7 100644 --- a/configure.ac +++ b/configure.ac @@ -395,6 +395,6 @@ AC_CONFIG_FILES([Makefile include/Makefile po-man/Makefile po/Makefile.in - proc/libproc-2.pc + library/libproc-2.pc testsuite/Makefile]) AC_OUTPUT diff --git a/proc/.gitignore b/library/.gitignore similarity index 100% rename from proc/.gitignore rename to library/.gitignore diff --git a/proc/COPYING b/library/COPYING similarity index 100% rename from proc/COPYING rename to library/COPYING diff --git a/proc/devname.c b/library/devname.c similarity index 100% rename from proc/devname.c rename to library/devname.c diff --git a/proc/diskstats.c b/library/diskstats.c similarity index 99% rename from proc/diskstats.c rename to library/diskstats.c index 37aa81ce..5496903e 100644 --- a/proc/diskstats.c +++ b/library/diskstats.c @@ -33,8 +33,8 @@ #include #include -#include -#include +#include "procps-private.h" +#include "diskstats.h" /* The following define will cause the 'node_add' function to maintain our | nodes list in ascending alphabetical order which could be used to avoid | diff --git a/proc/escape.c b/library/escape.c similarity index 100% rename from proc/escape.c rename to library/escape.c diff --git a/proc/devname.h b/library/include/devname.h similarity index 100% rename from proc/devname.h rename to library/include/devname.h diff --git a/proc/diskstats.h b/library/include/diskstats.h similarity index 100% rename from proc/diskstats.h rename to library/include/diskstats.h diff --git a/proc/escape.h b/library/include/escape.h similarity index 100% rename from proc/escape.h rename to library/include/escape.h diff --git a/proc/meminfo.h b/library/include/meminfo.h similarity index 100% rename from proc/meminfo.h rename to library/include/meminfo.h diff --git a/proc/misc.h b/library/include/misc.h similarity index 100% rename from proc/misc.h rename to library/include/misc.h diff --git a/proc/numa.h b/library/include/numa.h similarity index 100% rename from proc/numa.h rename to library/include/numa.h diff --git a/proc/pids.h b/library/include/pids.h similarity index 100% rename from proc/pids.h rename to library/include/pids.h diff --git a/proc/procps-private.h b/library/include/procps-private.h similarity index 100% rename from proc/procps-private.h rename to library/include/procps-private.h diff --git a/proc/pwcache.h b/library/include/pwcache.h similarity index 100% rename from proc/pwcache.h rename to library/include/pwcache.h diff --git a/proc/readproc.h b/library/include/readproc.h similarity index 99% rename from proc/readproc.h rename to library/include/readproc.h index 08692dbf..d7ff50b3 100644 --- a/proc/readproc.h +++ b/library/include/readproc.h @@ -13,7 +13,7 @@ #include #include #include -#include +#include "misc.h" // the following is development only, forcing display of "[ duplicate ENUM ]" strings // #define FALSE_THREADS /* set most child string fields to NULL */ diff --git a/proc/slabinfo.h b/library/include/slabinfo.h similarity index 100% rename from proc/slabinfo.h rename to library/include/slabinfo.h diff --git a/proc/stat.h b/library/include/stat.h similarity index 100% rename from proc/stat.h rename to library/include/stat.h diff --git a/proc/vmstat.h b/library/include/vmstat.h similarity index 100% rename from proc/vmstat.h rename to library/include/vmstat.h diff --git a/proc/wchan.h b/library/include/wchan.h similarity index 100% rename from proc/wchan.h rename to library/include/wchan.h diff --git a/proc/xtra-procps-debug.h b/library/include/xtra-procps-debug.h similarity index 100% rename from proc/xtra-procps-debug.h rename to library/include/xtra-procps-debug.h diff --git a/proc/libproc-2.pc.in b/library/libproc-2.pc.in similarity index 100% rename from proc/libproc-2.pc.in rename to library/libproc-2.pc.in diff --git a/proc/libproc-2.sym b/library/libproc-2.sym similarity index 100% rename from proc/libproc-2.sym rename to library/libproc-2.sym diff --git a/proc/meminfo.c b/library/meminfo.c similarity index 99% rename from proc/meminfo.c rename to library/meminfo.c index 719ad3e7..fa3aeacc 100644 --- a/proc/meminfo.c +++ b/library/meminfo.c @@ -31,8 +31,8 @@ #include #include -#include -#include +#include "procps-private.h" +#include "meminfo.h" #define MEMINFO_FILE "/proc/meminfo" diff --git a/proc/namespace.c b/library/namespace.c similarity index 97% rename from proc/namespace.c rename to library/namespace.c index 61fe4d50..af963db1 100644 --- a/proc/namespace.c +++ b/library/namespace.c @@ -21,8 +21,8 @@ #include #include -#include -#include "proc/procps-private.h" +#include "misc.h" +#include "procps-private.h" #define NSPATHLEN 64 diff --git a/proc/numa.c b/library/numa.c similarity index 100% rename from proc/numa.c rename to library/numa.c diff --git a/proc/pids.c b/library/pids.c similarity index 99% rename from proc/pids.c rename to library/pids.c index ac10df46..267f8af3 100644 --- a/proc/pids.c +++ b/library/pids.c @@ -35,14 +35,14 @@ #include #include -#include -#include -#include -#include -#include +#include "devname.h" +#include "misc.h" +#include "numa.h" +#include "readproc.h" +#include "wchan.h" -#include -#include +#include "procps-private.h" +#include "pids.h" //#define UNREF_RPTHASH // report hash details at uref() time diff --git a/proc/pwcache.c b/library/pwcache.c similarity index 100% rename from proc/pwcache.c rename to library/pwcache.c diff --git a/proc/readproc.c b/library/readproc.c similarity index 100% rename from proc/readproc.c rename to library/readproc.c diff --git a/proc/slabinfo.c b/library/slabinfo.c similarity index 99% rename from proc/slabinfo.c rename to library/slabinfo.c index e2ff2119..c0357a30 100644 --- a/proc/slabinfo.c +++ b/library/slabinfo.c @@ -34,8 +34,8 @@ #include #include -#include -#include +#include "procps-private.h" +#include "slabinfo.h" #define SLABINFO_FILE "/proc/slabinfo" diff --git a/proc/stat.c b/library/stat.c similarity index 99% rename from proc/stat.c rename to library/stat.c index ac0c2156..3b2182e0 100644 --- a/proc/stat.c +++ b/library/stat.c @@ -30,10 +30,10 @@ #include #include -#include +#include "numa.h" -#include -#include +#include "procps-private.h" +#include "stat.h" #define STAT_FILE "/proc/stat" diff --git a/proc/sysinfo.c b/library/sysinfo.c similarity index 100% rename from proc/sysinfo.c rename to library/sysinfo.c diff --git a/proc/test_Itemtables.c b/library/tests/test_Itemtables.c similarity index 93% rename from proc/test_Itemtables.c rename to library/tests/test_Itemtables.c index 4bbf5b59..42047005 100644 --- a/proc/test_Itemtables.c +++ b/library/tests/test_Itemtables.c @@ -19,12 +19,12 @@ #include -#include -#include -#include -#include -#include -#include +#include "diskstats.h" +#include "meminfo.h" +#include "pids.h" +#include "slabinfo.h" +#include "stat.h" +#include "vmstat.h" #include "tests.h" diff --git a/proc/test_namespace.c b/library/tests/test_namespace.c similarity index 98% rename from proc/test_namespace.c rename to library/tests/test_namespace.c index 3ee68046..2c55c4f8 100644 --- a/proc/test_namespace.c +++ b/library/tests/test_namespace.c @@ -20,7 +20,7 @@ #include #include -#include +#include "misc.h" #include "tests.h" int check_name_minus(void *data) diff --git a/proc/test_pids.c b/library/tests/test_pids.c similarity index 98% rename from proc/test_pids.c rename to library/tests/test_pids.c index 6435b955..0a9832b5 100644 --- a/proc/test_pids.c +++ b/library/tests/test_pids.c @@ -20,7 +20,7 @@ #include #include -#include +#include "pids.h" #include "tests.h" enum pids_item items[] = { PIDS_ID_PID, PIDS_ID_PID }; diff --git a/proc/test_sysinfo.c b/library/tests/test_sysinfo.c similarity index 98% rename from proc/test_sysinfo.c rename to library/tests/test_sysinfo.c index b3dabcf2..8390ccdd 100644 --- a/proc/test_sysinfo.c +++ b/library/tests/test_sysinfo.c @@ -19,7 +19,7 @@ #include #include -#include +#include "misc.h" #include "tests.h" int check_hertz(void *data) diff --git a/proc/test_uptime.c b/library/tests/test_uptime.c similarity index 99% rename from proc/test_uptime.c rename to library/tests/test_uptime.c index d7007169..35d3e2e0 100644 --- a/proc/test_uptime.c +++ b/library/tests/test_uptime.c @@ -21,7 +21,7 @@ #include #include -#include +#include "misc.h" #include "tests.h" int check_uptime(void *data) diff --git a/proc/test_version.c b/library/tests/test_version.c similarity index 98% rename from proc/test_version.c rename to library/tests/test_version.c index 31e882b1..f2f5e1ff 100644 --- a/proc/test_version.c +++ b/library/tests/test_version.c @@ -21,7 +21,7 @@ #include #include -#include +#include "misc.h" #include "tests.h" int check_linux_version(void *data) diff --git a/proc/uptime.c b/library/uptime.c similarity index 99% rename from proc/uptime.c rename to library/uptime.c index b4d9ba9d..88b368d1 100644 --- a/proc/uptime.c +++ b/library/uptime.c @@ -31,7 +31,7 @@ #include #include -#include +#include "misc.h" #include "procps-private.h" #define UPTIME_FILE "/proc/uptime" diff --git a/proc/version.c b/library/version.c similarity index 100% rename from proc/version.c rename to library/version.c diff --git a/proc/vmstat.c b/library/vmstat.c similarity index 99% rename from proc/vmstat.c rename to library/vmstat.c index 511dcb4a..6bf7c27f 100644 --- a/proc/vmstat.c +++ b/library/vmstat.c @@ -34,8 +34,8 @@ #include #include -#include -#include +#include "procps-private.h" +#include "vmstat.h" #define VMSTAT_FILE "/proc/vmstat" diff --git a/proc/wchan.c b/library/wchan.c similarity index 100% rename from proc/wchan.c rename to library/wchan.c diff --git a/src/free.c b/src/free.c index 75cc7510..3e3f23e1 100644 --- a/src/free.c +++ b/src/free.c @@ -42,7 +42,7 @@ #include "strutils.h" #include "fileutils.h" -#include +#include "meminfo.h" #ifndef SIZE_MAX #define SIZE_MAX 32 diff --git a/src/pgrep.c b/src/pgrep.c index 3a01c789..6490ad6c 100644 --- a/src/pgrep.c +++ b/src/pgrep.c @@ -55,8 +55,8 @@ #include "signals.h" #include "xalloc.h" -#include -#include +#include "misc.h" +#include "pids.h" enum pids_item Items[] = { PIDS_ID_PID, diff --git a/src/pidof.c b/src/pidof.c index 8c2ac2ac..cbb95e71 100644 --- a/src/pidof.c +++ b/src/pidof.c @@ -29,7 +29,7 @@ #include "nls.h" #include "xalloc.h" -#include +#include "pids.h" #define grow_size(x) do { \ diff --git a/src/pmap.c b/src/pmap.c index d4fe4c00..7ea9414a 100644 --- a/src/pmap.c +++ b/src/pmap.c @@ -37,7 +37,7 @@ #include "nls.h" #include "xalloc.h" -#include +#include "pids.h" static struct pids_info *Pids_info; diff --git a/src/ps/common.h b/src/ps/common.h index 08b1cb2a..a03c93f8 100644 --- a/src/ps/common.h +++ b/src/ps/common.h @@ -13,10 +13,10 @@ #define PROCPS_PS_H #include "../include/nls.h" -#include -#include -#include -#include +#include "meminfo.h" +#include "misc.h" +#include "pids.h" +#include "stat.h" // --- interface begin |||||||||||||||||||||||||||||||||||||||||||| // ----------------------------------------------------------------------- diff --git a/src/ps/sortformat.c b/src/ps/sortformat.c index ddbeed6b..4319e695 100644 --- a/src/ps/sortformat.c +++ b/src/ps/sortformat.c @@ -26,7 +26,7 @@ #include -#include "../proc/misc.h" +#include "misc.h" #include "../include/xalloc.h" #include "common.h" diff --git a/src/slabtop.c b/src/slabtop.c index e415218e..5a89e07d 100644 --- a/src/slabtop.c +++ b/src/slabtop.c @@ -43,7 +43,7 @@ #include "nls.h" #include "strutils.h" -#include +#include "slabinfo.h" #define DEFAULT_SORT SLAB_NUM_OBJS #define CHAINS_ALLOC 150 diff --git a/src/tload.c b/src/tload.c index 993c13bc..5b38bafa 100644 --- a/src/tload.c +++ b/src/tload.c @@ -43,7 +43,7 @@ #include "strutils.h" #include "xalloc.h" -#include +#include "misc.h" static char *screen; diff --git a/src/top/top.c b/src/top/top.c index 5a238de3..12cfbf33 100644 --- a/src/top/top.c +++ b/src/top/top.c @@ -51,10 +51,10 @@ #include "../include/signals.h" #include "../include/nls.h" -#include -#include -#include -#include +#include "meminfo.h" +#include "misc.h" +#include "pids.h" +#include "stat.h" #include "top.h" #include "top_nls.h" diff --git a/src/uptime.c b/src/uptime.c index 2702ae77..19c46560 100644 --- a/src/uptime.c +++ b/src/uptime.c @@ -28,7 +28,7 @@ #include "fileutils.h" #include "nls.h" -#include +#include "misc.h" static void print_uptime_since() { diff --git a/src/vmstat.c b/src/vmstat.c index 564edf66..86109835 100644 --- a/src/vmstat.c +++ b/src/vmstat.c @@ -49,12 +49,12 @@ #include "nls.h" #include "strutils.h" -#include -#include -#include -#include -#include -#include +#include "diskstats.h" +#include "meminfo.h" +#include "misc.h" +#include "slabinfo.h" +#include "stat.h" +#include "vmstat.h" #define UNIT_B 1 #define UNIT_k 1000 diff --git a/src/w.c b/src/w.c index 612d41cb..8b371798 100644 --- a/src/w.c +++ b/src/w.c @@ -54,8 +54,8 @@ #include "fileutils.h" #include "nls.h" -#include -#include +#include "misc.h" +#include "pids.h" static int ignoreuser = 0; /* for '-u' */ static int oldstyle = 0; /* for '-o' */