about summary refs log tree commit diff
path: root/csu/Makefile
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2001-05-14 23:32:39 +0000
committerRoland McGrath <roland@gnu.org>2001-05-14 23:32:39 +0000
commit083973f34e1c70e05e117db37239716995127cfd (patch)
tree1cbd8c5608a168b06bc8d8a8278cf0a9ab08e08e /csu/Makefile
parentaefdff34cd2669d3bb3824a759ce0322ed7e2ef2 (diff)
downloadglibc-083973f34e1c70e05e117db37239716995127cfd.tar.gz
glibc-083973f34e1c70e05e117db37239716995127cfd.tar.xz
glibc-083973f34e1c70e05e117db37239716995127cfd.zip
* csu/Makefile ($(objpfx)g$(start-installed-name)): Turn this into a
	static pattern rule also that also covers
	$(objpx)g$(static-start-installed-name).
	[$(start-installed-name) != $(static-start-installed-name)]
	(extra-objs, omit-deps, install-lib): Add
	$(static-start-installed-name) and g$(static-start-installed-name).
	* sysdeps/mach/hurd/i386/Makefile: Don't add crt0.o to those here;
	just setting static-start-installed-name is now sufficient.
	(extra-objs): Add static-start.o here.
	(CFLAGS-initfini.s): Remove obsolete variable.
	* sysdeps/mach/hurd/i386/Makeconfig: New file.
	Define static-start-installed-name here.

	* Makeconfig: Include existing $(full_config_sysdirs:=/Makeconfig).
	* Make-dist (+sysdep-tsrcs): Look for Makeconfig files.

	* Makerules ($(+sysdir_pfx)sysd-Makefile): Remove this target and
	associated hair.  Instead, just use $(wildcard ...) in the include.

	* configure.in (critic_missing, aux_missing): Collect in these vars
	the names of the missing programs, and include them in the error msgs.
	* configure: Regenerated.
Diffstat (limited to 'csu/Makefile')
-rw-r--r--csu/Makefile14
1 files changed, 11 insertions, 3 deletions
diff --git a/csu/Makefile b/csu/Makefile
index 838e14163f..2cc93c7011 100644
--- a/csu/Makefile
+++ b/csu/Makefile
@@ -1,6 +1,6 @@
 # Makefile for csu code for GNU C library.
 
-# Copyright (C) 1995,1996,1997,1998,1999,2000,2001 Free Software Foundation, Inc.
+# Copyright (C) 1995,96,97,98,99,2000,01 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
@@ -48,6 +48,13 @@ extra-objs += b$(start-installed-name)
 install-lib += b$(start-installed-name)
 endif
 
+ifneq ($(start-installed-name),$(static-start-installed-name))
+extra-objs += $(static-start-installed-name) g$(static-start-installed-name)
+omit-deps += $(patsubst %.o,%,$(static-start-installed-name) \
+			     g$(static-start-installed-name))
+install-lib += $(static-start-installed-name) g$(static-start-installed-name)
+endif
+
 ifeq (yes,$(elf))
 before-compile += $(objpfx)abi-tag.h
 generated += abi-tag.h
@@ -151,8 +158,9 @@ endif
 # The profiling startfile is made by linking together the normal
 # startfile with gmon-start.o, which defines a constructor function
 # to turn on profiling code at startup.
-$(objpfx)g$(start-installed-name): $(objpfx)$(start-installed-name) \
-				   $(objpfx)gmon-start.o
+$(addprefix $(objpfx),$(sort g$(start-installed-name) \
+			     g$(static-start-installed-name))): \
+  $(objpfx)g%: $(objpfx)% $(objpfx)gmon-start.o
 	$(link-relocatable)
 
 # These extra files are sometimes expected by system standard linking