OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* Makerules (install-others-programs-nosubdir): New target. 

(install-no-libc.a-nosubdir): Depend on it.

	* iconv/Makefile (install-others-programs): Set this instead of
	install-others.
	* login/Makefile (install-others-programs): Likewise.
	* posix/Makefile (install-others-programs): Likewise.

	* Makerules (install-no-libc.a-nosubdir): Clean up conditional
	dependencies.
This commit is contained in:
Roland McGrath 2007-07-24 23:09:42 +00:00
parent ff40792e78
commit 80d4c3b06e
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -1,3 +1,16 @@
2007-07-24 Roland McGrath <roland@redhat.com>
* Makerules (install-others-programs-nosubdir): New target.
(install-no-libc.a-nosubdir): Depend on it.
* iconv/Makefile (install-others-programs): Set this instead of
install-others.
* login/Makefile (install-others-programs): Likewise.
* posix/Makefile (install-others-programs): Likewise.
* Makerules (install-no-libc.a-nosubdir): Clean up conditional
dependencies.
2007-07-23 Ulrich Drepper <drepper@redhat.com> 2007-07-23 Ulrich Drepper <drepper@redhat.com>
* io/Makefile (tests): Add tst-posix_fallocate. * io/Makefile (tests): Add tst-posix_fallocate.

22
Makerules
View File

@ -834,12 +834,13 @@ force-install:
# $(install-lib) are installed from the object directory into $(libdir); # $(install-lib) are installed from the object directory into $(libdir);
# files in $(install-lib) matching `lib%.a' are ranlib'd after installation # files in $(install-lib) matching `lib%.a' are ranlib'd after installation
# unless they also appear in $(non-lib.a). $(install-data) are installed # unless they also appear in $(non-lib.a). $(install-data) are installed as
# as they are into $(datadir). $(headers) are installed as they are in # they are into $(datadir). $(headers) are installed as they are in
# $(includedir). $(install-bin), $(install-bin-script) and $(install-sbin) # $(includedir). $(install-bin), $(install-bin-script) and $(install-sbin)
# are installed from the object directory into $(bindir), $(bindir) and # are installed from the object directory into $(bindir), $(bindir) and
# $(sbindir), respectively. $(install-others) are absolute path names of # $(sbindir), respectively. $(install-others) and $(install-others-programs)
# files to install; rules to install them are defined elsewhere. # are absolute path names of files to install; rules to install them are
# defined elsewhere.
# The simple library name to install libc.a under. # The simple library name to install libc.a under.
# This could be defined by a sysdep Makefile. # 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-data-nosubdir: $(addprefix $(inst_datadir)/,$(install-data))
install-headers-nosubdir: $(addprefix $(inst_includedir)/,$(headers)) install-headers-nosubdir: $(addprefix $(inst_includedir)/,$(headers))
install-others-nosubdir: $(install-others) install-others-nosubdir: $(install-others)
install-others-programs-nosubdir: $(install-others-programs)
# We need all the `-nosubdir' targets so that `install' in the parent # We need all the `-nosubdir' targets so that `install' in the parent
# doesn't depend on several things which each iterate over the subdirs. # doesn't depend on several things which each iterate over the subdirs.
@ -1152,14 +1154,12 @@ install-others-nosubdir: $(install-others)
install-%:: install-%-nosubdir ; install-%:: install-%-nosubdir ;
.PHONY: install install-no-libc.a-nosubdir .PHONY: install install-no-libc.a-nosubdir
ifeq ($(build-programs),yes) install-no-libc.a-nosubdir: install-headers-nosubdir install-data-nosubdir \
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-lib-nosubdir install-others-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 endif
install: install-no-libc.a-nosubdir install: install-no-libc.a-nosubdir