More refined printing of messages and echoing

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@13866 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2002-06-13 16:13:15 +00:00
parent e66f44e1a8
commit d496043504

View file

@ -75,14 +75,14 @@ endif
#
$(APP_FILE): $(OBJ_FILES_TO_LINK)
$(LD) $(ALL_LDFLAGS) -o $(LDOUT)$@ $(OBJ_FILES_TO_LINK) \
$(ALL_GUI_LIBS)
$(ECHO_LINKING)$(LD) $(ALL_LDFLAGS) -o $(LDOUT)$@ $(OBJ_FILES_TO_LINK)\
$(ALL_GUI_LIBS)$(END_ECHO)
ifeq ($(OBJC_COMPILER), NeXT)
@$(TRANSFORM_PATHS_SCRIPT) $(subst -L,,$(ALL_LIB_DIRS)) \
>$(APP_DIR_NAME)/library_paths.openapp
# This is a hack for OPENSTEP systems to remove the iconheader file
# automatically generated by the makefile package.
rm -f $(GNUSTEP_INSTANCE).iconheader
@rm -f $(GNUSTEP_INSTANCE).iconheader
else
@$(TRANSFORM_PATHS_SCRIPT) $(subst -L,,$(ALL_LIB_DIRS)) \
>$(APP_DIR_NAME)/$(GNUSTEP_TARGET_LDIR)/library_paths.openapp
@ -120,7 +120,7 @@ ifeq ($(GNUSTEP_FLATTENED),)
internal-application-build-template: $(APP_DIR_NAME)/$(GNUSTEP_INSTANCE)
$(APP_DIR_NAME)/$(GNUSTEP_INSTANCE):
cp $(GNUSTEP_MAKEFILES)/executable.template \
@cp $(GNUSTEP_MAKEFILES)/executable.template \
$(APP_DIR_NAME)/$(GNUSTEP_INSTANCE); \
chmod a+x $(APP_DIR_NAME)/$(GNUSTEP_INSTANCE)
else
@ -148,9 +148,9 @@ $(APP_DIR_NAME)/Resources/Info-gnustep.plist: _FORCE
fi; \
echo " NSPrincipalClass = \"$(PRINCIPAL_CLASS)\";"; \
echo "}") >$@
@ if [ -r "$(GNUSTEP_INSTANCE)Info.plist" ]; then \
plmerge $@ $(GNUSTEP_INSTANCE)Info.plist; \
fi
@if [ -r "$(GNUSTEP_INSTANCE)Info.plist" ]; then \
plmerge $@ $(GNUSTEP_INSTANCE)Info.plist; \
fi
$(APP_DIR_NAME)/Resources/$(GNUSTEP_INSTANCE).desktop: \
$(APP_DIR_NAME)/Resources/Info-gnustep.plist
@ -159,8 +159,8 @@ $(APP_DIR_NAME)/Resources/$(GNUSTEP_INSTANCE).desktop: \
_FORCE::
internal-app-install_:: $(GNUSTEP_APPS)
rm -rf $(GNUSTEP_APPS)/$(APP_DIR_NAME); \
$(TAR) cf - $(APP_DIR_NAME) | (cd $(GNUSTEP_APPS); $(TAR) xf -)
$(ECHO_INSTALLING)rm -rf $(GNUSTEP_APPS)/$(APP_DIR_NAME); \
$(TAR) cf - $(APP_DIR_NAME) | (cd $(GNUSTEP_APPS); $(TAR) xf -)$(END_ECHO)
ifneq ($(CHOWN_TO),)
$(CHOWN) -R $(CHOWN_TO) $(GNUSTEP_APPS)/$(APP_DIR_NAME)
endif