mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-23 22:33:28 +00:00
Changed xxx_NEEDS_GUI and NEEDS_GUI to accept yes as well as YES as value; prefer yes as it's consistent with all other boolean options in gnustep-make
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@26263 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
7f2a73decd
commit
19f9ee1fe8
11 changed files with 48 additions and 23 deletions
20
ChangeLog
20
ChangeLog
|
@ -1,3 +1,23 @@
|
|||
2008-03-11 Nicola Pero <nicola.pero@meta-innovation.com>
|
||||
|
||||
Fixed NEEDS_GUI and xxx_NEEDS_GUI options to accept "yes" as well
|
||||
as "YES", to be consistent with all the other boolean options in
|
||||
gnustep-make.
|
||||
* Instance/rules.make (INTERNAL_NEEDS_GUI): Changed to accept
|
||||
"yes" as well as "YES"
|
||||
* Instance/application.make (NEEDS_GUI): Use yes/no in preference
|
||||
to YES/NO for the default values.
|
||||
* Instance/bundle.make: Same change.
|
||||
* Instance/framework.make: Same change.
|
||||
* Instance/gswapp.make: Same change.
|
||||
* Instance/gswbundle.make: Same change.
|
||||
* Instance/library.make: Same change.
|
||||
* Instance/palette.make: Same change.
|
||||
|
||||
* Documentation/releasenotes.texi: Suggest yes/no in preference to
|
||||
YES/NO as possible values for NEEDS_GUI and xxx_NEEDS_GUI.
|
||||
* RELEASENOTE: Regenerated.
|
||||
|
||||
2008-03-03 Nicola Pero <nicola.pero@meta-innovation.com>
|
||||
|
||||
Updated C++ and ObjC++ support so that it automatically uses g++
|
||||
|
|
|
@ -30,8 +30,8 @@ before or after sourcing GNUstep.sh. The same applies to
|
|||
|
||||
@item xxx_NEEDS_GUI
|
||||
This new variable can be used to specify that a project needs to be
|
||||
linked against the gui library (or not). If set to YES, the gui
|
||||
library will be linked; if set to NO, the gui library will not be
|
||||
linked against the gui library (or not). If set to yes, the gui
|
||||
library will be linked; if set to no, the gui library will not be
|
||||
linked. If unspecified, the generic variable NEEDS_GUI is used; if
|
||||
that is also unspecified, the behaviour depends on the project type
|
||||
(and is backwards-compatible): applications, bundles, frameworks,
|
||||
|
@ -43,7 +43,7 @@ the linking should be done.
|
|||
@item NEEDS_GUI
|
||||
This new variable can be used to specify that all projects built by
|
||||
this GNUmakefile need to be linked against the gui library (or not).
|
||||
If set to YES, the gui library will be linked; if set to NO, the gui
|
||||
If set to yes, the gui library will be linked; if set to no, the gui
|
||||
library will not be linked. This behaviour can be overridden for
|
||||
specific project targets by using the xxx_NEEDS_GUI variable (see
|
||||
above).
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
|
||||
# Applications usually link against a gui library (if available).
|
||||
ifeq ($(NEEDS_GUI),)
|
||||
NEEDS_GUI = YES
|
||||
NEEDS_GUI = yes
|
||||
endif
|
||||
|
||||
#
|
||||
|
|
|
@ -22,9 +22,9 @@
|
|||
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
|
||||
# Bundles usually link against a gui library (if available). If you
|
||||
# don't need a gui library, use xxx_NEEDS_GUI = NO.
|
||||
# don't need a gui library, use xxx_NEEDS_GUI = no.
|
||||
ifeq ($(NEEDS_GUI),)
|
||||
NEEDS_GUI = YES
|
||||
NEEDS_GUI = yes
|
||||
endif
|
||||
|
||||
ifeq ($(RULES_MAKE_LOADED),)
|
||||
|
|
|
@ -21,9 +21,9 @@
|
|||
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
|
||||
# Frameworks usually link against a gui library (if available). If
|
||||
# you don't need a gui library, use xxx_NEEDS_GUI = NO.
|
||||
# you don't need a gui library, use xxx_NEEDS_GUI = no.
|
||||
ifeq ($(NEEDS_GUI),)
|
||||
NEEDS_GUI = YES
|
||||
NEEDS_GUI = yes
|
||||
endif
|
||||
|
||||
ifeq ($(RULES_MAKE_LOADED),)
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
|
||||
ifeq ($(NEEDS_GUI),)
|
||||
NEEDS_GUI = NO
|
||||
NEEDS_GUI = no
|
||||
endif
|
||||
|
||||
ifeq ($(RULES_MAKE_LOADED),)
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
|
||||
ifeq ($(NEEDS_GUI),)
|
||||
NEEDS_GUI = NO
|
||||
NEEDS_GUI = no
|
||||
endif
|
||||
|
||||
ifeq ($(RULES_MAKE_LOADED),)
|
||||
|
|
|
@ -22,9 +22,9 @@
|
|||
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
|
||||
# Libraries usually link against a gui library (if available). If you
|
||||
# don't need a gui library, use xxx_NEEDS_GUI = NO.
|
||||
# don't need a gui library, use xxx_NEEDS_GUI = no.
|
||||
ifeq ($(NEEDS_GUI),)
|
||||
NEEDS_GUI = YES
|
||||
NEEDS_GUI = yes
|
||||
endif
|
||||
|
||||
ifeq ($(RULES_MAKE_LOADED),)
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
# Palettes usually link against a gui library (if available).
|
||||
ifeq ($(NEEDS_GUI),)
|
||||
NEEDS_GUI = YES
|
||||
NEEDS_GUI = yes
|
||||
endif
|
||||
|
||||
ifeq ($(RULES_MAKE_LOADED),)
|
||||
|
|
|
@ -375,16 +375,16 @@ LIBRARIES_DEPEND_UPON += $($(GNUSTEP_INSTANCE)_LIBRARIES_DEPEND_UPON)
|
|||
# You can control whether you want to link against the gui library
|
||||
# by using one of the two commands --
|
||||
#
|
||||
# xxx_NEEDS_GUI = YES
|
||||
# xxx_NEEDS_GUI = NO
|
||||
# xxx_NEEDS_GUI = yes
|
||||
# xxx_NEEDS_GUI = no
|
||||
# (where 'xxx' is the name of your application/bundle/etc.)
|
||||
#
|
||||
# You can also change it for all applications/bundles/etc by doing
|
||||
#
|
||||
# NEEDS_GUI = YES (or NO)
|
||||
# NEEDS_GUI = yes (or no)
|
||||
#
|
||||
# If you don't specify anything, the default for the project type will
|
||||
# be used (this is the NEEDS_GUI = YES/NO that is at the top of all
|
||||
# be used (this is the NEEDS_GUI = yes/no that is at the top of all
|
||||
# project types).
|
||||
#
|
||||
# If the project type doesn't specify anything (eg, doesn't need
|
||||
|
@ -398,15 +398,20 @@ ifeq ($(INTERNAL_NEEDS_GUI),)
|
|||
INTERNAL_NEEDS_GUI = $(NEEDS_GUI)
|
||||
|
||||
ifeq ($(INTERNAL_NEEDS_GUI),)
|
||||
INTERNAL_NEEDS_GUI = NO
|
||||
INTERNAL_NEEDS_GUI = no
|
||||
endif
|
||||
|
||||
endif
|
||||
|
||||
# Recognize 'YES' as well as 'yes'
|
||||
ifeq ($(INTERNAL_NEEDS_GUI),YES)
|
||||
INTERNAL_NEEDS_GUI = yes
|
||||
endif
|
||||
|
||||
# Now we prepare a variable, ALL_LIBS, containing the list of all LIBS
|
||||
# that should be used when linking. This is different depending on
|
||||
# whether we need to link against the gui library or not.
|
||||
ifeq ($(INTERNAL_NEEDS_GUI), YES)
|
||||
ifeq ($(INTERNAL_NEEDS_GUI), yes)
|
||||
# Please note that you usually need to add ALL_LIB_DIRS before
|
||||
# ALL_LIBS when linking. It's kept separate because sometimes (eg,
|
||||
# bundles) we only use ALL_LIB_DIRS and not ALL_LIBS (not sure how
|
||||
|
|
|
@ -31,8 +31,8 @@ using a newer version of the make system.
|
|||
|
||||
`xxx_NEEDS_GUI'
|
||||
This new variable can be used to specify that a project needs to be
|
||||
linked against the gui library (or not). If set to YES, the gui
|
||||
library will be linked; if set to NO, the gui library will not be
|
||||
linked against the gui library (or not). If set to yes, the gui
|
||||
library will be linked; if set to no, the gui library will not be
|
||||
linked. If unspecified, the generic variable NEEDS_GUI is used; if
|
||||
that is also unspecified, the behaviour depends on the project type
|
||||
(and is backwards-compatible): applications, bundles, frameworks,
|
||||
|
@ -44,8 +44,8 @@ using a newer version of the make system.
|
|||
`NEEDS_GUI'
|
||||
This new variable can be used to specify that all projects built by
|
||||
this GNUmakefile need to be linked against the gui library (or
|
||||
not). If set to YES, the gui library will be linked; if set to
|
||||
NO, the gui library will not be linked. This behaviour can be
|
||||
not). If set to yes, the gui library will be linked; if set to
|
||||
no, the gui library will not be linked. This behaviour can be
|
||||
overridden for specific project targets by using the xxx_NEEDS_GUI
|
||||
variable (see above).
|
||||
|
||||
|
|
Loading…
Reference in a new issue