[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH] Move libpoke/libpokeutils.la to libutils/libutils.la
|
From: |
Jose E. Marchesi |
|
Subject: |
Re: [PATCH] Move libpoke/libpokeutils.la to libutils/libutils.la |
|
Date: |
Sun, 03 May 2020 14:53:33 +0200 |
|
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) |
2020-05-03 Tim Rühsen <address@hidden>
* Makefile.am: Add libutils to SUBDIRS.
* configure.ac: Add libutils/Makefile to AC_CONFIG_FILES.
* libutils/Makefile.am: New file.
* libpoke/pk-utils.c: Move to libutils/.
* libpoke/pk-utils.h: Likewise.
* libpoke/Makefile.am: Use libutils/libutils.la instead of
libpoke/libpokeutils.la.
* poke/Makefile.am: Likewise.
* po/POTFILES.in: Add libutils/pk-utils.[ch].
Hi Tim.
Very nice, thanks! :)
OK for master.
---
ChangeLog | 12 ++++++++++++
Makefile.am | 2 +-
configure.ac | 1 +
libpoke/Makefile.am | 11 +++--------
{libpoke => libutils}/pk-utils.c | 0
{libpoke => libutils}/pk-utils.h | 0
po/POTFILES.in | 5 +++--
poke/Makefile.am | 3 ++-
8 files changed, 22 insertions(+), 12 deletions(-)
rename {libpoke => libutils}/pk-utils.c (100%)
rename {libpoke => libutils}/pk-utils.h (100%)
diff --git a/ChangeLog b/ChangeLog
index eba484f1..7dee730d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2020-05-03 Tim Rühsen <address@hidden>
+
+ * Makefile.am: Add libutils to SUBDIRS.
+ * configure.ac: Add libutils/Makefile to AC_CONFIG_FILES.
+ * libutils/Makefile.am: New file.
+ * libpoke/pk-utils.c: Move to libutils/.
+ * libpoke/pk-utils.h: Likewise.
+ * libpoke/Makefile.am: Use libutils/libutils.la instead of
+ libpoke/libpokeutils.la.
+ * poke/Makefile.am: Likewise.
+ * po/POTFILES.in: Add libutils/pk-utils.[ch].
+
2020-05-03 Tim Rühsen <address@hidden>
* libpoke/Makefile.am: Add libgnu.la to libpoke_la_LIBADD.
diff --git a/Makefile.am b/Makefile.am
index dc794986..a59b5ef1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = jitter gl pickles libpoke poke doc man testsuite etc po
+SUBDIRS = jitter gl pickles libutils libpoke poke doc man testsuite etc po
noinst_SCRIPTS = run
diff --git a/configure.ac b/configure.ac
index 7a043510..5a135eec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -128,6 +128,7 @@ fi
dnl Generate output files
AC_CONFIG_FILES(Makefile
gl/Makefile
+ libutils/Makefile
libpoke/Makefile
poke/Makefile
pickles/Makefile
diff --git a/libpoke/Makefile.am b/libpoke/Makefile.am
index 4fce30cd..26dbb11d 100644
--- a/libpoke/Makefile.am
+++ b/libpoke/Makefile.am
@@ -22,7 +22,7 @@ MAINTAINERCLEANFILES =
dist_pkgdata_DATA = pkl-rt.pk std.pk
-lib_LTLIBRARIES = libpokeutils.la libpoke.la
+lib_LTLIBRARIES = libpoke.la
include_HEADERS = libpoke.h
@@ -76,12 +76,13 @@ MOSTLYCLEANFILES += pkl-tab.output
AM_LFLAGS = -d
libpoke_la_CPPFLAGS = -I$(top_builddir)/gl -I$(top_srcdir)/gl \
+ -I$(top_builddir)/libutils -I$(top_srcdir)/libutils \
-DPKL_DEBUG \
-DPKGDATADIR=\"$(pkgdatadir)\" \
-DPKGINFODIR=\"$(infodir)\" \
-DLOCALEDIR=\"$(localedir)\"
libpoke_la_CFLAGS = -Wall $(BDW_GC_CFLAGS) $(LIBNBD_CFLAGS)
-libpoke_la_LIBADD = ../gl/libgnu.la libpokeutils.la libpvmjitter.la \
+libpoke_la_LIBADD = ../gl/libgnu.la ../libutils/libutils.la
libpvmjitter.la \
$(BDW_GC_LIBS) \
$(LIBNBD_LIBS)
libpoke_la_LDFLAGS =
@@ -103,10 +104,4 @@ 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/pk-utils.c b/libutils/pk-utils.c
similarity index 100%
rename from libpoke/pk-utils.c
rename to libutils/pk-utils.c
diff --git a/libpoke/pk-utils.h b/libutils/pk-utils.h
similarity index 100%
rename from libpoke/pk-utils.h
rename to libutils/pk-utils.h
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 29a6a099..6d96ef2f 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -30,8 +30,6 @@ libpoke/pkl-trans.c
libpoke/pkl-trans.h
libpoke/pkl-typify.c
libpoke/pkl-typify.h
-libpoke/pk-utils.c
-libpoke/pk-utils.h
libpoke/pvm-alloc.c
libpoke/pvm-alloc.h
libpoke/pvm.c
@@ -41,6 +39,9 @@ libpoke/pvm-program.c
libpoke/pvm-program.h
libpoke/pvm-val.c
+libutils/pk-utils.c
+libutils/pk-utils.h
+
poke/pk-cmd.c
poke/pk-cmd.h
poke/pk-def.c
diff --git a/poke/Makefile.am b/poke/Makefile.am
index 533bc20f..0d3e8234 100644
--- a/poke/Makefile.am
+++ b/poke/Makefile.am
@@ -36,6 +36,7 @@ if HSERVER
endif
poke_CPPFLAGS = -I$(top_builddir)/gl -I$(top_srcdir)/gl \
+ -I$(top_srcdir)/libutils -I$(top_builddir)/libutils \
-I$(top_srcdir)/libpoke -I$(top_builddir)/libpoke \
-DJITTER_VERSION=\"$(JITTER_VERSION)\" \
-DPKGDATADIR=\"$(pkgdatadir)\" \
@@ -44,7 +45,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)/libutils/libutils.la \
$(top_builddir)/libpoke/libpoke.la \
$(LTLIBREADLINE) \
$(JITTER_LDADD) \
--
2.26.2