gnustep/tools-make
0
0
Fork 0
mirror of https://github.com/gnustep/tools-make.git synced 2025-04-24 14:48:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Have PACKAGE_NEEDS_CONFIGURE and JAVADOC_BUILD_ALWAYS variables recognize the standard 'yes' and 'no' values as well as 'YES' and 'NO'

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@29859 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2010-03-06 16:15:18 +00:00
parent 0e442ddd3f
commit 84458d31c9
5 changed files with 33 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
2010-03-06 Nicola Pero <nicola.pero@meta-innovation.com>
* Instance/Documentation/javadoc.make (JAVADOC_BUILD_ALWAYS):
Recognize 'yes' (which is consistent with all other variables) as
well as 'YES' (still recognized for backwards-compatibility).
* Master/rpm.make (PACKAGE_NEEDS_CONFIGURE): Recognize
'yes' (which is consistent with all other variables) as well as
'YES' (still recognized for backwards-compatibility).
* Documentation/releasenotes.texi: Updated.
2010-03-06 Nicola Pero <nicola.pero@meta-innovation.com>
* configure.ac: Check for GNU make >= 3.79 and emit a warning if

8
Documentation/releasenotes.texi
View file

@ -7,6 +7,14 @@ migrate to using a newer version of the make system.
@section Version 2.4.0
@table @samp
@item PACKAGE_NEEDS_CONFIGURE and JAVADOC_BUILD_ALWAYS now support 'yes' and 'no'
gnustep-make boolean variables traditionally use the values 'yes' and
'no', with the unfortunate exception of PACKAGE_NEEDS_CONFIGURE and
JAVADOC_BUILD_ALWAYS which used to only recognize the values 'YES' and
'NO'. For consistency with everything else, starting with
gnustep-make 2.4.0 these two variables recognize the values 'yes' and
'no' too.
@item Versions of GNU make older then 3.79.1 (June 2000) are no longer supported
The .NOTPARALLEL pseudo-target is only available in GNU make 3.79 and
is essential for parallel builds to work. Starting with version

9
Instance/Documentation/javadoc.make
View file

@ -43,9 +43,14 @@ ALL_JAVADOCFLAGS = $(INTERNAL_CLASSPATHFLAGS) $(INTERNAL_JAVADOCFLAGS) \
# incremental compilation with javadoc is not supported - you can only
# build once, or always. by default we build only once - use
# `JAVADOC_BUILD_ALWAYS = YES' to force rebuilding it always
# `JAVADOC_BUILD_ALWAYS = yes' to force rebuilding it always
ifneq ($(JAVADOC_BUILD_ALWAYS),YES) # Build only once
# Recognize both 'YES' and 'yes'
ifeq ($(JAVADOC_BUILD_ALWAYS),YES)
JAVADOC_BUILD_ALWAYS = yes
endif
ifneq ($(JAVADOC_BUILD_ALWAYS),yes) # Build only once
internal-doc-all_:: $(GNUSTEP_INSTANCE)/index.html

2
Master/nsis.make
View file

@ -47,7 +47,7 @@
# compilation (usually only needed for GNUstep core libraries
# themselves), define the following make variable:
#
# PACKAGE_NEEDS_CONFIGURE = YES
# PACKAGE_NEEDS_CONFIGURE = yes
#
# in your makefile.
MAKENSIS=makensis

9
Master/rpm.make
View file

@ -111,7 +111,7 @@
# compilation (usually only needed for GNUstep core libraries
# themselves), define the following make variable:
#
# PACKAGE_NEEDS_CONFIGURE = YES
# PACKAGE_NEEDS_CONFIGURE = yes
#
# in your makefile.
@ -180,6 +180,11 @@ SPEC_RULES_TEMPLATE=$(GNUSTEP_MAKEFILES)/spec-rules.template
SPEC_IN=$(PACKAGE_NAME).spec.in
SPEC_SCRIPT_IN=$(PACKAGE_NAME).script.spec.in
# Recognize both YES and yes
ifeq ($(PACKAGE_NEEDS_CONFIGURE),YES)
PACKAGE_NEEDS_CONFIGURE = yes
endif
.PHONY: specfile rpm check-RPM_TOPDIR
#
@ -204,7 +209,7 @@ $(SPEC_FILE): $(SPEC_IN) $(GNUSTEP_OBJ_DIR)
$(ECHO_NOTHING)echo "%define gs_install_domain $(GNUSTEP_INSTALLATION_DOMAIN)" >> $@$(END_ECHO)
$(ECHO_NOTHING)echo "%define gs_makefiles $(GNUSTEP_MAKEFILES)" >> $@$(END_ECHO)
$(ECHO_NOTHING)echo "%define gs_file_list $(GNUSTEP_FILE_LIST)" >> $@$(END_ECHO)
ifeq ($(PACKAGE_NEEDS_CONFIGURE),YES)
ifeq ($(PACKAGE_NEEDS_CONFIGURE),yes)
$(ECHO_NOTHING)echo "%define gs_configure YES" >> $@$(END_ECHO)
else
$(ECHO_NOTHING)echo "%define gs_configure NO" >> $@$(END_ECHO)