diff options
author | Craig Small <csmall@dropbear.xyz> | 2022-08-29 19:02:44 +1000 |
---|---|---|
committer | Craig Small <csmall@dropbear.xyz> | 2022-08-29 19:02:44 +1000 |
commit | 3d0871728b4da1922cbb06585b495e55606dcf54 (patch) | |
tree | 175ad6aefbb299fe2bdd3a4578a4a91ea39f02df | |
parent | 406b6d311cebcf4022b90d0ef243534f4817b992 (diff) | |
download | procps-ng-3d0871728b4da1922cbb06585b495e55606dcf54.tar.gz |
build-sys: Relocate library to library/
All the dependent programs needed to have their includes moved too
Signed-off-by: Craig Small <csmall@dropbear.xyz>
-rw-r--r-- | Makefile.am | 162 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | library/.gitignore (renamed from proc/.gitignore) | 0 | ||||
-rw-r--r-- | library/COPYING (renamed from proc/COPYING) | 0 | ||||
-rw-r--r-- | library/devname.c (renamed from proc/devname.c) | 0 | ||||
-rw-r--r-- | library/diskstats.c (renamed from proc/diskstats.c) | 4 | ||||
-rw-r--r-- | library/escape.c (renamed from proc/escape.c) | 0 | ||||
-rw-r--r-- | library/include/devname.h (renamed from proc/devname.h) | 0 | ||||
-rw-r--r-- | library/include/diskstats.h (renamed from proc/diskstats.h) | 0 | ||||
-rw-r--r-- | library/include/escape.h (renamed from proc/escape.h) | 0 | ||||
-rw-r--r-- | library/include/meminfo.h (renamed from proc/meminfo.h) | 0 | ||||
-rw-r--r-- | library/include/misc.h (renamed from proc/misc.h) | 0 | ||||
-rw-r--r-- | library/include/numa.h (renamed from proc/numa.h) | 0 | ||||
-rw-r--r-- | library/include/pids.h (renamed from proc/pids.h) | 0 | ||||
-rw-r--r-- | library/include/procps-private.h (renamed from proc/procps-private.h) | 0 | ||||
-rw-r--r-- | library/include/pwcache.h (renamed from proc/pwcache.h) | 0 | ||||
-rw-r--r-- | library/include/readproc.h (renamed from proc/readproc.h) | 2 | ||||
-rw-r--r-- | library/include/slabinfo.h (renamed from proc/slabinfo.h) | 0 | ||||
-rw-r--r-- | library/include/stat.h (renamed from proc/stat.h) | 0 | ||||
-rw-r--r-- | library/include/vmstat.h (renamed from proc/vmstat.h) | 0 | ||||
-rw-r--r-- | library/include/wchan.h (renamed from proc/wchan.h) | 0 | ||||
-rw-r--r-- | library/include/xtra-procps-debug.h (renamed from proc/xtra-procps-debug.h) | 0 | ||||
-rw-r--r-- | library/libproc-2.pc.in (renamed from proc/libproc-2.pc.in) | 0 | ||||
-rw-r--r-- | library/libproc-2.sym (renamed from proc/libproc-2.sym) | 0 | ||||
-rw-r--r-- | library/meminfo.c (renamed from proc/meminfo.c) | 4 | ||||
-rw-r--r-- | library/namespace.c (renamed from proc/namespace.c) | 4 | ||||
-rw-r--r-- | library/numa.c (renamed from proc/numa.c) | 0 | ||||
-rw-r--r-- | library/pids.c (renamed from proc/pids.c) | 16 | ||||
-rw-r--r-- | library/pwcache.c (renamed from proc/pwcache.c) | 0 | ||||
-rw-r--r-- | library/readproc.c (renamed from proc/readproc.c) | 0 | ||||
-rw-r--r-- | library/slabinfo.c (renamed from proc/slabinfo.c) | 4 | ||||
-rw-r--r-- | library/stat.c (renamed from proc/stat.c) | 6 | ||||
-rw-r--r-- | library/sysinfo.c (renamed from proc/sysinfo.c) | 0 | ||||
-rw-r--r-- | library/tests/test_Itemtables.c (renamed from proc/test_Itemtables.c) | 12 | ||||
-rw-r--r-- | library/tests/test_namespace.c (renamed from proc/test_namespace.c) | 2 | ||||
-rw-r--r-- | library/tests/test_pids.c (renamed from proc/test_pids.c) | 2 | ||||
-rw-r--r-- | library/tests/test_sysinfo.c (renamed from proc/test_sysinfo.c) | 2 | ||||
-rw-r--r-- | library/tests/test_uptime.c (renamed from proc/test_uptime.c) | 2 | ||||
-rw-r--r-- | library/tests/test_version.c (renamed from proc/test_version.c) | 2 | ||||
-rw-r--r-- | library/uptime.c (renamed from proc/uptime.c) | 2 | ||||
-rw-r--r-- | library/version.c (renamed from proc/version.c) | 0 | ||||
-rw-r--r-- | library/vmstat.c (renamed from proc/vmstat.c) | 4 | ||||
-rw-r--r-- | library/wchan.c (renamed from proc/wchan.c) | 0 | ||||
-rw-r--r-- | src/free.c | 2 | ||||
-rw-r--r-- | src/pgrep.c | 4 | ||||
-rw-r--r-- | src/pidof.c | 2 | ||||
-rw-r--r-- | src/pmap.c | 2 | ||||
-rw-r--r-- | src/ps/common.h | 8 | ||||
-rw-r--r-- | src/ps/sortformat.c | 2 | ||||
-rw-r--r-- | src/slabtop.c | 2 | ||||
-rw-r--r-- | src/tload.c | 2 | ||||
-rw-r--r-- | src/top/top.c | 8 | ||||
-rw-r--r-- | src/uptime.c | 2 | ||||
-rw-r--r-- | src/vmstat.c | 12 | ||||
-rw-r--r-- | src/w.c | 4 |
55 files changed, 141 insertions, 141 deletions
diff --git a/Makefile.am b/Makefile.am index 110b920..075638a 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 - -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 - -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 + -Wl,--version-script=$(top_srcdir)/library/libproc-2.sym + +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 + +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 - -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 \ + library/tests/test_pids \ + library/tests/test_uptime \ + library/tests/test_sysinfo \ + library/tests/test_version \ + library/tests/test_namespace + +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 01add32..7acd15e 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 index a1db999..a1db999 100644 --- a/proc/.gitignore +++ b/library/.gitignore diff --git a/proc/COPYING b/library/COPYING index 12735e6..12735e6 100644 --- a/proc/COPYING +++ b/library/COPYING diff --git a/proc/devname.c b/library/devname.c index 1cc6bc7..1cc6bc7 100644 --- a/proc/devname.c +++ b/library/devname.c diff --git a/proc/diskstats.c b/library/diskstats.c index 37aa81c..5496903 100644 --- a/proc/diskstats.c +++ b/library/diskstats.c @@ -33,8 +33,8 @@ #include <sys/stat.h> #include <sys/types.h> -#include <proc/procps-private.h> -#include <proc/diskstats.h> +#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 index cab6286..cab6286 100644 --- a/proc/escape.c +++ b/library/escape.c diff --git a/proc/devname.h b/library/include/devname.h index 467cd29..467cd29 100644 --- a/proc/devname.h +++ b/library/include/devname.h diff --git a/proc/diskstats.h b/library/include/diskstats.h index 94ac470..94ac470 100644 --- a/proc/diskstats.h +++ b/library/include/diskstats.h diff --git a/proc/escape.h b/library/include/escape.h index 70dd81c..70dd81c 100644 --- a/proc/escape.h +++ b/library/include/escape.h diff --git a/proc/meminfo.h b/library/include/meminfo.h index 1913abd..1913abd 100644 --- a/proc/meminfo.h +++ b/library/include/meminfo.h diff --git a/proc/misc.h b/library/include/misc.h index 078aba5..078aba5 100644 --- a/proc/misc.h +++ b/library/include/misc.h diff --git a/proc/numa.h b/library/include/numa.h index 08b9855..08b9855 100644 --- a/proc/numa.h +++ b/library/include/numa.h diff --git a/proc/pids.h b/library/include/pids.h index 60df413..60df413 100644 --- a/proc/pids.h +++ b/library/include/pids.h diff --git a/proc/procps-private.h b/library/include/procps-private.h index 835ea21..835ea21 100644 --- a/proc/procps-private.h +++ b/library/include/procps-private.h diff --git a/proc/pwcache.h b/library/include/pwcache.h index e1bf0e8..e1bf0e8 100644 --- a/proc/pwcache.h +++ b/library/include/pwcache.h diff --git a/proc/readproc.h b/library/include/readproc.h index 08692db..d7ff50b 100644 --- a/proc/readproc.h +++ b/library/include/readproc.h @@ -13,7 +13,7 @@ #include <sys/types.h> #include <dirent.h> #include <unistd.h> -#include <proc/misc.h> +#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 index 293e888..293e888 100644 --- a/proc/slabinfo.h +++ b/library/include/slabinfo.h diff --git a/proc/stat.h b/library/include/stat.h index f4b6f75..f4b6f75 100644 --- a/proc/stat.h +++ b/library/include/stat.h diff --git a/proc/vmstat.h b/library/include/vmstat.h index b11f9f9..b11f9f9 100644 --- a/proc/vmstat.h +++ b/library/include/vmstat.h diff --git a/proc/wchan.h b/library/include/wchan.h index f2a184a..f2a184a 100644 --- a/proc/wchan.h +++ b/library/include/wchan.h diff --git a/proc/xtra-procps-debug.h b/library/include/xtra-procps-debug.h index 070a484..070a484 100644 --- a/proc/xtra-procps-debug.h +++ b/library/include/xtra-procps-debug.h diff --git a/proc/libproc-2.pc.in b/library/libproc-2.pc.in index 4ac2a59..4ac2a59 100644 --- a/proc/libproc-2.pc.in +++ b/library/libproc-2.pc.in diff --git a/proc/libproc-2.sym b/library/libproc-2.sym index bb84ba9..bb84ba9 100644 --- a/proc/libproc-2.sym +++ b/library/libproc-2.sym diff --git a/proc/meminfo.c b/library/meminfo.c index 719ad3e..fa3aeac 100644 --- a/proc/meminfo.c +++ b/library/meminfo.c @@ -31,8 +31,8 @@ #include <sys/stat.h> #include <sys/types.h> -#include <proc/procps-private.h> -#include <proc/meminfo.h> +#include "procps-private.h" +#include "meminfo.h" #define MEMINFO_FILE "/proc/meminfo" diff --git a/proc/namespace.c b/library/namespace.c index 61fe4d5..af963db 100644 --- a/proc/namespace.c +++ b/library/namespace.c @@ -21,8 +21,8 @@ #include <string.h> #include <sys/stat.h> -#include <proc/misc.h> -#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 index 80039e2..80039e2 100644 --- a/proc/numa.c +++ b/library/numa.c diff --git a/proc/pids.c b/library/pids.c index ac10df4..267f8af 100644 --- a/proc/pids.c +++ b/library/pids.c @@ -35,14 +35,14 @@ #include <sys/stat.h> #include <sys/types.h> -#include <proc/devname.h> -#include <proc/misc.h> -#include <proc/numa.h> -#include <proc/readproc.h> -#include <proc/wchan.h> - -#include <proc/procps-private.h> -#include <proc/pids.h> +#include "devname.h" +#include "misc.h" +#include "numa.h" +#include "readproc.h" +#include "wchan.h" + +#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 index 7baab1b..7baab1b 100644 --- a/proc/pwcache.c +++ b/library/pwcache.c diff --git a/proc/readproc.c b/library/readproc.c index bd71d95..bd71d95 100644 --- a/proc/readproc.c +++ b/library/readproc.c diff --git a/proc/slabinfo.c b/library/slabinfo.c index e2ff211..c0357a3 100644 --- a/proc/slabinfo.c +++ b/library/slabinfo.c @@ -34,8 +34,8 @@ #include <sys/stat.h> #include <sys/types.h> -#include <proc/procps-private.h> -#include <proc/slabinfo.h> +#include "procps-private.h" +#include "slabinfo.h" #define SLABINFO_FILE "/proc/slabinfo" diff --git a/proc/stat.c b/library/stat.c index ac0c215..3b2182e 100644 --- a/proc/stat.c +++ b/library/stat.c @@ -30,10 +30,10 @@ #include <sys/stat.h> #include <sys/types.h> -#include <proc/numa.h> +#include "numa.h" -#include <proc/procps-private.h> -#include <proc/stat.h> +#include "procps-private.h" +#include "stat.h" #define STAT_FILE "/proc/stat" diff --git a/proc/sysinfo.c b/library/sysinfo.c index 5d23cc5..5d23cc5 100644 --- a/proc/sysinfo.c +++ b/library/sysinfo.c diff --git a/proc/test_Itemtables.c b/library/tests/test_Itemtables.c index 4bbf5b5..4204700 100644 --- a/proc/test_Itemtables.c +++ b/library/tests/test_Itemtables.c @@ -19,12 +19,12 @@ #include <stdlib.h> -#include <proc/diskstats.h> -#include <proc/meminfo.h> -#include <proc/pids.h> -#include <proc/slabinfo.h> -#include <proc/stat.h> -#include <proc/vmstat.h> +#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 index 3ee6804..2c55c4f 100644 --- a/proc/test_namespace.c +++ b/library/tests/test_namespace.c @@ -20,7 +20,7 @@ #include <stdio.h> #include <string.h> -#include <proc/misc.h> +#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 index 6435b95..0a9832b 100644 --- a/proc/test_pids.c +++ b/library/tests/test_pids.c @@ -20,7 +20,7 @@ #include <stdio.h> #include <errno.h> -#include <proc/pids.h> +#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 index b3dabcf..8390ccd 100644 --- a/proc/test_sysinfo.c +++ b/library/tests/test_sysinfo.c @@ -19,7 +19,7 @@ #include <stdlib.h> #include <stdio.h> -#include <proc/misc.h> +#include "misc.h" #include "tests.h" int check_hertz(void *data) diff --git a/proc/test_uptime.c b/library/tests/test_uptime.c index d700716..35d3e2e 100644 --- a/proc/test_uptime.c +++ b/library/tests/test_uptime.c @@ -21,7 +21,7 @@ #include <stdlib.h> #include <stdio.h> -#include <proc/misc.h> +#include "misc.h" #include "tests.h" int check_uptime(void *data) diff --git a/proc/test_version.c b/library/tests/test_version.c index 31e882b..f2f5e1f 100644 --- a/proc/test_version.c +++ b/library/tests/test_version.c @@ -21,7 +21,7 @@ #include <stdlib.h> #include <stdio.h> -#include <proc/misc.h> +#include "misc.h" #include "tests.h" int check_linux_version(void *data) diff --git a/proc/uptime.c b/library/uptime.c index b4d9ba9..88b368d 100644 --- a/proc/uptime.c +++ b/library/uptime.c @@ -31,7 +31,7 @@ #include <unistd.h> #include <utmp.h> -#include <proc/misc.h> +#include "misc.h" #include "procps-private.h" #define UPTIME_FILE "/proc/uptime" diff --git a/proc/version.c b/library/version.c index e4df18b..e4df18b 100644 --- a/proc/version.c +++ b/library/version.c diff --git a/proc/vmstat.c b/library/vmstat.c index 511dcb4..6bf7c27 100644 --- a/proc/vmstat.c +++ b/library/vmstat.c @@ -34,8 +34,8 @@ #include <sys/stat.h> #include <sys/types.h> -#include <proc/procps-private.h> -#include <proc/vmstat.h> +#include "procps-private.h" +#include "vmstat.h" #define VMSTAT_FILE "/proc/vmstat" diff --git a/proc/wchan.c b/library/wchan.c index b67ab41..b67ab41 100644 --- a/proc/wchan.c +++ b/library/wchan.c @@ -42,7 +42,7 @@ #include "strutils.h" #include "fileutils.h" -#include <proc/meminfo.h> +#include "meminfo.h" #ifndef SIZE_MAX #define SIZE_MAX 32 diff --git a/src/pgrep.c b/src/pgrep.c index 3a01c78..6490ad6 100644 --- a/src/pgrep.c +++ b/src/pgrep.c @@ -55,8 +55,8 @@ #include "signals.h" #include "xalloc.h" -#include <proc/misc.h> -#include <proc/pids.h> +#include "misc.h" +#include "pids.h" enum pids_item Items[] = { PIDS_ID_PID, diff --git a/src/pidof.c b/src/pidof.c index 8c2ac2a..cbb95e7 100644 --- a/src/pidof.c +++ b/src/pidof.c @@ -29,7 +29,7 @@ #include "nls.h" #include "xalloc.h" -#include <proc/pids.h> +#include "pids.h" #define grow_size(x) do { \ @@ -37,7 +37,7 @@ #include "nls.h" #include "xalloc.h" -#include <proc/pids.h> +#include "pids.h" static struct pids_info *Pids_info; diff --git a/src/ps/common.h b/src/ps/common.h index 08b1cb2..a03c93f 100644 --- a/src/ps/common.h +++ b/src/ps/common.h @@ -13,10 +13,10 @@ #define PROCPS_PS_H #include "../include/nls.h" -#include <proc/meminfo.h> -#include <proc/misc.h> -#include <proc/pids.h> -#include <proc/stat.h> +#include "meminfo.h" +#include "misc.h" +#include "pids.h" +#include "stat.h" // --- <pids> interface begin |||||||||||||||||||||||||||||||||||||||||||| // ----------------------------------------------------------------------- diff --git a/src/ps/sortformat.c b/src/ps/sortformat.c index ddbeed6..4319e69 100644 --- a/src/ps/sortformat.c +++ b/src/ps/sortformat.c @@ -26,7 +26,7 @@ #include <sys/types.h> -#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 e415218..5a89e07 100644 --- a/src/slabtop.c +++ b/src/slabtop.c @@ -43,7 +43,7 @@ #include "nls.h" #include "strutils.h" -#include <proc/slabinfo.h> +#include "slabinfo.h" #define DEFAULT_SORT SLAB_NUM_OBJS #define CHAINS_ALLOC 150 diff --git a/src/tload.c b/src/tload.c index 993c13b..5b38baf 100644 --- a/src/tload.c +++ b/src/tload.c @@ -43,7 +43,7 @@ #include "strutils.h" #include "xalloc.h" -#include <proc/misc.h> +#include "misc.h" static char *screen; diff --git a/src/top/top.c b/src/top/top.c index 5a238de..12cfbf3 100644 --- a/src/top/top.c +++ b/src/top/top.c @@ -51,10 +51,10 @@ #include "../include/signals.h" #include "../include/nls.h" -#include <proc/meminfo.h> -#include <proc/misc.h> -#include <proc/pids.h> -#include <proc/stat.h> +#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 2702ae7..19c4656 100644 --- a/src/uptime.c +++ b/src/uptime.c @@ -28,7 +28,7 @@ #include "fileutils.h" #include "nls.h" -#include <proc/misc.h> +#include "misc.h" static void print_uptime_since() { diff --git a/src/vmstat.c b/src/vmstat.c index 564edf6..8610983 100644 --- a/src/vmstat.c +++ b/src/vmstat.c @@ -49,12 +49,12 @@ #include "nls.h" #include "strutils.h" -#include <proc/diskstats.h> -#include <proc/meminfo.h> -#include <proc/misc.h> -#include <proc/slabinfo.h> -#include <proc/stat.h> -#include <proc/vmstat.h> +#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 @@ -54,8 +54,8 @@ #include "fileutils.h" #include "nls.h" -#include <proc/misc.h> -#include <proc/pids.h> +#include "misc.h" +#include "pids.h" static int ignoreuser = 0; /* for '-u' */ static int oldstyle = 0; /* for '-o' */ |