[gentoo-commits] proj/portage-utils:master commit in: tests/rmspace/, /, tests/mkdir/, tests/atom_explode/, libq/, tests/copy_file/

[gentoo-commits] proj/portage-utils:master commit in: tests/rmspace/, /, tests/mkdir/, tests/atom_explode/, libq/, tests/copy_file/

[Fabian Groffen]

commit:     1ad6040d95a9c8733cec4388ac6cb3c73e8ddf0d
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 28 11:40:31 2022 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Aug 28 11:51:06 2022 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=1ad6040d

Remove libtool

* Libtool was only used for convenience libraries, which can
  be done in vanilla Automake. This allows passing `static`
  in LDFLAGS.

Bug: https://bugs.gentoo.org/841898
Signed-off-by: David Seifert <soap <AT> gentoo.org>
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 Makefile.am                    | 2 +-
 configure.ac                   | 3 +--
 libq/Makefile.am               | 6 +++---
 tests/atom_explode/Makefile.am | 2 +-
 tests/copy_file/Makefile.am    | 2 +-
 tests/mkdir/Makefile.am        | 2 +-
 tests/rmspace/Makefile.am      | 2 +-
 7 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 13a6044..7dbcf42 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -78,7 +78,7 @@ q_CPPFLAGS = \
 	$(LIBZ_CFLAGS) \
 	$(NULL)
 q_LDADD = \
-	$(top_builddir)/libq/libq.la \
+	$(top_builddir)/libq/libq.a \
 	$(top_builddir)/autotools/gnulib/libgnu.a \
 	$(OPENMP_CFLAGS) \
 	$(LIBSSL_LIBS) \

diff --git a/configure.ac b/configure.ac
index 5378795..9f892c6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,8 +21,7 @@ gl_EARLY
 gl_INIT
 
 AM_PROG_AR
-LT_INIT
-AC_SUBST([LIBTOOL_DEPS])
+AC_PROG_LN_S
 
 headers='#ifdef HAVE_STDDEF_H
 #include <stddef.h>

diff --git a/libq/Makefile.am b/libq/Makefile.am
index c0402a4..879d4a7 100644
--- a/libq/Makefile.am
+++ b/libq/Makefile.am
@@ -34,9 +34,9 @@ QFILES += hash_md5_sha1.c hash_md5_sha1.h
 endif
 endif
 
-noinst_LTLIBRARIES = libq.la
-libq_la_SOURCES = $(QFILES)
-libq_la_CPPFLAGS = \
+noinst_LIBRARIES = libq.a
+libq_a_SOURCES = $(QFILES)
+libq_a_CPPFLAGS = \
 	$(OPENMP_CFLAGS) \
 	-I$(top_builddir)/autotools/gnulib \
 	-I$(top_srcdir)/autotools/gnulib

diff --git a/tests/atom_explode/Makefile.am b/tests/atom_explode/Makefile.am
index ecdcc58..03f5754 100644
--- a/tests/atom_explode/Makefile.am
+++ b/tests/atom_explode/Makefile.am
@@ -7,7 +7,7 @@ e_CPPFLAGS = -I$(top_srcdir) \
 			 -I$(top_srcdir)/libq \
 			 -I$(top_builddir)/autotools/gnulib \
 			 -I$(top_srcdir)/autotools/gnulib
-e_LDADD = $(top_builddir)/libq/libq.la \
+e_LDADD = $(top_builddir)/libq/libq.a \
 		  $(top_builddir)/autotools/gnulib/libgnu.a \
 		  $(LIB_CLOCK_GETTIME) \
 		  $(LIB_EACCESS)

diff --git a/tests/copy_file/Makefile.am b/tests/copy_file/Makefile.am
index 5fbdf15..41bbc72 100644
--- a/tests/copy_file/Makefile.am
+++ b/tests/copy_file/Makefile.am
@@ -7,7 +7,7 @@ m_CPPFLAGS = -I$(top_srcdir) \
 			 -I$(top_srcdir)/libq \
 			 -I$(top_builddir)/autotools/gnulib \
 			 -I$(top_srcdir)/autotools/gnulib
-m_LDADD = $(top_builddir)/libq/libq.la \
+m_LDADD = $(top_builddir)/libq/libq.a \
 		  $(top_builddir)/autotools/gnulib/libgnu.a \
 		  $(LIB_CLOCK_GETTIME) \
 		  $(LIB_EACCESS) \

diff --git a/tests/mkdir/Makefile.am b/tests/mkdir/Makefile.am
index e9d1536..4b17004 100644
--- a/tests/mkdir/Makefile.am
+++ b/tests/mkdir/Makefile.am
@@ -7,7 +7,7 @@ m_CPPFLAGS = -I$(top_srcdir) \
 			 -I$(top_srcdir)/libq \
 			 -I$(top_builddir)/autotools/gnulib \
 			 -I$(top_srcdir)/autotools/gnulib
-m_LDADD = $(top_builddir)/libq/libq.la \
+m_LDADD = $(top_builddir)/libq/libq.a \
 		  $(top_builddir)/autotools/gnulib/libgnu.a \
 		  $(LIB_CLOCK_GETTIME) \
 		  $(LIB_EACCESS)

diff --git a/tests/rmspace/Makefile.am b/tests/rmspace/Makefile.am
index cb54f32..0cb689d 100644
--- a/tests/rmspace/Makefile.am
+++ b/tests/rmspace/Makefile.am
@@ -7,7 +7,7 @@ m_CPPFLAGS = -I$(top_srcdir) \
 			 -I$(top_srcdir)/libq \
 			 -I$(top_builddir)/autotools/gnulib \
 			 -I$(top_srcdir)/autotools/gnulib
-m_LDADD = $(top_builddir)/libq/libq.la \
+m_LDADD = $(top_builddir)/libq/libq.a \
 		  $(top_builddir)/autotools/gnulib/libgnu.a \
 		  $(LIB_CLOCK_GETTIME) \
 		  $(LIB_EACCESS)