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

Standardized checks for Apple building style to be a check that FOUNDATION_LIB

Browse source 
is apple


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@15388 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2002-12-30 16:33:21 +00:00
parent 0b3559267f
commit 56dab36ebd
4 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Instance/application.make
View file

@ -74,7 +74,7 @@ APP_DIR_NAME = $(GNUSTEP_INSTANCE:=.$(APP_EXTENSION))
# Now include the standard resource-bundle routines from Shared/bundle.make
#
ifneq ($(FOUNDATION_LIB),nx)
ifneq ($(FOUNDATION_LIB), apple)
# GNUstep bundle
GNUSTEP_SHARED_BUNDLE_RESOURCE_PATH = $(APP_DIR_NAME)/Resources
APP_INFO_PLIST_FILE = $(APP_DIR_NAME)/Resources/Info-gnustep.plist
@ -87,8 +87,7 @@ GNUSTEP_SHARED_BUNDLE_MAIN_PATH = $(APP_DIR_NAME)
GNUSTEP_SHARED_BUNDLE_INSTALL_DIR = $(APP_INSTALL_DIR)
include $(GNUSTEP_MAKEFILES)/Instance/Shared/bundle.make
# Support building NeXT applications
ifneq ($(OBJC_COMPILER), NeXT)
ifneq ($(FOUNDATION_LIB), apple)
APP_FILE = \
$(APP_DIR_NAME)/$(GNUSTEP_TARGET_LDIR)/$(GNUSTEP_INSTANCE)$(EXEEXT)
else
@ -102,7 +101,7 @@ endif
$(APP_FILE): $(OBJ_FILES_TO_LINK)
$(ECHO_LINKING)$(LD) $(ALL_LDFLAGS) -o $(LDOUT)$@ $(OBJ_FILES_TO_LINK)\
$(ALL_GUI_LIBS)$(END_ECHO)
ifeq ($(OBJC_COMPILER), NeXT)
ifeq ($(FOUNDATION_LIB), apple)
@$(TRANSFORM_PATHS_SCRIPT) $(subst -L,,$(ALL_LIB_DIRS)) \
>$(APP_DIR_NAME)/library_paths.openapp
else
@ -114,7 +113,7 @@ endif
# Compilation targets
#
ifeq ($(FOUNDATION_LIB), nx)
ifeq ($(FOUNDATION_LIB), apple)
internal-app-all_:: $(GNUSTEP_OBJ_DIR) \
$(APP_DIR_NAME) \
$(APP_FILE) \
@ -170,14 +169,14 @@ MAIN_MODEL_FILE = $(strip $(subst .gmodel,,$(subst .gorm,,$(subst .nib,,$($(GNUS
GNUSTEP_STAMP_STRING = $(PRINCIPAL_CLASS)-$(APPLICATION_ICON)-$(MAIN_MODEL_FILE)
GNUSTEP_STAMP_DIR = $(APP_DIR_NAME)
ifneq ($(FOUNDATION_LIB),nx)
ifneq ($(FOUNDATION_LIB), apple)
# Only for efficiency
$(GNUSTEP_STAMP_DIR): $(APP_DIR_NAME)/$(GNUSTEP_TARGET_LDIR)
endif
include $(GNUSTEP_MAKEFILES)/Instance/Shared/stamp-string.make
ifeq ($(FOUNDATION_LIB), nx)
ifeq ($(FOUNDATION_LIB), apple)
$(APP_INFO_PLIST_FILE): $(GNUSTEP_STAMP_DEPEND)
@(echo "{"; echo ' NOTE = "Automatically generated, do not edit!";'; \
echo " NSExecutable = \"$(GNUSTEP_INSTANCE)\";"; \

12
Instance/bundle.make
View file

@ -90,7 +90,7 @@ endif # OBJ_FILES_TO_LINK
# xxx.bundle/Contents/Info.plist
# xxx.bundle/Contents/Resources/<all resources here>
# This second way of building bundles is triggered by FOUNDATION_LIB =
# nx.
# apple.
#
internal-bundle-all_:: $(GNUSTEP_OBJ_DIR) build-bundle
@ -106,7 +106,7 @@ ifeq ($(BUNDLE_INSTALL_DIR),)
BUNDLE_INSTALL_DIR = $(GNUSTEP_BUNDLES)
endif
ifneq ($(FOUNDATION_LIB),nx)
ifneq ($(FOUNDATION_LIB), apple)
# GNUstep bundle
GNUSTEP_SHARED_BUNDLE_RESOURCE_PATH = $(BUNDLE_DIR_NAME)/Resources
BUNDLE_INFO_PLIST_FILE = $(BUNDLE_DIR_NAME)/Resources/Info-gnustep.plist
@ -171,7 +171,7 @@ MAIN_MODEL_FILE = $(strip $(subst .gmodel,,$(subst .gorm,,$(subst .nib,,$($(GNUS
GNUSTEP_STAMP_STRING = $(PRINCIPAL_CLASS)-$(MAIN_MODEL_FILE)
GNUSTEP_STAMP_DIR = $(BUNDLE_DIR_NAME)
ifeq ($(FOUNDATION_LIB),nx)
ifeq ($(FOUNDATION_LIB), apple)
# For efficiency, depend on the rule to build BUNDLE_DIR_NAME/Contents
# (which would be used anyway when building the bundle), rather than
# executing a separate rule.
@ -184,7 +184,7 @@ endif
include $(GNUSTEP_MAKEFILES)/Instance/Shared/stamp-string.make
ifeq ($(FOUNDATION_LIB),nx)
ifeq ($(FOUNDATION_LIB), apple)
# MacOSX bundles
$(BUNDLE_DIR_NAME)/Contents:
@ -226,7 +226,7 @@ $(BUNDLE_DIR_NAME)/Contents/Info.plist: $(BUNDLE_DIR_NAME)/Contents \
) >$@
endif
else # following executed if FOUNDATION_LIB != nx
else # following executed if FOUNDATION_LIB != apple
ifneq ($(OBJ_FILES_TO_LINK),)
# GNUstep bundles
@ -252,7 +252,7 @@ $(BUNDLE_DIR_NAME)/Resources/Info-gnustep.plist: $(BUNDLE_DIR_NAME)/Resources \
fi)
endif
endif # FOUNDATION_LIB != nx
endif # FOUNDATION_LIB != apple
$(BUNDLE_INSTALL_DIR):
$(MKINSTALLDIRS) $@

2
Instance/framework.make
View file

@ -316,7 +316,7 @@ $(DUMMY_FRAMEWORK_OBJ_FILE): $(DUMMY_FRAMEWORK_FILE)
$(ECHO_COMPILING)$(CC) $< -c $(ALL_CPPFLAGS) $(ALL_OBJCFLAGS) -o $@$(END_ECHO)
endif
ifeq ($(FOUNDATION_LIB), nx)
ifeq ($(FOUNDATION_LIB), apple)
# When building native frameworks on Apple, we need to create a
# top-level symlink xxx.framework/xxx ---> the framework shared
# library

6
Instance/gswapp.make
View file

@ -101,7 +101,7 @@ ifeq ($(strip $(LANGUAGES)),)
endif
# Support building NeXT applications
ifneq ($(OBJC_COMPILER), NeXT)
ifneq ($(FOUNDATION_LIB), apple)
GSWAPP_FILE = \
$(GSWAPP_DIR_NAME)/$(GNUSTEP_TARGET_LDIR)/$(GNUSTEP_INSTANCE)$(EXEEXT)
else
@ -116,7 +116,7 @@ $(GSWAPP_FILE): $(OBJ_FILES_TO_LINK)
$(ECHO_LINKING)$(LD) $(ALL_LDFLAGS) -o $(LDOUT)$@ $(OBJ_FILES_TO_LINK)\
$(ALL_GSW_LIBS)$(END_ECHO)
ifeq ($(OBJC_COMPILER), NeXT)
ifeq ($(FOUNDATION_LIB), apple)
@$(TRANSFORM_PATHS_SCRIPT) $(subst -L,,$(ALL_LIB_DIRS)) \
>$(GSWAPP_DIR_NAME)/library_paths.openapp
# This is a hack for OPENSTEP systems to remove the iconheader file
@ -130,7 +130,7 @@ endif
#
# Compilation targets
#
ifeq ($(OBJC_COMPILER), NeXT)
ifeq ($(FOUNDATION_LIB), apple)
internal-gswapp-all_:: \
$(GNUSTEP_OBJ_DIR) $(GSWAPP_DIR_NAME) $(GSWAPP_FILE) \
gswapp-components \