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>

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
 

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

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 |

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 */

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"

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
 

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 "devname.h"
+#include "misc.h"
+#include "numa.h"
+#include "readproc.h"
+#include "wchan.h"
 
-#include <proc/procps-private.h>
-#include <proc/pids.h>
+#include "procps-private.h"
+#include "pids.h"
 
 
 //#define UNREF_RPTHASH                // report hash details at uref() time

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"

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"

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"
 

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)

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 };

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)

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)

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)

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"

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"

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

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,

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 { \

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;
 

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 ||||||||||||||||||||||||||||||||||||||||||||
 // -----------------------------------------------------------------------

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"

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

src/tload.c

@@ -43,7 +43,7 @@
 #include "strutils.h"
 #include "xalloc.h"
 
-#include <proc/misc.h>
+#include "misc.h"
 
 static char *screen;
 

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"

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()
 {

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

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' */