aboutsummaryrefslogtreecommitdiff
path: root/elf/Makefile
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-05-08 20:42:23 +0000
committerUlrich Drepper <drepper@redhat.com>1998-05-08 20:42:23 +0000
commitc7562c74ed1b18fda99bfd5f6c4b61a449bcb35f (patch)
treee41cbd118cf034f46d55af209737acb87f0eaf2c /elf/Makefile
parentb9a60a8f14b13145029d370fdeffd34b37c69c6a (diff)
downloadglibc-c7562c74ed1b18fda99bfd5f6c4b61a449bcb35f.zip
glibc-c7562c74ed1b18fda99bfd5f6c4b61a449bcb35f.tar.gz
glibc-c7562c74ed1b18fda99bfd5f6c4b61a449bcb35f.tar.bz2
Update.
* intl/locale.alias: Change italian to it_IT.ISO-8859-1. Reported by Ottavio G. Rizzo <otto@mast.queensu.ca>. 1998-05-08 19:24 Zack Weinberg <zack@rabi.phys.columbia.edu> * Makefile (+subdir-inits): Delete variable. (+init_subdirs): Likewise. (aux): Likewise. (before-compile): Likewise. (libc-init): Delete stanza. (version-info.h): Delete rule and associated variable. (distribute): Don't distribute moved files. * Makerules (interp-obj): It lives in elf now. Only use it if $(elf) is set. Delete rule to build it. * csu/Makefile: Build set-init.o and/or munch-init.o. Build version.o and version-info.h. Minor cleanups. (routines): Add libc-init, sysdep, version. (generated): Add version-info.h. * elf/Makefile: Build interp.os. * interp.c: Moved to elf. * set-init.c: Moved to csu. * munch-init.c: Likewise. * munch.awk: Likewise. * version.c: Likewise. * Makeconfig: Add emacs mode marker. * Makerules: Likewise. * Rules: Likewise, and also unconfuse syntax highlighting with a fake comment. 1998-05-08 Ulrich Drepper <drepper@cygnus.com>
Diffstat (limited to 'elf/Makefile')
-rw-r--r--elf/Makefile7
1 files changed, 5 insertions, 2 deletions
diff --git a/elf/Makefile b/elf/Makefile
index 9ce3ac5..2c16415 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -39,7 +39,7 @@ ld-map = $(libc-map)
distribute = $(rtld-routines:=.c) dynamic-link.h do-rel.h dl-machine.h \
dl-hash.h soinit.c sofini.c ldd.sh.in ldd.bash.in eval.c \
genrtldtbl.awk atomicity.h dl-procinfo.h ldsodefs.h \
- dl-librecon.h
+ dl-librecon.h interp.c
extra-libs = libdl
extra-libs-others = $(extra-libs)
@@ -54,7 +54,7 @@ all: # Make this the default target; it will be defined in Rules.
include ../Makeconfig
ifeq (yes,$(build-shared))
-extra-objs = $(rtld-routines:=.os) soinit.os sofini.os eval.os
+extra-objs = $(rtld-routines:=.os) soinit.os sofini.os eval.os interp.os
generated = librtld.os dl-allobjs.os ld.so trusted-dirs.h rtldtbl.h
install-others = $(inst_slibdir)/$(rtld-installed-name)
install-bin = ldd
@@ -124,6 +124,9 @@ endef
# The dl code in the static libc needs a default library path.
CFLAGS-dl-support.c = -D'DEFAULT_RPATH="$(default-rpath)"'
+# interp.c exists just to get this string into the libraries.
+CFLAGS-interp.c = -D'RUNTIME_LINKER="$(slibdir)/$(rtld-installed-name)"'
+
ifneq (ld.so,$(rtld-installed-name))
# Make sure ld.so.1 exists in the build directory so we can link
# against it.