diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | Makeconfig | 7 | ||||
| -rw-r--r-- | Makefile | 12 | ||||
| -rw-r--r-- | csu/Makefile | 4 | ||||
| -rw-r--r-- | version.h | 2 |
5 files changed, 25 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog index 024ccb9ee9..8d72bfe5e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,17 @@ 2006-03-01 Roland McGrath <roland@redhat.com> + * version.h (VERSION): 2.3.91 + + * Makeconfig (sysdeps-srcdirs): New variable. + (sysdeps-add-ons-srcdirs): Use it. + * csu/Makefile (all-Banner-files): Use it. + + * Makefile (dist-selector): New variable. + (glibc-%.tar rule): Use it. Make $(dist-separate) tarballs + contain one version-named directory. + * Makefile (format-me): Use --plaintext --no-number-sections. + * NOTES, INSTALL: Regenerated. * NEWS: Update 2.4 items. diff --git a/Makeconfig b/Makeconfig index cc44b00012..1f4b62822a 100644 --- a/Makeconfig +++ b/Makeconfig @@ -107,9 +107,10 @@ sysdirs := $(foreach D,$(config-sysdirs),$(firstword $(filter /%,$D) $(..)$D)) # to find specific add-on files without assuming the add-on directory name. # It also means that headers can go into an add-on's base directory # instead of the add-on needing a sysdeps/generic of its own. -+sysdep_dirs := $(sysdirs) $(foreach add-on,$(sysdeps-add-ons),\ - $(firstword $(filter /%,$(add-on)) \ - $(..)$(add-on))) +sysdeps-srcdirs := $(foreach add-on,$(sysdeps-add-ons),\ + $(firstword $(filter /%,$(add-on)) \ + $(..)$(add-on))) ++sysdep_dirs = $(sysdirs) $(sysdeps-srcdirs) ifdef objdir +sysdep_dirs := $(objdir) $(+sysdep_dirs) endif diff --git a/Makefile b/Makefile index 25bcca0135..43c4f4d4b5 100644 --- a/Makefile +++ b/Makefile @@ -358,20 +358,18 @@ endif files-for-dist := README FAQ INSTALL NOTES configure tag-of-stem = glibc-$(subst .,_,$*) +dist-selector = -r $(tag-of-stem) # Add-ons in the main repository but distributed in their own tar files. dist-separate = libidn -# Directories in each add-on. -dist-separate-libidn = libidn - glibc-%.tar $(dist-separate:%=glibc-%-%.tar): $(files-for-dist) \ $(foreach D,$(dist-separate),\ $D/configure) @rm -fr glibc-$* $(MAKE) -q `find sysdeps $(addsuffix /sysdeps,$(sysdeps-add-ons)) \ -name configure` - cvs $(CVSOPTS) -Q export -d glibc-$* -r $(tag-of-stem) libc + cvs $(CVSOPTS) -Q export -d glibc-$* $(dist-selector) libc # Touch all the configure scripts going into the tarball since cvs export # might have delivered configure.in newer than configure. find glibc-$* -name configure -print | xargs touch @@ -380,8 +378,10 @@ glibc-%.tar $(dist-separate:%=glibc-%-%.tar): $(files-for-dist) \ rm -fr glibc-$* define dist-do-separate-dirs $(foreach dir,$(dist-separate), - tar cf glibc-$(dir)-$*.tar -C glibc-$* $(dist-separate-$(dir)) - rm -rf $(addprefix glibc-$*/,$(dist-separate-$(dir))) + @rm -fr glibc-$(dir)-$* + mv glibc-$*/$(dir) glibc-$(dir)-$* + tar cf glibc-$(dir)-$*.tar glibc-$(dir)-$* + rm -fr glibc-$(dir)-$* ) endef diff --git a/csu/Makefile b/csu/Makefile index 54af0d6662..0e2ae07cf7 100644 --- a/csu/Makefile +++ b/csu/Makefile @@ -200,7 +200,9 @@ $(objpfx)abi-tag.h: $(..)abi-tags if test -r $@.new; then mv -f $@.new $@; \ else echo >&2 'This configuration not matched in $<'; exit 1; fi -all-Banner-files = $(wildcard $(addsuffix /Banner,$(subdir-srcdirs))) +all-Banner-files = $(wildcard $(addsuffix /Banner,\ + $(sort $(subdir-srcdirs) \ + $(sysdeps-srcdirs)))) $(objpfx)version-info.h: $(common-objpfx)config.make $(all-Banner-files) $(make-target-directory) (case $(config-os) in \ diff --git a/version.h b/version.h index aec3a8f2b1..3eec34c09b 100644 --- a/version.h +++ b/version.h @@ -1,4 +1,4 @@ /* This file just defines the current version number of libc. */ #define RELEASE "development" -#define VERSION "2.3.90" +#define VERSION "2.3.91" |