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

Improved/tidied up echoing messges

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@13867 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2002-06-13 16:14:06 +00:00
parent d496043504
commit 3bb1193589
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Instance/bundle.make
View file

@ -118,18 +118,18 @@ $(BUNDLE_DIR_NAME)/$(GNUSTEP_TARGET_LDIR):
ifeq ($(WITH_DLL),yes)
$(BUNDLE_FILE) : $(OBJ_FILES_TO_LINK)
$(DLLWRAP) --driver-name $(CC) \
$(ECHO_LINKING)$(DLLWRAP) --driver-name $(CC) \
-o $(LDOUT)$(BUNDLE_FILE) \
$(OBJ_FILES_TO_LINK) \
$(ALL_BUNDLE_LIBS)
$(ALL_BUNDLE_LIBS)$(END_ECHO)
else # WITH_DLL
$(BUNDLE_FILE) : $(OBJ_FILES_TO_LINK)
$(BUNDLE_LD) $(BUNDLE_LDFLAGS) $(ALL_LDFLAGS) \
$(ECHO_LINKING)$(BUNDLE_LD) $(BUNDLE_LDFLAGS) $(ALL_LDFLAGS) \
-o $(LDOUT)$(BUNDLE_FILE) \
$(OBJ_FILES_TO_LINK) \
$(ALL_BUNDLE_LIBS)
$(ALL_BUNDLE_LIBS)$(END_ECHO)
endif # WITH_DLL
@ -151,7 +151,7 @@ endif # OBJ_FILES_TO_LINK
# MacOSX bundles
$(BUNDLE_DIR_NAME)/Contents :
$(MKDIRS) $@
@$(MKDIRS) $@
$(BUNDLE_DIR_NAME)/Contents/Resources : $(BUNDLE_DIR_NAME)/Contents \
$(BUNDLE_DIR_NAME)/Resources
@ -214,9 +214,9 @@ $(BUNDLE_DIR_NAME)/Resources/Info-gnustep.plist:
echo " NSMainNibFile = \"$(MAIN_MODEL_FILE)\";"; \
echo " NSPrincipalClass = \"$(PRINCIPAL_CLASS)\";"; \
echo "}") >$@
@if [ -r "$(GNUSTEP_INSTANCE)Info.plist" ]; then \
@(if [ -r "$(GNUSTEP_INSTANCE)Info.plist" ]; then \
plmerge $@ $(GNUSTEP_INSTANCE)Info.plist; \
fi
fi)
else # following code for when no object file is built
# NeXTstep bundles
$(BUNDLE_DIR_NAME)/Resources/Info.plist:
@ -229,9 +229,9 @@ $(BUNDLE_DIR_NAME)/Resources/Info-gnustep.plist:
@(echo "{"; echo ' NOTE = "Automatically generated, do not edit!";'; \
echo " NSMainNibFile = \"$(MAIN_MODEL_FILE)\";"; \
echo "}") >$@
@if [ -r "$(GNUSTEP_INSTANCE)Info.plist" ]; then \
@(if [ -r "$(GNUSTEP_INSTANCE)Info.plist" ]; then \
plmerge $@ $(GNUSTEP_INSTANCE)Info.plist; \
fi
fi)
endif
# Comment on the tar options used in the rule below -
@ -259,7 +259,7 @@ endif
# symbolic link, we don't care).
internal-bundle-install_:: $(BUNDLE_INSTALL_DIR) shared-instance-headers-install
rm -f .tmp.gnustep.exclude; \
$(ECHO_INSTALLING)rm -f .tmp.gnustep.exclude; \
echo "$(BUNDLE_DIR_NAME)/Contents/Resources" > .tmp.gnustep.exclude;\
rm -rf $(BUNDLE_INSTALL_DIR)/$(BUNDLE_DIR_NAME); \
$(TAR) chfX - .tmp.gnustep.exclude $(BUNDLE_DIR_NAME) \
@ -268,7 +268,7 @@ internal-bundle-install_:: $(BUNDLE_INSTALL_DIR) shared-instance-headers-install
(cd $(BUNDLE_INSTALL_DIR)/$(BUNDLE_DIR_NAME)/Contents; \
if [ ! -d Resources ]; then \
rm -f Resources; $(LN_S) ../Resources .; \
fi;)
fi;)$(END_ECHO)
ifneq ($(CHOWN_TO),)
$(CHOWN) -R $(CHOWN_TO) $(BUNDLE_INSTALL_DIR)/$(BUNDLE_DIR_NAME)
endif