[PATCH 1/2] Move pk-utils.h out of libpoke.h

[Tim Rühsen]

2020-05-02  Tim Rühsen  <address@hidden>

        * libpoke/libpoke.h: Remove include of pk-utils.h.
        Add include of stdint.h.
        * libpoke/Makefile.am: Add libpokeutils.la to ib_LTLIBRARIES.
        Remove pk-utils.h pk-utils.c from libpoke_la_SOURCES.
        Add libpokeutils.la to libpoke_la_LIBADD.
        Add assignments for libpokeutils_la.
        * poke/Makefile.am: Add libpokeutils.la to poke_LDADD.
        * poke/pk-cmd.c: Add include of pk-utils.h.
        * poke/pk-cmd.h: Add include of stddef.h.
        * poke/pk-editor.c: Add include of pk-utils.h.
        * poke/pk-info.c: Likewise.
        * poke/pk-ios.c: Likewise.
        * poke/pk-misc.c: Likewise.
        * poke/pk-set.c: Likewise.
        * poke/poke.c: Likewise.
---
 ChangeLog           | 18 ++++++++++++++++++
 libpoke/Makefile.am | 15 ++++++++++-----
 libpoke/libpoke.c   |  1 +
 libpoke/libpoke.h   |  2 +-
 poke/Makefile.am    |  1 +
 poke/pk-cmd.c       |  1 +
 poke/pk-cmd.h       |  1 +
 poke/pk-editor.c    |  1 +
 poke/pk-info.c      |  1 +
 poke/pk-ios.c       |  1 +
 poke/pk-misc.c      |  1 +
 poke/pk-set.c       |  1 +
 poke/poke.c         |  1 +
 13 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fe444e7d..e65a7359 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2020-05-02  Tim Rühsen  <address@hidden>
+
+       * libpoke/libpoke.h: Remove include of pk-utils.h.
+       Add include of stdint.h.
+       * libpoke/Makefile.am: Add libpokeutils.la to ib_LTLIBRARIES.
+       Remove pk-utils.h pk-utils.c from libpoke_la_SOURCES.
+       Add libpokeutils.la to libpoke_la_LIBADD.
+       Add assignments for libpokeutils_la.
+       * poke/Makefile.am: Add libpokeutils.la to poke_LDADD.
+       * poke/pk-cmd.c: Add include of pk-utils.h.
+       * poke/pk-cmd.h: Add include of stddef.h.
+       * poke/pk-editor.c: Add include of pk-utils.h.
+       * poke/pk-info.c: Likewise.
+       * poke/pk-ios.c: Likewise.
+       * poke/pk-misc.c: Likewise.
+       * poke/pk-set.c: Likewise.
+       * poke/poke.c: Likewise.
+
 2020-05-03  Jose E. Marchesi  <address@hidden>

        * libpoke/std.pk (stoca): Define.
diff --git a/libpoke/Makefile.am b/libpoke/Makefile.am
index df624094..b39952c5 100644
--- a/libpoke/Makefile.am
+++ b/libpoke/Makefile.am
@@ -22,9 +22,9 @@ MAINTAINERCLEANFILES =

 dist_pkgdata_DATA = pkl-rt.pk std.pk

-lib_LTLIBRARIES = libpoke.la
+lib_LTLIBRARIES = libpokeutils.la libpoke.la

-include_HEADERS = libpoke.h pk-utils.h
+include_HEADERS = libpoke.h

 libpoke_la_SOURCES = libpoke.h libpoke.c \
                      pkt.h \
@@ -52,8 +52,7 @@ libpoke_la_SOURCES = libpoke.h libpoke.c \
                      pvm-program.h pvm-program.c \
                      pvm.jitter \
                      ios.c ios.h ios-dev.h \
-                     ios-dev-file.c ios-dev-mem.c \
-                     pk-utils.h pk-utils.c
+                     ios-dev-file.c ios-dev-mem.c

 if NBD
 libpoke_la_SOURCES += ios-dev-nbd.c
@@ -82,7 +81,7 @@ libpoke_la_CPPFLAGS = -I$(top_builddir)/gl -I$(top_srcdir)/gl 
\
                       -DPKGINFODIR=\"$(infodir)\" \
                       -DLOCALEDIR=\"$(localedir)\"
 libpoke_la_CFLAGS = -Wall $(BDW_GC_CFLAGS) $(LIBNBD_CFLAGS)
-libpoke_la_LIBADD = libpvmjitter.la \
+libpoke_la_LIBADD = libpokeutils.la libpvmjitter.la \
                     $(BDW_GC_LIBS) \
                     $(LIBNBD_LIBS)
 libpoke_la_LDFLAGS =
@@ -104,4 +103,10 @@ BUILT_SOURCES += pvm-vm.h pvm-vm1.c pvm-vm2.c
 pvm-vm.h pvm-vm1.c pvm-vm2.c: pvm.jitter
        $(JITTER) $(srcdir)/pvm.jitter --output $(builddir)

+libpokeutils_la_SOURCES = pk-utils.c pk-utils.h pkt.h
+libpokeutils_la_CFLAGS = -Wall $(BDW_GC_CFLAGS) $(LIBNBD_CFLAGS)
+libpokeutils_la_CPPFLAGS = -I$(top_builddir)/gl -I$(top_srcdir)/gl
+libpokeutils_la_LIBADD = ../gl/libgnu.la
+libpokeutils_la_LDFLAGS =
+
 # End of Makefile.am
diff --git a/libpoke/libpoke.c b/libpoke/libpoke.c
index eb867594..93e65375 100644
--- a/libpoke/libpoke.c
+++ b/libpoke/libpoke.c
@@ -18,6 +18,7 @@

 #include <config.h>

+#include <string.h>
 #include <stdlib.h>
 #include <assert.h>

diff --git a/libpoke/libpoke.h b/libpoke/libpoke.h
index 38a39cee..da031f65 100644
--- a/libpoke/libpoke.h
+++ b/libpoke/libpoke.h
@@ -21,7 +21,7 @@

 #include <config.h>

-#include "pk-utils.h"
+#include <stdint.h>

 typedef struct pk_compiler *pk_compiler;
 typedef struct pk_ios *pk_ios;
diff --git a/poke/Makefile.am b/poke/Makefile.am
index 2073c665..533bc20f 100644
--- a/poke/Makefile.am
+++ b/poke/Makefile.am
@@ -44,6 +44,7 @@ poke_CPPFLAGS = -I$(top_builddir)/gl -I$(top_srcdir)/gl \
 poke_CFLAGS = -Wall
 # XXX remove JITTER_LDADD
 poke_LDADD = $(top_builddir)/gl/libgnu.la \
+             $(top_builddir)/libpoke/libpokeutils.la \
              $(top_builddir)/libpoke/libpoke.la \
              $(LTLIBREADLINE) \
              $(JITTER_LDADD) \
diff --git a/poke/pk-cmd.c b/poke/pk-cmd.c
index ae892852..b57f0ac0 100644
--- a/poke/pk-cmd.c
+++ b/poke/pk-cmd.c
@@ -36,6 +36,7 @@
 #include "poke.h"
 #include "pk-cmd.h"
 #include "pk-term.h"
+#include "pk-utils.h"

 /* Table of supported commands.  */

diff --git a/poke/pk-cmd.h b/poke/pk-cmd.h
index d18b0432..fd95ba92 100644
--- a/poke/pk-cmd.h
+++ b/poke/pk-cmd.h
@@ -21,6 +21,7 @@

 #include <config.h>

+#include <stddef.h>
 #include "poke.h"

 enum pk_cmd_arg_type
diff --git a/poke/pk-editor.c b/poke/pk-editor.c
index 2e466d0d..c8a966c1 100644
--- a/poke/pk-editor.c
+++ b/poke/pk-editor.c
@@ -29,6 +29,7 @@
 #include "poke.h"
 #include "pk-cmd.h"
 #include "pk-term.h"
+#include "pk-utils.h"

 static int
 pk_cmd_editor (int argc, struct pk_cmd_arg argv[], uint64_t uflags)
diff --git a/poke/pk-info.c b/poke/pk-info.c
index 53bc4bff..baf73359 100644
--- a/poke/pk-info.c
+++ b/poke/pk-info.c
@@ -18,6 +18,7 @@

 #include <config.h>
 #include "pk-cmd.h"
+#include "pk-utils.h"

 extern struct pk_cmd null_cmd;       /* pk-cmd.c  */
 extern struct pk_cmd info_ios_cmd;   /* pk-ios.c  */
diff --git a/poke/pk-ios.c b/poke/pk-ios.c
index 6254a804..5960df00 100644
--- a/poke/pk-ios.c
+++ b/poke/pk-ios.c
@@ -31,6 +31,7 @@
 #include "poke.h"
 #include "pk-cmd.h"
 #include "pk-term.h"
+#include "pk-utils.h"
 #if HAVE_HSERVER
 #  include "pk-hserver.h"
 #endif
diff --git a/poke/pk-misc.c b/poke/pk-misc.c
index 3510511b..37c50552 100644
--- a/poke/pk-misc.c
+++ b/poke/pk-misc.c
@@ -28,6 +28,7 @@
 #include "poke.h"
 #include "pk-cmd.h"
 #include "pk-term.h"
+#include "pk-utils.h"

 static int
 pk_cmd_exit (int argc, struct pk_cmd_arg argv[], uint64_t uflags)
diff --git a/poke/pk-set.c b/poke/pk-set.c
index 83f615cd..d1ab0a47 100644
--- a/poke/pk-set.c
+++ b/poke/pk-set.c
@@ -28,6 +28,7 @@
 #include "poke.h"
 #include "pk-cmd.h"
 #include "pk-term.h"
+#include "pk-utils.h"

 static int
 pk_cmd_set_obase (int argc, struct pk_cmd_arg argv[], uint64_t uflags)
diff --git a/poke/poke.c b/poke/poke.c
index 55714865..27320fe8 100644
--- a/poke/poke.c
+++ b/poke/poke.c
@@ -37,6 +37,7 @@
 #include "pk-cmd.h"
 #include "pk-repl.h"
 #include "pk-term.h"
+#include "pk-utils.h"

 /* poke can be run either interactively (from a tty) or in batch mode.
    The following predicate records this.  */
--
2.26.2