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>

diff --git a/Makefile.am b/Makefile.am
index 110b920026136f6abe935846345aed8f21d1c693..075638a93a3cb908ad2a059f3a96e1f17cda50ff 100644 (file)
--- 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 01add3278a8d94ebef47cf6b2df764c921a29fac..7acd15e7337b5b8f848b9ba2582975c3892cd1ac 100644 (file)
--- 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 37aa81ce80e219b2008f657dbb396f07289c8284..5496903e03d14b06250ad2a9ec3a6304ba5a9a70 100644 (file)
--- 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
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 08692dbff89bc3c72988d8e0c5940fcfd64341f9..d7ff50b374bcf763adf50abd3d33f9f3ca29cfa8 100644 (file)
--- 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
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 719ad3e78acb258c15d8be2cbdbcabcbcb89dbac..fa3aeacce7e5d73d3a050ee862114a6840bb4237 100644 (file)
--- 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
similarity index 97%
rename from proc/namespace.c
rename to library/namespace.c
index 61fe4d50c706e633a940c18769308ab56241b5eb..af963db1a34eda811d9d9c21c55c350da9f9f7e8 100644 (file)
--- 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
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 ac10df46aed0a9e785a15933e2f84f45263a1aa6..267f8af3e757d6d4e85734fa90af88a0ae180e20 100644 (file)
--- 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
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 e2ff211937751fb317a24ddcf6a382cea3ab7d82..c0357a30c7606ecd5376f663d0177ca4a9676b1b 100644 (file)
--- 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
similarity index 99%
rename from proc/stat.c
rename to library/stat.c
index ac0c2156d4690eae9cf88aa8a0baf98fdde697fd..3b2182e045297e8d4624de3a71c7e46d36031be1 100644 (file)
--- 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
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 4bbf5b595950533f0815b045e25e528cb572ad62..420470050dbed9c916acd5e8a0dfb55fc44a7f06 100644 (file)
--- 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
similarity index 98%
rename from proc/test_namespace.c
rename to library/tests/test_namespace.c
index 3ee68046cd550ae5cde5f780a53787500cfcf436..2c55c4f8a8c7b3d3d7d1efddc9e9490e6635d581 100644 (file)
--- 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
similarity index 98%
rename from proc/test_pids.c
rename to library/tests/test_pids.c
index 6435b9551301ac94415dda4477305ec684e4fe1b..0a9832b5fe01ddd07ecbe44ba09f1470b45c6c9d 100644 (file)
--- 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
similarity index 98%
rename from proc/test_sysinfo.c
rename to library/tests/test_sysinfo.c
index b3dabcf27414eb0bec0e09876d114333320f84ff..8390ccddc2428b574c3281b9faeb9432464a1a86 100644 (file)
--- 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
similarity index 99%
rename from proc/test_uptime.c
rename to library/tests/test_uptime.c
index d7007169744ff1f1bb7ddd45159ad66adf590f54..35d3e2e0a7eb0698374bcaa263a60021b1c32913 100644 (file)
--- 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
similarity index 98%
rename from proc/test_version.c
rename to library/tests/test_version.c
index 31e882b1e6b0459078216bc901af3f80fa3c7a19..f2f5e1ff2d55d8b38bfd96f5e25f1b623a0c7228 100644 (file)
--- 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
similarity index 99%
rename from proc/uptime.c
rename to library/uptime.c
index b4d9ba9d3062759e5f404a687025befe4a52ea68..88b368d12c5cca2177ea5e85865f317c5e60ccb9 100644 (file)
--- 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
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 511dcb4afdba62c82cadfa4b8b21dd0b681e08aa..6bf7c27fdef028f8c5e07047074b2f34189a320f 100644 (file)
--- 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
similarity index 100%
rename from proc/wchan.c
rename to library/wchan.c

diff --git a/src/free.c b/src/free.c
index 75cc751059f3b2c78f97032e89114f547372c621..3e3f23e1b3b1c4ab99b5ca8ea51bdbf0d37a58c3 100644 (file)
--- a/src/free.c
+++ b/src/free.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 3a01c78941777c565758451fac64ca710f671672..6490ad6c4632e2e84d3afd10c8a56701162e8f4b 100644 (file)
--- 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 8c2ac2acd7ed1d1a34a79e61d360553549851388..cbb95e71d43d136db216e7f25edf6d1eec1a454c 100644 (file)
--- 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 { \

diff --git a/src/pmap.c b/src/pmap.c
index d4fe4c0045d9ab3e691ae92c1c76d0bbf9da4426..7ea9414aab2582a6031f2e32196aa24b29a8b9ef 100644 (file)
--- a/src/pmap.c
+++ b/src/pmap.c
@@ -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 08b1cb2a595e88d551277d6dbbbb02cfd0a07eb3..a03c93f840be9af32a25adba4e441d5d0db3bac5 100644 (file)
--- 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 ddbeed6b9ec4880d479d5c2334e4f41990fe942d..4319e6953bdf9e69f7e39313b913046a80d9a947 100644 (file)
--- 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 e415218e1ec0346e21b5eb1a90369d94787e6c0f..5a89e07da565bd3d84037ab5999ee8aa44da5cb0 100644 (file)
--- 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 993c13bc55671ae835b0396a2c5954cb6f4411a5..5b38bafaf52cd0cb57a656498b5787b04058c2ed 100644 (file)
--- 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 5a238de37989645b503a04fd86e457b9c8376104..12cfbf3371f4e90fa6bcfa5fc318d296998465eb 100644 (file)
--- 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 2702ae7738f5bbbf9731ccbb797e2fb9c4046612..19c4656049c84271baa09b4d4fb3b2559c5872d2 100644 (file)
--- 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 564edf66f9da6543b0ae202d129359ee95ab97cb..86109835b73351901d6b3342e12faf90f21f3127 100644 (file)
--- 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

diff --git a/src/w.c b/src/w.c
index 612d41cb2fdd7aeb8a1ff27e015891759feca3a7..8b37179820c9003c01c287e5ebf66921b19750e9 100644 (file)
--- a/src/w.c
+++ b/src/w.c
@@ -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' */