[commits] r1150 - in /trunk/libc: ChangeLog.eglibc Makerules catgets/Makefile option-groups.def option-groups.defaults option-groups.mak

[jimb@xxxxxxxxxx]

Author: jimb
Date: Tue Jan  9 15:46:15 2007
New Revision: 1150

Log:
Merge from branches/eglibc-2_5/libc:
2006-12-08  Jim Blandy  <jimb@xxxxxxxxxxxxxxxx>

	Add rudimentary option group support.
	* option-groups.mak, option-groups.def, option-groups.defaults:
        New files.
	* Makerules: Add contents of enabled option groups to the values
	of the variables 'routines', 'others', 'install-bin',
	'install-sbin', 'extra-objs', 'tests', and 'test-srcs'.
	* catgets/Makefile: Add the catgets directory's routines and
	programs to the OPTION_EGLIBC_CATGETS option group.

Added:
    trunk/libc/option-groups.def
      - copied unchanged from r927, branches/eglibc-2_5/libc/option-groups.def
    trunk/libc/option-groups.defaults
      - copied unchanged from r927, branches/eglibc-2_5/libc/option-groups.defaults
    trunk/libc/option-groups.mak
      - copied unchanged from r927, branches/eglibc-2_5/libc/option-groups.mak
Modified:
    trunk/libc/ChangeLog.eglibc
    trunk/libc/Makerules
    trunk/libc/catgets/Makefile

Modified: trunk/libc/ChangeLog.eglibc
==============================================================================
--- trunk/libc/ChangeLog.eglibc (original)
+++ trunk/libc/ChangeLog.eglibc Tue Jan  9 15:46:15 2007
@@ -1,3 +1,14 @@
+2006-12-08  Jim Blandy  <jimb@xxxxxxxxxxxxxxxx>
+
+	Add rudimentary option group support.
+	* option-groups.mak, option-groups.def, option-groups.defaults:
+        New files.
+	* Makerules: Add contents of enabled option groups to the values
+	of the variables 'routines', 'others', 'install-bin',
+	'install-sbin', 'extra-objs', 'tests', and 'test-srcs'.
+	* catgets/Makefile: Add the catgets directory's routines and
+	programs to the OPTION_EGLIBC_CATGETS option group.
+
 2006-12-07  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 
 	* misc/tst-efgcvt.c (ecvt_tests): Disable subnormal test for E500

Modified: trunk/libc/Makerules
==============================================================================
--- trunk/libc/Makerules (original)
+++ trunk/libc/Makerules Tue Jan  9 15:46:15 2007
@@ -405,6 +405,16 @@
 endef
 endif
 
+# Include targets in the selected option groups.
+routines     += $(routines-y)
+others       += $(others-y)
+install-bin  += $(install-bin-y)
+install-sbin += $(install-sbin-y)
+extra-objs   += $(extra-objs-y)
+tests        += $(tests-y)
+test-srcs    += $(test-srcs-y)
+
+
 # Modify the list of routines we build for different targets
 
 ifeq (yesyes,$(build-shared)$(elf))

Modified: trunk/libc/catgets/Makefile
==============================================================================
--- trunk/libc/catgets/Makefile (original)
+++ trunk/libc/catgets/Makefile Tue Jan  9 15:46:15 2007
@@ -21,16 +21,18 @@
 #
 subdir	:= catgets
 
+include ../option-groups.mak
+
 headers		= nl_types.h
 distribute	= catgetsinfo.h config.h xopen-msg.sed test1.msg test2.msg \
 		  test-gencat.sh sample.SJIS
-routines	= catgets open_catalog
-others		= gencat
-install-bin	= gencat
-extra-objs	= $(gencat-modules:=.o)
+routines-$(OPTION_EGLIBC_CATGETS)    := catgets open_catalog
+others-$(OPTION_EGLIBC_CATGETS)      := gencat
+install-bin-$(OPTION_EGLIBC_CATGETS) := gencat
+extra-objs-$(OPTION_EGLIBC_CATGETS)  := $(gencat-modules:=.o)
 
-tests = tst-catgets
-test-srcs = test-gencat
+tests-$(OPTION_EGLIBC_CATGETS)       := tst-catgets
+test-srcs-$(OPTION_EGLIBC_CATGETS)   := test-gencat
 
 gencat-modules	= xmalloc