From c2a29d370cdc1e80ca5f571c092206a478884334 Mon Sep 17 00:00:00 2001 From: Jim Warner Date: Sun, 1 Apr 2018 00:00:00 -0600 Subject: [PATCH] sysctl: relocate the procio code to a more proper home Now that the procio logic was removed from the library we must move the header file, lest we break make dist. In the process, we will relocate that source file too. [ we'll take a slightly different approach than that ] [ used under the master branch by exploiting those 2 ] [ non-library directories 'include' and 'lib', while ] [ avoiding any sysctl hard coded function prototype. ] Signed-off-by: Jim Warner --- Makefile.am | 3 +-- include/Makefile.am | 1 + {proc => include}/procio.h | 0 {proc => lib}/procio.3 | 0 procio.c => lib/procio.c | 0 sysctl.c | 2 +- 6 files changed, 3 insertions(+), 3 deletions(-) rename {proc => include}/procio.h (100%) rename {proc => lib}/procio.3 (100%) rename procio.c => lib/procio.c (100%) diff --git a/Makefile.am b/Makefile.am index 1f79d82c..ac43ad1c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -213,8 +213,7 @@ pwdx_LDADD= $(CYGWINFLAGS) sysctl_SOURCES = \ sysctl.c \ lib/fileutils.c \ - procio.c \ - procio.h + lib/procio.c sysctl_LDADD= endif tload_SOURCES = tload.c lib/strutils.c lib/fileutils.c diff --git a/include/Makefile.am b/include/Makefile.am index f2b6f1d3..84fe3a6c 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -2,6 +2,7 @@ dist_noinst_HEADERS = \ c.h \ fileutils.h \ nls.h \ + procio.h \ rpmatch.h \ signals.h \ strutils.h \ diff --git a/proc/procio.h b/include/procio.h similarity index 100% rename from proc/procio.h rename to include/procio.h diff --git a/proc/procio.3 b/lib/procio.3 similarity index 100% rename from proc/procio.3 rename to lib/procio.3 diff --git a/procio.c b/lib/procio.c similarity index 100% rename from procio.c rename to lib/procio.c diff --git a/sysctl.c b/sysctl.c index bd6e42f0..9dfdba39 100644 --- a/sysctl.c +++ b/sysctl.c @@ -45,7 +45,7 @@ #include "fileutils.h" #include "nls.h" #include "xalloc.h" -#include "proc/procio.h" +#include "procio.h" /* * Globals...