diff options
author | Roland McGrath <roland@gnu.org> | 2005-02-16 12:31:10 +0000 |
---|---|---|
committer | Roland McGrath <roland@gnu.org> | 2005-02-16 12:31:10 +0000 |
commit | 833861be818bb5d45ab0c47370b84068dfb2fedf (patch) | |
tree | 2f1754a415c378f6b067f9158cc42df24d4641d2 /Makefile | |
parent | c397a0064061e28a00eea873669e59f3983db791 (diff) |
import later fedora-branch tweaks
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 18 |
1 files changed, 3 insertions, 15 deletions
@@ -1,4 +1,4 @@ -# Copyright (C) 1991-2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 1991-2002, 2003, 2004 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 @@ -64,7 +64,7 @@ endif # $(AUTOCONF) = no subdir_update-abi subdir_check-abi \ subdir_echo-headers \ subdir_install \ - subdir_objs subdir_stubs subdir_testclean \ + subdir_testclean \ $(addprefix install-, no-libc.a bin lib data headers others) headers := limits.h values.h features.h gnu-versions.h bits/libc-lock.h \ @@ -157,25 +157,13 @@ others: $(common-objpfx)testrun.sh subdir-stubs := $(foreach dir,$(subdirs),$(common-objpfx)$(dir)/stubs) -ifeq ($(biarch),no) -installed-stubs = $(inst_includedir)/gnu/stubs.h -else -installed-stubs = $(inst_includedir)/gnu/stubs-$(biarch).h - -$(inst_includedir)/gnu/stubs.h: include/stubs-biarch.h $(+force) - $(INSTALL_DATA) $< $@ - -install-others-nosubdir: $(installed-stubs) -endif - - # Since stubs.h is never needed when building the library, we simplify the # hairy installation process by producing it in place only as the last part # of the top-level `make install'. It depends on subdir_install, which # iterates over all the subdirs; subdir_install in each subdir depends on # the subdir's stubs file. Having more direct dependencies would result in # extra iterations over the list for subdirs and many recursive makes. -$(installed-stubs): include/stubs-prologue.h subdir_install +$(inst_includedir)/gnu/stubs.h: include/stubs-prologue.h subdir_install $(make-target-directory) @rm -f $(objpfx)stubs.h (sed '/^@/d' $<; LC_ALL=C sort $(subdir-stubs)) > $(objpfx)stubs.h |