From 7fdc3cf046ee112b883752ea15ca8cb05444d12f Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 30 Jan 2016 14:20:57 -0800 Subject: Build lib/e-*.o only on platforms that need it * configure.ac (hybrid malloc): Simplify configuration. (SHEAP_OBJ): Remove; no longer needed. (HYBRID_MALLOC): New var. Subst it. (HYBRID_MALLOC_LIB): New Automake conditional. * lib/Makefile.am (noinst_LIBRARIES): Add libegnu.a only if HYBRID_MALLOC_LIB. (libegnu_a_CPPFLAGS): Omit AM_CPPFLAGS; not needed. (MOSTLYCLEANFILES): Add libegnu.a. * src/Makefile.in (SHEAP_OBJ): Remove. (HYBRID_MALLOC): New macro. (base_obj): Use it to conditionally add sheap.o. (LIBEGNU_ARCHIVE): New macro. ($(LIBEGNU_ARCHIVE)): New rule, replacing $(lib)/libegnu.a. All uses of the latter replaced by the former. * src/alloc.c (USE_ALIGNED_ALLOC): Simplify configuration. Correct misspelling ALIGNED_ALLOC to HAVE_ALIGNED_ALLOC. * src/gmalloc.c: Update comment. * src/lisp.h (aligned_alloc) [!DOUG_LEA_MALLOC && !HYBRID_MALLOC && !SYSTEM_MALLOC]: New decl. (Bug#22086) --- lib/Makefile.am | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/Makefile.am b/lib/Makefile.am index a1dd6a4ca90..74bab4eee06 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,3 +1,20 @@ +# Copyright 2016 Free Software Foundation, Inc. + +# This file is part of GNU Emacs. + +# GNU Emacs is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# GNU Emacs is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with GNU Emacs. If not, see . + BUILT_SOURCES = CLEANFILES = EXTRA_DIST = @@ -17,14 +34,16 @@ include gnulib.mk libgnu_a_SOURCES += openat-die.c save-cwd.c endif +if HYBRID_MALLOC_LIB noinst_LIBRARIES += libegnu.a +endif libegnu_a_SOURCES = $(libgnu_a_SOURCES) libegnu_a_LIBADD = $(patsubst %.o,e-%.o,$(libgnu_a_LIBADD)) EXTRA_libegnu_a_SOURCES = $(EXTRA_libgnu_a_SOURCES) libegnu_a_SHORTNAME = e - -libegnu_a_CPPFLAGS = $(AM_CPPFLAGS) -Demacs +libegnu_a_CPPFLAGS = -Demacs +MOSTLYCLEANFILES += libegnu.a .PHONY: bootstrap-clean -- cgit v1.2.1