diff options
| author |   David Seifert <soap@gentoo.org> | 2022-08-28 13:40:31 +0200 |
|---|---|---|
| committer |   Fabian Groffen <grobian@gentoo.org> | 2022-08-28 13:51:06 +0200 |
| commit | 1ad6040d95a9c8733cec4388ac6cb3c73e8ddf0d (patch) | |
| tree | 7c5d94823c7ead4fd322f5a33cab1e19f0ffa3fd | |
| parent | Use pkg-config for dependencies (diff) | |
| download | portage-utils-1ad6040d95a9c8733cec4388ac6cb3c73e8ddf0d.tar.gz portage-utils-1ad6040d95a9c8733cec4388ac6cb3c73e8ddf0d.tar.bz2 portage-utils-1ad6040d95a9c8733cec4388ac6cb3c73e8ddf0d.zip | |
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@gentoo.org>
Signed-off-by: Fabian Groffen <grobian@gentoo.org>
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | libq/Makefile.am | 6 | ||||
| -rw-r--r-- | tests/atom_explode/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/copy_file/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/mkdir/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/rmspace/Makefile.am | 2 |
7 files changed, 9 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am index 13a6044d..7dbcf42c 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 53787952..9f892c64 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 c0402a4a..879d4a71 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 ecdcc58a..03f57542 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 5fbdf154..41bbc720 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 e9d15365..4b170042 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 cb54f32f..0cb689d0 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) |