mirror of
https://github.com/gnustep/tools-make.git
synced 2025-05-30 00:41:14 +00:00
Reorganized to get rid of some variables and get header include order right
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@12138 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero
parent
dd310a6338
commit
d242cff3d3
3 changed files with 30 additions and 28 deletions
|
|
@ -1,3 +1,10 @@
|
|||
Sun Jan 20 00:02:17 2002 Nicola Pero <n.pero@mi.flashnet.it>
|
||||
|
||||
* common.make: Got rid of the GNUSTEP_HEADERS_TARGET_FLAGS
|
||||
variable.
|
||||
* rules.make (ALL_OBJCFLAGS, ALL_CFLAGS): Do not include
|
||||
GNUSTEP_HEADERS_TARGET_FLAGS.
|
||||
|
||||
Sat Jan 19 23:58:13 2002 Nicola Pero <n.pero@mi.flashnet.it>
|
||||
|
||||
* common.make (GNUSTEP_FRAMEWORKS_LIBRARIES_ROOT): Removed.
|
||||
|
|
|
|||
41
common.make
41
common.make
|
|
@ -190,6 +190,9 @@ ifeq ($(GNUSTEP_FLATTENED),)
|
|||
GNUSTEP_SYSTEM_FRAMEWORKS_LIBRARIES_FLAGS = \
|
||||
-L$(GNUSTEP_SYSTEM_ROOT)/Library/Libraries/$(GNUSTEP_TARGET_LDIR)
|
||||
|
||||
GNUSTEP_SYSTEM_HEADERS_FLAGS = \
|
||||
-I$(GNUSTEP_SYSTEM_HEADERS)/$(GNUSTEP_TARGET_DIR) \
|
||||
-I$(GNUSTEP_SYSTEM_HEADERS)
|
||||
GNUSTEP_SYSTEM_LIBRARIES_FLAGS = \
|
||||
-L$(GNUSTEP_SYSTEM_ROOT)/Libraries/$(GNUSTEP_TARGET_LDIR) \
|
||||
-L$(GNUSTEP_SYSTEM_ROOT)/Libraries/$(GNUSTEP_TARGET_DIR)
|
||||
|
|
@ -198,10 +201,10 @@ else
|
|||
GNUSTEP_SYSTEM_FRAMEWORKS_LIBRARIES_FLAGS = \
|
||||
-L$(GNUSTEP_SYSTEM_ROOT)/Library/Libraries
|
||||
|
||||
GNUSTEP_SYSTEM_HEADERS_FLAGS = -I$(GNUSTEP_SYSTEM_HEADERS)
|
||||
GNUSTEP_SYSTEM_LIBRARIES_FLAGS = -L$(GNUSTEP_SYSTEM_ROOT)/Libraries
|
||||
endif
|
||||
|
||||
GNUSTEP_SYSTEM_HEADERS_FLAGS = -I$(GNUSTEP_SYSTEM_HEADERS)
|
||||
# FIXME: parse -framework keyword
|
||||
GNUSTEP_SYSTEM_FRAMEWORKS_HEADERS_FLAGS = \
|
||||
-I$(GNUSTEP_SYSTEM_ROOT)/Library/Headers
|
||||
|
|
@ -217,6 +220,9 @@ ifneq ($(GNUSTEP_LOCAL_ROOT),)
|
|||
GNUSTEP_LOCAL_FRAMEWORKS_LIBRARIES_FLAGS = \
|
||||
-L$(GNUSTEP_LOCAL_ROOT)/Library/Libraries/$(GNUSTEP_TARGET_LDIR)
|
||||
|
||||
GNUSTEP_LOCAL_HEADERS_FLAGS = \
|
||||
-I$(GNUSTEP_LOCAL_HEADERS)/$(GNUSTEP_TARGET_DIR) \
|
||||
-I$(GNUSTEP_LOCAL_HEADERS)
|
||||
GNUSTEP_LOCAL_LIBRARIES_FLAGS = \
|
||||
-L$(GNUSTEP_LOCAL_ROOT)/Libraries/$(GNUSTEP_TARGET_LDIR) \
|
||||
-L$(GNUSTEP_LOCAL_ROOT)/Libraries/$(GNUSTEP_TARGET_DIR)
|
||||
|
|
@ -224,10 +230,10 @@ ifneq ($(GNUSTEP_LOCAL_ROOT),)
|
|||
GNUSTEP_LOCAL_FRAMEWORKS_LIBRARIES_FLAGS = \
|
||||
-L$(GNUSTEP_LOCAL_ROOT)/Library/Libraries
|
||||
|
||||
GNUSTEP_LOCAL_HEADERS_FLAGS = -I$(GNUSTEP_LOCAL_HEADERS)
|
||||
GNUSTEP_LOCAL_LIBRARIES_FLAGS = -L$(GNUSTEP_LOCAL_ROOT)/Libraries
|
||||
endif
|
||||
|
||||
GNUSTEP_LOCAL_HEADERS_FLAGS = -I$(GNUSTEP_LOCAL_HEADERS)
|
||||
# FIXME: parse -framework keyword
|
||||
GNUSTEP_LOCAL_FRAMEWORKS_HEADERS_FLAGS = \
|
||||
-I$(GNUSTEP_LOCAL_ROOT)/Library/Headers
|
||||
|
|
@ -244,16 +250,20 @@ ifneq ($(GNUSTEP_USER_ROOT),)
|
|||
GNUSTEP_USER_FRAMEWORKS_LIBRARIES_FLAGS = \
|
||||
-L$(GNUSTEP_USER_ROOT)/Library/Libraries/$(GNUSTEP_TARGET_LDIR)
|
||||
|
||||
GNUSTEP_USER_HEADERS_FLAGS = \
|
||||
-I$(GNUSTEP_USER_HEADERS)/$(GNUSTEP_TARGET_DIR) \
|
||||
-I$(GNUSTEP_USER_HEADERS)
|
||||
GNUSTEP_USER_LIBRARIES_FLAGS = \
|
||||
-L$(GNUSTEP_USER_ROOT)/Libraries/$(GNUSTEP_TARGET_LDIR) \
|
||||
-L$(GNUSTEP_USER_ROOT)/Libraries/$(GNUSTEP_TARGET_DIR)
|
||||
else
|
||||
GNUSTEP_USER_FRAMEWORKS_LIBRARIES_FLAGS = \
|
||||
-L$(GNUSTEP_USER_ROOT)/Library/Libraries
|
||||
|
||||
GNUSTEP_USER_HEADERS_FLAGS = -I$(GNUSTEP_USER_HEADERS)
|
||||
GNUSTEP_USER_LIBRARIES_FLAGS = -L$(GNUSTEP_USER_ROOT)/Libraries
|
||||
endif
|
||||
|
||||
GNUSTEP_USER_HEADERS_FLAGS = -I$(GNUSTEP_USER_HEADERS)
|
||||
# FIXME: parse -framework keyword
|
||||
GNUSTEP_USER_FRAMEWORKS_HEADERS_FLAGS \
|
||||
= -I$(GNUSTEP_USER_ROOT)/Library/Headers
|
||||
|
|
@ -268,6 +278,9 @@ ifneq ($(GNUSTEP_NETWORK_ROOT),)
|
|||
GNUSTEP_NETWORK_HEADERS = $(GNUSTEP_NETWORK_ROOT)/Headers
|
||||
|
||||
ifeq ($(GNUSTEP_FLATTENED),)
|
||||
GNUSTEP_NETWORK_HEADERS_FLAGS = \
|
||||
-I$(GNUSTEP_NETWORK_HEADERS)/$(GNUSTEP_TARGET_DIR) \
|
||||
-I$(GNUSTEP_NETWORK_HEADERS)
|
||||
GNUSTEP_NETWORK_LIBRARIES_FLAGS = \
|
||||
-L$(GNUSTEP_NETWORK_ROOT)/Libraries/$(GNUSTEP_TARGET_LDIR) \
|
||||
-L$(GNUSTEP_NETWORK_ROOT)/Libraries/$(GNUSTEP_TARGET_DIR)
|
||||
|
|
@ -275,39 +288,19 @@ ifneq ($(GNUSTEP_NETWORK_ROOT),)
|
|||
GNUSTEP_NETWORK_FRAMEWORKS_LIBRARIES_FLAGS = \
|
||||
-L$(GNUSTEP_NETWORK_ROOT)/Library/Libraries/$(GNUSTEP_TARGET_LDIR)
|
||||
else
|
||||
GNUSTEP_NETWORK_HEADERS_FLAGS = -I$(GNUSTEP_NETWORK_HEADERS)
|
||||
GNUSTEP_NETWORK_LIBRARIES_FLAGS = -L$(GNUSTEP_NETWORK_ROOT)/Libraries
|
||||
|
||||
GNUSTEP_NETWORK_FRAMEWORKS_LIBRARIES_FLAGS = \
|
||||
-L$(GNUSTEP_NETWORK_ROOT)/Library/Libraries
|
||||
endif
|
||||
|
||||
GNUSTEP_NETWORK_HEADERS_FLAGS = -I$(GNUSTEP_NETWORK_HEADERS)
|
||||
# FIXME: parse -framework keyword
|
||||
GNUSTEP_NETWORK_FRAMEWORKS_HEADERS_FLAGS \
|
||||
= -I$(GNUSTEP_NETWORK_ROOT)/Library/Headers
|
||||
|
||||
endif
|
||||
|
||||
ifeq ($(GNUSTEP_FLATTENED),)
|
||||
#
|
||||
# Target specific header include directories
|
||||
#
|
||||
ifneq ($(GNUSTEP_NETWORK_ROOT),)
|
||||
GNUSTEP_HEADERS_TARGET_FLAGS += \
|
||||
-I$(GNUSTEP_NETWORK_HEADERS)/$(GNUSTEP_TARGET_DIR)
|
||||
endif
|
||||
ifneq ($(GNUSTEP_USER_ROOT),)
|
||||
GNUSTEP_HEADERS_TARGET_FLAGS \
|
||||
+= -I$(GNUSTEP_USER_HEADERS)/$(GNUSTEP_TARGET_DIR)
|
||||
endif
|
||||
ifneq ($(GNUSTEP_LOCAL_ROOT),)
|
||||
GNUSTEP_HEADERS_TARGET_FLAGS \
|
||||
+= -I$(GNUSTEP_LOCAL_HEADERS)/$(GNUSTEP_TARGET_DIR)
|
||||
endif
|
||||
GNUSTEP_HEADERS_TARGET_FLAGS \
|
||||
+= -I$(GNUSTEP_SYSTEM_HEADERS)/$(GNUSTEP_TARGET_DIR)
|
||||
endif
|
||||
|
||||
#
|
||||
# Determine Foundation header subdirectory based upon library combo
|
||||
#
|
||||
|
|
|
|||
10
rules.make
10
rules.make
|
|
@ -312,8 +312,9 @@ ALL_OBJCFLAGS = $(INTERNAL_OBJCFLAGS) $(ADDITIONAL_OBJCFLAGS) \
|
|||
$(GNUSTEP_NETWORK_FRAMEWORKS_HEADERS_FLAGS) \
|
||||
$(GNUSTEP_SYSTEM_FRAMEWORKS_HEADERS_FLAGS) \
|
||||
$(GNUSTEP_HEADERS_FND_FLAG) $(GNUSTEP_HEADERS_GUI_FLAG) \
|
||||
$(GNUSTEP_HEADERS_TARGET_FLAGS) $(GNUSTEP_USER_HEADERS_FLAGS) \
|
||||
$(GNUSTEP_LOCAL_HEADERS_FLAGS) $(GNUSTEP_NETWORK_HEADERS_FLAGS) \
|
||||
$(GNUSTEP_USER_HEADERS_FLAGS) \
|
||||
$(GNUSTEP_LOCAL_HEADERS_FLAGS) \
|
||||
$(GNUSTEP_NETWORK_HEADERS_FLAGS) \
|
||||
$(GNUSTEP_SYSTEM_HEADERS_FLAGS)
|
||||
|
||||
ALL_CFLAGS = $(INTERNAL_CFLAGS) $(ADDITIONAL_CFLAGS) \
|
||||
|
|
@ -326,8 +327,9 @@ ALL_CFLAGS = $(INTERNAL_CFLAGS) $(ADDITIONAL_CFLAGS) \
|
|||
$(GNUSTEP_NETWORK_FRAMEWORKS_HEADERS_FLAGS) \
|
||||
$(GNUSTEP_SYSTEM_FRAMEWORKS_HEADERS_FLAGS) \
|
||||
$(GNUSTEP_HEADERS_FND_FLAG) $(GNUSTEP_HEADERS_GUI_FLAG) \
|
||||
$(GNUSTEP_HEADERS_TARGET_FLAGS) $(GNUSTEP_USER_HEADERS_FLAGS) \
|
||||
$(GNUSTEP_LOCAL_HEADERS_FLAGS) $(GNUSTEP_NETWORK_HEADERS_FLAGS) \
|
||||
$(GNUSTEP_USER_HEADERS_FLAGS) \
|
||||
$(GNUSTEP_LOCAL_HEADERS_FLAGS) \
|
||||
$(GNUSTEP_NETWORK_HEADERS_FLAGS) \
|
||||
$(GNUSTEP_SYSTEM_HEADERS_FLAGS)
|
||||
|
||||
# if you need, you can define ADDITIONAL_CCFLAGS to add C++ specific flags
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue