mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-23 22:33:28 +00:00
Tidyup messages
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@16822 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero
parent
fed9c7815f
commit
430b6317dc
20 changed files with 161 additions and 115 deletions
46
ChangeLog
46
ChangeLog
|
|
@ -1,3 +1,49 @@
|
|||
Tue May 27 13:12:59 2003 Nicola Pero <n.pero@mi.flashnet.it>
|
||||
|
||||
* Instance/application.make: Use ECHO_NOTHING in commands which
|
||||
were using @ or printing the command.
|
||||
* Instance/documentation.make: The same.
|
||||
* Instance/framework.make: The same.
|
||||
* Instance/gswapp.make: The same.
|
||||
* Instance/java-tool.make: The same.
|
||||
* Instance/library.make: The same.
|
||||
* Instance/palette.make: The same.
|
||||
* Instance/resource-set.make: The same.
|
||||
* Instance/service.make: The same.
|
||||
* Instance/subproject.make: The same.
|
||||
* Instance/Documentation/autogsdoc.make: The same.
|
||||
* Instance/Documentation/gsdoc.make: The same.
|
||||
* Instance/Documentation/javadoc.make: The same.
|
||||
* Instance/Documentation/latex.make: The same.
|
||||
* Instance/Documentation/texi.make: The same.
|
||||
* Instance/Shared/java.make: The same.
|
||||
|
||||
* Instance/ctool.make (internal-ctool-uninstall_): Use ECHO_UNINSTALLING.
|
||||
* Instance/document.make (internal-textdoc-uninstall_): The same.
|
||||
* Instance/framework.make (internal-framework-uninstall_): The same.
|
||||
* Instance/gswapp.make (internal-gswapp-uninstall_): The same.
|
||||
* Instance/gswbundle.make (internal-gswbundle-uninstall_): The same.
|
||||
* Instance/java-tool.make (internal-java_tool-uninstall_): The same.
|
||||
* Instance/library.make (internal-library-uninstall_): The same.
|
||||
* Instance/objc.make (internal-objc-uninstall_): The same.
|
||||
* Instance/service.make (internal-service-uninstall_): The same.
|
||||
* Instance/Documentation/autogsdoc.make (internal-doc-uninstall_): The same.
|
||||
* Instance/Documentation/gsdoc.make (internal-doc-uninstall_): The same.
|
||||
* Instance/Documentation/install_files.make (internal-doc-uninstall_): The same.
|
||||
* Instance/Documentation/javadoc.make (internal-doc-uninstall_): The same.
|
||||
* Instance/Documentation/latex.make (internal-doc-uninstall_): The same.
|
||||
|
||||
* Instance/gswbundle.make (internal-gswbundle-install_): Use ECHO_INSTALLING.
|
||||
* Instance/Documentation/autogsdoc.make (internal-doc-install_): The same.
|
||||
* Instance/Documentation/gsdoc.make (internal-doc-install_): The same.
|
||||
* Instance/Documentation/install_files.make (internal-doc-install_): The same.
|
||||
* Instance/Documentation/javadoc.make (internal-doc-install_): The same.
|
||||
|
||||
* Instance/gswapp.make: Use ECHO_CREATING when building the
|
||||
various files.
|
||||
* Instance/subproject.make: Use ECHO_CREATING when building the
|
||||
DLL_DEF_INP file.
|
||||
|
||||
Tue May 27 12:04:38 2003 Nicola Pero <n.pero@mi.flashnet.it>
|
||||
|
||||
* messages.make (ECHO_CHOWNING, ECHO_STRIPPING): New variables.
|
||||
|
|
|
|||
|
|
@ -44,19 +44,19 @@ generate-autogsdoc: $(GNUSTEP_INSTANCE)
|
|||
$(AUTOGSDOC) $(INTERNAL_AGSDOCFLAGS) $(AGSDOC_FILES)
|
||||
|
||||
internal-doc-install_::
|
||||
rm -rf $(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR)/$(GNUSTEP_INSTANCE)
|
||||
$(ECHO_INSTALLING)rm -rf $(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR)/$(GNUSTEP_INSTANCE)
|
||||
$(TAR) cf - $(GNUSTEP_INSTANCE) | \
|
||||
(cd $(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR); $(TAR) xf -)
|
||||
(cd $(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR); $(TAR) xf -)$(END_ECHO)
|
||||
ifneq ($(CHOWN_TO),)
|
||||
$(ECHO_CHOWNING)$(CHOWN) -R $(CHOWN_TO) \
|
||||
$(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR)/$(GNUSTEP_INSTANCE)$(END_ECHO)
|
||||
endif
|
||||
|
||||
internal-doc-uninstall_::
|
||||
-rm -f $(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR)/$(GNUSTEP_INSTANCE)
|
||||
-$(ECHO_UNINSTALLING)rm -f $(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR)/$(GNUSTEP_INSTANCE)
|
||||
|
||||
internal-doc-clean::
|
||||
@ -rm -Rf $(GNUSTEP_INSTANCE)
|
||||
-$(ECHO_NOTHING)rm -Rf $(GNUSTEP_INSTANCE)$(END_ECHO)
|
||||
|
||||
else
|
||||
|
||||
|
|
|
|||
|
|
@ -31,13 +31,13 @@ $(GSDOC_OBJECT_FILES): $(GSDOC_FILES)
|
|||
autogsdoc $(GSDOC_FILES)
|
||||
|
||||
internal-doc-install_:: \
|
||||
$(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR)/$(GNUSTEP_INSTANCE)
|
||||
$(INSTALL_DATA) $(GSDOC_OBJECT_FILES) \
|
||||
$(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR)/$(GNUSTEP_INSTANCE)
|
||||
$(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR)/$(GNUSTEP_INSTANCE)
|
||||
$(ECHO_INSTALLING)$(INSTALL_DATA) $(GSDOC_OBJECT_FILES) \
|
||||
$(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR)/$(GNUSTEP_INSTANCE)$(END_ECHO)
|
||||
internal-doc-uninstall_::
|
||||
rm -f \
|
||||
$(ECHO_UNINSTALLING)rm -f \
|
||||
$(addprefix $(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR)/\
|
||||
$(GNUSTEP_INSTANCE)/,$(GSDOC_OBJECT_FILES))
|
||||
$(GNUSTEP_INSTANCE)/,$(GSDOC_OBJECT_FILES))$(END_ECHO)
|
||||
|
||||
internal-doc-clean::
|
||||
@ -rm -f $(GSDOC_OBJECT_FILES)
|
||||
-$(ECHO_NOTHING)rm -f $(GSDOC_OBJECT_FILES)$(END_ECHO)
|
||||
|
|
|
|||
|
|
@ -21,16 +21,16 @@
|
|||
# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
|
||||
internal-doc-install_::
|
||||
for file in $($(GNUSTEP_INSTANCE)_INSTALL_FILES) __done; do \
|
||||
$(ECHO_INSTALLING)for file in $($(GNUSTEP_INSTANCE)_INSTALL_FILES) __done; do \
|
||||
if [ $$file != __done ]; then \
|
||||
$(INSTALL_DATA) $$file \
|
||||
$(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR)/$$file ; \
|
||||
fi; \
|
||||
done
|
||||
done$(END_ECHO)
|
||||
|
||||
internal-doc-uninstall_::
|
||||
for file in $($(GNUSTEP_INSTANCE)_INSTALL_FILES) __done; do \
|
||||
$(ECHO_UNINSTALLING)for file in $($(GNUSTEP_INSTANCE)_INSTALL_FILES) __done; do \
|
||||
if [ $$file != __done ]; then \
|
||||
rm -f $(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR)/$$file ; \
|
||||
fi; \
|
||||
done
|
||||
done$(END_ECHO)
|
||||
|
|
|
|||
|
|
@ -46,16 +46,16 @@ ifneq ($(JAVADOC_BUILD_ALWAYS),YES) # Build only once
|
|||
internal-doc-all_:: $(GNUSTEP_INSTANCE)/index.html
|
||||
|
||||
$(GNUSTEP_INSTANCE)/index.html:
|
||||
$(MKDIRS) $(GNUSTEP_INSTANCE); \
|
||||
$(JAVADOC) $(ALL_JAVADOCFLAGS) $(JAVADOC_FILES) -d $(GNUSTEP_INSTANCE)
|
||||
$(ECHO_NOTHING)$(MKDIRS) $(GNUSTEP_INSTANCE); \
|
||||
$(JAVADOC) $(ALL_JAVADOCFLAGS) $(JAVADOC_FILES) -d $(GNUSTEP_INSTANCE)$(END_ECHO)
|
||||
|
||||
else # Build always
|
||||
|
||||
internal-doc-all_:: generate-javadoc
|
||||
|
||||
generate-javadoc:
|
||||
$(MKDIRS) $(GNUSTEP_INSTANCE); \
|
||||
$(JAVADOC) $(ALL_JAVADOCFLAGS) $(JAVADOC_FILES) -d $(GNUSTEP_INSTANCE)
|
||||
$(ECHO_NOTHING)$(MKDIRS) $(GNUSTEP_INSTANCE); \
|
||||
$(JAVADOC) $(ALL_JAVADOCFLAGS) $(JAVADOC_FILES) -d $(GNUSTEP_INSTANCE)$(END_ECHO)
|
||||
|
||||
endif
|
||||
|
||||
|
|
@ -66,21 +66,21 @@ endif
|
|||
ifneq ($(JAVADOC_FILES),)
|
||||
|
||||
internal-doc-install_::
|
||||
rm -rf $(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR)/$(GNUSTEP_INSTANCE)
|
||||
$(ECHO_INSTALLING)rm -rf $(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR)/$(GNUSTEP_INSTANCE)
|
||||
$(TAR) cf - $(GNUSTEP_INSTANCE) | \
|
||||
(cd $(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR); $(TAR) xf -)
|
||||
(cd $(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR); $(TAR) xf -)$(END_ECHO)
|
||||
ifneq ($(CHOWN_TO),)
|
||||
$(ECHO_CHOWNING)$(CHOWN) -R $(CHOWN_TO) \
|
||||
$(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR)/$(GNUSTEP_INSTANCE)$(END_ECHO)
|
||||
endif
|
||||
|
||||
internal-doc-uninstall_::
|
||||
-rm -f $(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR)/$(GNUSTEP_INSTANCE)
|
||||
-$(ECHO_UNINSTALLING)rm -f $(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR)/$(GNUSTEP_INSTANCE)$(END_ECHO)
|
||||
|
||||
endif # JAVADOC_FILES
|
||||
|
||||
internal-doc-clean::
|
||||
@ -rm -Rf $(GNUSTEP_INSTANCE)
|
||||
-$(ECHO_NOTHING)rm -Rf $(GNUSTEP_INSTANCE)$(END_ECHO)
|
||||
|
||||
internal-doc-distclean::
|
||||
|
||||
|
|
|
|||
|
|
@ -37,11 +37,11 @@ internal-doc-install_::
|
|||
$(INSTALL_DATA) $(GNUSTEP_INSTANCE).ps \
|
||||
$(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR)
|
||||
internal-doc-uninstall_::
|
||||
rm -f \
|
||||
$(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR)/$(GNUSTEP_INSTANCE).ps
|
||||
$(ECHO_UNINSTALLING)rm -f \
|
||||
$(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR)/$(GNUSTEP_INSTANCE).ps$(END_ECHO)
|
||||
|
||||
internal-doc-clean::
|
||||
@ -rm -f $(GNUSTEP_INSTANCE).aux \
|
||||
-$(ECHO_NOTHING)rm -f $(GNUSTEP_INSTANCE).aux \
|
||||
$(GNUSTEP_INSTANCE).cp \
|
||||
$(GNUSTEP_INSTANCE).cps \
|
||||
$(GNUSTEP_INSTANCE).dvi \
|
||||
|
|
@ -59,7 +59,7 @@ internal-doc-clean::
|
|||
$(GNUSTEP_INSTANCE).ps.gz \
|
||||
$(GNUSTEP_INSTANCE).tar.gz \
|
||||
$(GNUSTEP_INSTANCE)/* \
|
||||
*.aux
|
||||
*.aux$(END_ECHO)
|
||||
|
||||
#
|
||||
# Targets built only if we can find `latex2html'
|
||||
|
|
@ -88,11 +88,11 @@ internal-doc-install_::
|
|||
# Yeah - I know - the following is dangerous if you have misused the
|
||||
# DOC_INSTALL_DIR - but it's the only way to do it
|
||||
internal-doc-uninstall_::
|
||||
-rm -f $(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR)/*.html
|
||||
-rm -f $(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR)/*.css
|
||||
-$(ECHO_UNINSTALLING)rm -f $(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR)/*.html; \
|
||||
rm -f $(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR)/*.css$(END_ECHO)
|
||||
|
||||
internal-doc-distclean::
|
||||
@ if [ -d "$(GNUSTEP_INSTANCE)" ]; then \
|
||||
$(ECHO_NOTHING) if [ -d "$(GNUSTEP_INSTANCE)" ]; then \
|
||||
rm -rf $(GNUSTEP_INSTANCE)/; \
|
||||
fi
|
||||
fi$(END_ECHO)
|
||||
endif # LATEX2HTML
|
||||
|
|
|
|||
|
|
@ -85,7 +85,7 @@ $(GNUSTEP_INSTANCE): $(TEXI_FILES) $(TEXT_MAIN)
|
|||
-o $@ $(TEXT_MAIN)
|
||||
|
||||
internal-doc-clean::
|
||||
@ -rm -f $(GNUSTEP_INSTANCE).aux \
|
||||
-$(ECHO_NOTHING) rm -f $(GNUSTEP_INSTANCE).aux \
|
||||
$(GNUSTEP_INSTANCE).cp \
|
||||
$(GNUSTEP_INSTANCE).cps \
|
||||
$(GNUSTEP_INSTANCE).dvi \
|
||||
|
|
@ -102,7 +102,7 @@ internal-doc-clean::
|
|||
$(GNUSTEP_INSTANCE)_*.html \
|
||||
$(GNUSTEP_INSTANCE).ps.gz \
|
||||
$(GNUSTEP_INSTANCE).tar.gz \
|
||||
$(GNUSTEP_INSTANCE)/*
|
||||
$(GNUSTEP_INSTANCE)/*$(END_ECHO)
|
||||
|
||||
# NB: Only install HTML if it has been generated
|
||||
|
||||
|
|
|
|||
|
|
@ -102,11 +102,11 @@ $(APP_FILE): $(OBJ_FILES_TO_LINK)
|
|||
$(ECHO_LINKING)$(LD) $(ALL_LDFLAGS) -o $(LDOUT)$@ $(OBJ_FILES_TO_LINK)\
|
||||
$(ALL_GUI_LIBS)$(END_ECHO)
|
||||
ifeq ($(FOUNDATION_LIB), apple)
|
||||
@$(TRANSFORM_PATHS_SCRIPT) $(subst -L,,$(ALL_LIB_DIRS)) \
|
||||
>$(APP_DIR_NAME)/library_paths.openapp
|
||||
$(ECHO_NOTHING)$(TRANSFORM_PATHS_SCRIPT) $(subst -L,,$(ALL_LIB_DIRS)) \
|
||||
>$(APP_DIR_NAME)/library_paths.openapp$(END_ECHO)
|
||||
else
|
||||
@$(TRANSFORM_PATHS_SCRIPT) $(subst -L,,$(ALL_LIB_DIRS)) \
|
||||
>$(APP_DIR_NAME)/$(GNUSTEP_TARGET_LDIR)/library_paths.openapp
|
||||
$(ECHO_NOTHING)$(TRANSFORM_PATHS_SCRIPT) $(subst -L,,$(ALL_LIB_DIRS)) \
|
||||
>$(APP_DIR_NAME)/$(GNUSTEP_TARGET_LDIR)/library_paths.openapp$(END_ECHO)
|
||||
endif
|
||||
|
||||
#
|
||||
|
|
@ -141,9 +141,9 @@ ifeq ($(GNUSTEP_FLATTENED),)
|
|||
internal-application-build-template: $(APP_DIR_NAME)/$(GNUSTEP_INSTANCE)
|
||||
|
||||
$(APP_DIR_NAME)/$(GNUSTEP_INSTANCE):
|
||||
@cp $(GNUSTEP_MAKEFILES)/executable.template \
|
||||
$(ECHO_NOTHING)cp $(GNUSTEP_MAKEFILES)/executable.template \
|
||||
$(APP_DIR_NAME)/$(GNUSTEP_INSTANCE); \
|
||||
chmod a+x $(APP_DIR_NAME)/$(GNUSTEP_INSTANCE)
|
||||
chmod a+x $(APP_DIR_NAME)/$(GNUSTEP_INSTANCE)$(END_ECHO)
|
||||
else
|
||||
internal-application-build-template:
|
||||
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ $(CTOOL_INSTALL_DIR)/$(GNUSTEP_TARGET_DIR):
|
|||
$(ECHO_CREATING)$(MKINSTALLDIRS) $@$(END_ECHO)
|
||||
|
||||
internal-ctool-uninstall_::
|
||||
rm -f $(CTOOL_INSTALL_DIR)/$(GNUSTEP_TARGET_DIR)/$(GNUSTEP_INSTANCE)$(EXEEXT)
|
||||
$(ECHO_UNINSTALLING)rm -f $(CTOOL_INSTALL_DIR)/$(GNUSTEP_TARGET_DIR)/$(GNUSTEP_INSTANCE)$(EXEEXT)$(END_ECHO)
|
||||
|
||||
include $(GNUSTEP_MAKEFILES)/Instance/Shared/strings.make
|
||||
|
||||
|
|
|
|||
|
|
@ -140,15 +140,15 @@ endif
|
|||
# they should be moved in there
|
||||
#
|
||||
internal-textdoc-install_:: $(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR)
|
||||
$(INSTALL_DATA) $(GNUSTEP_INSTANCE) \
|
||||
$(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR)
|
||||
$(ECHO_NOTHING)$(INSTALL_DATA) $(GNUSTEP_INSTANCE) \
|
||||
$(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR)$(END_ECHO)
|
||||
|
||||
internal-textdoc-uninstall_::
|
||||
rm -f \
|
||||
$(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR)/$(GNUSTEP_INSTANCE)
|
||||
$(ECHO_UNINSTALLING)rm -f \
|
||||
$(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR)/$(GNUSTEP_INSTANCE)$(END_ECHO)
|
||||
|
||||
internal-textdoc-clean::
|
||||
@ rm -f $(GNUSTEP_INSTANCE)
|
||||
$(ECHO_NOTHING) rm -f $(GNUSTEP_INSTANCE) $(END_ECHO)
|
||||
|
||||
internal-textdoc-distclean::
|
||||
|
||||
|
|
|
|||
|
|
@ -193,9 +193,9 @@ build-framework-dirs:: $(DERIVED_SOURCES) \
|
|||
$(FRAMEWORK_VERSION_DIR_NAME)/Resources \
|
||||
$(FRAMEWORK_RESOURCE_DIRS)
|
||||
ifeq ($(DEPLOY_WITH_CURRENT_VERSION),yes)
|
||||
@rm -f $(FRAMEWORK_DIR_NAME)/Versions/Current
|
||||
$(ECHO_NOTHING)rm -f $(FRAMEWORK_DIR_NAME)/Versions/Current$(END_ECHO)
|
||||
endif
|
||||
@(cd $(FRAMEWORK_DIR_NAME)/Versions; \
|
||||
$(ECHO_NOTHING)cd $(FRAMEWORK_DIR_NAME)/Versions; \
|
||||
if [ ! -L "Current" ]; then \
|
||||
rm -f Current; \
|
||||
$(LN_S) $(CURRENT_VERSION_NAME) Current; \
|
||||
|
|
@ -208,14 +208,14 @@ endif
|
|||
if [ ! -L "Headers" ]; then \
|
||||
rm -f Headers; \
|
||||
$(LN_S) Versions/Current/Headers Headers; \
|
||||
fi;)
|
||||
fi$(END_ECHO)
|
||||
ifneq ($(HEADER_FILES),)
|
||||
@(cd $(DERIVED_SOURCES); \
|
||||
$(ECHO_NOTHING)cd $(DERIVED_SOURCES); \
|
||||
if [ ! -L "$(HEADER_FILES_INSTALL_DIR)" ]; then \
|
||||
rm -f ./$(HEADER_FILES_INSTALL_DIR); \
|
||||
$(LN_S) ../$(FRAMEWORK_DIR_NAME)/Headers \
|
||||
./$(HEADER_FILES_INSTALL_DIR); \
|
||||
fi;)
|
||||
fi$(END_ECHO)
|
||||
endif
|
||||
|
||||
$(FRAMEWORK_LIBRARY_DIR_NAME):
|
||||
|
|
@ -230,12 +230,12 @@ $(DERIVED_SOURCES):
|
|||
# Need to share this code with the headers code ... but how.
|
||||
$(FRAMEWORK_HEADER_FILES):: $(HEADER_FILES)
|
||||
ifneq ($(HEADER_FILES),)
|
||||
for file in $(HEADER_FILES) __done; do \
|
||||
$(ECHO_NOTHING)for file in $(HEADER_FILES) __done; do \
|
||||
if [ $$file != __done ]; then \
|
||||
$(INSTALL_DATA) $(HEADER_FILES_DIR)/$$file \
|
||||
$(FRAMEWORK_VERSION_DIR_NAME)/Headers/$$file ; \
|
||||
fi; \
|
||||
done
|
||||
done$(END_ECHO)
|
||||
endif
|
||||
|
||||
OBJC_OBJ_FILES_TO_INSPECT = $(OBJC_OBJ_FILES) $(SUBPROJECT_OBJ_FILES)
|
||||
|
|
@ -329,9 +329,9 @@ ifeq ($(FOUNDATION_LIB), apple)
|
|||
OPTIONAL_TOP_LEVEL_LINK = $(GNUSTEP_INSTANCE).framework/$(GNUSTEP_INSTANCE)
|
||||
|
||||
$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_INSTANCE):
|
||||
(cd $(GNUSTEP_INSTANCE).framework; \
|
||||
$(ECHO_NOTHING)cd $(GNUSTEP_INSTANCE).framework; \
|
||||
rm -f $(GNUSTEP_INSTANCE); \
|
||||
$(LN_S) Versions/Current/$(GNUSTEP_TARGET_LDIR)/$(GNUSTEP_INSTANCE) $(GNUSTEP_INSTANCE))
|
||||
$(LN_S) Versions/Current/$(GNUSTEP_TARGET_LDIR)/$(GNUSTEP_INSTANCE) $(GNUSTEP_INSTANCE)$(END_ECHO)
|
||||
else
|
||||
OPTIONAL_TOP_LEVEL_LINK =
|
||||
endif
|
||||
|
|
@ -419,7 +419,7 @@ ifneq ($(CHOWN_TO),)
|
|||
$(CHOWN) $(CHOWN_TO) $(HEADER_FILES_INSTALL_DIR); \
|
||||
fi$(END_ECHO)
|
||||
endif
|
||||
@(cd $(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR); \
|
||||
$(ECHO_NOTHING)cd $(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR); \
|
||||
if test -f "$(FRAMEWORK_LIBRARY_FILE)"; then \
|
||||
rm -f $(FRAMEWORK_LIBRARY_FILE); \
|
||||
fi; \
|
||||
|
|
@ -433,7 +433,7 @@ endif
|
|||
if test -f "$(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_CURRENT_LIBRARY_DIR_NAME)/$(SONAME_FRAMEWORK_FILE)"; then \
|
||||
$(LN_S) `$(REL_PATH_SCRIPT) $(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR) $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_CURRENT_LIBRARY_DIR_NAME)/$(SONAME_FRAMEWORK_FILE)` $(SONAME_FRAMEWORK_FILE); \
|
||||
fi; \
|
||||
$(LN_S) `$(REL_PATH_SCRIPT) $(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR) $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_CURRENT_LIBRARY_DIR_NAME)/$(VERSION_FRAMEWORK_LIBRARY_FILE)` $(VERSION_FRAMEWORK_LIBRARY_FILE);)
|
||||
$(LN_S) `$(REL_PATH_SCRIPT) $(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR) $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_CURRENT_LIBRARY_DIR_NAME)/$(VERSION_FRAMEWORK_LIBRARY_FILE)` $(VERSION_FRAMEWORK_LIBRARY_FILE)$(END_ECHO)
|
||||
ifneq ($(CHOWN_TO),)
|
||||
$(ECHO_CHOWNING)cd $(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR); \
|
||||
$(CHOWN) $(CHOWN_TO) $(FRAMEWORK_LIBRARY_FILE); \
|
||||
|
|
@ -489,12 +489,12 @@ ifneq ($(CHOWN_TO),)
|
|||
$(CHOWN) -R $(CHOWN_TO) $(HEADER_FILES_INSTALL_DIR); \
|
||||
fi$(END_ECHO)
|
||||
endif
|
||||
(cd $(DLL_INSTALLATION_DIR); \
|
||||
$(ECHO_NOTHING)cd $(DLL_INSTALLATION_DIR); \
|
||||
if test -f "$(FRAMEWORK_FILE)"; then \
|
||||
rm -f $(FRAMEWORK_FILE); \
|
||||
fi;)
|
||||
$(INSTALL_PROGRAM) -m 0755 $(FRAMEWORK_FILE) \
|
||||
$(DLL_INSTALLATION_DIR)/$(FRAMEWORK_FILE);
|
||||
fi$(END_ECHO)
|
||||
$(ECHO_NOTHING)$(INSTALL_PROGRAM) -m 0755 $(FRAMEWORK_FILE) \
|
||||
$(DLL_INSTALLATION_DIR)/$(FRAMEWORK_FILE)$(END_ECHO)
|
||||
|
||||
endif
|
||||
|
||||
|
|
@ -515,25 +515,25 @@ $(GNUSTEP_HEADERS) :
|
|||
|
||||
# FIXME - uninstall doesn't work - it should be removing all the symlinks!
|
||||
internal-framework-uninstall_::
|
||||
if [ "$(HEADER_FILES)" != "" ]; then \
|
||||
$(ECHO_UNINSTALLING)if [ "$(HEADER_FILES)" != "" ]; then \
|
||||
for file in $(HEADER_FILES) __done; do \
|
||||
if [ $$file != __done ]; then \
|
||||
rm -rf $(GNUSTEP_HEADERS)/$(HEADER_FILES_INSTALL_DIR)/$$file ; \
|
||||
fi; \
|
||||
done; \
|
||||
fi; \
|
||||
rm -rf $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_DIR_NAME)
|
||||
rm -rf $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_DIR_NAME)$(END_ECHO)
|
||||
|
||||
#
|
||||
# Cleaning targets
|
||||
#
|
||||
internal-framework-clean::
|
||||
rm -rf $(GNUSTEP_OBJ_DIR) $(PSWRAP_C_FILES) $(PSWRAP_H_FILES) \
|
||||
$(FRAMEWORK_DIR_NAME) $(DERIVED_SOURCES)
|
||||
$(ECHO_NOTHING)rm -rf $(GNUSTEP_OBJ_DIR) $(PSWRAP_C_FILES) $(PSWRAP_H_FILES) \
|
||||
$(FRAMEWORK_DIR_NAME) $(DERIVED_SOURCES)$(END_ECHO)
|
||||
|
||||
internal-framework-distclean::
|
||||
rm -rf shared_obj static_obj shared_debug_obj shared_profile_obj \
|
||||
$(ECHO_NOTHING)rm -rf shared_obj static_obj shared_debug_obj shared_profile_obj \
|
||||
static_debug_obj static_profile_obj shared_profile_debug_obj \
|
||||
static_profile_debug_obj
|
||||
static_profile_debug_obj$(END_ECHO)
|
||||
|
||||
include $(GNUSTEP_MAKEFILES)/Instance/Shared/strings.make
|
||||
|
|
|
|||
|
|
@ -117,14 +117,14 @@ $(GSWAPP_FILE): $(OBJ_FILES_TO_LINK)
|
|||
$(ALL_GSW_LIBS)$(END_ECHO)
|
||||
|
||||
ifeq ($(FOUNDATION_LIB), apple)
|
||||
@$(TRANSFORM_PATHS_SCRIPT) $(subst -L,,$(ALL_LIB_DIRS)) \
|
||||
>$(GSWAPP_DIR_NAME)/library_paths.openapp
|
||||
$(ECHO_NOTHING)$(TRANSFORM_PATHS_SCRIPT) $(subst -L,,$(ALL_LIB_DIRS)) \
|
||||
>$(GSWAPP_DIR_NAME)/library_paths.openapp$(END_ECHO)
|
||||
# This is a hack for OPENSTEP systems to remove the iconheader file
|
||||
# automatically generated by the makefile package.
|
||||
rm -f $(GNUSTEP_INSTANCE).iconheader
|
||||
$(ECHO_NOTHING)rm -f $(GNUSTEP_INSTANCE).iconheader$(END_ECHO)
|
||||
else
|
||||
@$(TRANSFORM_PATHS_SCRIPT) $(subst -L,,$(ALL_LIB_DIRS)) \
|
||||
>$(GSWAPP_DIR_NAME)/$(GNUSTEP_TARGET_LDIR)/library_paths.openapp
|
||||
$(ECHO_NOTHING)$(TRANSFORM_PATHS_SCRIPT) $(subst -L,,$(ALL_LIB_DIRS)) \
|
||||
>$(GSWAPP_DIR_NAME)/$(GNUSTEP_TARGET_LDIR)/library_paths.openapp$(END_ECHO)
|
||||
endif
|
||||
|
||||
#
|
||||
|
|
@ -141,11 +141,11 @@ internal-gswapp-all_:: \
|
|||
$(GSWAPP_DIR_NAME)/$(GNUSTEP_INSTANCE).sh
|
||||
|
||||
$(GNUSTEP_INSTANCE).iconheader:
|
||||
@(echo "F $(GNUSTEP_INSTANCE).$(GSWAPP_EXTENSION) $(GNUSTEP_INSTANCE) $(GSWAPP_EXTENSION)"; \
|
||||
echo "F $(GNUSTEP_INSTANCE) $(GNUSTEP_INSTANCE) app") >$@
|
||||
$(ECHO_CREATING)(echo "F $(GNUSTEP_INSTANCE).$(GSWAPP_EXTENSION) $(GNUSTEP_INSTANCE) $(GSWAPP_EXTENSION)"; \
|
||||
echo "F $(GNUSTEP_INSTANCE) $(GNUSTEP_INSTANCE) app") >$@$(END_ECHO)
|
||||
|
||||
$(GSWAPP_DIR_NAME):
|
||||
mkdir $@
|
||||
$(ECHO_CREATING)mkdir $@$(END_ECHO)
|
||||
else
|
||||
|
||||
internal-gswapp-all_:: \
|
||||
|
|
@ -164,10 +164,10 @@ endif
|
|||
|
||||
ifeq ($(GNUSTEP_INSTANCE)_GEN_SCRIPT,yes) #<==
|
||||
$(GSWAPP_DIR_NAME)/$(GNUSTEP_INSTANCE).sh: $(GSWAPP_DIR_NAME)
|
||||
@(echo "#!/bin/sh"; \
|
||||
$(ECHO_CREATING)(echo "#!/bin/sh"; \
|
||||
echo '# Automatically generated, do not edit!'; \
|
||||
echo '$${GNUSTEP_HOST_LDIR}/$(GNUSTEP_INSTANCE) $$1 $$2 $$3 $$4 $$5 $$6 $$7 $$8') >$@
|
||||
chmod +x $@
|
||||
echo '$${GNUSTEP_HOST_LDIR}/$(GNUSTEP_INSTANCE) $$1 $$2 $$3 $$4 $$5 $$6 $$7 $$8') >$@$(END_ECHO)
|
||||
$(ECHO_NOTHING)chmod +x $@$(END_ECHO)
|
||||
else
|
||||
$(GSWAPP_DIR_NAME)/$(GNUSTEP_INSTANCE).sh:
|
||||
|
||||
|
|
@ -305,7 +305,7 @@ GSWAPP_INFO_PLIST = $($(GNUSTEP_INSTANCE)_GSWAPP_INFO_PLIST)
|
|||
MAIN_MODEL_FILE = $(strip $(subst .gmodel,,$(subst .gorm,,$(subst .nib,,$($(GNUSTEP_INSTANCE)_MAIN_MODEL_FILE)))))
|
||||
|
||||
$(GSWAPP_DIR_NAME)/Resources/Info-gnustep.plist: $(GSWAPP_DIR_NAME)/Resources
|
||||
@(echo "{"; echo ' NOTE = "Automatically generated, do not edit!";'; \
|
||||
$(ECHO_CREATING)(echo "{"; echo ' NOTE = "Automatically generated, do not edit!";'; \
|
||||
echo " NSExecutable = \"$(GNUSTEP_INSTANCE)\";"; \
|
||||
echo " NSPrincipalClass = \"$(PRINCIPAL_CLASS)\";"; \
|
||||
if [ "$(HAS_GSWCOMPONENTS)" != "" ]; then \
|
||||
|
|
@ -318,7 +318,7 @@ $(GSWAPP_DIR_NAME)/Resources/Info-gnustep.plist: $(GSWAPP_DIR_NAME)/Resources
|
|||
if [ "$(GSWAPP_INFO_PLIST)" != "" ]; then \
|
||||
cat $(GSWAPP_INFO_PLIST); \
|
||||
fi; \
|
||||
echo "}") >$@
|
||||
echo "}") >$@$(END_ECHO)
|
||||
|
||||
$(GSWAPP_DIR_NAME)/Resources:
|
||||
$(ECHO_CREATING)$(MKDIRS) $@$(END_ECHO)
|
||||
|
|
@ -338,6 +338,6 @@ ifeq ($(strip),yes)
|
|||
endif
|
||||
|
||||
internal-gswapp-uninstall_::
|
||||
(cd $(GNUSTEP_GSWAPPS); rm -rf $(GSWAPP_DIR_NAME))
|
||||
$(ECHO_UNINSTALLING)(cd $(GNUSTEP_GSWAPPS); rm -rf $(GSWAPP_DIR_NAME))$(END_ECHO)
|
||||
|
||||
include $(GNUSTEP_MAKEFILES)/Instance/Shared/strings.make
|
||||
|
|
|
|||
|
|
@ -245,8 +245,8 @@ $(GSWBUNDLE_DIR_NAME)/Resources/WebServer:
|
|||
$(ECHO_CREATING)$(MKDIRS) $@$(END_ECHO)
|
||||
|
||||
internal-gswbundle-install_:: $(GSWBUNDLE_INSTALL_DIR) shared-instance-headers-install
|
||||
rm -rf $(GSWBUNDLE_INSTALL_DIR)/$(GSWBUNDLE_DIR_NAME); \
|
||||
$(TAR) ch --exclude=CVS --to-stdout $(GSWBUNDLE_DIR_NAME) | (cd $(GSWBUNDLE_INSTALL_DIR); $(TAR) xf -)
|
||||
$(ECHO_INSTALLING)rm -rf $(GSWBUNDLE_INSTALL_DIR)/$(GSWBUNDLE_DIR_NAME); \
|
||||
$(TAR) ch --exclude=CVS --to-stdout $(GSWBUNDLE_DIR_NAME) | (cd $(GSWBUNDLE_INSTALL_DIR); $(TAR) xf -)$(END_ECHO)
|
||||
ifneq ($(CHOWN_TO),)
|
||||
$(ECHO_CHOWNING)$(CHOWN) -R $(CHOWN_TO) $(GSWBUNDLE_INSTALL_DIR)/$(GSWBUNDLE_DIR_NAME)$(END_ECHO)
|
||||
endif
|
||||
|
|
@ -258,6 +258,6 @@ $(GSWBUNDLE_INSTALL_DIR)::
|
|||
$(ECHO_CREATING)$(MKINSTALLDIRS) $@$(END_ECHO)
|
||||
|
||||
internal-gswbundle-uninstall_:: shared-instance-headers-uninstall
|
||||
rm -rf $(GSWBUNDLE_INSTALL_DIR)/$(GSWBUNDLE_DIR_NAME)
|
||||
$(ECHO_UNINSTALLING)rm -rf $(GSWBUNDLE_INSTALL_DIR)/$(GSWBUNDLE_DIR_NAME)$(END_ECHO)
|
||||
|
||||
include $(GNUSTEP_MAKEFILES)/Instance/Shared/strings.make
|
||||
|
|
|
|||
|
|
@ -70,10 +70,10 @@ ESCAPED_PRINCIPAL_CLASS = $(subst /,\/,$(PRINCIPAL_CLASS))
|
|||
|
||||
# Always rebuild this because if the PRINCIPAL_CLASS changes...
|
||||
$(JAVA_TOOL_INSTALLATION_DIR)/$(GNUSTEP_INSTANCE): _FORCE
|
||||
sed -e 's/JAVA_OBJ_FILE/$(ESCAPED_PRINCIPAL_CLASS)/g' \
|
||||
$(ECHO_NOTHING)sed -e 's/JAVA_OBJ_FILE/$(ESCAPED_PRINCIPAL_CLASS)/g' \
|
||||
$(GNUSTEP_MAKEFILES)/java-executable.template \
|
||||
> $(JAVA_TOOL_INSTALLATION_DIR)/$(GNUSTEP_INSTANCE); \
|
||||
chmod a+x $(JAVA_TOOL_INSTALLATION_DIR)/$(GNUSTEP_INSTANCE);
|
||||
chmod a+x $(JAVA_TOOL_INSTALLATION_DIR)/$(GNUSTEP_INSTANCE)$(END_ECHO)
|
||||
ifneq ($(CHOWN_TO),)
|
||||
$(ECHO_CHOWNING)$(CHOWN) $(CHOWN_TO) \
|
||||
$(JAVA_TOOL_INSTALLATION_DIR)/$(GNUSTEP_INSTANCE)$(END_ECHO)
|
||||
|
|
@ -83,7 +83,7 @@ _FORCE::
|
|||
|
||||
|
||||
internal-java_tool-uninstall_:: shared-instance-java-uninstall
|
||||
rm -f $(JAVA_TOOL_INSTALLATION_DIR)/$(GNUSTEP_INSTANCE)
|
||||
$(ECHO_UNINSTALLING)rm -f $(JAVA_TOOL_INSTALLATION_DIR)/$(GNUSTEP_INSTANCE)$(END_ECHO)
|
||||
|
||||
internal-java_tool-clean:: shared-instance-java-clean
|
||||
|
||||
|
|
|
|||
|
|
@ -191,16 +191,16 @@ internal-library-all_:: \
|
|||
$(GNUSTEP_OBJ_DIR)/$(DLL_EXP_LIB)
|
||||
|
||||
internal-library-clean::
|
||||
rm -rf $(DERIVED_SOURCES)
|
||||
$(ECHO_NOTHING)rm -rf $(DERIVED_SOURCES)$(END_ECHO)
|
||||
|
||||
$(DERIVED_SOURCES):
|
||||
$(ECHO_CREATING)$(MKDIRS) $@$(END_ECHO)
|
||||
|
||||
$(DERIVED_SOURCES)/$(GNUSTEP_INSTANCE).def: $(OBJ_FILES_TO_LINK) $(DLL_DEF_INP)
|
||||
$(DLLTOOL) $(DLL_DEF_FLAG) --output-def $@ $(OBJ_FILES_TO_LINK)
|
||||
$(ECHO_NOTHING)$(DLLTOOL) $(DLL_DEF_FLAG) --output-def $@ $(OBJ_FILES_TO_LINK)$(END_ECHO)
|
||||
|
||||
$(GNUSTEP_OBJ_DIR)/$(DLL_EXP_LIB): $(DERIVED_SOURCES)/$(GNUSTEP_INSTANCE).def
|
||||
$(DLLTOOL) --dllname $(DLL_NAME) --def $< --output-lib $@
|
||||
$(ECHO_NOTHING)$(DLLTOOL) --dllname $(DLL_NAME) --def $< --output-lib $@$(END_ECHO)
|
||||
|
||||
$(GNUSTEP_OBJ_DIR)/$(DLL_NAME): $(OBJ_FILES_TO_LINK) \
|
||||
$(DERIVED_SOURCES)/$(GNUSTEP_INSTANCE).def
|
||||
|
|
@ -271,15 +271,15 @@ endif
|
|||
ifeq ($(BUILD_DLL),yes)
|
||||
|
||||
internal-library-uninstall_:: shared-instance-headers-uninstall
|
||||
rm -f $(DLL_INSTALLATION_DIR)/$(DLL_NAME) \
|
||||
$(FINAL_LIBRARY_INSTALL_DIR)/$(DLL_EXP_LIB)
|
||||
$(ECHO_UNINSTALLING)rm -f $(DLL_INSTALLATION_DIR)/$(DLL_NAME) \
|
||||
$(FINAL_LIBRARY_INSTALL_DIR)/$(DLL_EXP_LIB)$(END_ECHO)
|
||||
|
||||
else
|
||||
|
||||
internal-library-uninstall_:: shared-instance-headers-uninstall
|
||||
rm -f $(FINAL_LIBRARY_INSTALL_DIR)/$(VERSION_LIBRARY_FILE) \
|
||||
$(ECHO_UNINSTALLING)rm -f $(FINAL_LIBRARY_INSTALL_DIR)/$(VERSION_LIBRARY_FILE) \
|
||||
$(FINAL_LIBRARY_INSTALL_DIR)/$(LIBRARY_FILE) \
|
||||
$(FINAL_LIBRARY_INSTALL_DIR)/$(SONAME_LIBRARY_FILE)
|
||||
$(FINAL_LIBRARY_INSTALL_DIR)/$(SONAME_LIBRARY_FILE)$(END_ECHO)
|
||||
endif
|
||||
|
||||
#
|
||||
|
|
|
|||
|
|
@ -71,6 +71,6 @@ $(OBJC_PROGRAM_INSTALL_DIR)/$(GNUSTEP_TARGET_LDIR):
|
|||
$(ECHO_CREATING)$(MKINSTALLDIRS) $@$(END_ECHO)
|
||||
|
||||
internal-objc_program-uninstall_::
|
||||
rm -f $(OBJC_PROGRAM_INSTALL_DIR)/$(GNUSTEP_TARGET_LDIR)/$(GNUSTEP_INSTANCE)$(EXEEXT)
|
||||
$(ECHO_UNINSTALLING)rm -f $(OBJC_PROGRAM_INSTALL_DIR)/$(GNUSTEP_TARGET_LDIR)/$(GNUSTEP_INSTANCE)$(EXEEXT)$(END_ECHO)
|
||||
|
||||
include $(GNUSTEP_MAKEFILES)/Instance/Shared/strings.make
|
||||
|
|
|
|||
|
|
@ -134,11 +134,11 @@ $(PALETTE_INSTALL_DIR):
|
|||
$(ECHO_CREATING)$(MKINSTALLDIRS) $(PALETTE_INSTALL_DIR)$(END_ECHO)
|
||||
|
||||
internal-palette-uninstall_::
|
||||
rm -rf $(PALETTE_INSTALL_DIR)/$(PALETTE_DIR_NAME)
|
||||
$(ECHO_NOTHING)rm -rf $(PALETTE_INSTALL_DIR)/$(PALETTE_DIR_NAME)$(END_ECHO)
|
||||
|
||||
internal-palette-distclean::
|
||||
rm -rf shared_obj static_obj shared_debug_obj shared_profile_obj \
|
||||
$(ECHO_NOTHING)rm -rf shared_obj static_obj shared_debug_obj shared_profile_obj \
|
||||
static_debug_obj static_profile_obj shared_profile_debug_obj \
|
||||
static_profile_debug_obj $(PALETTE_DIR_NAME)
|
||||
static_profile_debug_obj $(PALETTE_DIR_NAME)$(END_ECHO)
|
||||
|
||||
include $(GNUSTEP_MAKEFILES)/Instance/Shared/strings.make
|
||||
|
|
|
|||
|
|
@ -91,15 +91,15 @@ internal-resource_set-install_: \
|
|||
$(RESOURCE_FILES_FULL_INSTALL_DIR) \
|
||||
$(addprefix $(RESOURCE_FILES_FULL_INSTALL_DIR)/,$(RESOURCE_DIRS))
|
||||
ifneq ($(RESOURCE_FILES),)
|
||||
@(for file in $(RESOURCE_FILES) __done; do \
|
||||
$(ECHO_NOTHING)for file in $(RESOURCE_FILES) __done; do \
|
||||
if [ $$file != __done ]; then \
|
||||
$(INSTALL_DATA) $(RESOURCE_FILES_DIR)/$$file \
|
||||
$(RESOURCE_FILES_FULL_INSTALL_DIR)/$$file; \
|
||||
fi; \
|
||||
done)
|
||||
done$(END_ECHO)
|
||||
endif
|
||||
ifneq ($(LOCALIZED_RESOURCE_FILES),)
|
||||
@(for l in $(LANGUAGES); do \
|
||||
$(ECHO_NOTHING)for l in $(LANGUAGES); do \
|
||||
if [ -d $$l.lproj ]; then \
|
||||
$(MKINSTALLDIRS) $(RESOURCE_FILES_FULL_INSTALL_DIR)/$$l.lproj; \
|
||||
for f in $(LOCALIZED_RESOURCE_FILES); do \
|
||||
|
|
@ -113,7 +113,7 @@ ifneq ($(LOCALIZED_RESOURCE_FILES),)
|
|||
else \
|
||||
echo "Warning: $$l.lproj not found - ignoring"; \
|
||||
fi; \
|
||||
done)
|
||||
done$(END_ECHO)
|
||||
endif
|
||||
|
||||
else # Following code turned on by setting GNUSTEP_DEVELOPER=YES in the shell
|
||||
|
|
@ -123,7 +123,7 @@ else # Following code turned on by setting GNUSTEP_DEVELOPER=YES in the shell
|
|||
# One optimized for recurrent installations during development - this
|
||||
# rule installs a single file only if strictly needed
|
||||
$(RESOURCE_FILES_FULL_INSTALL_DIR)/% : $(RESOURCE_FILES_DIR)/%
|
||||
$(INSTALL_DATA) $< $@
|
||||
$(ECHO_NOTHING)$(INSTALL_DATA) $< $@$(END_ECHO)
|
||||
|
||||
# This rule depends on having installed all files
|
||||
internal-resource_set-install_: \
|
||||
|
|
@ -147,7 +147,7 @@ $(addsuffix .lproj,$(addprefix $(RESOURCE_FILES_FULL_INSTALL_DIR)/,$(LANGUAGES))
|
|||
# be found, rather than aborting with an error as make would do.
|
||||
internal-resource-set-install-languages: \
|
||||
$(addsuffix .lproj,$(addprefix $(RESOURCE_FILES_FULL_INSTALL_DIR)/,$(LANGUAGES)))
|
||||
@(for l in $(LANGUAGES); do \
|
||||
$(ECHO_NOTHING)for l in $(LANGUAGES); do \
|
||||
if [ -d $$l.lproj ]; then \
|
||||
for f in $(LOCALIZED_RESOURCE_FILES); do \
|
||||
if [ -f $$l.lproj/$$f ]; then \
|
||||
|
|
@ -162,7 +162,7 @@ $(addsuffix .lproj,$(addprefix $(RESOURCE_FILES_FULL_INSTALL_DIR)/,$(LANGUAGES))
|
|||
else \
|
||||
echo "Warning: $$l.lproj not found - ignoring"; \
|
||||
fi; \
|
||||
done)
|
||||
done$(END_ECHO)
|
||||
|
||||
|
||||
endif # LOCALIZED_RESOURCE_FILES
|
||||
|
|
@ -172,15 +172,15 @@ endif
|
|||
|
||||
internal-resource_set-uninstall_:
|
||||
ifneq ($(RESOURCE_FILES),)
|
||||
for file in $(RESOURCE_FILES); do \
|
||||
$(ECHO_NOTHING)for file in $(RESOURCE_FILES); do \
|
||||
rm -rf $(RESOURCE_FILES_FULL_INSTALL_DIR)/$$file ; \
|
||||
done
|
||||
done$(END_ECHO)
|
||||
endif
|
||||
ifneq ($(LOCALIZED_RESOURCE_FILES),)
|
||||
for language in $(LANGUAGES); do \
|
||||
$(ECHO_NOTHING)for language in $(LANGUAGES); do \
|
||||
for file in $(LOCALIZED_RESOURCE_FILES); do \
|
||||
rm -rf $(RESOURCE_FILES_FULL_INSTALL_DIR)/$$language.lproj/$$file;\
|
||||
done; \
|
||||
done;
|
||||
done$(END_ECHO)
|
||||
endif
|
||||
|
||||
|
|
|
|||
|
|
@ -114,16 +114,16 @@ ifeq ($(strip),yes)
|
|||
endif
|
||||
|
||||
internal-service-uninstall_::
|
||||
(cd $(GNUSTEP_SERVICES); rm -rf $(SERVICE_DIR_NAME))
|
||||
$(ECHO_UNINSTALLING)cd $(GNUSTEP_SERVICES); rm -rf $(SERVICE_DIR_NAME)$(END_ECHO)
|
||||
|
||||
|
||||
#
|
||||
# Cleaning targets
|
||||
#
|
||||
internal-service-distclean::
|
||||
rm -rf shared_obj static_obj shared_debug_obj shared_profile_obj \
|
||||
$(ECHO_NOTHING)rm -rf shared_obj static_obj shared_debug_obj shared_profile_obj \
|
||||
static_debug_obj static_profile_obj shared_profile_debug_obj \
|
||||
static_profile_debug_obj *.app *.debug *.profile *.iconheader \
|
||||
$(SERVICE_DIR_NAME)
|
||||
$(SERVICE_DIR_NAME)$(END_ECHO)
|
||||
|
||||
include $(GNUSTEP_MAKEFILES)/Instance/Shared/strings.make
|
||||
|
|
|
|||
|
|
@ -43,18 +43,18 @@ ifneq ($(strip $(DLL_DEF_FILES)),)
|
|||
DLL_DEF_INP = $(GNUSTEP_INSTANCE).inp
|
||||
|
||||
$(DLL_DEF_INP): $(DLL_DEF_FILES)
|
||||
cat $(DLL_DEF_FILES) > $@
|
||||
$(ECHO_CREATING)cat $(DLL_DEF_FILES) > $@$(END_ECHO)
|
||||
|
||||
DLL_DEF_FLAG = --input-def $(DLL_DEF_INP)
|
||||
endif
|
||||
|
||||
internal-subproject-clean::
|
||||
rm -rf $(DLL_DEF_IMP)
|
||||
$(ECHO_NOTHING)rm -rf $(DLL_DEF_IMP)$(END_ECHO)
|
||||
|
||||
internal-subproject-all_:: subproject.def
|
||||
|
||||
subproject.def: $(OBJ_FILES_TO_LINK) $(DLL_DEF)
|
||||
$(DLLTOOL) $(DLL_DEF_FLAG) --output-def subproject.def $(OBJ_FILES_TO_LINK)
|
||||
$(ECHO_NOTHING)$(DLLTOOL) $(DLL_DEF_FLAG) --output-def subproject.def $(OBJ_FILES_TO_LINK)$(END_ECHO)
|
||||
|
||||
endif
|
||||
|
||||
|
|
@ -83,11 +83,11 @@ internal-subproject-build-headers:: $(OWNING_PROJECT_HEADER_FILES)
|
|||
# has built his dirs
|
||||
$(OWNING_PROJECT_HEADER_FILES):: $(HEADER_FILES) $(OWNING_PROJECT_HEADER_DIR)
|
||||
ifneq ($(HEADER_FILES),)
|
||||
for file in $(HEADER_FILES) __done; do \
|
||||
$(ECHO_NOTHING)for file in $(HEADER_FILES) __done; do \
|
||||
if [ $$file != __done ]; then \
|
||||
$(INSTALL_DATA) ./$$file $(OWNING_PROJECT_HEADER_DIR)/$$file ; \
|
||||
fi; \
|
||||
done
|
||||
done$(END_ECHO)
|
||||
endif # we got HEADER_FILES
|
||||
|
||||
$(OWNING_PROJECT_HEADER_DIR):
|
||||
|
|
|
|||
Loading…
Reference in a new issue