Re: $(build-programs) and $(install-others)

[Mike Frysinger <vapier at gentoo dot org>]

On Monday 23 July 2007, Roland McGrath wrote:
> > how about changing "others" to "programs" ?  it's certainly clearer what
> > it means and ties better with $(build-programs) ...
>
> It seems less likely the patch will be small and surely correct in getting
> all uses.

you're the boss ;)

attached patch sets up a new $(install-extras) target, moves all non-binary 
related targets to that, and filters out $(install-other) when 
$(build-programs) is set to no.

tested glibc-2.6 no apparent regressions:
 - build-programs=no host=powerpc target=ia64
 - build-programs=yes host=powerpc target=powerpc
-mike

Attachment: signature.asc
Description: This is a digitally signed message part.

2007-07-24  Mike Frysinger  <vapier@gentoo.org>

	* Makefile (+subdir_targets): Add extras with install- prefix.
	(install-extras): Change from install-others.
	(install-extras-nosubdir): Change from install-others-nosubdir.
	* Makerules (install-extras-nosubdir): Define.
	(install-no-libc.a-nosubdir): Add install-extras-nosubdir when
	build-programs.  Delete install-others-nosubdir when not.
	* elf/Makefile (install-extras): Change from install-others.
	* iconvdata/Makefile (install-extras): Likewise.
	* intl/Makefile (install-extras): Likewise.
	* localedata/Makefile (install-extras): Likewise.
	* po/Makefile (install-extras): Likewise.
	* stdio-common/Makefile (install-extras): Likewise.
	* timezone/Makefile (install-extras): Likewise.

--- Makefile
+++ Makefile
@@ -66,7 +66,7 @@
 		   subdir_echo-headers 					\
 		   subdir_install					\
 		   subdir_objs subdir_stubs subdir_testclean		\
-		   $(addprefix install-, no-libc.a bin lib data headers others)
+		   $(addprefix install-, no-libc.a bin lib data headers others extras)
 
 headers := limits.h values.h features.h gnu-versions.h bits/libc-lock.h \
 	   bits/xopen_lim.h gnu/libc-version.h
@@ -78,7 +78,7 @@
 vpath %.h $(subdir-dirs)
 
 # What to install.
-install-others = $(inst_includedir)/gnu/stubs.h
+install-extras = $(inst_includedir)/gnu/stubs.h
 install-bin-script =
 
 ifeq (yes,$(build-shared))
@@ -167,7 +167,7 @@
 	$(make-target-directory)
 	$(INSTALL_DATA) $< $@
 
-install-others-nosubdir: $(installed-stubs)
+install-extras-nosubdir: $(installed-stubs)
 endif
 
 
--- Makerules
+++ Makerules
@@ -1144,6 +1144,7 @@
 install-data-nosubdir: $(addprefix $(inst_datadir)/,$(install-data))
 install-headers-nosubdir: $(addprefix $(inst_includedir)/,$(headers))
 install-others-nosubdir: $(install-others)
+install-extras-nosubdir: $(install-extras)
 
 # We need all the `-nosubdir' targets so that `install' in the parent
 # doesn't depend on several things which each iterate over the subdirs.
@@ -1155,11 +1156,12 @@
 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
+			    install-lib-nosubdir install-extras-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-extras-nosubdir
 endif
 install: install-no-libc.a-nosubdir
 
--- elf/Makefile
+++ elf/Makefile
@@ -116,7 +116,7 @@
 ifeq (yes,$(build-shared))
 extra-objs	= $(all-rtld-routines:%=%.os) soinit.os sofini.os interp.os
 generated	+= librtld.os dl-allobjs.os ld.so ldd
-install-others	= $(inst_slibdir)/$(rtld-installed-name)
+install-extras	= $(inst_slibdir)/$(rtld-installed-name)
 install-bin-script = ldd
 endif
 
--- iconvdata/Makefile
+++ iconvdata/Makefile
@@ -210,7 +210,7 @@
 
 
 extra-objs	+= $(modules.so)
-install-others	= $(addprefix $(inst_gconvdir)/, $(modules.so))	\
+install-extras	= $(addprefix $(inst_gconvdir)/, $(modules.so))	\
 		  $(inst_gconvdir)/gconv-modules
 
 # We can build the conversion tables for numerous charsets automatically.
--- intl/Makefile
+++ intl/Makefile
@@ -45,7 +45,7 @@
 
 before-compile = $(objpfx)msgs.h
 
-install-others = $(inst_msgcatdir)/locale.alias
+install-extras = $(inst_msgcatdir)/locale.alias
 
 generated = msgs.h mtrace-tst-gettext tst-gettext.mtrace
 generated-dirs := domaindir localedir
--- localedata/Makefile
+++ localedata/Makefile
@@ -102,7 +102,7 @@
 endif
 
 # Files to install.
-install-others := $(addprefix $(inst_i18ndir)/, \
+install-extras := $(addprefix $(inst_i18ndir)/, \
 			      $(addsuffix .gz, $(charmaps)) \
 			      $(locales))
 
--- po/Makefile
+++ po/Makefile
@@ -46,7 +46,7 @@
 mo-installed = $(inst_msgcatdir)/%/LC_MESSAGES/$(domainname).mo
 
 # Files to install: a $(domainname).mo file for each language.
-install-others = $(LINGUAS:%=$(mo-installed))
+install-extras = $(LINGUAS:%=$(mo-installed))
 
 # Files to distribute: all the source and compiled binary translation files.
 distribute = $(ALL_LINGUAS:=.po) $(BROKEN_LINGUAS:=.po) $(ALL_LINGUAS:=.mo) \
--- stdio-common/Makefile
+++ stdio-common/Makefile
@@ -36,7 +36,7 @@
 	remove rename renameat						      \
 	flockfile ftrylockfile funlockfile
 
-install-others = $(inst_includedir)/bits/stdio_lim.h
+install-extras = $(inst_includedir)/bits/stdio_lim.h
 
 include ../Makeconfig
 
--- timezone/Makefile
+++ timezone/Makefile
@@ -71,14 +71,14 @@
 
 ifeq ($(cross-compiling),no)
 # Don't try to install the zoneinfo files since we can't run zic.
-install-others = $(addprefix $(inst_zonedir)/,$(zonenames) \
+install-extras = $(addprefix $(inst_zonedir)/,$(zonenames) \
 					      $(zonenames:%=posix/%) \
 					      $(zonenames:%=right/%)) \
 		 $(installed-localtime-file) $(installed-posixrules-file)
 endif
 
 ifeq ($(have-ksh),yes)
-install-others += $(inst_zonedir)/iso3166.tab $(inst_zonedir)/zone.tab
+install-extras += $(inst_zonedir)/iso3166.tab $(inst_zonedir)/zone.tab
 install-bin-script = tzselect
 generated += tzselect
 endif