mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-11-29 07:58:28 +00:00
2f8935099c
This fixes some minor problems introduced in the recent switch to GNU Make, discovered by further testing. Without some of these changes 'make -j' would sometimes have race conditions caused by missing dependencies. (Bug#26100) * .gitignore: Remove src/stamp-h.in, src/stamp-h1. * Makefile.in ($(MAKEFILE_NAME)): Depend on configure, not src/config.in, since the former's timestamp now represents the latter's. ($(srcdir)/configure): Use plain ./autogen.sh, for consistency with other autogen.sh invocations. ($(srcdir)/src/stamp-h.in): Remove rule, as this file is no longer created. * Makefile.in (top_distclean): * src/Makefile.in (bootstrap-clean): No need to remove stamp-h1, as that was an Automake byproduct and Automake is no longer in use. * lib/Makefile.in, src/Makefile.in: (AUTOCONF_INPUTS, $(top_srcdir)/configure): Remove. (../config.status, Makefile): Simplify by limiting dependencies to files we care about and files in the repository, and by using just one file to represent the timestamps on multiple targets updated by the same rule. * autogen.sh: Do not create or use src/stamp-h.in. Instead, have 'find' test the two output files directly.
65 lines
2.8 KiB
Makefile
65 lines
2.8 KiB
Makefile
# Configurations for ../lib/gnulib.mk.
|
|
#
|
|
# Copyright 2017 Free Software Foundation, Inc.
|
|
#
|
|
# This file 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.
|
|
#
|
|
# This file 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 this file. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
|
# Gnulib modules to be omitted from Emacs.
|
|
|
|
# Omit them because they either conflict with MinGW headers or
|
|
# headers in nt/inc, or because those modules won't compile with
|
|
# MinGW, or because Emacs already has the corresponding facilities as
|
|
# part of Emacs sources, and their implementation is incompatible with
|
|
# Gnulib's.
|
|
#
|
|
# In general, do NOT omit modules that
|
|
# don't need to be omitted, to minimize the differences from
|
|
# upstream gnulib.mk and thus make the maintenance easier. Every
|
|
# header file whose generation is controlled by configure-time tests
|
|
# does NOT need to be removed; instead, force the configure script to
|
|
# accept whatever MinGW has to offer, by defining the appropriate
|
|
# Autoconf variable in the nt/mingw-cfg.site file. Headers that are
|
|
# generated conditionally have the tell-tale "ifneq (,$(GL_GENERATE_foo_H))"
|
|
# condition before their Makefile snippet in this file. Likewise, do
|
|
# NOT remove gnulib modules which introduce header files that don't
|
|
# exist in MinGW and in nt/inc/, since they cannot possibly clash
|
|
# with anything. Gnulib modules that introduce source *.c files also
|
|
# need not be removed; if they define functions that could clash with
|
|
# the w32 substitutes in Emacs, disable their compilation by defining
|
|
# suitable variables in nt/mingw-cfg.site.
|
|
# ----------------------------------------------------------------------
|
|
|
|
OMIT_GNULIB_MODULE_acl-permissions = true
|
|
OMIT_GNULIB_MODULE_allocator = true
|
|
OMIT_GNULIB_MODULE_at-internal = true
|
|
OMIT_GNULIB_MODULE_careadlinkat = true
|
|
OMIT_GNULIB_MODULE_dirent = true
|
|
OMIT_GNULIB_MODULE_dirfd = true
|
|
OMIT_GNULIB_MODULE_fcntl = true
|
|
OMIT_GNULIB_MODULE_fcntl-h = true
|
|
OMIT_GNULIB_MODULE_inttypes-incomplete = true
|
|
OMIT_GNULIB_MODULE_mkostemp = true
|
|
OMIT_GNULIB_MODULE_pipe2 = true
|
|
OMIT_GNULIB_MODULE_secure_getenv = true
|
|
OMIT_GNULIB_MODULE_signal-h = true
|
|
OMIT_GNULIB_MODULE_stdio = true
|
|
OMIT_GNULIB_MODULE_stdlib = true
|
|
OMIT_GNULIB_MODULE_sys_select = true
|
|
OMIT_GNULIB_MODULE_sys_stat = true
|
|
OMIT_GNULIB_MODULE_sys_time = true
|
|
OMIT_GNULIB_MODULE_sys_types = true
|
|
OMIT_GNULIB_MODULE_tempname = true
|
|
OMIT_GNULIB_MODULE_unistd = true
|