From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id BA303385842D for ; Sat, 5 Feb 2022 05:47:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org BA303385842D Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gentoo.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gentoo.org Received: by smtp.gentoo.org (Postfix, from userid 559) id 4E432342F9D; Sat, 5 Feb 2022 05:47:03 +0000 (UTC) From: Mike Frysinger To: newlib@sourceware.org Subject: [PATCH 3/5] libgloss: merge libgloss into top-level Makefile Date: Sat, 5 Feb 2022 00:46:54 -0500 Message-Id: <20220205054656.11443-4-vapier@gentoo.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220205054656.11443-1-vapier@gentoo.org> References: <20220205054656.11443-1-vapier@gentoo.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.6 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: newlib@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Newlib mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Feb 2022 05:47:05 -0000 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