mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-27 03:41:23 +08:00
a5f891ac8d
In <https://sourceware.org/ml/libc-alpha/2014-01/msg00196.html> I noted it was necessary to add includes of Makeconfig early in various subdirectory makefiles for the tests-special variable settings added by that patch to be conditional on configuration information. No-one commented on the general question there of whether Makeconfig should always be included immediately after the definition of subdir. This patch implements that early inclusion of Makeconfig in each directory (which is a lot easier than consistent placement of includes of Rules). Includes are added if needed, or moved up if already present. Subdirectory "all:" targets are removed, since Makeconfig provides one. There is potential for further cleanups I haven't done. Rules and Makerules have code such as ifneq "$(findstring env,$(origin headers))" "" headers := endif to override to empty any value of various variables that came from the environment. I think there is a case for Makeconfig setting all the subdirectory variables (other than subdir) to empty to ensure no outside value is going to take effect if a subdirectory fails to define a variable. (A list of such variables, possibly out of date and incomplete, is in manual/maint.texi.) Rules and Makerules would give errors if Makeconfig hadn't already been included, instead of including it themselves. The special code to override values coming from the environment would then be obsolete and could be removed. Tested x86_64, including that installed binaries are identical before and after the patch. * argp/Makefile: Include Makeconfig immediately after defining subdir. * assert/Makefile: Likewise. * benchtests/Makefile: Likewise. * catgets/Makefile: Likewise. * conform/Makefile: Likewise. * crypt/Makefile: Likewise. * csu/Makefile: Likewise. (all): Remove target. * ctype/Makefile: Include Makeconfig immediately after defining subdir. * debug/Makefile: Likewise. * dirent/Makefile: Likewise. * dlfcn/Makefile: Likewise. * gmon/Makefile: Likewise. * gnulib/Makefile: Likewise. * grp/Makefile: Likewise. * gshadow/Makefile: Likewise. * hesiod/Makefile: Likewise. * hurd/Makefile: Likewise. (all): Remove target. * iconvdata/Makefile: Include Makeconfig immediately after defining subdir. * inet/Makefile: Likewise. * intl/Makefile: Likewise. * io/Makefile: Likewise. * libio/Makefile: Likewise. (all): Remove target. * locale/Makefile: Include Makeconfig immediately after defining subdir. * login/Makefile: Likewise. * mach/Makefile: Likewise. (all): Remove target. * malloc/Makefile: Include Makeconfig immediately after defining subdir. (all): Remove target. * manual/Makefile: Include Makeconfig immediately after defining subdir. * math/Makefile: Likewise. * misc/Makefile: Likewise. * nis/Makefile: Likewise. * nss/Makefile: Likewise. * po/Makefile: Likewise. (all): Remove target. * posix/Makefile: Include Makeconfig immediately after defining subdir. * pwd/Makefile: Likewise. * resolv/Makefile: Likewise. * resource/Makefile: Likewise. * rt/Makefile: Likewise. * setjmp/Makefile: Likewise. * shadow/Makefile: Likewise. * signal/Makefile: Likewise. * socket/Makefile: Likewise. * soft-fp/Makefile: Likewise. * stdio-common/Makefile: Likewise. * stdlib/Makefile: Likewise. * streams/Makefile: Likewise. * string/Makefile: Likewise. * sunrpc/Makefile: Likewise. (all): Remove target. * sysvipc/Makefile: Include Makeconfig immediately after defining subdir. * termios/Makefile: Likewise. * time/Makefile: Likewise. * timezone/Makefile: Likewise. (all): Remove target. * wcsmbs/Makefile: Include Makeconfig immediately after defining subdir. * wctype/Makefile: Likewise. libidn/ChangeLog: * Makefile: Include Makeconfig immediately after defining subdir. localedata/ChangeLog: * Makefile: Include Makeconfig immediately after defining subdir. (all): Remove target. nptl/ChangeLog: * Makefile: Include Makeconfig immediately after defining subdir. nptl_db/ChangeLog: * Makefile: Include Makeconfig immediately after defining subdir.
92 lines
3.2 KiB
Makefile
92 lines
3.2 KiB
Makefile
# Copyright (C) 1996-2014 Free Software Foundation, Inc.
|
|
# This file is part of the GNU C Library.
|
|
|
|
# The GNU C Library is free software; you can redistribute it and/or
|
|
# modify it under the terms of the GNU Lesser General Public
|
|
# License as published by the Free Software Foundation; either
|
|
# version 2.1 of the License, or (at your option) any later version.
|
|
|
|
# The GNU C Library 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
|
|
# Lesser General Public License for more details.
|
|
|
|
# You should have received a copy of the GNU Lesser General Public
|
|
# License along with the GNU C Library; if not, see
|
|
# <http://www.gnu.org/licenses/>.
|
|
|
|
#
|
|
# Makefile for NIS/NIS+ part.
|
|
#
|
|
subdir := nis
|
|
|
|
include ../Makeconfig
|
|
|
|
aux := nis_hash
|
|
|
|
ifeq ($(link-obsolete-rpc),yes)
|
|
headers := $(wildcard rpcsvc/*.[hx])
|
|
endif
|
|
|
|
# These are the databases available for the nis (and perhaps later nisplus)
|
|
# service. This must be a superset of the services in nss.
|
|
databases = proto service hosts network grp pwd rpc ethers \
|
|
spwd netgrp alias publickey
|
|
|
|
# Specify rules for the nss_* modules.
|
|
services := nis nisplus compat
|
|
|
|
extra-libs = libnsl $(services:%=libnss_%)
|
|
# These libraries will be built in the `others' pass rather than
|
|
# the `lib' pass, because they depend on libc.so being built already.
|
|
extra-libs-others = $(extra-libs)
|
|
|
|
# The sources are found in the appropriate subdir.
|
|
subdir-dirs = $(services:%=nss_%)
|
|
vpath %.c $(subdir-dirs)
|
|
|
|
libnsl-routines = yp_xdr ypclnt ypupdate_xdr \
|
|
nis_subr nis_local_names nis_free nis_file \
|
|
nis_print nis_error nis_call nis_lookup\
|
|
nis_table nis_xdr nis_server nis_ping \
|
|
nis_checkpoint nis_mkdir nis_rmdir nis_getservlist\
|
|
nis_verifygroup nis_ismember nis_addmember nis_util\
|
|
nis_removemember nis_creategroup nis_destroygroup\
|
|
nis_print_group_entry nis_domain_of nis_domain_of_r\
|
|
nis_modify nis_remove nis_add nis_defaults\
|
|
nis_findserv nis_callback nis_clone_dir nis_clone_obj\
|
|
nis_clone_res nss-default
|
|
|
|
libnss_compat-routines := $(addprefix compat-,grp pwd spwd initgroups)
|
|
libnss_compat-inhibit-o = $(filter-out .os,$(object-suffixes))
|
|
|
|
libnss_nis-routines := $(addprefix nis-,$(databases)) nis-initgroups \
|
|
nss-nis
|
|
libnss_nis-inhibit-o = $(filter-out .os,$(object-suffixes))
|
|
|
|
libnss_nisplus-routines := $(addprefix nisplus-,$(databases)) nisplus-parser \
|
|
nss-nisplus nisplus-initgroups
|
|
libnss_nisplus-inhibit-o = $(filter-out .os,$(object-suffixes))
|
|
|
|
include ../Rules
|
|
|
|
|
|
$(objpfx)libnss_compat.so: $(objpfx)libnsl.so$(libnsl.so-version)
|
|
$(objpfx)libnss_nis.so: $(objpfx)libnsl.so$(libnsl.so-version) \
|
|
$(common-objpfx)nss/libnss_files.so
|
|
$(objpfx)libnss_nisplus.so: $(objpfx)libnsl.so$(libnsl.so-version)
|
|
|
|
libnsl-libc = $(common-objpfx)linkobj/libc.so
|
|
# Target-specific variable setting to link objects using deprecated
|
|
# RPC interfaces with the version of libc.so that makes them available
|
|
# for new links:
|
|
$(services:%=$(objpfx)libnss_%.so) $(objpfx)libnsl.so: \
|
|
libc-for-link = $(libnsl-libc)
|
|
|
|
|
|
ifeq ($(build-shared),yes)
|
|
$(others:%=$(objpfx)%): $(objpfx)libnsl.so$(libnsl.so-version)
|
|
else
|
|
$(others:%=$(objpfx)%): $(objpfx)libnsl.a
|
|
endif
|