svn commit: r217734 - head

[Bjoern A. Zeeb]

On Sun, 23 Jan 2011, Warner Losh wrote:

> On 01/22/2011 16:10, Bjoern A. Zeeb wrote:
>> Author: bz
>> Date: Sat Jan 22 23:10:58 2011
>> New Revision: 217734
>> URL: http://svn.freebsd.org/changeset/base/217734
>> 
>> Log:
>>    In `make targets` print the make variable TARGETS as we expect it rather
>>    than the grammatically better sounding variant without the 'S'.  This
>>    allows copy and paste and is less confusing.
>> 
>
> Also, 'make targets' explains which targets are supported by make buildworld, 
> not make universe.  Again, please revert.

I see.  Unfortunately the sparse documentation didn't say that and the
target is sitting in a section of the Makefile that starts with

#
# universe
#

(for obvious reasons).  And being told I understand it.

What about:

http://people.freebsd.org/~bz/20110124-01-make-targets.diff


!
! Back out r217734. [1]
!
! Properly document what `make targets` is supposed to list to avoid
! further confusion given the place the target sits. Should have happened
! with r217125.
!
! Requested by:	imp [1]
!
Index: share/man/man7/build.7
===================================================================
--- share/man/man7/build.7	(revision 217774)
+++ share/man/man7/build.7	(working copy)
@@ -24,7 +24,7 @@
  .\"
  .\" $FreeBSD$
  .\"
-.Dd January 22, 2011
+.Dd January 24, 2011
  .Dt BUILD 7
  .Os
  .Sh NAME
@@ -229,6 +229,12 @@ This command takes a long time.
  .It Cm update
  Get updated sources as configured in
  .Xr make.conf 5 .
+.It Cm targets
+Print a list of supported 
+.Va TARGET
+/
+.Va TARGET_ARCH
+pairs for world and kernel targets.
  .It Cm tinderbox
  Execute the same targets as
  .Cm universe .
Index: Makefile
===================================================================
--- Makefile	(revision 217774)
+++ Makefile	(working copy)
@@ -28,7 +28,8 @@
  # delete-old-dirs     - Delete obsolete directories.
  # delete-old-files    - Delete obsolete files.
  # delete-old-libs     - Delete obsolete libraries.
-# targets             - Print a list of supported TARGET/TARGET_ARCH pairs.
+# targets             - Print a list of supported TARGET/TARGET_ARCH pairs
+#                       for world and kernel targets.
  #
  # This makefile is simple by design. The FreeBSD make automatically reads
  # the /usr/share/mk/sys.mk unless the -m argument is specified on the
@@ -297,7 +298,7 @@ TARGET_ARCHES_${target}?= ${target}
  .endfor

  targets:
-	@echo "Supported TARGETS/TARGET_ARCH pairs"
+	@echo "Supported TARGET/TARGET_ARCH pairs for world and kernel targets"
  .for target in ${TARGETS}
  .for target_arch in ${TARGET_ARCHES_${target}}
  	@echo "    ${target}/${target_arch}"




> Warner
>> Modified:
>>    head/Makefile
>> 
>> Modified: head/Makefile
>> ==============================================================================
>> --- head/Makefile	Sat Jan 22 22:57:28 2011	(r217733)
>> +++ head/Makefile	Sat Jan 22 23:10:58 2011	(r217734)
>> @@ -297,7 +297,7 @@ TARGET_ARCHES_${target}?= ${target}
>>   .endfor
>>
>>   targets:
>> -	@echo "Supported TARGET/TARGET_ARCH pairs"
>> +	@echo "Supported TARGETS/TARGET_ARCH pairs"
>>   .for target in ${TARGETS}
>>   .for target_arch in ${TARGET_ARCHES_${target}}
>>   	@echo "    ${target}/${target_arch}"
>> 
>> 
>> 
>

-- 
Bjoern A. Zeeb                                 You have to have visions!
         <ks> Going to jail sucks -- <bz> All my daemons like it!
   http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/jails.html