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

Rewritten the code creating the list of header and library directories, so

Browse source 
that if any of the GNUSTEP_XXX_ROOT directories are the same, we avoid adding
duplicates


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@18819 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2004-03-09 17:38:18 +00:00
parent b59a569578
commit d1a80447c5
1 changed files with 56 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

92
common.make
View file

@ -218,46 +218,70 @@ MAKEFILE_NAME = GNUmakefile
endif
# Now prepare the library and header flags - we first prepare the list
# of directories, then optionally remove the empty ones, then prepend
# -I / -L to them.
# of directories (trying to avoid duplicates in the list), then
# optionally remove the empty ones, then prepend -I / -L to them.
ifeq ($(GNUSTEP_FLATTENED),)
GNUSTEP_HEADERS_DIRS = \
$(GNUSTEP_USER_ROOT)/Library/Headers/$(LIBRARY_COMBO)/$(GNUSTEP_TARGET_DIR) \
$(GNUSTEP_USER_ROOT)/Library/Headers/$(LIBRARY_COMBO) \
$(GNUSTEP_LOCAL_ROOT)/Library/Headers/$(LIBRARY_COMBO)/$(GNUSTEP_TARGET_DIR)\
$(GNUSTEP_LOCAL_ROOT)/Library/Headers/$(LIBRARY_COMBO) \
$(GNUSTEP_NETWORK_ROOT)/Library/Headers/$(LIBRARY_COMBO)/$(GNUSTEP_TARGET_DIR)\
$(GNUSTEP_NETWORK_ROOT)/Library/Headers/$(LIBRARY_COMBO) \
$(GNUSTEP_SYSTEM_ROOT)/Library/Headers/$(LIBRARY_COMBO)/$(GNUSTEP_TARGET_DIR)\
$(GNUSTEP_SYSTEM_ROOT)/Library/Headers/$(LIBRARY_COMBO)
# The following variables have to be evaluated after setting dir to
# something, such as GNUSTEP_USER_ROOT. When you evaluate them in
# that situation, they will generate paths according to the following
# definition. Later, we'll systematically replace dir with
# GNUSTEP_USER_ROOT, the GNUSTEP_LOCAL_ROOT, then
# GNUSTEP_NETWORK_ROOT, then GNUSTEP_SYSTEM_ROOT.
GS_HEADER_PATH = \
$(dir)/Library/Headers/$(LIBRARY_COMBO)/$(GNUSTEP_TARGET_DIR) \
$(dir)/Library/Headers/$(LIBRARY_COMBO)
GNUSTEP_LIBRARIES_DIRS = \
$(GNUSTEP_USER_ROOT)/Library/Libraries/$(GNUSTEP_TARGET_LDIR) \
$(GNUSTEP_USER_ROOT)/Library/Libraries/$(GNUSTEP_TARGET_DIR) \
$(GNUSTEP_LOCAL_ROOT)/Library/Libraries/$(GNUSTEP_TARGET_LDIR) \
$(GNUSTEP_LOCAL_ROOT)/Library/Libraries/$(GNUSTEP_TARGET_DIR) \
$(GNUSTEP_NETWORK_ROOT)/Library/Libraries/$(GNUSTEP_TARGET_LDIR) \
$(GNUSTEP_NETWORK_ROOT)/Library/Libraries/$(GNUSTEP_TARGET_DIR) \
$(GNUSTEP_SYSTEM_ROOT)/Library/Libraries/$(GNUSTEP_TARGET_LDIR) \
$(GNUSTEP_SYSTEM_ROOT)/Library/Libraries/$(GNUSTEP_TARGET_DIR)
GS_LIBRARY_PATH = \
$(dir)/Library/Libraries/$(GNUSTEP_TARGET_LDIR) \
$(dir)/Library/Libraries/$(GNUSTEP_TARGET_DIR)
else # GNUSTEP_FLATTENED
else
GNUSTEP_HEADERS_DIRS = \
$(GNUSTEP_USER_ROOT)/Library/Headers \
$(GNUSTEP_LOCAL_ROOT)/Library/Headers \
$(GNUSTEP_NETWORK_ROOT)/Library/Headers \
$(GNUSTEP_SYSTEM_ROOT)/Library/Headers
# In the flattened case, the paths to generate are considerably simpler.
GNUSTEP_LIBRARIES_DIRS = \
$(GNUSTEP_USER_ROOT)/Library/Libraries \
$(GNUSTEP_LOCAL_ROOT)/Library/Libraries \
$(GNUSTEP_NETWORK_ROOT)/Library/Libraries \
$(GNUSTEP_SYSTEM_ROOT)/Library/Libraries
GS_HEADER_PATH = $(dir)/Library/Headers
GS_LIBRARY_PATH = $(dir)/Library/Libraries
endif # GNUSTEP_FLATTENED
endif
# First, we add paths based on GNUSTEP_USER_ROOT.
# Please note that the following causes GS_HEADER_PATH to be evaluated
# with the variable dir equal $(GNUSTEP_USER_ROOT), which gives the
# effect we wanted.
GNUSTEP_HEADERS_DIRS = $(foreach dir,$(GNUSTEP_USER_ROOT),$(GS_HEADER_PATH))
GNUSTEP_LIBRARIES_DIRS = $(foreach dir,$(GNUSTEP_USER_ROOT),$(GS_LIBRARY_PATH))
# Second, if GNUSTEP_LOCAL_ROOT is different from GNUSTEP_USER_ROOT
# (which has already been added), we add the paths based on
# GNUSTEP_LOCAL_ROOT too.
ifneq ($(GNUSTEP_LOCAL_ROOT), $(GNUSTEP_USER_ROOT))
GNUSTEP_HEADERS_DIRS += $(foreach dir,$(GNUSTEP_LOCAL_ROOT),$(GS_HEADER_PATH))
GNUSTEP_LIBRARIES_DIRS += $(foreach dir,$(GNUSTEP_LOCAL_ROOT),$(GS_LIBRARY_PATH))
endif
# Third, if GNUSTEP_NETWORK_ROOT is different from GNUSTEP_USER_ROOT and
# GNUSTEP_LOCAL_ROOT (which have already been added), we add the paths
# based on GNUSTEP_NETWORK_ROOT too.
ifneq ($(GNUSTEP_NETWORK_ROOT), $(GNUSTEP_USER_ROOT))
ifneq ($(GNUSTEP_NETWORK_ROOT), $(GNUSTEP_LOCAL_ROOT))
GNUSTEP_HEADERS_DIRS += $(foreach dir,$(GNUSTEP_NETWORK_ROOT),$(GS_HEADER_PATH))
GNUSTEP_LIBRARIES_DIRS += $(foreach dir,$(GNUSTEP_NETWORK_ROOT),$(GS_LIBRARY_PATH))
endif
endif
# Last, if GNUSTEP_SYSTEM_ROOT is different from GNUSTEP_USER_ROOT,
# GNUSTEP_LOCAL_ROOT and GNUSTEP_NETWORK_ROOT (which have already been
# added), we add the pathe paths based on GNUSTEP_SYSTEM_ROOT too.
ifneq ($(GNUSTEP_SYSTEM_ROOT), $(GNUSTEP_USER_ROOT))
ifneq ($(GNUSTEP_SYSTEM_ROOT), $(GNUSTEP_LOCAL_ROOT))
ifneq ($(GNUSTEP_SYSTEM_ROOT), $(GNUSTEP_NETWORK_ROOT))
GNUSTEP_HEADERS_DIRS += $(foreach dir,$(GNUSTEP_SYSTEM_ROOT),$(GS_HEADER_PATH))
GNUSTEP_LIBRARIES_DIRS += $(foreach dir,$(GNUSTEP_SYSTEM_ROOT),$(GS_LIBRARY_PATH))
endif
endif
endif
ifeq ($(REMOVE_EMPTY_DIRS),yes)
# This variable, when evaluated, gives $(dir) if dir is non-empty, and
@ -548,7 +572,3 @@ unexport GNUSTEP_INSTANCE
unexport GNUSTEP_TYPE
endif # COMMON_MAKE_LOADED
## Local variables:
## mode: makefile
## End: