1
0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-30 22:43:12 +03:00

Consistently include Makeconfig after defining subdir.

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.
This commit is contained in:
Joseph Myers
2014-02-26 23:12:03 +00:00
parent cf822e3c94
commit a5f891ac8d
62 changed files with 205 additions and 76 deletions

View File

@ -1,3 +1,76 @@
2014-02-26 Joseph Myers <joseph@codesourcery.com>
* 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.
2014-02-26 Steve Ellcey <sellcey@mips.com> 2014-02-26 Steve Ellcey <sellcey@mips.com>
* sysdeps/mips/math_private.h (_FPU_MASK_ALL) New. * sysdeps/mips/math_private.h (_FPU_MASK_ALL) New.

View File

@ -20,6 +20,8 @@
# #
subdir := argp subdir := argp
include ../Makeconfig
headers = argp.h headers = argp.h
routines = $(addprefix argp-, ba fmtstream fs-xinl help parse pv \ routines = $(addprefix argp-, ba fmtstream fs-xinl help parse pv \
pvh xinl eexst) pvh xinl eexst)

View File

@ -19,6 +19,9 @@
# Sub-makefile for assert portion of the library. # Sub-makefile for assert portion of the library.
# #
subdir := assert subdir := assert
include ../Makeconfig
headers := assert.h headers := assert.h
routines := assert assert-perr __assert routines := assert assert-perr __assert

View File

@ -20,6 +20,9 @@
# Add benchmark functions in alphabetical order. # Add benchmark functions in alphabetical order.
subdir := benchtests subdir := benchtests
include ../Makeconfig
bench := acos acosh asin asinh atan atanh cos cosh exp exp2 log log2 modf pow \ bench := acos acosh asin asinh atan atanh cos cosh exp exp2 log log2 modf pow \
rint sin sincos sinh sqrt tan tanh rint sin sincos sinh sqrt tan tanh
@ -65,7 +68,6 @@ LDLIBS-bench-sincos = -lm
# affect their performance. # affect their performance.
.NOTPARALLEL: .NOTPARALLEL:
include ../Makeconfig
include ../Rules include ../Rules
binaries-bench := $(addprefix $(objpfx)bench-,$(bench)) binaries-bench := $(addprefix $(objpfx)bench-,$(bench))

View File

@ -20,6 +20,8 @@
# #
subdir := catgets subdir := catgets
include ../Makeconfig
headers = nl_types.h headers = nl_types.h
routines = catgets open_catalog routines = catgets open_catalog
others = gencat others = gencat

View File

@ -20,6 +20,8 @@
# #
subdir := conform subdir := conform
include ../Makeconfig
include ../Rules include ../Rules
ifneq (yes,$(fast-check)) ifneq (yes,$(fast-check))

View File

@ -20,6 +20,8 @@
# #
subdir := crypt subdir := crypt
include ../Makeconfig
headers := crypt.h headers := crypt.h
extra-libs := libcrypt extra-libs := libcrypt
@ -30,8 +32,6 @@ libcrypt-routines := crypt-entry md5-crypt sha256-crypt sha512-crypt crypt \
tests := cert md5c-test sha256c-test sha512c-test badsalttest tests := cert md5c-test sha256c-test sha512c-test badsalttest
include ../Makeconfig
ifeq ($(crypt-in-libc),yes) ifeq ($(crypt-in-libc),yes)
routines += $(libcrypt-routines) routines += $(libcrypt-routines)
endif endif

View File

@ -24,6 +24,8 @@
subdir := csu subdir := csu
include ../Makeconfig
routines = init-first libc-start $(libc-init) sysdep version check_fds \ routines = init-first libc-start $(libc-init) sysdep version check_fds \
libc-tls elf-init dso_handle libc-tls elf-init dso_handle
aux = errno aux = errno
@ -43,10 +45,6 @@ before-compile = $(objpfx)version-info.h
tests := tst-empty tst-atomic tst-atomic-long tests := tst-empty tst-atomic tst-atomic-long
tests-static := tst-empty tests-static := tst-empty
all: # Make this the default target; it will be defined in Rules.
include ../Makeconfig
ifeq (yes,$(build-shared)) ifeq (yes,$(build-shared))
extra-objs += S$(start-installed-name) extra-objs += S$(start-installed-name)
install-lib += S$(start-installed-name) install-lib += S$(start-installed-name)

View File

@ -19,6 +19,9 @@
# Sub-makefile for ctype portion of the library. # Sub-makefile for ctype portion of the library.
# #
subdir := ctype subdir := ctype
include ../Makeconfig
headers := ctype.h headers := ctype.h
routines := ctype ctype-extn ctype_l isctype routines := ctype ctype-extn ctype_l isctype

View File

@ -20,6 +20,8 @@
# #
subdir := debug subdir := debug
include ../Makeconfig
headers := execinfo.h headers := execinfo.h
# Note that ptsname_r_chk and getlogin_r are not here, but in # Note that ptsname_r_chk and getlogin_r are not here, but in
@ -161,8 +163,6 @@ others = pcprofiledump
install-bin = pcprofiledump install-bin = pcprofiledump
install-bin-script = xtrace install-bin-script = xtrace
include ../Makeconfig
ifeq ($(build-shared),yes) ifeq ($(build-shared),yes)
install-bin-script += catchsegv install-bin-script += catchsegv
endif endif

View File

@ -20,6 +20,8 @@
# #
subdir := dirent subdir := dirent
include ../Makeconfig
headers := dirent.h bits/dirent.h headers := dirent.h bits/dirent.h
routines := opendir closedir readdir readdir_r rewinddir \ routines := opendir closedir readdir readdir_r rewinddir \
seekdir telldir scandir alphasort versionsort \ seekdir telldir scandir alphasort versionsort \

View File

@ -16,6 +16,9 @@
# <http://www.gnu.org/licenses/>. # <http://www.gnu.org/licenses/>.
subdir := dlfcn subdir := dlfcn
include ../Makeconfig
headers := bits/dlfcn.h dlfcn.h headers := bits/dlfcn.h dlfcn.h
extra-libs := libdl extra-libs := libdl
libdl-routines := dlopen dlclose dlsym dlvsym dlerror dladdr dladdr1 dlinfo \ libdl-routines := dlopen dlclose dlsym dlvsym dlerror dladdr dladdr1 dlinfo \
@ -25,8 +28,6 @@ elide-routines.os := $(routines)
extra-libs-others := libdl extra-libs-others := libdl
include ../Makeconfig
ifeq ($(build-shared),yes) ifeq ($(build-shared),yes)
libdl-routines += dlopenold libdl-routines += dlopenold
libdl-shared-only-routines := dlopenold dlfcn libdl-shared-only-routines := dlopenold dlfcn

View File

@ -20,13 +20,13 @@
# #
subdir := gmon subdir := gmon
include ../Makeconfig
headers := sys/gmon.h sys/gmon_out.h sys/profil.h headers := sys/gmon.h sys/gmon_out.h sys/profil.h
routines := gmon mcount profil sprofil bb_init_func bb_exit_func prof-freq routines := gmon mcount profil sprofil bb_init_func bb_exit_func prof-freq
elide-routines.os = bb_init_func bb_exit_func elide-routines.os = bb_init_func bb_exit_func
include ../Makeconfig
tests = tst-sprofil tests = tst-sprofil
ifeq ($(build-profile),yes) ifeq ($(build-profile),yes)
tests += tst-profile-static tests += tst-profile-static

View File

@ -17,6 +17,8 @@
subdir := gnulib subdir := gnulib
include ../Makeconfig
# Maybe this is the right place for a test of gcc's interface. # Maybe this is the right place for a test of gcc's interface.
tests = tst-gcc tests = tst-gcc

View File

@ -19,14 +19,15 @@
# Sub-makefile for grp portion of the library. # Sub-makefile for grp portion of the library.
# #
subdir := grp subdir := grp
include ../Makeconfig
headers := grp.h headers := grp.h
routines := fgetgrent initgroups setgroups \ routines := fgetgrent initgroups setgroups \
getgrent getgrgid getgrnam putgrent \ getgrent getgrgid getgrnam putgrent \
getgrent_r getgrgid_r getgrnam_r fgetgrent_r getgrent_r getgrgid_r getgrnam_r fgetgrent_r
include ../Makeconfig
tests := testgrp tests := testgrp
ifeq (yes,$(build-shared)) ifeq (yes,$(build-shared))

View File

@ -20,6 +20,8 @@
# #
subdir := gshadow subdir := gshadow
include ../Makeconfig
headers = gshadow.h headers = gshadow.h
routines = getsgent getsgnam sgetsgent fgetsgent putsgent \ routines = getsgent getsgnam sgetsgent fgetsgent putsgent \
getsgent_r getsgnam_r sgetsgent_r fgetsgent_r getsgent_r getsgnam_r sgetsgent_r fgetsgent_r

View File

@ -20,6 +20,8 @@
# #
subdir := hesiod subdir := hesiod
include ../Makeconfig
extra-libs := libnss_hesiod extra-libs := libnss_hesiod
extra-libs-others = $(extra-libs) extra-libs-others = $(extra-libs)

View File

@ -17,12 +17,8 @@
subdir := hurd subdir := hurd
all:
# Some things below (but before including Rules) use configuration variables.
include ../Makeconfig include ../Makeconfig
headers = hurd.h $(interface-headers) \ headers = hurd.h $(interface-headers) \
$(addprefix hurd/,fd.h id.h port.h signal.h sigpreempt.h ioctl.h\ $(addprefix hurd/,fd.h id.h port.h signal.h sigpreempt.h ioctl.h\
userlink.h resource.h threadvar.h lookup.h) userlink.h resource.h threadvar.h lookup.h)

View File

@ -20,6 +20,8 @@
# #
subdir := iconvdata subdir := iconvdata
include ../Makeconfig
# Names of all the shared objects which implement the transformations. # Names of all the shared objects which implement the transformations.
modules := ISO8859-1 ISO8859-2 ISO8859-3 ISO8859-4 ISO8859-5 \ modules := ISO8859-1 ISO8859-2 ISO8859-3 ISO8859-4 ISO8859-5 \
ISO8859-6 ISO8859-7 ISO8859-8 ISO8859-9 ISO8859-10 \ ISO8859-6 ISO8859-7 ISO8859-8 ISO8859-9 ISO8859-10 \
@ -63,8 +65,6 @@ modules := ISO8859-1 ISO8859-2 ISO8859-3 ISO8859-4 ISO8859-5 \
modules.so := $(addsuffix .so, $(modules)) modules.so := $(addsuffix .so, $(modules))
include ../Makeconfig
ifeq (yes,$(build-shared)) ifeq (yes,$(build-shared))
tests = bug-iconv1 bug-iconv2 tst-loading tst-e2big tst-iconv4 bug-iconv4 \ tests = bug-iconv1 bug-iconv2 tst-loading tst-e2big tst-iconv4 bug-iconv4 \
tst-iconv6 bug-iconv5 bug-iconv6 tst-iconv7 bug-iconv8 bug-iconv9 tst-iconv6 bug-iconv5 bug-iconv6 tst-iconv7 bug-iconv8 bug-iconv9

View File

@ -20,6 +20,8 @@
# #
subdir := inet subdir := inet
include ../Makeconfig
headers := netinet/ether.h netinet/in.h netinet/in_systm.h \ headers := netinet/ether.h netinet/in.h netinet/in_systm.h \
netinet/if_ether.h netinet/igmp.h \ netinet/if_ether.h netinet/igmp.h \
netinet/tcp.h netinet/ip.h $(wildcard arpa/*.h protocols/*.h) \ netinet/tcp.h netinet/ip.h $(wildcard arpa/*.h protocols/*.h) \

View File

@ -18,14 +18,15 @@
# Makefile for intl subdirectory: message handling code from GNU gettext. # Makefile for intl subdirectory: message handling code from GNU gettext.
subdir = intl subdir = intl
include ../Makeconfig
headers = libintl.h headers = libintl.h
routines = bindtextdom dcgettext dgettext gettext \ routines = bindtextdom dcgettext dgettext gettext \
dcigettext dcngettext dngettext ngettext \ dcigettext dcngettext dngettext ngettext \
finddomain loadmsgcat localealias textdomain finddomain loadmsgcat localealias textdomain
aux = l10nflist explodename plural plural-exp hash-string aux = l10nflist explodename plural plural-exp hash-string
include ../Makeconfig
multithread-test-srcs := tst-gettext4 tst-gettext5 tst-gettext6 multithread-test-srcs := tst-gettext4 tst-gettext5 tst-gettext6
test-srcs := tst-gettext tst-translit tst-gettext2 tst-codeset tst-gettext3 test-srcs := tst-gettext tst-translit tst-gettext2 tst-codeset tst-gettext3
ifeq ($(have-thread-library),yes) ifeq ($(have-thread-library),yes)

View File

@ -20,6 +20,8 @@
# #
subdir := io subdir := io
include ../Makeconfig
headers := sys/stat.h bits/stat.h sys/statfs.h bits/statfs.h sys/vfs.h \ headers := sys/stat.h bits/stat.h sys/statfs.h bits/statfs.h sys/vfs.h \
sys/statvfs.h bits/statvfs.h fcntl.h sys/fcntl.h bits/fcntl.h \ sys/statvfs.h bits/statvfs.h fcntl.h sys/fcntl.h bits/fcntl.h \
poll.h sys/poll.h bits/poll.h bits/fcntl2.h bits/poll2.h \ poll.h sys/poll.h bits/poll.h bits/fcntl2.h bits/poll2.h \

View File

@ -1,3 +1,7 @@
2014-02-26 Joseph Myers <joseph@codesourcery.com>
* Makefile: Include Makeconfig immediately after defining subdir.
2013-10-30 Mike Frysinger <vapier@gentoo.org> 2013-10-30 Mike Frysinger <vapier@gentoo.org>
* configure.in: Moved to ... * configure.in: Moved to ...

View File

@ -19,6 +19,8 @@
subdir := libidn subdir := libidn
include ../Makeconfig
routines = idn-stub routines = idn-stub
extra-libs = libcidn extra-libs = libcidn
@ -27,9 +29,6 @@ extra-libs-others = $(extra-libs)
libcidn-routines := punycode toutf8 nfkc stringprep rfc3454 profiles idna \ libcidn-routines := punycode toutf8 nfkc stringprep rfc3454 profiles idna \
iconvme iconvme
include $(..)Makeconfig
libcidn-inhibit-o = $(filter-out .os,$(object-suffixes)) libcidn-inhibit-o = $(filter-out .os,$(object-suffixes))
include $(..)Rules include $(..)Rules

View File

@ -20,6 +20,8 @@
# #
subdir := libio subdir := libio
include ../Makeconfig
headers := stdio.h libio.h _G_config.h bits/stdio.h bits/stdio-lock.h \ headers := stdio.h libio.h _G_config.h bits/stdio.h bits/stdio-lock.h \
bits/sys_errlist.h bits/stdio2.h bits/stdio-ldbl.h bits/libio-ldbl.h bits/sys_errlist.h bits/stdio2.h bits/stdio-ldbl.h bits/libio-ldbl.h
@ -46,8 +48,6 @@ routines := \
\ \
libc_fatal fmemopen libc_fatal fmemopen
include ../Makeconfig
tests = tst_swprintf tst_wprintf tst_swscanf tst_wscanf tst_getwc tst_putwc \ tests = tst_swprintf tst_wprintf tst_swscanf tst_wscanf tst_getwc tst_putwc \
tst_wprintf2 tst-widetext test-fmemopen tst-ext tst-ext2 \ tst_wprintf2 tst-widetext test-fmemopen tst-ext tst-ext2 \
tst-fgetws tst-ungetwc1 tst-ungetwc2 tst-swscanf tst-sscanf \ tst-fgetws tst-ungetwc1 tst-ungetwc2 tst-swscanf tst-sscanf \
@ -68,8 +68,6 @@ tests += tst-fopenloc
endif endif
test-srcs = test-freopen test-srcs = test-freopen
all: # Make this the default target; it will be defined in Rules.
ifeq ($(build-shared),yes) ifeq ($(build-shared),yes)
routines += oldiofopen oldiofdopen oldiofclose oldiopopen oldpclose \ routines += oldiofopen oldiofdopen oldiofclose oldiopopen oldpclose \
oldtmpfile oldiofgetpos oldiofgetpos64 oldiofsetpos \ oldtmpfile oldiofgetpos oldiofgetpos64 oldiofsetpos \

View File

@ -20,6 +20,8 @@
# #
subdir := locale subdir := locale
include ../Makeconfig
headers = locale.h bits/locale.h langinfo.h xlocale.h headers = locale.h bits/locale.h langinfo.h xlocale.h
routines = setlocale findlocale loadlocale loadarchive \ routines = setlocale findlocale loadlocale loadarchive \
localeconv nl_langinfo nl_langinfo_l mb_cur_max \ localeconv nl_langinfo nl_langinfo_l mb_cur_max \

View File

@ -1,3 +1,8 @@
2014-02-26 Joseph Myers <joseph@codesourcery.com>
* Makefile: Include Makeconfig immediately after defining subdir.
(all): Remove target.
2014-02-21 Joseph Myers <joseph@codesourcery.com> 2014-02-21 Joseph Myers <joseph@codesourcery.com>
* Makefile ($(objpfx)sort-test.out): Use $(evaluate-test). * Makefile ($(objpfx)sort-test.out): Use $(evaluate-test).

View File

@ -19,7 +19,7 @@
subdir := localedata subdir := localedata
all: # Make this the default target; it will be defined in Rules. include ../Makeconfig
# List with all available character set descriptions. # List with all available character set descriptions.
charmaps := $(wildcard charmaps/[A-I]*) $(wildcard charmaps/[J-Z]*) charmaps := $(wildcard charmaps/[A-I]*) $(wildcard charmaps/[J-Z]*)
@ -56,9 +56,6 @@ generated := $(test-input) $(test-output) sort-test.out tst-locale.out \
generated-dirs := $(ld-test-names) tt_TT de_DE.437 \ generated-dirs := $(ld-test-names) tt_TT de_DE.437 \
$(addprefix tstfmon_,$(fmon-tests)) \ $(addprefix tstfmon_,$(fmon-tests)) \
# Get $(inst_i18ndir) defined.
include ../Makeconfig
ifeq ($(run-built-tests),yes) ifeq ($(run-built-tests),yes)
locale_test_suite := tst_iswalnum tst_iswalpha tst_iswcntrl \ locale_test_suite := tst_iswalnum tst_iswalpha tst_iswcntrl \
tst_iswctype tst_iswdigit tst_iswgraph \ tst_iswctype tst_iswdigit tst_iswgraph \

View File

@ -21,6 +21,8 @@
subdir := login subdir := login
include ../Makeconfig
headers := utmp.h bits/utmp.h lastlog.h pty.h headers := utmp.h bits/utmp.h lastlog.h pty.h
routines := getlogin getlogin_r setlogin getlogin_r_chk \ routines := getlogin getlogin_r setlogin getlogin_r_chk \
@ -32,8 +34,6 @@ CFLAGS-grantpt.c = -DLIBEXECDIR='"$(libexecdir)"'
others = utmpdump others = utmpdump
include ../Makeconfig
ifeq (yes,$(build-pt-chown)) ifeq (yes,$(build-pt-chown))
others += pt_chown others += pt_chown
others-pie = pt_chown others-pie = pt_chown

View File

@ -17,12 +17,8 @@
subdir := mach subdir := mach
all:
# Some things below (but before including Rules) use configuration variables.
include ../Makeconfig include ../Makeconfig
headers = mach_init.h mach.h mach_error.h mach-shortcuts.h mach/mach_traps.h \ headers = mach_init.h mach.h mach_error.h mach-shortcuts.h mach/mach_traps.h \
$(interface-headers) mach/mach.h mach/mig_support.h mach/error.h \ $(interface-headers) mach/mach.h mach/mig_support.h mach/error.h \
$(lock-headers) machine-sp.h $(lock-headers) machine-sp.h

View File

@ -20,7 +20,7 @@
# #
subdir := malloc subdir := malloc
all: include ../Makeconfig
dist-headers := malloc.h dist-headers := malloc.h
headers := $(dist-headers) obstack.h mcheck.h headers := $(dist-headers) obstack.h mcheck.h
@ -48,8 +48,6 @@ extra-objs = mcheck-init.o libmcheck.a
# Include the cleanup handler. # Include the cleanup handler.
aux := set-freeres thread-freeres aux := set-freeres thread-freeres
include ../Makeconfig
CPPFLAGS-memusagestat = -DNOT_IN_libc CPPFLAGS-memusagestat = -DNOT_IN_libc
# The Perl script to analyze the output of the mtrace functions. # The Perl script to analyze the output of the mtrace functions.

View File

@ -19,14 +19,13 @@
subdir := manual subdir := manual
include ../Makeconfig
# Allow override # Allow override
INSTALL_INFO = install-info INSTALL_INFO = install-info
.PHONY: dvi pdf info html .PHONY: dvi pdf info html
# Get glibc's configuration info.
include ../Makeconfig
dvi: $(objpfx)libc.dvi dvi: $(objpfx)libc.dvi
pdf: $(objpfx)libc.pdf pdf: $(objpfx)libc.pdf

View File

@ -19,6 +19,8 @@
subdir := math subdir := math
include ../Makeconfig
# Installed header files. # Installed header files.
headers := math.h bits/mathcalls.h bits/mathinline.h bits/huge_val.h \ headers := math.h bits/mathcalls.h bits/mathinline.h bits/huge_val.h \
bits/huge_valf.h bits/huge_vall.h bits/inf.h bits/nan.h \ bits/huge_valf.h bits/huge_vall.h bits/inf.h bits/nan.h \
@ -61,8 +63,6 @@ libm-calls = e_acos e_acosh e_asin e_atan2 e_atanh e_cosh e_exp e_fmod \
s_isinf_ns s_issignaling $(calls:s_%=m_%) x2y2m1 k_casinh \ s_isinf_ns s_issignaling $(calls:s_%=m_%) x2y2m1 k_casinh \
gamma_product gamma_product
include ../Makeconfig
dbl-only-routines := branred doasin dosincos halfulp mpa mpatan2 \ dbl-only-routines := branred doasin dosincos halfulp mpa mpatan2 \
mpatan mpexp mplog mpsqrt mptan sincos32 slowexp \ mpatan mpexp mplog mpsqrt mptan sincos32 slowexp \
slowpow sincostab slowpow sincostab

View File

@ -21,6 +21,8 @@
subdir := misc subdir := misc
include ../Makeconfig
headers := sys/uio.h bits/uio.h sys/ioctl.h bits/ioctls.h bits/ioctl-types.h \ headers := sys/uio.h bits/uio.h sys/ioctl.h bits/ioctls.h bits/ioctl-types.h \
sys/ptrace.h sys/file.h sys/dir.h sys/cdefs.h \ sys/ptrace.h sys/file.h sys/dir.h sys/cdefs.h \
ar.h a.out.h libgen.h stab.h bits/stab.def sgtty.h \ ar.h a.out.h libgen.h stab.h bits/stab.def sgtty.h \
@ -69,8 +71,6 @@ routines := brk sbrk sstk ioctl \
generated := tst-error1.mtrace tst-error1-mem generated := tst-error1.mtrace tst-error1-mem
include ../Makeconfig
aux := init-misc aux := init-misc
install-lib := libg.a install-lib := libg.a
gpl2lgpl := error.c error.h gpl2lgpl := error.c error.h

View File

@ -20,10 +20,10 @@
# #
subdir := nis subdir := nis
aux := nis_hash
include ../Makeconfig include ../Makeconfig
aux := nis_hash
ifeq ($(link-obsolete-rpc),yes) ifeq ($(link-obsolete-rpc),yes)
headers := $(wildcard rpcsvc/*.[hx]) headers := $(wildcard rpcsvc/*.[hx])
endif endif

View File

@ -1,3 +1,7 @@
2014-02-26 Joseph Myers <joseph@codesourcery.com>
* Makefile: Include Makeconfig immediately after defining subdir.
2014-02-21 Joseph Myers <joseph@codesourcery.com> 2014-02-21 Joseph Myers <joseph@codesourcery.com>
* Makefile ($(objpfx)tst-stack3-mem): Use $(evaluate-test). * Makefile ($(objpfx)tst-stack3-mem): Use $(evaluate-test).

View File

@ -20,6 +20,8 @@
# #
subdir := nptl subdir := nptl
include ../Makeconfig
headers := pthread.h semaphore.h bits/semaphore.h headers := pthread.h semaphore.h bits/semaphore.h
extra-libs := libpthread extra-libs := libpthread
@ -282,8 +284,6 @@ LDFLAGS-pthread.so = -Wl,--enable-new-dtags,-z,nodelete,-z,initfirst
CFLAGS-tst-cleanup2.c = -fno-builtin CFLAGS-tst-cleanup2.c = -fno-builtin
CFLAGS-tst-cleanupx2.c = -fno-builtin CFLAGS-tst-cleanupx2.c = -fno-builtin
include ../Makeconfig
ifeq ($(have-forced-unwind),yes) ifeq ($(have-forced-unwind),yes)
tests += tst-cancelx2 tst-cancelx3 tst-cancelx4 tst-cancelx5 \ tests += tst-cancelx2 tst-cancelx3 tst-cancelx4 tst-cancelx5 \
tst-cancelx6 tst-cancelx7 tst-cancelx8 tst-cancelx9 tst-cancelx10 \ tst-cancelx6 tst-cancelx7 tst-cancelx8 tst-cancelx9 tst-cancelx10 \

View File

@ -1,3 +1,7 @@
2014-02-26 Joseph Myers <joseph@codesourcery.com>
* Makefile: Include Makeconfig immediately after defining subdir.
2014-02-21 Joseph Myers <joseph@codesourcery.com> 2014-02-21 Joseph Myers <joseph@codesourcery.com>
* Makefile ($(objpfx)db-symbols.out): Use * Makefile ($(objpfx)db-symbols.out): Use

View File

@ -19,6 +19,8 @@
subdir := nptl_db subdir := nptl_db
include ../Makeconfig
nptl_db-version = 1.0 nptl_db-version = 1.0
extra-libs = libthread_db extra-libs = libthread_db

View File

@ -20,6 +20,8 @@
# #
subdir := nss subdir := nss
include ../Makeconfig
headers := nss.h headers := nss.h
# This is the trivial part which goes into libc itself. # This is the trivial part which goes into libc itself.
@ -40,8 +42,6 @@ extra-objs += $(makedb-modules:=.o)
tests = test-netdb tst-nss-test1 test-digits-dots tests = test-netdb tst-nss-test1 test-digits-dots
xtests = bug-erange xtests = bug-erange
include ../Makeconfig
# Specify rules for the nss_* modules. We have some services. # Specify rules for the nss_* modules. We have some services.
services := files db services := files db

View File

@ -19,6 +19,8 @@
subdir := po subdir := po
include ../Makeconfig
# Add names of the languages with broken .po files here. # Add names of the languages with broken .po files here.
BROKEN_LINGUAS = BROKEN_LINGUAS =
@ -36,10 +38,6 @@ endif
# Text domain name to install under; must match ../locale/SYS_libc.c string. # Text domain name to install under; must match ../locale/SYS_libc.c string.
domainname = libc domainname = libc
all: # Make this the default target; it will be defined in Rules.
include ../Makeconfig
# Pattern for where message catalog object for language % gets installed. # Pattern for where message catalog object for language % gets installed.
mo-installed = $(inst_msgcatdir)/%/LC_MESSAGES/$(domainname).mo mo-installed = $(inst_msgcatdir)/%/LC_MESSAGES/$(domainname).mo

View File

@ -20,6 +20,8 @@
# #
subdir := posix subdir := posix
include ../Makeconfig
headers := sys/utsname.h sys/times.h sys/wait.h sys/types.h unistd.h \ headers := sys/utsname.h sys/times.h sys/wait.h sys/types.h unistd.h \
glob.h regex.h wordexp.h fnmatch.h getopt.h \ glob.h regex.h wordexp.h fnmatch.h getopt.h \
bits/types.h bits/typesizes.h bits/pthreadtypes.h \ bits/types.h bits/typesizes.h bits/pthreadtypes.h \
@ -59,8 +61,6 @@ routines := \
posix_madvise \ posix_madvise \
get_child_max sched_cpucount sched_cpualloc sched_cpufree get_child_max sched_cpucount sched_cpualloc sched_cpufree
include ../Makeconfig
aux := init-posix environ aux := init-posix environ
tests := tstgetopt testfnm runtests runptests \ tests := tstgetopt testfnm runtests runptests \
tst-preadwrite tst-preadwrite64 test-vfork regexbug1 \ tst-preadwrite tst-preadwrite64 test-vfork regexbug1 \

View File

@ -19,6 +19,9 @@
# Sub-makefile for pwd portion of the library. # Sub-makefile for pwd portion of the library.
# #
subdir := pwd subdir := pwd
include ../Makeconfig
headers := pwd.h headers := pwd.h
routines := fgetpwent getpw putpwent \ routines := fgetpwent getpw putpwent \

View File

@ -20,6 +20,8 @@
# #
subdir := resolv subdir := resolv
include ../Makeconfig
headers := resolv.h \ headers := resolv.h \
netdb.h bits/netdb.h \ netdb.h bits/netdb.h \
arpa/nameser.h arpa/nameser_compat.h \ arpa/nameser.h arpa/nameser_compat.h \
@ -33,8 +35,6 @@ xtests = tst-leaks2
generate := mtrace-tst-leaks tst-leaks.mtrace tst-leaks2.mtrace generate := mtrace-tst-leaks tst-leaks.mtrace tst-leaks2.mtrace
include ../Makeconfig
extra-libs := libresolv libnss_dns extra-libs := libresolv libnss_dns
ifeq ($(have-thread-library),yes) ifeq ($(have-thread-library),yes)
extra-libs += libanl extra-libs += libanl

View File

@ -17,6 +17,8 @@
subdir := resource subdir := resource
include ../Makeconfig
headers := sys/resource.h bits/resource.h sys/vlimit.h sys/vtimes.h \ headers := sys/resource.h bits/resource.h sys/vlimit.h sys/vtimes.h \
ulimit.h ulimit.h

View File

@ -20,6 +20,8 @@
# #
subdir := rt subdir := rt
include ../Makeconfig
headers := aio.h mqueue.h bits/mqueue.h bits/mqueue2.h headers := aio.h mqueue.h bits/mqueue.h bits/mqueue2.h
aio-routines := aio_cancel aio_error aio_fsync aio_misc aio_read \ aio-routines := aio_cancel aio_error aio_fsync aio_misc aio_read \

View File

@ -20,6 +20,8 @@
# #
subdir := setjmp subdir := setjmp
include ../Makeconfig
headers := setjmp.h bits/setjmp.h bits/setjmp2.h headers := setjmp.h bits/setjmp.h bits/setjmp2.h
routines := setjmp sigjmp bsd-setjmp bsd-_setjmp \ routines := setjmp sigjmp bsd-setjmp bsd-_setjmp \

View File

@ -20,6 +20,8 @@
# #
subdir := shadow subdir := shadow
include ../Makeconfig
headers = shadow.h headers = shadow.h
routines = getspent getspnam sgetspent fgetspent putspent \ routines = getspent getspnam sgetspent fgetspent putspent \
getspent_r getspnam_r sgetspent_r fgetspent_r \ getspent_r getspnam_r sgetspent_r fgetspent_r \

View File

@ -20,6 +20,8 @@
# #
subdir := signal subdir := signal
include ../Makeconfig
headers := signal.h sys/signal.h bits/signum.h bits/sigcontext.h \ headers := signal.h sys/signal.h bits/signum.h bits/sigcontext.h \
bits/sigaction.h bits/sigset.h bits/siginfo.h bits/sigstack.h \ bits/sigaction.h bits/sigset.h bits/siginfo.h bits/sigstack.h \
bits/sigthread.h bits/sigthread.h

View File

@ -20,6 +20,8 @@
# #
subdir := socket subdir := socket
include ../Makeconfig
headers := sys/socket.h sys/un.h bits/sockaddr.h bits/socket.h \ headers := sys/socket.h sys/un.h bits/sockaddr.h bits/socket.h \
bits/socket2.h sys/socketvar.h net/if.h bits/socket2.h sys/socketvar.h net/if.h

View File

@ -21,6 +21,8 @@
# #
subdir := soft-fp subdir := soft-fp
include ../Makeconfig
gcc-single-routines := negsf2 addsf3 subsf3 mulsf3 divsf3 eqsf2 \ gcc-single-routines := negsf2 addsf3 subsf3 mulsf3 divsf3 eqsf2 \
lesf2 gesf2 unordsf2 fixsfsi fixunssfsi floatsisf fixsfdi \ lesf2 gesf2 unordsf2 fixsfsi fixunssfsi floatsisf fixsfdi \
fixunssfdi floatdisf sqrtsf2 floatunsisf floatundisf fixunssfdi floatdisf sqrtsf2 floatunsisf floatundisf

View File

@ -20,6 +20,8 @@
# #
subdir := stdio-common subdir := stdio-common
include ../Makeconfig
headers := stdio_ext.h printf.h bits/printf-ldbl.h bits/stdio_lim.h headers := stdio_ext.h printf.h bits/printf-ldbl.h bits/stdio_lim.h
routines := \ routines := \
@ -39,8 +41,6 @@ routines := \
isoc99_vsscanf \ isoc99_vsscanf \
psiginfo psiginfo
include ../Makeconfig
aux := errlist siglist printf-parsemb printf-parsewc fxprintf aux := errlist siglist printf-parsemb printf-parsewc fxprintf
tests := tstscanf test_rdwr test-popen tstgetln test-fseek \ tests := tstscanf test_rdwr test-popen tstgetln test-fseek \

View File

@ -20,6 +20,8 @@
# #
subdir := stdlib subdir := stdlib
include ../Makeconfig
headers := stdlib.h bits/stdlib.h bits/stdlib-ldbl.h bits/stdlib-float.h \ headers := stdlib.h bits/stdlib.h bits/stdlib-ldbl.h bits/stdlib-float.h \
monetary.h bits/monetary-ldbl.h \ monetary.h bits/monetary-ldbl.h \
inttypes.h stdint.h bits/wordsize.h \ inttypes.h stdint.h bits/wordsize.h \
@ -76,8 +78,6 @@ tests-static := tst-secure-getenv
modules-names = tst-tls-atexit-lib modules-names = tst-tls-atexit-lib
include ../Makeconfig
ifeq ($(build-shared),yes) ifeq ($(build-shared),yes)
tests += tst-putenv tests += tst-putenv
endif endif

View File

@ -20,6 +20,8 @@
# #
subdir := streams subdir := streams
include ../Makeconfig
headers = stropts.h sys/stropts.h bits/stropts.h bits/xtitypes.h headers = stropts.h sys/stropts.h bits/stropts.h bits/xtitypes.h
routines = isastream getmsg getpmsg putmsg putpmsg fattach fdetach routines = isastream getmsg getpmsg putmsg putpmsg fattach fdetach

View File

@ -20,6 +20,8 @@
# #
subdir := string subdir := string
include ../Makeconfig
headers := string.h strings.h memory.h endian.h bits/endian.h \ headers := string.h strings.h memory.h endian.h bits/endian.h \
argz.h envz.h byteswap.h bits/byteswap.h bits/byteswap-16.h \ argz.h envz.h byteswap.h bits/byteswap.h bits/byteswap-16.h \
bits/string.h bits/string2.h bits/string3.h bits/string.h bits/string2.h bits/string3.h

View File

@ -20,6 +20,8 @@
# #
subdir := sunrpc subdir := sunrpc
include ../Makeconfig
# The code in this subdirectory is taken from Sun's RPCSRC-4.0 # The code in this subdirectory is taken from Sun's RPCSRC-4.0
# distribution with some additional changes from the TI-RPC package # distribution with some additional changes from the TI-RPC package
# which is also available from Sun. The files are heavily changed to # which is also available from Sun. The files are heavily changed to
@ -58,8 +60,6 @@ generated = $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c) $(rpcsvc:%.x=x%.stmp) \
$(rpcsvc:%.x=rpcsvc/%.stmp) rpcgen $(rpcsvc:%.x=rpcsvc/%.stmp) rpcgen
generated-dirs := rpcsvc generated-dirs := rpcsvc
include ../Makeconfig
ifeq ($(link-obsolete-rpc),yes) ifeq ($(link-obsolete-rpc),yes)
headers += $(headers-in-tirpc) $(headers-not-in-tirpc) headers += $(headers-in-tirpc) $(headers-not-in-tirpc)
endif endif
@ -94,8 +94,6 @@ rpcgen-objs = rpc_main.o rpc_hout.o rpc_cout.o rpc_parse.o \
extra-objs = $(rpcgen-objs) $(addprefix cross-,$(rpcgen-objs)) extra-objs = $(rpcgen-objs) $(addprefix cross-,$(rpcgen-objs))
others += rpcgen others += rpcgen
all: # Make this the default target; it will be defined in Rules.
tests = tst-xdrmem tst-xdrmem2 tests = tst-xdrmem tst-xdrmem2
xtests := tst-getmyaddr xtests := tst-getmyaddr

View File

@ -20,6 +20,8 @@
# #
subdir := sysvipc subdir := sysvipc
include ../Makeconfig
headers := sys/ipc.h sys/msg.h sys/sem.h sys/shm.h \ headers := sys/ipc.h sys/msg.h sys/sem.h sys/shm.h \
bits/ipctypes.h bits/ipc.h bits/msq.h bits/sem.h bits/shm.h bits/ipctypes.h bits/ipc.h bits/msq.h bits/sem.h bits/shm.h

View File

@ -20,6 +20,8 @@
# #
subdir := termios subdir := termios
include ../Makeconfig
headers := termios.h bits/termios.h sys/ttydefaults.h sys/termios.h \ headers := termios.h bits/termios.h sys/ttydefaults.h sys/termios.h \
sys/ttychars.h sys/ttychars.h

View File

@ -20,6 +20,8 @@
# #
subdir := time subdir := time
include ../Makeconfig
headers := time.h sys/time.h sys/timeb.h bits/time.h headers := time.h sys/time.h sys/timeb.h bits/time.h
routines := offtime asctime clock ctime ctime_r difftime \ routines := offtime asctime clock ctime ctime_r difftime \

View File

@ -20,6 +20,8 @@
# #
subdir := timezone subdir := timezone
include ../Makeconfig
extra-objs := scheck.o ialloc.o extra-objs := scheck.o ialloc.o
others := zdump zic others := zdump zic
@ -38,10 +40,6 @@ install-sbin := zic zdump
generated-dirs = testdata generated-dirs = testdata
all: # Make this the default target; it will be defined in Rules.
include ../Makeconfig # Get objpfx defined so we can use it below.
CPPFLAGS-zic = -DNOT_IN_libc CPPFLAGS-zic = -DNOT_IN_libc
install-bin-script = tzselect install-bin-script = tzselect

View File

@ -20,6 +20,8 @@
# #
subdir := wcsmbs subdir := wcsmbs
include ../Makeconfig
headers := wchar.h bits/wchar.h bits/wchar2.h bits/wchar-ldbl.h uchar.h headers := wchar.h bits/wchar.h bits/wchar2.h bits/wchar-ldbl.h uchar.h
routines := wcscat wcschr wcscmp wcscpy wcscspn wcsdup wcslen wcsncat \ routines := wcscat wcschr wcscmp wcscpy wcscspn wcsdup wcslen wcsncat \

View File

@ -20,6 +20,8 @@
# #
subdir := wctype subdir := wctype
include ../Makeconfig
headers := wctype.h headers := wctype.h
routines := wcfuncs wctype iswctype wctrans towctrans \ routines := wcfuncs wctype iswctype wctrans towctrans \
wcfuncs_l wctype_l iswctype_l wctrans_l towctrans_l wcfuncs_l wctype_l iswctype_l wctrans_l towctrans_l