diff options
author | Roland McGrath <roland@gnu.org> | 2006-02-28 07:11:04 +0000 |
---|---|---|
committer | Roland McGrath <roland@gnu.org> | 2006-02-28 07:11:04 +0000 |
commit | e0a3ed4ff95ec2e422c1211b35ddf7bf6fbc0a5a (patch) | |
tree | 9ee2ada7a666b14f1e47aa183012ddf59de3fb73 /libidn | |
parent | 2006-02-27 Roland McGrath <roland@redhat.com> (diff) | |
download | glibc-e0a3ed4ff95ec2e422c1211b35ddf7bf6fbc0a5a.tar.gz glibc-e0a3ed4ff95ec2e422c1211b35ddf7bf6fbc0a5a.tar.bz2 glibc-e0a3ed4ff95ec2e422c1211b35ddf7bf6fbc0a5a.zip |
* Makefile (subdir-target-args): New variable.
($(all-subdirs-targets)): Use it in place of -C option.
* Rules: Use $(..) instead of ../ if it's already defined.
* Makeconfig (subdir-srcdirs): New variable.
* csu/Makefile (all-Banner-files): Use it.
* configure.in (--enable-add-ons): Set to "yes" by default.
Handle absolute add-on directory names when looking for configure
fragments. Also look for sysdeps/*/preconfigure fragments in add-ons.
Require add-on configure to set $libc_add_on_canonical, use
that in $add_ons_sfx. Substitute add_on_subdirs with computed list
of subdir names each add-on configure set in libc_add_on_subdirs.
* configure: Regenerated.
* Makefile (%/preconfigure: %/preconfigure.in): New pattern rule.
* config.make.in (add-on-subdirs): New substituted variable.
* Makeconfig (all-subdirs): Include $(add-on-subdirs).
Remove $(add-ons), $(sysdep-subdirs).
Don't filter out $(sysdep-inhibit-subdirs).
($(common-objpfx)sysd-dirs): Target removed. Don't include it.
($(common-objpfx)sysd-sorted): Rewritten to feed Depend and Subdirs
files together to gen-sorted.awk, and $(subdirs) via -v.
(subdirs): Remove magic reordering for mach and hurd.
* scripts/gen-sorted.awk: Use subdirs from command line.
Process Subdirs and Depend files directly.
Let Subdirs files use "first dir" and "inhibit dir".
Always move elf to the end of the list.
* hurd/Depend: New file.
* sysdeps/mach/Subdirs: Use "first mach".
* Makefile (dist-separate): Remove linuxthreads.
(dist-separate-linuxthreads): Variable removed.
(glibc-%.tar rule): Use $(sysdeps-add-ons).
* Makerules ($(common-objpfx)Versions.v.i): Use $(subdirs),
not $(all-subdirs).
(sysdep-makefiles): Use $(sysdirs).
(sysdirs): Remove export.
($(+sysdir_pfx)sysd-rules): Handle absolute directory names in
$(config-sysdirs).
(+sysdir_pfx): Variable removed.
(sysd-rules): Use $(common-objpfx) in place of it.
(sysdirs): Variable moved to ...
* Makeconfig (sysdirs): ... here.
Handle absolute directory names in $(config-sysdirs).
(full_config_sysdirs): Variable removed.
* csu/Makefile: Use $(sysdirs) in vpath directive.
* math/Makefile (ulps-file): Use $(sysdirs).
* sysdeps/gnu/Makefile (errlist-c): Likewise.
($(objpfx)errlist-compat.c): Likewise.
* Makeconfig (all-Subdirs-files): Likewise.
($(common-objpfx)config.status): Likewise.
* configure.in (sysnames): Handle absolute add-on directory names.
(sysdeps_add_ons): New variable, AC_SUBST it.
Compute which add-ons contributed sysdeps directories.
* configure: Regenerated.
* config.make.in (sysdeps-add-ons): New substituted variable.
* Makerules (+sysdep_dirs, +sysdep-includes): Variables moved ...
* Makeconfig: ... to here.
(+sysdep_dirs): Append $(sysdeps-add-ons) here.
(+includes): Remove $(objpfx) include, already in $(+sysdep_dirs).
Remove $(includes).
(sysdep-makeconfigs): Use $(+sysdep_dirs).
($(common-objpfx)shlib-versions.v.i): Likewise.
* Makeconfig: Remove hair to set Makeconfig-add-on.
* sysdeps/unix/Makefile (sysdirs): Remove export.
(asm_CPP): Variable removed.
($(common-objpfx)sysd-syscalls): Pass them directly for the script.
* sysdeps/posix/Makefile: New file.
* Makerules (L_tmpnam, TMP_MAX, L_ctermid, L_cuserid): Set non-posix
values here with ?=.
* stdlib/gen-mpn-copy: File removed.
* stdlib/Makefile (distribute): Remove it.
* configure.in: Don't grok --with-gmp.
* configure: Regenerated.
* configure.in (libc_cv_idn): Don't check it; libidn/configure does it.
* configure: Regenerated.
* bare: Directory removed, saved in ports repository.
Diffstat (limited to 'libidn')
-rw-r--r-- | libidn/Makefile | 6 | ||||
-rw-r--r-- | libidn/configure | 3 | ||||
-rw-r--r-- | libidn/configure.in | 3 |
3 files changed, 9 insertions, 3 deletions
diff --git a/libidn/Makefile b/libidn/Makefile index 3d2ef5ef9b..3a4d1b3422 100644 --- a/libidn/Makefile +++ b/libidn/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005, 2006 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 @@ -31,10 +31,10 @@ libcidn-routines := punycode toutf8 nfkc stringprep rfc3454 profiles idna \ iconvme -include ../Makeconfig +include $(..)Makeconfig libcidn-inhibit-o = $(filter-out .os,$(object-suffixes)) -include ../Rules +include $(..)Rules $(objpfx)libcidn.so: $(common-objpfx)libc.so $(common-objpfx)libc_nonshared.a diff --git a/libidn/configure b/libidn/configure index 52ddb3fc26..365e747df2 100644 --- a/libidn/configure +++ b/libidn/configure @@ -1,5 +1,8 @@ # This file is generated from configure.in by Autoconf. DO NOT EDIT! +libc_add_on_canonical= +libc_add_on_subdirs=. + # Get this defined in config.h for main source code to test. cat >>confdefs.h <<\_ACEOF #define HAVE_LIBIDN 1 diff --git a/libidn/configure.in b/libidn/configure.in index bafa3555ef..38b9ad7fac 100644 --- a/libidn/configure.in +++ b/libidn/configure.in @@ -1,5 +1,8 @@ dnl glibc configure fragment for libidn add-on GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. +libc_add_on_canonical= +libc_add_on_subdirs=. + # Get this defined in config.h for main source code to test. AC_DEFINE([HAVE_LIBIDN]) |