mirror of
git://sourceware.org/git/glibc.git
synced 2024-12-03 04:01:43 +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.
90 lines
3.2 KiB
Makefile
90 lines
3.2 KiB
Makefile
# Copyright (C) 1995-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/>.
|
|
|
|
#
|
|
# Sub-makefile for wcsmbs portion of the library.
|
|
#
|
|
subdir := wcsmbs
|
|
|
|
include ../Makeconfig
|
|
|
|
headers := wchar.h bits/wchar.h bits/wchar2.h bits/wchar-ldbl.h uchar.h
|
|
|
|
routines := wcscat wcschr wcscmp wcscpy wcscspn wcsdup wcslen wcsncat \
|
|
wcsncmp wcsncpy wcspbrk wcsrchr wcsspn wcstok wcsstr wmemchr \
|
|
wmemcmp wmemcpy wmemmove wmemset wcpcpy wcpncpy wmempcpy \
|
|
btowc wctob mbsinit \
|
|
mbrlen mbrtowc wcrtomb mbsrtowcs wcsrtombs \
|
|
mbsnrtowcs wcsnrtombs wcsnlen wcschrnul \
|
|
wcstol wcstoul wcstoll wcstoull wcstod wcstold wcstof \
|
|
wcstol_l wcstoul_l wcstoll_l wcstoull_l \
|
|
wcstod_l wcstold_l wcstof_l \
|
|
wcscoll wcsxfrm \
|
|
wcwidth wcswidth \
|
|
wcscoll_l wcsxfrm_l \
|
|
wcscasecmp wcsncase wcscasecmp_l wcsncase_l \
|
|
wcsmbsload mbsrtowcs_l \
|
|
isoc99_wscanf isoc99_vwscanf isoc99_fwscanf isoc99_vfwscanf \
|
|
isoc99_swscanf isoc99_vswscanf \
|
|
mbrtoc16 c16rtomb
|
|
|
|
strop-tests := wcscmp wmemcmp wcslen wcschr wcsrchr wcscpy
|
|
tests := tst-wcstof wcsmbs-tst1 tst-wcsnlen tst-btowc tst-mbrtowc \
|
|
tst-wcrtomb tst-wcpncpy tst-mbsrtowcs tst-wchar-h tst-mbrtowc2 \
|
|
tst-c16c32-1 wcsatcliff $(addprefix test-,$(strop-tests))
|
|
tests-ifunc := $(strop-tests:%=test-%-ifunc)
|
|
tests += $(tests-ifunc)
|
|
|
|
include ../Rules
|
|
|
|
CFLAGS-wcwidth.c = -I../wctype
|
|
CFLAGS-wcswidth.c = -I../wctype
|
|
|
|
strtox-CFLAGS = -I../include
|
|
CFLAGS-wcstol.c = $(strtox-CFLAGS)
|
|
CFLAGS-wcstoul.c = $(strtox-CFLAGS)
|
|
CFLAGS-wcstoll.c = $(strtox-CFLAGS)
|
|
CFLAGS-wcstoull.c = $(strtox-CFLAGS)
|
|
CFLAGS-wcstod.c = $(strtox-CFLAGS)
|
|
CFLAGS-wcstold.c = $(strtox-CFLAGS)
|
|
CFLAGS-wcstof.c = $(strtox-CFLAGS)
|
|
CFLAGS-wcstol_l.c = $(strtox-CFLAGS)
|
|
CFLAGS-wcstoul_l.c = $(strtox-CFLAGS)
|
|
CFLAGS-wcstoll_l.c = $(strtox-CFLAGS)
|
|
CFLAGS-wcstoull_l.c = $(strtox-CFLAGS)
|
|
CFLAGS-wcstod_l.c = $(strtox-CFLAGS)
|
|
CFLAGS-wcstold_l.c = $(strtox-CFLAGS)
|
|
CFLAGS-wcstof_l.c = $(strtox-CFLAGS)
|
|
CPPFLAGS-tst-wchar-h.c = -D_FORTIFY_SOURCE=2
|
|
|
|
CFLAGS-isoc99_wscanf.c += $(exceptions)
|
|
CFLAGS-isoc99_fwscanf.c += $(exceptions)
|
|
CFLAGS-isoc99_vwscanf.c += $(exceptions)
|
|
CFLAGS-isoc99_vfwscanf.c += $(exceptions)
|
|
|
|
CPPFLAGS += $(libio-mtsafe)
|
|
|
|
# We need to find the default version of strtold_l in stdlib.
|
|
CPPFLAGS-wcstold_l.c = -I../stdlib
|
|
|
|
tst-btowc-ENV = LOCPATH=$(common-objpfx)localedata
|
|
tst-mbrtowc-ENV = LOCPATH=$(common-objpfx)localedata
|
|
tst-wcrtomb-ENV = LOCPATH=$(common-objpfx)localedata
|
|
tst-mbrtowc2-ENV = LOCPATH=$(common-objpfx)localedata
|
|
tst-c16c32-1-ENV = LOCPATH=$(common-objpfx)localedata
|
|
tst-mbsnrtowcs-ENV = LOCPATH=$(common-objpfx)localedata
|