mirror of
git://sourceware.org/git/glibc.git
synced 2024-12-09 04:11:27 +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
2.8 KiB
Makefile
90 lines
2.8 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 catgets.
|
|
#
|
|
subdir := catgets
|
|
|
|
include ../Makeconfig
|
|
|
|
headers = nl_types.h
|
|
routines = catgets open_catalog
|
|
others = gencat
|
|
install-bin = gencat
|
|
extra-objs = $(gencat-modules:=.o)
|
|
|
|
tests = tst-catgets
|
|
test-srcs = test-gencat
|
|
|
|
gencat-modules = xmalloc
|
|
|
|
# To find xmalloc.c
|
|
vpath %.c ../locale/programs
|
|
|
|
|
|
include ../Rules
|
|
|
|
$(objpfx)gencat: $(gencat-modules:%=$(objpfx)%.o)
|
|
|
|
catgets-CPPFLAGS := -DNLSPATH='"$(msgcatdir)/%L/%N:$(msgcatdir)/%L/LC_MESSAGES/%N:$(msgcatdir)/%l/%N:$(msgcatdir)/%l/LC_MESSAGES/%N:"' \
|
|
-DHAVE_CONFIG_H
|
|
|
|
CPPFLAGS-gencat = -DNOT_IN_libc
|
|
|
|
generated = de.msg test1.cat test1.h test2.cat test2.h sample.SJIS.cat \
|
|
test-gencat.h
|
|
generated-dirs = de
|
|
|
|
tst-catgets-ENV = NLSPATH="$(objpfx)%l/%N.cat" LANG=de
|
|
|
|
ifeq ($(run-built-tests),yes)
|
|
tests: $(objpfx)de/libc.cat $(objpfx)test1.cat $(objpfx)test2.cat \
|
|
$(objpfx)test-gencat.out
|
|
# This test just checks whether the program produces any error or not.
|
|
# The result is not tested.
|
|
$(objpfx)test1.cat: test1.msg $(objpfx)gencat
|
|
LC_ALL=hr_HR.ISO-8859-2 LOCPATH=$(common-objpfx)localedata \
|
|
GCONV_PATH=$(common-objpfx)iconvdata \
|
|
$(built-program-cmd) -H $(objpfx)test1.h $@ $<; \
|
|
$(evaluate-test)
|
|
$(objpfx)test2.cat: test2.msg $(objpfx)gencat
|
|
LOCPATH=$(common-objpfx)localedata \
|
|
GCONV_PATH=$(common-objpfx)iconvdata \
|
|
$(built-program-cmd) -H $(objpfx)test2.h $@ $<; \
|
|
$(evaluate-test)
|
|
$(objpfx)de/libc.cat: $(objpfx)de.msg $(objpfx)gencat
|
|
$(make-target-directory)
|
|
LC_ALL=de_DE.ISO-8859-1 LOCPATH=$(common-objpfx)localedata \
|
|
GCONV_PATH=$(common-objpfx)iconvdata $(built-program-cmd) $@ $<; \
|
|
$(evaluate-test)
|
|
$(objpfx)tst-catgets.out: $(objpfx)de/libc.cat
|
|
|
|
# Generate a non-simple input file.
|
|
$(objpfx)de.msg: xopen-msg.awk $(..)po/de.po
|
|
LC_ALL=C $(AWK) -f $^ $< > $@
|
|
|
|
$(objpfx)test-gencat.out: test-gencat.sh $(objpfx)test-gencat \
|
|
$(objpfx)sample.SJIS.cat
|
|
$(SHELL) $< $(common-objpfx) '$(test-program-cmd)'; \
|
|
$(evaluate-test)
|
|
|
|
$(objpfx)sample.SJIS.cat: sample.SJIS $(objpfx)gencat
|
|
GCONV_PATH=$(common-objpfx)iconvdata LC_ALL=C \
|
|
$(built-program-cmd) -H $(objpfx)test-gencat.h < $(word 1,$^) > $@
|
|
endif
|