From: Mike Frysinger <vapier@gentoo.org>
To: newlib@sourceware.org
Subject: [PATCH 3/5] libgloss: merge libgloss into top-level Makefile
Date: Sat, 5 Feb 2022 00:46:54 -0500 [thread overview]
Message-ID: <20220205054656.11443-4-vapier@gentoo.org> (raw)
In-Reply-To: <20220205054656.11443-1-vapier@gentoo.org>
Avoid a recursive make to speed things up a bit.
---
libgloss/Makefile.am | 13 ++
libgloss/Makefile.in | 384 ++++++++++++++++++++++++++++-----
libgloss/configure | 18 +-
libgloss/configure.ac | 5 +-
libgloss/libnosys/Makefile.in | 115 ----------
libgloss/libnosys/Makefile.inc | 27 +++
6 files changed, 383 insertions(+), 179 deletions(-)
delete mode 100644 libgloss/libnosys/Makefile.in
create mode 100644 libgloss/libnosys/Makefile.inc
diff --git a/libgloss/Makefile.am b/libgloss/Makefile.am
index 81ba50a70f8c..1209ec9d8d85 100644
--- a/libgloss/Makefile.am
+++ b/libgloss/Makefile.am
@@ -3,6 +3,7 @@
ACLOCAL_AMFLAGS = -I . -I .. -I ../config
# Variables that will accumulate in subdirs.
+check_PROGRAMS =
info_TEXINFOS =
PHONY =
@@ -10,6 +11,15 @@ SUBDIRS = @subdirs@ .
tooldir = $(exec_prefix)/$(target_alias)
+multilibtooldir = $(tooldir)/lib$(MULTISUBDIR)
+multilibtool_DATA =
+multilibtool_LIBRARIES =
+
+# A fake library so automake will generate rules for plain objects that we want
+# to install (e.g. our crt0.o objects).
+noinst_LIBRARIES = libobjs.a
+libobjs_a_SOURCES =
+
## These are roughly topologically sorted in order to make porting more
## streamlined.
FLAGS_TO_PASS = \
@@ -43,3 +53,6 @@ TEXINFO_TEX = ../texinfo/texinfo.tex
if HAVE_DOC
include doc/Makefile.inc
endif
+if CONFIG_LIBNOSYS
+include libnosys/Makefile.inc
+endif
diff --git a/libgloss/configure.ac b/libgloss/configure.ac
index 5657f094a197..1c04d92a44aa 100644
--- a/libgloss/configure.ac
+++ b/libgloss/configure.ac
@@ -230,10 +230,7 @@ dnl if test "${config_testsuite}" = "true";
dnl then AC_CONFIG_SUBDIRS([testsuite])
dnl fi
-if test "${config_libnosys}" = "true"; then
- AC_CONFIG_FILES([libnosys/Makefile])
- subdirs="$subdirs libnosys"
-fi
+AM_CONDITIONAL(CONFIG_LIBNOSYS, test x$config_libnosys = xtrue)
LIB_AC_PROG_CC
AS=${AS-as}
diff --git a/libgloss/libnosys/Makefile.inc b/libgloss/libnosys/Makefile.inc
new file mode 100644
index 000000000000..5e69072e7872
--- /dev/null
+++ b/libgloss/libnosys/Makefile.inc
@@ -0,0 +1,27 @@
+multilibtool_DATA += %D%/nosys.specs
+multilibtool_LIBRARIES += %D%/libnosys.a
+%C%_libnosys_a_SOURCES = \
+ %D%/chown.c \
+ %D%/close.c \
+ %D%/environ.c \
+ %D%/errno.c \
+ %D%/execve.c \
+ %D%/fork.c \
+ %D%/fstat.c \
+ %D%/getpid.c \
+ %D%/gettod.c \
+ %D%/isatty.c \
+ %D%/kill.c \
+ %D%/link.c \
+ %D%/lseek.c \
+ %D%/open.c \
+ %D%/read.c \
+ %D%/readlink.c \
+ %D%/sbrk.c \
+ %D%/stat.c \
+ %D%/symlink.c \
+ %D%/times.c \
+ %D%/unlink.c \
+ %D%/wait.c \
+ %D%/write.c \
+ %D%/_exit.c
--
2.34.1
next prev parent reply other threads:[~2022-02-05 5:47 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-05 5:46 [PATCH 0/5] start converting libgloss to non-recursive automake Mike Frysinger
2022-02-05 5:46 ` [PATCH 1/5] libgloss: convert top level to automake Mike Frysinger
2022-02-05 5:46 ` [PATCH 2/5] libgloss: merge doc into top-level Makefile Mike Frysinger
2022-02-05 5:46 ` Mike Frysinger [this message]
2022-02-07 11:14 ` [PATCH 3/5] libgloss: merge libgloss " Mike Frysinger
2022-02-07 11:49 ` Corinna Vinschen
2022-02-05 5:46 ` [PATCH 4/5] libgloss: merge iq2000 " Mike Frysinger
2022-02-05 5:46 ` [PATCH 5/5] libgloss: merge bfin " Mike Frysinger
2022-02-07 11:44 ` Corinna Vinschen
2022-02-07 12:07 ` Corinna Vinschen
2022-02-07 13:11 ` Mike Frysinger
2022-02-07 11:36 ` [PATCH 0/5] start converting libgloss to non-recursive automake Corinna Vinschen
2022-02-07 12:45 ` Mike Frysinger
2022-02-08 9:15 ` Corinna Vinschen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220205054656.11443-4-vapier@gentoo.org \
--to=vapier@gentoo.org \
--cc=newlib@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).