diff options
| author | Roland McGrath <roland@gnu.org> | 2005-02-11 10:17:19 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2005-02-11 10:17:19 +0000 |
| commit | 3e1e123d02fa495961898f390741bd743a92022d (patch) | |
| tree | ed5b2fddac71558294faac14742a16f723643746 /Makefile | |
| parent | 9b382805e29a41abca88de8cd0348958d90f724f (diff) | |
| download | glibc-3e1e123d02fa495961898f390741bd743a92022d.tar.gz glibc-3e1e123d02fa495961898f390741bd743a92022d.tar.xz glibc-3e1e123d02fa495961898f390741bd743a92022d.zip | |
[BZ #715] cvs/fedora-glibc-20050211T1037
* Makefile (installed-stubs): New variable. Set to $(inst_includedir)/gnu/stubs.h if $(biarch) is no, or to $(inst_includedir)/gnu/stubs-$(biarch).h if otherwise. [$(biarch) != no] (install-others-nosubdir): Add $(installed-stubs). ($(inst_includedir)/gnu/stubs.h): Use $(installed-stubs) for this rule's target. ($(inst_includedir)/gnu/stubs.h): New target, install from ... * include/stubs-biarch.h: New file. * shlib-versions (i.86-.*-.*): Add WORDSIZE64 line mapping to x86_64. * Makeconfig ($(common-objpfx)soversions.mk): Depend on Makeconfig. Emit defn for variable `biarch'. * include/stub-tag.h: Update comment.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/Makefile b/Makefile index c2f4ae32a5..dc7a6f177a 100644 --- a/Makefile +++ b/Makefile @@ -157,13 +157,25 @@ 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. -$(inst_includedir)/gnu/stubs.h: include/stubs-prologue.h subdir_install +$(installed-stubs): 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 |