diff options
author | Jakub Jelinek <jakub@redhat.com> | 2007-07-31 17:46:17 +0000 |
---|---|---|
committer | Jakub Jelinek <jakub@redhat.com> | 2007-07-31 17:46:17 +0000 |
commit | 8833066b122427710a9e14a888ce6cfa862332d3 (patch) | |
tree | 29591019d695919417b3698618d6a342e97381d6 /Makerules | |
parent | fedca46896bdb702cb988837a0c2c5447e72ba2b (diff) |
Updated to fedora-glibc-20070731T1624cvs/fedora-glibc-2_6_90-1
Diffstat (limited to 'Makerules')
-rw-r--r-- | Makerules | 30 |
1 files changed, 15 insertions, 15 deletions
@@ -1,4 +1,4 @@ -# Copyright (C) 1991-2002,2003,2004,2005,2006 Free Software Foundation, Inc. +# Copyright (C) 1991-2006, 2007 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 @@ -240,9 +240,9 @@ $(common-objpfx)sysd-rules: $(common-objpfx)config.make $(..)Makerules \ echo "\$$(objpfx)rtld-%$$o: $$dir/%.s \$$(before-compile); \ \$$(compile-command.s)"; \ echo "\$$(objpfx)ptw-%$$o: $$dir/%.S \$$(before-compile); \ - \$$(compile-command.S)"; \ + \$$(compile-command.S) -DPTW"; \ echo "\$$(objpfx)ptw-%$$o: $$dir/%.s \$$(before-compile); \ - \$$(compile-command.s)"; \ + \$$(compile-command.s) -DPTW"; \ echo "\$$(objpfx)m_%$$o: $$dir/s_%.S \$$(before-compile); \ \$$(compile-command.S)"; \ echo "\$$(objpfx)m_%$$o: $$dir/s_%.s \$$(before-compile); \ @@ -253,7 +253,7 @@ $(common-objpfx)sysd-rules: $(common-objpfx)config.make $(..)Makerules \ echo "\$$(objpfx)rtld-%$$o: $$dir/%.c \$$(before-compile); \ \$$(compile-command.c)"; \ echo "\$$(objpfx)ptw-%$$o: $$dir/%.c \$$(before-compile); \ - \$$(compile-command.c)"; \ + \$$(compile-command.c) -DPTW"; \ echo "\$$(objpfx)m_%$$o: $$dir/s_%.c \$$(before-compile); \ \$$(compile-command.c)"; \ done; \ @@ -834,12 +834,13 @@ force-install: # $(install-lib) are installed from the object directory into $(libdir); # files in $(install-lib) matching `lib%.a' are ranlib'd after installation -# unless they also appear in $(non-lib.a). $(install-data) are installed -# as they are into $(datadir). $(headers) are installed as they are in +# unless they also appear in $(non-lib.a). $(install-data) are installed as +# they are into $(datadir). $(headers) are installed as they are in # $(includedir). $(install-bin), $(install-bin-script) and $(install-sbin) # are installed from the object directory into $(bindir), $(bindir) and -# $(sbindir), respectively. $(install-others) are absolute path names of -# files to install; rules to install them are defined elsewhere. +# $(sbindir), respectively. $(install-others) and $(install-others-programs) +# are absolute path names of files to install; rules to install them are +# defined elsewhere. # The simple library name to install libc.a under. # This could be defined by a sysdep Makefile. @@ -1144,6 +1145,7 @@ install-lib-nosubdir: $(addprefix $(inst_libdir)/,\ install-data-nosubdir: $(addprefix $(inst_datadir)/,$(install-data)) install-headers-nosubdir: $(addprefix $(inst_includedir)/,$(headers)) install-others-nosubdir: $(install-others) +install-others-programs-nosubdir: $(install-others-programs) # We need all the `-nosubdir' targets so that `install' in the parent # doesn't depend on several things which each iterate over the subdirs. @@ -1152,14 +1154,12 @@ install-others-nosubdir: $(install-others) install-%:: install-%-nosubdir ; .PHONY: install install-no-libc.a-nosubdir -ifeq ($(build-programs),yes) -install-no-libc.a-nosubdir: install-headers-nosubdir install-data-nosubdir\ - install-bin-nosubdir install-bin-script-nosubdir \ - install-lib-nosubdir install-others-nosubdir \ - install-rootsbin-nosubdir install-sbin-nosubdir -else -install-no-libc.a-nosubdir: install-headers-nosubdir install-data-nosubdir\ +install-no-libc.a-nosubdir: install-headers-nosubdir install-data-nosubdir \ install-lib-nosubdir install-others-nosubdir +ifeq ($(build-programs),yes) +install-no-libc.a-nosubdir: install-bin-nosubdir install-bin-script-nosubdir \ + install-rootsbin-nosubdir install-sbin-nosubdir \ + install-others-programs-nosubdir endif install: install-no-libc.a-nosubdir |