From 56552e4257910954051f3ff02c0ee2609c7ca688 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 29 Jan 1997 03:50:12 +0000 Subject: update from main archive 970128 1997-01-29 04:30 Ulrich Drepper * sunrpc/Makefile: Don't generate headers derived from .x files when crosscompiling. 1997-01-28 10:51 Richard Henderson * Makefile: Generate gnu/lib-names.h in before-compile. * nss/nss.h (NSS_SHLIB_REVISION): Turn it into a const variable. * nss/nssswitch.c (__nss_shlib_revision): New variable. Initialize to the revision found for LIBNSS_FILES_SO. (nss_initilized): Removed. It was tested but never set. (nss_lookup_function): Don't treat NSS_SHLIB_REVISION as a literal. * shlib-versions: Tag all alpha-linux shlibs with a .1 "minor" not just libc. Except instead of ld.so.1.1 use ld-linux.so.2. * sysdeps/unix/sysv/linux/alpha/ieee_set_fp_control.S: Typo in ldgp. 1997-01-28 12:16 Andreas Jaeger * elf/Makefile (CFLAGS-dl-load.c): Use += to not override the definition. 1997-01-28 20:13 Fila Kolodny * config.make.in (malloc): Remove. --- Makefile | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 790d08f421..5cdae9469a 100644 --- a/Makefile +++ b/Makefile @@ -91,10 +91,12 @@ echo-headers: subdir_echo-headers # What to install. install-others = $(inst_includedir)/gnu/stubs.h +install-bin = glibcbug + ifeq (yes,$(build-shared)) -install-others += $(inst_includedir)/gnu/lib-names.h +before-compile += $(objpfx)lib-names.h +install_others += $(inst_includedir)/gnu/lib-names.h endif -install-bin = glibcbug ifeq (yes,$(gnu-ld)) libc-init = set-init @@ -194,8 +196,13 @@ ifeq (yes,$(build-shared)) # Like gnu/stubs.h the gnu/lib-names.h header is not used while building the # libc itself. So we generate it while installing. -$(inst_includedir)/gnu/lib-names.h: $(common-objpfx)soversions.mk - @rm -f $(objpfx)lib-names.h +$(inst_includedir)/gnu/lib-names.h: $(objpfx)lib-names.h + if test -r $@ && cmp -s $< $@; \ + then echo 'gnu/lib-names.h unchanged'; \ + else $(INSTALL_DATA) $< $@; fi + +$(objpfx)lib-names.h: $(common-objpfx)soversions.mk + @rm -f $@ (echo '/* This file is automatically generated.';\ echo ' It defines macros to allow user program to find the shared';\ echo ' library files which come as part of GNU libc. */';\ @@ -209,11 +216,8 @@ $(inst_includedir)/gnu/lib-names.h: $(common-objpfx)soversions.mk echo "#define $${upname}_SO \"$$l\""; \ done;) | sort; \ echo; \ - echo '#endif /* gnu/lib-names.h */';) > $(objpfx)lib-names.h - if test -r $@ && cmp -s $(objpfx)lib-names.h $@; \ - then echo 'gnu/lib-names.h unchanged'; \ - else $(INSTALL_DATA) $(objpfx)lib-names.h $@; fi - rm -f $(objpfx)lib-names.h + echo '#endif /* gnu/lib-names.h */';) > $@ +generated += lib-names.h endif # The `glibcbug' script contains the version number and it shall be rebuild -- cgit v1.2.3