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

Changed all '::' rules (except for internal- ones) to be ':' rules

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@21412 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2005-07-06 16:14:15 +00:00
parent f03d6aa26e
commit d1d0b944ab
5 changed files with 59 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
2005-07-06 Nicola Pero <n.pero@mi.flashnet.it>
* Instance/bundle.make: Removed usage of :: rules for all but the
internal- rules. Can't see a reason why we were using :: rules in
the other cases, probably a tradition that was followed without
really understanding why.
* Instance/gswbundle.make: Same change.
* Instance/framework.make: Same change.
* Instance/subproject.make: Same change.
2005-06-17 Adam Fedor <fedor@gnu.org>
* Documentation/GNUmakefile: Don't try to install README.NetBSD

22
Instance/bundle.make
View file

@ -147,15 +147,15 @@ include $(GNUSTEP_MAKEFILES)/Instance/Shared/bundle.make
ifneq ($(OBJ_FILES_TO_LINK),)
ifneq ($(FOUNDATION_LIB),apple)
build-bundle:: $(BUNDLE_DIR)/$(GNUSTEP_TARGET_LDIR) \
$(BUNDLE_FILE) \
$(BUNDLE_INFO_PLIST_FILE) \
shared-instance-bundle-all
build-bundle: $(BUNDLE_DIR)/$(GNUSTEP_TARGET_LDIR) \
$(BUNDLE_FILE) \
$(BUNDLE_INFO_PLIST_FILE) \
shared-instance-bundle-all
else
build-bundle:: $(BUNDLE_DIR)/Contents/MacOS \
$(BUNDLE_FILE) \
$(BUNDLE_INFO_PLIST_FILE) \
shared-instance-bundle-all
build-bundle: $(BUNDLE_DIR)/Contents/MacOS \
$(BUNDLE_FILE) \
$(BUNDLE_INFO_PLIST_FILE) \
shared-instance-bundle-all
endif
# The rule to build $(BUNDLE_DIR)/Resources is already provided
@ -167,7 +167,7 @@ $(BUNDLE_DIR)/$(GNUSTEP_TARGET_LDIR):
# OLD_DLL_SUPPORT should really be deprecated and dropped.
ifeq ($(OLD_DLL_SUPPORT),yes)
$(BUNDLE_FILE) : $(OBJ_FILES_TO_LINK)
$(BUNDLE_FILE): $(OBJ_FILES_TO_LINK)
$(ECHO_LINKING)$(DLLWRAP) --driver-name $(CC) \
-o $(LDOUT)$(BUNDLE_FILE) \
$(OBJ_FILES_TO_LINK) \
@ -176,7 +176,7 @@ $(BUNDLE_FILE) : $(OBJ_FILES_TO_LINK)
else # Standard bundle build using the rules for this target
$(BUNDLE_FILE) : $(OBJ_FILES_TO_LINK)
$(BUNDLE_FILE): $(OBJ_FILES_TO_LINK)
$(ECHO_LINKING)$(BUNDLE_LD) $(BUNDLE_LDFLAGS) $(ALL_LDFLAGS) \
-o $(LDOUT)$(BUNDLE_FILE) \
$(OBJ_FILES_TO_LINK) \
@ -193,7 +193,7 @@ endif
else
# Following code for the case OBJ_FILES_TO_LINK is empty - bundle with
# no shared object in it.
build-bundle:: $(BUNDLE_INFO_PLIST_FILE) shared-instance-bundle-all
build-bundle: $(BUNDLE_INFO_PLIST_FILE) shared-instance-bundle-all
endif # OBJ_FILES_TO_LINK
MAIN_MODEL_FILE = $(strip $(subst .gmodel,,$(subst .gorm,,$(subst .nib,,$($(GNUSTEP_INSTANCE)_MAIN_MODEL_FILE)))))

40
Instance/framework.make
View file

@ -251,7 +251,7 @@ ifeq ($(MAKE_CURRENT_VERSION),yes)
# A target to build/reset the Current symlink to point to the newly
# compiled framework. Only executed if MAKE_CURRENT_VERSION is yes.
UPDATE_CURRENT_SYMLINK_RULE = update-current-symlink
update-current-symlink:: $(FRAMEWORK_VERSION_DIR)
update-current-symlink: $(FRAMEWORK_VERSION_DIR)
$(ECHO_NOTHING)cd $(FRAMEWORK_DIR)/Versions; \
$(RM_LN_S) Current; \
$(LN_S) $(CURRENT_VERSION_NAME) Current$(END_ECHO)
@ -262,12 +262,12 @@ endif
# Please note that test -h must be used instead of test -L because on old
# Sun Solaris, test -h works but test -L does not.
build-framework-dirs:: $(DERIVED_SOURCES_DIR) \
$(FRAMEWORK_LIBRARY_DIR) \
$(FRAMEWORK_VERSION_DIR)/Headers \
$(FRAMEWORK_VERSION_DIR)/Resources \
$(FRAMEWORK_RESOURCE_DIRS) \
$(UPDATE_CURRENT_SYMLINK_RULE)
build-framework-dirs: $(DERIVED_SOURCES_DIR) \
$(FRAMEWORK_LIBRARY_DIR) \
$(FRAMEWORK_VERSION_DIR)/Headers \
$(FRAMEWORK_VERSION_DIR)/Resources \
$(FRAMEWORK_RESOURCE_DIRS) \
$(UPDATE_CURRENT_SYMLINK_RULE)
$(ECHO_NOTHING)cd $(FRAMEWORK_DIR); \
if [ ! -h "Resources" ]; then \
$(RM_LN_S) Resources; \
@ -294,7 +294,7 @@ $(DERIVED_SOURCES_DIR):
$(ECHO_CREATING)$(MKDIRS) $@$(END_ECHO)
# Need to share this code with the headers code ... but how.
$(FRAMEWORK_HEADER_FILES):: $(addprefix $(HEADER_FILES_DIR)/,$(HEADER_FILES))
$(FRAMEWORK_HEADER_FILES): $(addprefix $(HEADER_FILES_DIR)/,$(HEADER_FILES))
ifneq ($(HEADER_FILES),)
$(ECHO_NOTHING)for file in $(HEADER_FILES) __done; do \
if [ $$file != __done ]; then \
@ -391,10 +391,10 @@ ifeq ($(findstring darwin, $(GNUSTEP_TARGET_OS)), darwin)
# library. On Darwin (non-Apple) we do this as well since we can partially
# emulate frameworks (see the ld_lib_path.sh comments on this).
build-framework:: $(FRAMEWORK_FILE) \
shared-instance-bundle-all \
$(FRAMEWORK_VERSION_DIR)/Resources/Info.plist \
$(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_INSTANCE)
build-framework: $(FRAMEWORK_FILE) \
shared-instance-bundle-all \
$(FRAMEWORK_VERSION_DIR)/Resources/Info.plist \
$(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_INSTANCE)
# Please note that the following keeps the top-level symlink pointing
# to the framework in Current. This is always correct, even if what
@ -411,9 +411,9 @@ endif
else
build-framework:: $(FRAMEWORK_FILE) \
shared-instance-bundle-all \
$(FRAMEWORK_VERSION_DIR)/Resources/Info-gnustep.plist
build-framework: $(FRAMEWORK_FILE) \
shared-instance-bundle-all \
$(FRAMEWORK_VERSION_DIR)/Resources/Info-gnustep.plist
endif
@ -567,19 +567,19 @@ endif
endif
$(DLL_INSTALLATION_DIR)::
$(DLL_INSTALLATION_DIR):
$(ECHO_CREATING)$(MKINSTALLDIRS) $@$(END_ECHO)
$(FRAMEWORK_DIR)/Resources::
$(FRAMEWORK_DIR)/Resources:
$(ECHO_CREATING)$(MKDIRS) $@$(END_ECHO)
$(FRAMEWORK_INSTALL_DIR)::
$(FRAMEWORK_INSTALL_DIR):
$(ECHO_CREATING)$(MKINSTALLDIRS) $@$(END_ECHO)
$(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR) :
$(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR):
$(ECHO_CREATING)$(MKINSTALLDIRS) $@$(END_ECHO)
$(GNUSTEP_HEADERS) :
$(GNUSTEP_HEADERS):
$(ECHO_CREATING)$(MKINSTALLDIRS) $@$(END_ECHO)
# NB: We use '$(RM_LN_S)' to remove the symlinks to insure

34
Instance/gswbundle.make
View file

@ -110,9 +110,9 @@ ifeq ($(strip $(LANGUAGES)),)
endif
build-bundle-dir:: $(GSWBUNDLE_DIR)/Resources \
$(GSWBUNDLE_DIR)/$(GNUSTEP_TARGET_LDIR) \
$(GSWBUNDLE_RESOURCE_DIRS)
build-bundle-dir: $(GSWBUNDLE_DIR)/Resources \
$(GSWBUNDLE_DIR)/$(GNUSTEP_TARGET_LDIR) \
$(GSWBUNDLE_RESOURCE_DIRS)
$(GSWBUNDLE_DIR)/$(GNUSTEP_TARGET_LDIR):
$(ECHO_CREATING)$(MKDIRS) $(GSWBUNDLE_DIR)/$(GNUSTEP_TARGET_LDIR)$(END_ECHO)
@ -120,12 +120,12 @@ $(GSWBUNDLE_DIR)/$(GNUSTEP_TARGET_LDIR):
$(GSWBUNDLE_RESOURCE_DIRS):
$(ECHO_CREATING)$(MKDIRS) $(GSWBUNDLE_RESOURCE_DIRS)$(END_ECHO)
build-bundle:: $(GSWBUNDLE_FILE) \
gswbundle-components \
gswbundle-resource-files \
gswbundle-localized-resource-files \
gswbundle-localized-webresource-files \
gswbundle-webresource-files
build-bundle: $(GSWBUNDLE_FILE) \
gswbundle-components \
gswbundle-resource-files \
gswbundle-localized-resource-files \
gswbundle-localized-webresource-files \
gswbundle-webresource-files
$(GSWBUNDLE_FILE) : $(OBJ_FILES_TO_LINK)
@ -134,7 +134,7 @@ $(GSWBUNDLE_FILE) : $(OBJ_FILES_TO_LINK)
$(OBJ_FILES_TO_LINK) \
$(ALL_GSWBUNDLE_LIBS)$(END_ECHO)
gswbundle-components :: $(GSWBUNDLE_DIR)
gswbundle-components: $(GSWBUNDLE_DIR)
ifneq ($(strip $(COMPONENTS)),)
@(echo "Linking components into the bundle wrapper..."; \
cd $(GSWBUNDLE_DIR)/Resources; \
@ -158,8 +158,8 @@ ifneq ($(strip $(COMPONENTS)),)
done)
endif
gswbundle-resource-files:: $(GSWBUNDLE_DIR)/bundle-info.plist \
$(GSWBUNDLE_DIR)/Resources/Info-gnustep.plist
gswbundle-resource-files: $(GSWBUNDLE_DIR)/bundle-info.plist \
$(GSWBUNDLE_DIR)/Resources/Info-gnustep.plist
ifneq ($(strip $(RESOURCE_FILES)),)
@(echo "Linking resources into the bundle wrapper..."; \
cd $(GSWBUNDLE_DIR)/Resources/; \
@ -168,7 +168,7 @@ ifneq ($(strip $(RESOURCE_FILES)),)
done)
endif
gswbundle-localized-resource-files:: $(GSWBUNDLE_DIR)/Resources/Info-gnustep.plist
gswbundle-localized-resource-files: $(GSWBUNDLE_DIR)/Resources/Info-gnustep.plist
ifneq ($(strip $(LOCALIZED_RESOURCE_FILES)),)
@(echo "Linking localized resources into the bundle wrapper..."; \
cd $(GSWBUNDLE_DIR)/Resources; \
@ -188,10 +188,10 @@ ifneq ($(strip $(LOCALIZED_RESOURCE_FILES)),)
done)
endif
gswbundle-webresource-dir::
gswbundle-webresource-dir:
$(ECHO_CREATING)$(MKDIRS) $(GSWBUNDLE_WEBSERVER_RESOURCE_DIRS)$(END_ECHO)
gswbundle-webresource-files:: $(GSWBUNDLE_DIR)/Resources/WebServer \
gswbundle-webresource-files: $(GSWBUNDLE_DIR)/Resources/WebServer \
gswbundle-webresource-dir
ifneq ($(strip $(WEBSERVER_RESOURCE_FILES)),)
@(echo "Linking webserver resources into the application wrapper..."; \
@ -201,7 +201,7 @@ ifneq ($(strip $(WEBSERVER_RESOURCE_FILES)),)
done)
endif
gswbundle-localized-webresource-files:: $(GSWBUNDLE_DIR)/Resources/WebServer \
gswbundle-localized-webresource-files: $(GSWBUNDLE_DIR)/Resources/WebServer \
gswbundle-webresource-dir
ifneq ($(strip $(LOCALIZED_WEBSERVER_RESOURCE_FILES)),)
@(echo "Linking localized web resources into the application wrapper..."; \
@ -260,7 +260,7 @@ ifeq ($(strip),yes)
$(ECHO_STRIPPING)$(STRIP) $(GSWBUNDLE_INSTALL_DIR)/$(GSWBUNDLE_FILE_NAME)$(END_ECHO)
endif
$(GSWBUNDLE_INSTALL_DIR)::
$(GSWBUNDLE_INSTALL_DIR):
$(ECHO_CREATING)$(MKINSTALLDIRS) $@$(END_ECHO)
internal-gswbundle-uninstall_:: shared-instance-headers-uninstall

2
Instance/subproject.make
View file

@ -83,7 +83,7 @@ internal-subproject-build-headers:: $(OWNING_PROJECT_HEADER_FILES)
# We need to build the OWNING_PROJECT_HEADER_DIR directory here
# because this rule could be executed before the top-level framework
# has built his dirs
$(OWNING_PROJECT_HEADER_FILES):: $(HEADER_FILES) $(OWNING_PROJECT_HEADER_DIR)
$(OWNING_PROJECT_HEADER_FILES): $(HEADER_FILES) $(OWNING_PROJECT_HEADER_DIR)
ifneq ($(HEADER_FILES),)
$(ECHO_NOTHING)for file in $(HEADER_FILES) __done; do \
if [ $$file != __done ]; then \