mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-22 22:00:49 +00:00
Improved echoing of messages
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@13868 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
3bb1193589
commit
fdadb261c0
3 changed files with 17 additions and 17 deletions
|
@ -57,14 +57,14 @@ internal-ctool-all_:: $(GNUSTEP_OBJ_DIR) \
|
|||
|
||||
$(GNUSTEP_OBJ_DIR)/$(GNUSTEP_INSTANCE)$(EXEEXT): $(C_OBJ_FILES) \
|
||||
$(SUBPROJECT_OBJ_FILES)
|
||||
$(LD) $(ALL_LDFLAGS) -o $(LDOUT)$@ \
|
||||
$(ECHO_LINKING)$(LD) $(ALL_LDFLAGS) -o $(LDOUT)$@ \
|
||||
$(C_OBJ_FILES) $(SUBPROJECT_OBJ_FILES) \
|
||||
$(ALL_TOOL_LIBS)
|
||||
$(ALL_TOOL_LIBS)$(END_ECHO)
|
||||
|
||||
internal-ctool-install_:: $(CTOOL_INSTALLATION_DIR)
|
||||
$(INSTALL_PROGRAM) -m 0755 \
|
||||
$(ECHO_INSTALLING)$(INSTALL_PROGRAM) -m 0755 \
|
||||
$(GNUSTEP_OBJ_DIR)/$(GNUSTEP_INSTANCE)$(EXEEXT) \
|
||||
$(CTOOL_INSTALLATION_DIR)
|
||||
$(CTOOL_INSTALLATION_DIR)$(END_ECHO)
|
||||
|
||||
$(CTOOL_INSTALLATION_DIR):
|
||||
$(MKINSTALLDIRS) $(CTOOL_INSTALLATION_DIR)
|
||||
|
|
|
@ -242,15 +242,15 @@ build-framework:: $(FRAMEWORK_FILE) \
|
|||
ifeq ($(WITH_DLL),yes)
|
||||
|
||||
$(FRAMEWORK_FILE) : $(DUMMY_FRAMEWORK_OBJ_FILE) $(OBJ_FILES_TO_LINK)
|
||||
$(DLLWRAP) --driver-name $(CC) \
|
||||
$(ECHO_LINKING)$(DLLWRAP) --driver-name $(CC) \
|
||||
-o $(LDOUT)$(FRAMEWORK_FILE) \
|
||||
$(OBJ_FILES_TO_LINK) \
|
||||
$(ALL_FRAMEWORK_LIBS)
|
||||
$(ALL_FRAMEWORK_LIBS)$(END_ECHO)
|
||||
|
||||
else # without DLL
|
||||
|
||||
$(FRAMEWORK_FILE) : $(DUMMY_FRAMEWORK_OBJ_FILE) $(OBJ_FILES_TO_LINK)
|
||||
$(FRAMEWORK_LINK_CMD)
|
||||
$(ECHO_LINKING)$(FRAMEWORK_LINK_CMD)$(END_ECHO)
|
||||
@(cd $(FRAMEWORK_LIBRARY_DIR_NAME); \
|
||||
rm -f $(GNUSTEP_INSTANCE); \
|
||||
$(LN_S) $(VERSION_FRAMEWORK_LIBRARY_FILE) \
|
||||
|
@ -291,21 +291,21 @@ ifneq ($(WITH_DLL),yes)
|
|||
internal-framework-install_:: $(FRAMEWORK_INSTALL_DIR) \
|
||||
$(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR) \
|
||||
$(GNUSTEP_HEADERS)
|
||||
rm -rf $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_DIR_NAME)
|
||||
$(TAR) cf - $(FRAMEWORK_DIR_NAME) | (cd $(FRAMEWORK_INSTALL_DIR); $(TAR) xf -)
|
||||
$(ECHO_INSTALLING)rm -rf $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_DIR_NAME); \
|
||||
$(TAR) cf - $(FRAMEWORK_DIR_NAME) | (cd $(FRAMEWORK_INSTALL_DIR); $(TAR) xf -)$(END_ECHO)
|
||||
ifneq ($(CHOWN_TO),)
|
||||
$(CHOWN) -R $(CHOWN_TO) $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_DIR_NAME)
|
||||
endif
|
||||
ifeq ($(strip),yes)
|
||||
$(STRIP) $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_FILE)
|
||||
endif
|
||||
(cd $(GNUSTEP_HEADERS); \
|
||||
$(ECHO_INSTALLING_HEADERS)cd $(GNUSTEP_HEADERS); \
|
||||
if [ "$(HEADER_FILES)" != "" ]; then \
|
||||
if test -L "$(GNUSTEP_INSTANCE)"; then \
|
||||
rm -f $(GNUSTEP_INSTANCE); \
|
||||
fi; \
|
||||
$(LN_S) `$(REL_PATH_SCRIPT) $(GNUSTEP_HEADERS) $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_DIR_NAME)/Headers` $(GNUSTEP_INSTANCE); \
|
||||
fi;)
|
||||
fi;$(END_ECHO)
|
||||
ifneq ($(CHOWN_TO),)
|
||||
@(cd $(GNUSTEP_HEADERS); \
|
||||
if [ "$(HEADER_FILES)" != "" ]; then \
|
||||
|
@ -342,15 +342,15 @@ internal-framework-install_:: $(FRAMEWORK_INSTALL_DIR) \
|
|||
$(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR) \
|
||||
$(GNUSTEP_HEADERS) \
|
||||
$(DLL_INSTALLATION_DIR)
|
||||
rm -rf $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_DIR_NAME)
|
||||
$(TAR) cf - $(FRAMEWORK_DIR_NAME) | (cd $(FRAMEWORK_INSTALL_DIR); $(TAR) xf -)
|
||||
$(ECHO_INSTALLING)rm -rf $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_DIR_NAME); \
|
||||
$(TAR) cf - $(FRAMEWORK_DIR_NAME) | (cd $(FRAMEWORK_INSTALL_DIR); $(TAR) xf -)$(END_ECHO)
|
||||
ifneq ($(CHOWN_TO),)
|
||||
$(CHOWN) -R $(CHOWN_TO) $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_DIR_NAME)
|
||||
endif
|
||||
ifeq ($(strip),yes)
|
||||
$(STRIP) $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_FILE)
|
||||
endif
|
||||
(cd $(GNUSTEP_HEADERS); \
|
||||
$(ECHO_INSTALLING_HEADERS)cd $(GNUSTEP_HEADERS); \
|
||||
if [ "$(HEADER_FILES)" != "" ]; then \
|
||||
if test -d "$(GNUSTEP_INSTANCE)"; then \
|
||||
rm -Rf $(GNUSTEP_INSTANCE); \
|
||||
|
@ -359,7 +359,7 @@ endif
|
|||
cd $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_VERSION_DIR_NAME)/Headers ; \
|
||||
$(TAR) cf - . | (cd $(GNUSTEP_HEADERS)/$(GNUSTEP_INSTANCE); \
|
||||
$(TAR) xf - ); \
|
||||
fi;)
|
||||
fi;$(END_ECHO)
|
||||
ifneq ($(CHOWN_TO),)
|
||||
@(cd $(GNUSTEP_HEADERS); \
|
||||
if [ "$(HEADER_FILES)" != "" ]; then \
|
||||
|
|
|
@ -113,8 +113,8 @@ endif
|
|||
#
|
||||
|
||||
$(GSWAPP_FILE): $(OBJ_FILES_TO_LINK)
|
||||
$(LD) $(ALL_LDFLAGS) -o $(LDOUT)$@ $(OBJ_FILES_TO_LINK) \
|
||||
$(ALL_GSW_LIBS)
|
||||
$(ECHO_LINKING)$(LD) $(ALL_LDFLAGS) -o $(LDOUT)$@ $(OBJ_FILES_TO_LINK)\
|
||||
$(ALL_GSW_LIBS)$(END_ECHO)
|
||||
|
||||
ifeq ($(OBJC_COMPILER), NeXT)
|
||||
@$(TRANSFORM_PATHS_SCRIPT) $(subst -L,,$(ALL_LIB_DIRS)) \
|
||||
|
|
Loading…
Reference in a new issue