mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-22 22:00:49 +00:00
Simplified implementation of before-xxx-all and after-xxx-all; implemented
before-xxx-install and after-xxx-install git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@13156 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero
parent
e211f87894
commit
9be02b2255
21 changed files with 232 additions and 241 deletions
|
|
@ -41,9 +41,9 @@ endif
|
|||
# where xxx is the application name
|
||||
#
|
||||
|
||||
.PHONY: internal-app-all \
|
||||
internal-app-install \
|
||||
internal-app-uninstall \
|
||||
.PHONY: internal-app-all_ \
|
||||
internal-app-install_ \
|
||||
internal-app-uninstall_ \
|
||||
internal-application-build-template \
|
||||
_FORCE
|
||||
|
||||
|
|
@ -92,13 +92,11 @@ endif
|
|||
# Compilation targets
|
||||
#
|
||||
ifeq ($(OBJC_COMPILER), NeXT)
|
||||
internal-app-all:: before-$(GNUSTEP_INSTANCE)-all \
|
||||
$(GNUSTEP_INSTANCE).iconheader \
|
||||
$(GNUSTEP_OBJ_DIR) \
|
||||
$(APP_DIR_NAME) \
|
||||
$(APP_FILE) \
|
||||
shared-instance-bundle-all \
|
||||
after-$(GNUSTEP_INSTANCE)-all
|
||||
internal-app-all_:: $(GNUSTEP_INSTANCE).iconheader \
|
||||
$(GNUSTEP_OBJ_DIR) \
|
||||
$(APP_DIR_NAME) \
|
||||
$(APP_FILE) \
|
||||
shared-instance-bundle-all
|
||||
|
||||
$(GNUSTEP_INSTANCE).iconheader:
|
||||
@(echo "F $(GNUSTEP_INSTANCE).$(APP_EXTENSION) $(GNUSTEP_INSTANCE) $(APP_EXTENSION)"; \
|
||||
|
|
@ -106,16 +104,14 @@ $(GNUSTEP_INSTANCE).iconheader:
|
|||
|
||||
else
|
||||
|
||||
internal-app-all:: before-$(GNUSTEP_INSTANCE)-all \
|
||||
$(GNUSTEP_OBJ_DIR) \
|
||||
$(APP_DIR_NAME)/$(GNUSTEP_TARGET_LDIR) \
|
||||
$(APP_FILE) \
|
||||
internal-application-build-template \
|
||||
$(APP_DIR_NAME)/Resources \
|
||||
$(APP_DIR_NAME)/Resources/Info-gnustep.plist \
|
||||
$(APP_DIR_NAME)/Resources/$(GNUSTEP_INSTANCE).desktop \
|
||||
shared-instance-bundle-all \
|
||||
after-$(GNUSTEP_INSTANCE)-all
|
||||
internal-app-all_:: $(GNUSTEP_OBJ_DIR) \
|
||||
$(APP_DIR_NAME)/$(GNUSTEP_TARGET_LDIR) \
|
||||
$(APP_FILE) \
|
||||
internal-application-build-template \
|
||||
$(APP_DIR_NAME)/Resources \
|
||||
$(APP_DIR_NAME)/Resources/Info-gnustep.plist \
|
||||
$(APP_DIR_NAME)/Resources/$(GNUSTEP_INSTANCE).desktop \
|
||||
shared-instance-bundle-all
|
||||
|
||||
$(APP_DIR_NAME)/$(GNUSTEP_TARGET_LDIR):
|
||||
@$(MKDIRS) $@
|
||||
|
|
@ -162,7 +158,7 @@ $(APP_DIR_NAME)/Resources/$(GNUSTEP_INSTANCE).desktop: \
|
|||
|
||||
_FORCE::
|
||||
|
||||
internal-app-install:: $(GNUSTEP_APPS)
|
||||
internal-app-install_:: $(GNUSTEP_APPS)
|
||||
rm -rf $(GNUSTEP_APPS)/$(APP_DIR_NAME); \
|
||||
$(TAR) cf - $(APP_DIR_NAME) | (cd $(GNUSTEP_APPS); $(TAR) xf -)
|
||||
ifneq ($(CHOWN_TO),)
|
||||
|
|
@ -176,7 +172,7 @@ endif
|
|||
$(GNUSTEP_APPS):
|
||||
$(MKINSTALLDIRS) $@
|
||||
|
||||
internal-app-uninstall::
|
||||
internal-app-uninstall_::
|
||||
(cd $(GNUSTEP_APPS); rm -rf $(APP_DIR_NAME))
|
||||
|
||||
## Local variables:
|
||||
|
|
|
|||
|
|
@ -41,11 +41,9 @@ include $(GNUSTEP_MAKEFILES)/Instance/Shared/headers.make
|
|||
# where xxx is the bundle name
|
||||
#
|
||||
|
||||
.PHONY: internal-bundle-all \
|
||||
internal-bundle-clean \
|
||||
internal-bundle-distclean \
|
||||
internal-bundle-install \
|
||||
internal-bundle-uninstall \
|
||||
.PHONY: internal-bundle-all_ \
|
||||
internal-bundle-install_ \
|
||||
internal-bundle-uninstall_ \
|
||||
build-bundle-dir \
|
||||
build-bundle \
|
||||
build-macosx-bundle \
|
||||
|
|
@ -86,11 +84,9 @@ ALL_CPPFLAGS += $(TTMP_LIBS)
|
|||
BUNDLE_OBJ_EXT = $(DLL_LIBEXT)
|
||||
endif # WITH_DLL
|
||||
|
||||
internal-bundle-all:: before-$(GNUSTEP_INSTANCE)-all \
|
||||
$(GNUSTEP_OBJ_DIR) \
|
||||
build-bundle \
|
||||
build-macosx-bundle \
|
||||
after-$(GNUSTEP_INSTANCE)-all
|
||||
internal-bundle-all_:: $(GNUSTEP_OBJ_DIR) \
|
||||
build-bundle \
|
||||
build-macosx-bundle
|
||||
|
||||
BUNDLE_DIR_NAME = $(GNUSTEP_INSTANCE:=$(BUNDLE_EXTENSION))
|
||||
|
||||
|
|
@ -218,7 +214,7 @@ $(BUNDLE_DIR_NAME)/Resources/Info-gnustep.plist:
|
|||
# Resources already exists and is a directory (either a real one or a
|
||||
# symbolic link, we don't care).
|
||||
|
||||
internal-bundle-install:: $(BUNDLE_INSTALL_DIR) shared-instance-headers-install
|
||||
internal-bundle-install_:: $(BUNDLE_INSTALL_DIR) shared-instance-headers-install
|
||||
rm -f .tmp.gnustep.exclude; \
|
||||
echo "$(BUNDLE_DIR_NAME)/Contents/Resources" > .tmp.gnustep.exclude;\
|
||||
rm -rf $(BUNDLE_INSTALL_DIR)/$(BUNDLE_DIR_NAME); \
|
||||
|
|
@ -239,7 +235,7 @@ endif
|
|||
$(BUNDLE_INSTALL_DIR):
|
||||
$(MKINSTALLDIRS) $@
|
||||
|
||||
internal-bundle-uninstall:: shared-instance-headers-uninstall
|
||||
internal-bundle-uninstall_:: shared-instance-headers-uninstall
|
||||
rm -rf $(BUNDLE_INSTALL_DIR)/$(BUNDLE_DIR_NAME)
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -31,9 +31,9 @@
|
|||
# It all works as for library.make but we install outside library-combo
|
||||
#
|
||||
|
||||
.PHONY: internal-clibrary-all \
|
||||
internal-clibrary-install \
|
||||
internal-clibrary-uninstall
|
||||
.PHONY: internal-clibrary-all_ \
|
||||
internal-clibrary-install_ \
|
||||
internal-clibrary-uninstall_
|
||||
|
||||
# This is the directory where the lib get installed.
|
||||
ifeq ($(CLIBRARY_INSTALL_DIR),)
|
||||
|
|
@ -49,13 +49,11 @@ FINAL_LIBRARY_INSTALL_DIR = $(CLIBRARY_INSTALL_DIR)/$(GNUSTEP_TARGET_DIR)
|
|||
include $(GNUSTEP_MAKEFILES)/Instance/library.make
|
||||
|
||||
# Now call them from our own rules
|
||||
internal-clibrary-all:: internal-library-all
|
||||
internal-clibrary-all_:: internal-library-all_
|
||||
|
||||
internal-clibrary-clean:: internal-library-clean
|
||||
internal-clibrary-install_:: internal-library-install_
|
||||
|
||||
internal-clibrary-install:: internal-library-install
|
||||
|
||||
internal-clibrary-uninstall:: internal-library-uninstall
|
||||
internal-clibrary-uninstall_:: internal-library-uninstall_
|
||||
|
||||
internal-clibrary-check:: internal-library-check
|
||||
|
||||
|
|
|
|||
|
|
@ -37,9 +37,9 @@ ifeq ($(CTOOL_INSTALLATION_DIR),)
|
|||
CTOOL_INSTALLATION_DIR = $(GNUSTEP_TOOLS)/$(GNUSTEP_TARGET_DIR)
|
||||
endif
|
||||
|
||||
.PHONY: internal-ctool-all \
|
||||
internal-ctool-install \
|
||||
internal-ctool-uninstall
|
||||
.PHONY: internal-ctool-all_ \
|
||||
internal-ctool-install_ \
|
||||
internal-ctool-uninstall_
|
||||
|
||||
ALL_TOOL_LIBS = \
|
||||
$(shell $(WHICH_LIB_SCRIPT) \
|
||||
|
|
@ -71,10 +71,8 @@ endif
|
|||
#
|
||||
# Compilation targets
|
||||
#
|
||||
internal-ctool-all:: before-$(GNUSTEP_INSTANCE)-all \
|
||||
$(GNUSTEP_OBJ_DIR) \
|
||||
$(GNUSTEP_OBJ_DIR)/$(GNUSTEP_INSTANCE)$(EXEEXT) \
|
||||
after-$(GNUSTEP_INSTANCE)-all
|
||||
internal-ctool-all_:: $(GNUSTEP_OBJ_DIR) \
|
||||
$(GNUSTEP_OBJ_DIR)/$(GNUSTEP_INSTANCE)$(EXEEXT)
|
||||
|
||||
$(GNUSTEP_OBJ_DIR)/$(GNUSTEP_INSTANCE)$(EXEEXT): $(C_OBJ_FILES) \
|
||||
$(SUBPROJECT_OBJ_FILES)
|
||||
|
|
@ -82,7 +80,7 @@ $(GNUSTEP_OBJ_DIR)/$(GNUSTEP_INSTANCE)$(EXEEXT): $(C_OBJ_FILES) \
|
|||
$(C_OBJ_FILES) $(SUBPROJECT_OBJ_FILES) \
|
||||
$(ALL_TOOL_LIBS)
|
||||
|
||||
internal-ctool-install:: $(CTOOL_INSTALLATION_DIR)
|
||||
internal-ctool-install_:: $(CTOOL_INSTALLATION_DIR)
|
||||
$(INSTALL_PROGRAM) -m 0755 \
|
||||
$(GNUSTEP_OBJ_DIR)/$(GNUSTEP_INSTANCE)$(EXEEXT) \
|
||||
$(CTOOL_INSTALLATION_DIR)
|
||||
|
|
@ -90,7 +88,7 @@ internal-ctool-install:: $(CTOOL_INSTALLATION_DIR)
|
|||
$(CTOOL_INSTALLATION_DIR):
|
||||
$(MKINSTALLDIRS) $(CTOOL_INSTALLATION_DIR)
|
||||
|
||||
internal-ctool-uninstall::
|
||||
internal-ctool-uninstall_::
|
||||
rm -f $(CTOOL_INSTALLATION_DIR)/$(GNUSTEP_INSTANCE)$(EXEEXT)
|
||||
|
||||
## Local variables:
|
||||
|
|
|
|||
|
|
@ -76,16 +76,16 @@ DOC_INSTALL_DIR = $($(GNUSTEP_INSTANCE)_DOC_INSTALL_DIR)
|
|||
TEXT_MAIN = $($(GNUSTEP_INSTANCE)_TEXT_MAIN)
|
||||
|
||||
|
||||
.PHONY: internal-doc-all \
|
||||
internal-textdoc-all \
|
||||
.PHONY: internal-doc-all_ \
|
||||
internal-textdoc-all_ \
|
||||
internal-doc-clean \
|
||||
internal-textdoc-clean \
|
||||
internal-doc-distclean \
|
||||
internal-textdoc-distclean \
|
||||
internal-doc-install \
|
||||
internal-textdoc-install \
|
||||
internal-doc-uninstall \
|
||||
internal-textdoc-uninstall \
|
||||
internal-doc-install_ \
|
||||
internal-textdoc-install_ \
|
||||
internal-doc-uninstall_ \
|
||||
internal-textdoc-uninstall_ \
|
||||
generate-javadoc
|
||||
|
||||
#
|
||||
|
|
@ -101,15 +101,11 @@ TEXT_MAIN = $($(GNUSTEP_INSTANCE)_TEXT_MAIN)
|
|||
#
|
||||
ifneq ($(TEXI_FILES),)
|
||||
|
||||
internal-doc-all:: before-$(GNUSTEP_INSTANCE)-all \
|
||||
$(GNUSTEP_INSTANCE).info \
|
||||
$(GNUSTEP_INSTANCE).ps \
|
||||
$(GNUSTEP_INSTANCE)_toc.html \
|
||||
after-$(GNUSTEP_INSTANCE)-all
|
||||
internal-doc-all_:: $(GNUSTEP_INSTANCE).info \
|
||||
$(GNUSTEP_INSTANCE).ps \
|
||||
$(GNUSTEP_INSTANCE)_toc.html
|
||||
|
||||
internal-textdoc-all:: before-$(GNUSTEP_INSTANCE)-all \
|
||||
$(GNUSTEP_INSTANCE) \
|
||||
after-$(GNUSTEP_INSTANCE)-all
|
||||
internal-textdoc-all_:: $(GNUSTEP_INSTANCE)
|
||||
|
||||
$(GNUSTEP_INSTANCE).info: $(TEXI_FILES)
|
||||
$(GNUSTEP_MAKEINFO) $(GNUSTEP_MAKEINFO_FLAGS) \
|
||||
|
|
@ -147,9 +143,7 @@ ifneq ($(GSDOC_FILES),)
|
|||
# %.html file, we rebuild them all.
|
||||
GSDOC_OBJECT_FILES = $(patsubst %.gsdoc,%.html,$(GSDOC_FILES))
|
||||
|
||||
internal-doc-all:: before-$(GNUSTEP_INSTANCE)-all \
|
||||
$(GSDOC_OBJECT_FILES) \
|
||||
after-$(GNUSTEP_INSTANCE)-all
|
||||
internal-doc-all_:: $(GSDOC_OBJECT_FILES)
|
||||
|
||||
$(GSDOC_OBJECT_FILES): $(GSDOC_FILES)
|
||||
gsdoc $(GSDOC_FILES)
|
||||
|
|
@ -203,10 +197,8 @@ $(GNUSTEP_INSTANCE)/%.html: $(GNUSTEP_INSTANCE)/%.gsdoc $(GNUSTEP_INSTANCE)/$(GN
|
|||
$(GNUSTEP_INSTANCE)/$(GNUSTEP_INSTANCE).igsdoc: $(AGSDOC_GSDOC_FILES)
|
||||
autogsdoc $(INTERNAL_AGSDOCFLAGS) -GenerateHtml NO $(AGSDOC_GSDOC_FILES)
|
||||
|
||||
internal-doc-all:: before-$(GNUSTEP_INSTANCE)-all \
|
||||
$(GNUSTEP_INSTANCE) \
|
||||
$(AGSDOC_HTML_FILES) \
|
||||
after-$(GNUSTEP_INSTANCE)-all
|
||||
internal-doc-all_:: $(GNUSTEP_INSTANCE) \
|
||||
$(AGSDOC_HTML_FILES)
|
||||
|
||||
else
|
||||
|
||||
|
|
@ -220,9 +212,7 @@ INTERNAL_AGSDOCFLAGS += -DocumentationDirectory $(GNUSTEP_INSTANCE)
|
|||
|
||||
# The autogsdoc program has built-in dependency handling, so we can
|
||||
# simply run it and it will work out what needs to be rebuilt.
|
||||
internal-doc-all:: before-$(GNUSTEP_INSTANCE)-all \
|
||||
generate-autogsdoc \
|
||||
after-$(GNUSTEP_INSTANCE)-all
|
||||
internal-doc-all_:: generate-autogsdoc
|
||||
|
||||
$(GNUSTEP_INSTANCE):
|
||||
$(MKDIRS) $@
|
||||
|
|
@ -234,7 +224,7 @@ endif # AGSDOC_EXPERIMENTAL
|
|||
|
||||
else
|
||||
|
||||
internal-doc-all::
|
||||
internal-doc-all_::
|
||||
@echo "No libxml - processing of autogsdoc files skipped"
|
||||
|
||||
endif # GNUSTEP_BASE_HAVE_LIBXML
|
||||
|
|
@ -259,8 +249,7 @@ $(GNUSTEP_INSTANCE).ps: $(GNUSTEP_INSTANCE).dvi
|
|||
$(GNUSTEP_INSTANCE).ps.gz: $(GNUSTEP_INSTANCE).ps
|
||||
gzip $(GNUSTEP_INSTANCE).ps -c > $(GNUSTEP_INSTANCE).ps.gz
|
||||
|
||||
internal-doc-all:: before-$(GNUSTEP_INSTANCE)-all \
|
||||
$(GNUSTEP_INSTANCE).ps.gz
|
||||
internal-doc-all_:: $(GNUSTEP_INSTANCE).ps.gz
|
||||
|
||||
#
|
||||
# Targets built only if we can find `latex2html'
|
||||
|
|
@ -273,7 +262,7 @@ ifneq ($(LATEX2HTML),)
|
|||
endif
|
||||
|
||||
ifeq ($(HAS_LATEX2HTML),yes)
|
||||
internal-doc-all:: $(GNUSTEP_INSTANCE).tar.gz
|
||||
internal-doc-all_:: $(GNUSTEP_INSTANCE).tar.gz
|
||||
|
||||
$(GNUSTEP_INSTANCE)/$(GNUSTEP_INSTANCE).html: $(GNUSTEP_INSTANCE).dvi
|
||||
$(LATEX2HTML) $(GNUSTEP_INSTANCE)
|
||||
|
|
@ -283,8 +272,6 @@ $(GNUSTEP_INSTANCE).tar.gz: $(GNUSTEP_INSTANCE)/$(GNUSTEP_INSTANCE).html
|
|||
|
||||
endif # LATEX2HTML
|
||||
|
||||
internal-doc-all:: after-$(GNUSTEP_INSTANCE)-all
|
||||
|
||||
endif # LATEX_FILES
|
||||
|
||||
#
|
||||
|
|
@ -304,18 +291,16 @@ endif
|
|||
|
||||
ifneq ($(JAVADOC_BUILD_ALWAYS),YES) # Build only once
|
||||
|
||||
internal-doc-all:: before-$(GNUSTEP_INSTANCE)-all \
|
||||
$(GNUSTEP_INSTANCE)/index.html \
|
||||
after-$(GNUSTEP_INSTANCE)-all
|
||||
internal-doc-all_:: $(GNUSTEP_INSTANCE)/index.html
|
||||
|
||||
$(GNUSTEP_INSTANCE)/index.html:
|
||||
$(MKDIRS) $(GNUSTEP_INSTANCE); \
|
||||
$(JAVADOC) $(ALL_JAVADOCFLAGS) $(JAVADOC_FILES) -d $(GNUSTEP_INSTANCE)
|
||||
|
||||
else # Build always
|
||||
|
||||
internal-doc-all:: before-$(GNUSTEP_INSTANCE)-all \
|
||||
generate-javadoc \
|
||||
after-$(GNUSTEP_INSTANCE)-all
|
||||
internal-doc-all_:: generate-javadoc
|
||||
|
||||
generate-javadoc:
|
||||
$(MKDIRS) $(GNUSTEP_INSTANCE); \
|
||||
$(JAVADOC) $(ALL_JAVADOCFLAGS) $(JAVADOC_FILES) -d $(GNUSTEP_INSTANCE)
|
||||
|
|
@ -332,14 +317,14 @@ endif # JAVADOC_FILES
|
|||
#
|
||||
# Installation directory - always created
|
||||
#
|
||||
internal-doc-install:: $(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR)
|
||||
internal-doc-install_:: $(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR)
|
||||
|
||||
$(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR):
|
||||
$(MKINSTALLDIRS) $(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR)
|
||||
|
||||
# xxx_INSTALL_FILES
|
||||
ifneq ($($(GNUSTEP_INSTANCE)_INSTALL_FILES),)
|
||||
internal-doc-install::
|
||||
internal-doc-install_::
|
||||
for file in $($(GNUSTEP_INSTANCE)_INSTALL_FILES) __done; do \
|
||||
if [ $$file != __done ]; then \
|
||||
$(INSTALL_DATA) $$file \
|
||||
|
|
@ -347,7 +332,7 @@ internal-doc-install::
|
|||
fi; \
|
||||
done
|
||||
|
||||
internal-doc-uninstall::
|
||||
internal-doc-uninstall_::
|
||||
for file in $($(GNUSTEP_INSTANCE)_INSTALL_FILES) __done; do \
|
||||
if [ $$file != __done ]; then \
|
||||
rm -f $(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR)/$$file ; \
|
||||
|
|
@ -361,7 +346,7 @@ endif
|
|||
ifneq ($(TEXI_FILES),)
|
||||
|
||||
# NB: Only install HTML if it has been generated
|
||||
internal-doc-install::
|
||||
internal-doc-install_::
|
||||
$(INSTALL_DATA) $(GNUSTEP_INSTANCE).ps \
|
||||
$(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR)
|
||||
$(INSTALL_DATA) $(GNUSTEP_INSTANCE).info \
|
||||
|
|
@ -371,7 +356,7 @@ internal-doc-install::
|
|||
$(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR); \
|
||||
fi
|
||||
|
||||
internal-doc-uninstall::
|
||||
internal-doc-uninstall_::
|
||||
rm -f \
|
||||
$(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR)/$(GNUSTEP_INSTANCE).ps
|
||||
rm -f \
|
||||
|
|
@ -385,10 +370,10 @@ endif # TEXI_FILES
|
|||
#
|
||||
ifneq ($(GSDOC_FILES),)
|
||||
|
||||
internal-doc-install::
|
||||
internal-doc-install_::
|
||||
$(INSTALL_DATA) $(GSDOC_OBJECT_FILES) \
|
||||
$(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR)
|
||||
internal-doc-uninstall::
|
||||
internal-doc-uninstall_::
|
||||
rm -f \
|
||||
$(addprefix $(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR)/,\
|
||||
$(GSDOC_OBJECT_FILES))
|
||||
|
|
@ -399,7 +384,7 @@ endif # GSDOC_FILES
|
|||
#
|
||||
ifneq ($(AGSDOC_FILES),)
|
||||
|
||||
internal-doc-install::
|
||||
internal-doc-install_::
|
||||
rm -rf $(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR)/$(GNUSTEP_INSTANCE)
|
||||
$(TAR) cf - $(GNUSTEP_INSTANCE) | \
|
||||
(cd $(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR); $(TAR) xf -)
|
||||
|
|
@ -411,7 +396,7 @@ ifneq ($(CHOWN_TO),)
|
|||
$(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR)/$(GNUSTEP_INSTANCE)
|
||||
endif
|
||||
|
||||
internal-doc-uninstall::
|
||||
internal-doc-uninstall_::
|
||||
-rm -f $(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR)/$(GNUSTEP_INSTANCE)
|
||||
|
||||
endif # AUTOGSDOC_FILES
|
||||
|
|
@ -420,22 +405,22 @@ endif # AUTOGSDOC_FILES
|
|||
# LaTeX installation
|
||||
#
|
||||
ifneq ($(LATEX_FILES),)
|
||||
internal-doc-install::
|
||||
internal-doc-install_::
|
||||
$(INSTALL_DATA) $(GNUSTEP_INSTANCE).ps \
|
||||
$(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR)
|
||||
internal-doc-uninstall::
|
||||
internal-doc-uninstall_::
|
||||
rm -f \
|
||||
$(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR)/$(GNUSTEP_INSTANCE).ps
|
||||
|
||||
ifeq ($(HAS_LATEX2HTML),yes)
|
||||
internal-doc-install::
|
||||
internal-doc-install_::
|
||||
$(INSTALL_DATA) $(GNUSTEP_INSTANCE)/*.html \
|
||||
$(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR)
|
||||
$(INSTALL_DATA) $(GNUSTEP_INSTANCE)/*.css \
|
||||
$(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR)
|
||||
# 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::
|
||||
internal-doc-uninstall_::
|
||||
-rm -f $(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR)/*.html
|
||||
-rm -f $(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR)/*.css
|
||||
endif # LATEX2HTML
|
||||
|
|
@ -446,7 +431,7 @@ endif # LATEX_FILES
|
|||
#
|
||||
ifneq ($(JAVADOC_FILES),)
|
||||
|
||||
internal-doc-install::
|
||||
internal-doc-install_::
|
||||
rm -rf $(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR)/$(GNUSTEP_INSTANCE)
|
||||
$(TAR) cf - $(GNUSTEP_INSTANCE) | \
|
||||
(cd $(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR); $(TAR) xf -)
|
||||
|
|
@ -455,7 +440,7 @@ ifneq ($(CHOWN_TO),)
|
|||
$(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR)/$(GNUSTEP_INSTANCE)
|
||||
endif
|
||||
|
||||
internal-doc-uninstall::
|
||||
internal-doc-uninstall_::
|
||||
-rm -f $(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR)/$(GNUSTEP_INSTANCE)
|
||||
|
||||
endif # JAVADOC_FILES
|
||||
|
|
@ -463,11 +448,11 @@ endif # JAVADOC_FILES
|
|||
#
|
||||
# text file installation
|
||||
#
|
||||
internal-textdoc-install:: $(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR)
|
||||
internal-textdoc-install_:: $(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR)
|
||||
$(INSTALL_DATA) $(GNUSTEP_INSTANCE) \
|
||||
$(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR)
|
||||
|
||||
internal-textdoc-uninstall::
|
||||
internal-textdoc-uninstall_::
|
||||
rm -f \
|
||||
$(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR)/$(GNUSTEP_INSTANCE)
|
||||
|
||||
|
|
|
|||
|
|
@ -24,6 +24,8 @@ ifeq ($(RULES_MAKE_LOADED),)
|
|||
include $(GNUSTEP_MAKEFILES)/rules.make
|
||||
endif
|
||||
|
||||
# FIXME - missing .PHONY declaration
|
||||
|
||||
# The name of the framework is in the FRAMEWORK_NAME variable.
|
||||
# The list of framework resource files are in xxx_RESOURCE_FILES
|
||||
# The list of framework web server resource files are in
|
||||
|
|
@ -123,10 +125,8 @@ endif # WITH_DLL
|
|||
GNUSTEP_SHARED_INSTANCE_BUNDLE_RESOURCE_PATH = $(FRAMEWORK_VERSION_DIR_NAME)/Resources
|
||||
include $(GNUSTEP_MAKEFILES)/Instance/Shared/bundle.make
|
||||
|
||||
internal-framework-all:: before-$(GNUSTEP_INSTANCE)-all \
|
||||
$(GNUSTEP_OBJ_DIR) \
|
||||
build-framework \
|
||||
after-$(GNUSTEP_INSTANCE)-all
|
||||
internal-framework-all_:: $(GNUSTEP_OBJ_DIR) \
|
||||
build-framework
|
||||
|
||||
ifeq ($(FRAMEWORK_INSTALL_DIR),)
|
||||
FRAMEWORK_INSTALL_DIR = $(GNUSTEP_FRAMEWORKS)
|
||||
|
|
@ -299,7 +299,7 @@ $(FRAMEWORK_VERSION_DIR_NAME)/Resources/Info-gnustep.plist: $(FRAMEWORK_VERSION_
|
|||
|
||||
ifneq ($(WITH_DLL),yes)
|
||||
|
||||
internal-framework-install:: $(FRAMEWORK_INSTALL_DIR) \
|
||||
internal-framework-install_:: $(FRAMEWORK_INSTALL_DIR) \
|
||||
$(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR) \
|
||||
$(GNUSTEP_HEADERS)
|
||||
rm -rf $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_DIR_NAME)
|
||||
|
|
@ -349,7 +349,7 @@ endif
|
|||
|
||||
else # install DLL
|
||||
|
||||
internal-framework-install:: $(FRAMEWORK_INSTALL_DIR) \
|
||||
internal-framework-install_:: $(FRAMEWORK_INSTALL_DIR) \
|
||||
$(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR) \
|
||||
$(GNUSTEP_HEADERS) \
|
||||
$(DLL_INSTALLATION_DIR)
|
||||
|
|
@ -402,7 +402,7 @@ $(GNUSTEP_HEADERS) :
|
|||
$(MKINSTALLDIRS) $@
|
||||
|
||||
# FIXME - uninstall doesn't work
|
||||
internal-framework-uninstall::
|
||||
internal-framework-uninstall_::
|
||||
if [ "$(HEADER_FILES)" != "" ]; then \
|
||||
for file in $(HEADER_FILES) __done; do \
|
||||
if [ $$file != __done ]; then \
|
||||
|
|
|
|||
|
|
@ -67,9 +67,9 @@ endif
|
|||
|
||||
GNUSTEP_GSWAPPS = $(GNUSTEP_INSTALLATION_DIR)/GSWApps
|
||||
|
||||
.PHONY: internal-gswapp-all \
|
||||
internal-gswapp-install \
|
||||
internal-gswapp-uninstall \
|
||||
.PHONY: internal-gswapp-all_ \
|
||||
internal-gswapp-install_ \
|
||||
internal-gswapp-uninstall_ \
|
||||
gswapp-components \
|
||||
gswapp-webresource-dir \
|
||||
gswapp-webresource-files \
|
||||
|
|
@ -131,16 +131,14 @@ endif
|
|||
# Compilation targets
|
||||
#
|
||||
ifeq ($(OBJC_COMPILER), NeXT)
|
||||
internal-gswapp-all:: \
|
||||
before-$(GNUSTEP_INSTANCE)-all \
|
||||
internal-gswapp-all_:: \
|
||||
$(GNUSTEP_OBJ_DIR) $(GSWAPP_DIR_NAME) $(GSWAPP_FILE) \
|
||||
gswapp-components \
|
||||
gswapp-localized-webresource-files \
|
||||
gswapp-webresource-files \
|
||||
gswapp-localized-resource-files \
|
||||
gswapp-resource-files \
|
||||
$(GSWAPP_DIR_NAME)/$(GNUSTEP_INSTANCE).sh \
|
||||
after-$(GNUSTEP_INSTANCE)-all
|
||||
$(GSWAPP_DIR_NAME)/$(GNUSTEP_INSTANCE).sh
|
||||
|
||||
$(GNUSTEP_INSTANCE).iconheader:
|
||||
@(echo "F $(GNUSTEP_INSTANCE).$(GSWAPP_EXTENSION) $(GNUSTEP_INSTANCE) $(GSWAPP_EXTENSION)"; \
|
||||
|
|
@ -150,16 +148,15 @@ $(GSWAPP_DIR_NAME):
|
|||
mkdir $@
|
||||
else
|
||||
|
||||
internal-gswapp-all:: \
|
||||
before-$(GNUSTEP_INSTANCE)-all $(GNUSTEP_OBJ_DIR) \
|
||||
internal-gswapp-all_:: \
|
||||
$(GNUSTEP_OBJ_DIR) \
|
||||
$(GSWAPP_DIR_NAME)/$(GNUSTEP_TARGET_LDIR) $(GSWAPP_FILE) \
|
||||
gswapp-components \
|
||||
gswapp-localized-webresource-files \
|
||||
gswapp-webresource-files \
|
||||
gswapp-localized-resource-files \
|
||||
gswapp-resource-files \
|
||||
$(GSWAPP_DIR_NAME)/$(GNUSTEP_INSTANCE).sh \
|
||||
after-$(GNUSTEP_INSTANCE)-all
|
||||
$(GSWAPP_DIR_NAME)/$(GNUSTEP_INSTANCE).sh
|
||||
|
||||
$(GSWAPP_DIR_NAME)/$(GNUSTEP_TARGET_LDIR):
|
||||
@$(MKDIRS) $(GSWAPP_DIR_NAME)/$(GNUSTEP_TARGET_LDIR)
|
||||
|
|
@ -329,7 +326,7 @@ $(GSWAPP_DIR_NAME)/Resources:
|
|||
$(GSWAPP_DIR_NAME)/Resources/WebServer:
|
||||
@$(MKDIRS) $@
|
||||
|
||||
internal-gswapp-install::
|
||||
internal-gswapp-install_::
|
||||
@($(MKINSTALLDIRS) $(GNUSTEP_GSWAPPS); \
|
||||
rm -rf $(GNUSTEP_GSWAPPS)/$(GSWAPP_DIR_NAME); \
|
||||
$(TAR) ch --exclude=CVS --to-stdout $(GSWAPP_DIR_NAME) | (cd $(GNUSTEP_GSWAPPS); $(TAR) xf -))
|
||||
|
|
@ -340,7 +337,7 @@ ifeq ($(strip),yes)
|
|||
$(STRIP) $(GNUSTEP_GSWAPPS)/$(GSWAPP_FILE)
|
||||
endif
|
||||
|
||||
internal-gswapp-uninstall::
|
||||
internal-gswapp-uninstall_::
|
||||
(cd $(GNUSTEP_GSWAPPS); rm -rf $(GSWAPP_DIR_NAME))
|
||||
|
||||
## Local variables:
|
||||
|
|
|
|||
|
|
@ -65,11 +65,9 @@ endif
|
|||
# xxx_LOCALIZED_WEBSERVER_RESOURCE_DIRS
|
||||
# where xxx is the application name <==
|
||||
|
||||
.PHONY: internal-gswbundle-all \
|
||||
internal-gswbundle-clean \
|
||||
internal-gswbundle-distclean \
|
||||
internal-gswbundle-install \
|
||||
internal-gswbundle-uninstall \
|
||||
.PHONY: internal-gswbundle-all_ \
|
||||
internal-gswbundle-install_ \
|
||||
internal-gswbundle-uninstall_ \
|
||||
build-bundle-dir \
|
||||
build-bundle \
|
||||
gswbundle-components \
|
||||
|
|
@ -91,11 +89,9 @@ endif
|
|||
debug=$(debug) profile=$(profile) shared=$(shared) libext=$(LIBEXT) \
|
||||
shared_libext=$(SHARED_LIBEXT))
|
||||
|
||||
internal-gswbundle-all:: before-$(GNUSTEP_INSTANCE)-all \
|
||||
$(GNUSTEP_OBJ_DIR) \
|
||||
build-bundle-dir \
|
||||
build-bundle \
|
||||
after-$(GNUSTEP_INSTANCE)-all
|
||||
internal-gswbundle-all_:: $(GNUSTEP_OBJ_DIR) \
|
||||
build-bundle-dir \
|
||||
build-bundle
|
||||
|
||||
GSWBUNDLE_DIR_NAME = $(GNUSTEP_INSTANCE:=$(GSWBUNDLE_EXTENSION))
|
||||
GSWBUNDLE_FILE = \
|
||||
|
|
@ -248,7 +244,7 @@ $(GSWBUNDLE_DIR_NAME)/Resources:
|
|||
$(GSWBUNDLE_DIR_NAME)/Resources/WebServer:
|
||||
@$(MKDIRS) $@
|
||||
|
||||
internal-gswbundle-install:: $(GSWBUNDLE_INSTALL_DIR) shared-instance-headers-install
|
||||
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 -)
|
||||
ifneq ($(CHOWN_TO),)
|
||||
|
|
@ -261,7 +257,7 @@ endif
|
|||
$(GSWBUNDLE_INSTALL_DIR)::
|
||||
@$(MKINSTALLDIRS) $@
|
||||
|
||||
internal-gswbundle-uninstall:: shared-instance-headers-uninstall
|
||||
internal-gswbundle-uninstall_:: shared-instance-headers-uninstall
|
||||
rm -rf $(GSWBUNDLE_INSTALL_DIR)/$(GSWBUNDLE_DIR_NAME)
|
||||
|
||||
## Local variables:
|
||||
|
|
|
|||
|
|
@ -32,11 +32,11 @@ ifeq ($(RULES_MAKE_LOADED),)
|
|||
include $(GNUSTEP_MAKEFILES)/rules.make
|
||||
endif
|
||||
|
||||
.PHONY: internal-java_tool-all \
|
||||
.PHONY: internal-java_tool-all_ \
|
||||
internal-java_tool-clean \
|
||||
internal-java_tool-distclean \
|
||||
internal-java_tool-install \
|
||||
internal-java_tool-uninstall \
|
||||
internal-java_tool-install_ \
|
||||
internal-java_tool-uninstall_ \
|
||||
_FORCE
|
||||
|
||||
# This is the directory where the tools get installed. If you don't specify a
|
||||
|
|
@ -48,11 +48,9 @@ endif
|
|||
GNUSTEP_SHARED_JAVA_INSTALLATION_DIR = $(JAVA_TOOL_INSTALLATION_DIR)/Java
|
||||
include $(GNUSTEP_MAKEFILES)/Instance/Shared/java.make
|
||||
|
||||
internal-java_tool-all:: before-$(GNUSTEP_INSTANCE)-all \
|
||||
shared-instance-java-all \
|
||||
after-$(GNUSTEP_INSTANCE)-all
|
||||
internal-java_tool-all_:: shared-instance-java-all
|
||||
|
||||
internal-java_tool-install:: shared-instance-java-install \
|
||||
internal-java_tool-install_:: shared-instance-java-install \
|
||||
$(JAVA_TOOL_INSTALLATION_DIR)/$(GNUSTEP_INSTANCE)
|
||||
|
||||
PRINCIPAL_CLASS = $(strip $($(GNUSTEP_INSTANCE)_PRINCIPAL_CLASS))
|
||||
|
|
@ -84,7 +82,7 @@ endif
|
|||
_FORCE::
|
||||
|
||||
|
||||
internal-java_tool-uninstall:: shared-instance-java-uninstall
|
||||
internal-java_tool-uninstall_:: shared-instance-java-uninstall
|
||||
rm -f $(JAVA_TOOL_INSTALLATION_DIR)/$(GNUSTEP_INSTANCE)
|
||||
|
||||
internal-java_tool-clean:: shared-instance-java-clean
|
||||
|
|
|
|||
|
|
@ -57,11 +57,11 @@ endif
|
|||
# If you have properties file to install, put them in the
|
||||
# xxx_JAVA_PROPERTIES_FILES
|
||||
|
||||
.PHONY: internal-java_package-all \
|
||||
.PHONY: internal-java_package-all_ \
|
||||
internal-java_package-clean \
|
||||
internal-java_package-distclean \
|
||||
internal-java_package-install \
|
||||
internal-java_package-uninstall
|
||||
internal-java_package-install_ \
|
||||
internal-java_package-uninstall_
|
||||
|
||||
# This is the directory where the java classses get
|
||||
# installed. Normally this is /usr/GNUstep/Local/Libraries/Java/
|
||||
|
|
@ -73,17 +73,15 @@ GNUSTEP_SHARED_JAVA_INSTALLATION_DIR = $(JAVA_INSTALLATION_DIR)
|
|||
include $(GNUSTEP_MAKEFILES)/Instance/Shared/java.make
|
||||
|
||||
|
||||
internal-java_package-all:: before-$(GNUSTEP_INSTANCE)-all \
|
||||
shared-instance-java-all \
|
||||
after-$(GNUSTEP_INSTANCE)-all
|
||||
internal-java_package-all_:: shared-instance-java-all
|
||||
|
||||
internal-java_package-install:: shared-instance-java-install
|
||||
internal-java_package-install_:: shared-instance-java-install
|
||||
|
||||
internal-java_package-clean:: shared-instance-java-clean
|
||||
|
||||
internal-java_package-distclean::
|
||||
|
||||
internal-java_package-uninstall:: shared-instance-java-uninstall
|
||||
internal-java_package-uninstall_:: shared-instance-java-uninstall
|
||||
|
||||
|
||||
## Local variables:
|
||||
|
|
|
|||
|
|
@ -41,9 +41,9 @@ include $(GNUSTEP_MAKEFILES)/Instance/Shared/headers.make
|
|||
# Where xxx is the name of the library
|
||||
#
|
||||
|
||||
.PHONY: internal-library-all \
|
||||
internal-library-install \
|
||||
internal-library-uninstall \
|
||||
.PHONY: internal-library-all_ \
|
||||
internal-library-install_ \
|
||||
internal-library-uninstall_ \
|
||||
internal-install-lib \
|
||||
internal-install-dirs
|
||||
|
||||
|
|
@ -164,14 +164,12 @@ endif
|
|||
CLEAN_library_NAME = $(shell echo $(GNUSTEP_INSTANCE)|tr '-' '_')
|
||||
SHARED_CFLAGS += -DBUILD_$(CLEAN_library_NAME)_DLL=1
|
||||
|
||||
internal-library-all:: \
|
||||
before-$(GNUSTEP_INSTANCE)-all \
|
||||
internal-library-all_:: \
|
||||
$(GNUSTEP_OBJ_DIR) \
|
||||
$(DERIVED_SOURCES) \
|
||||
$(DERIVED_SOURCES)/$(GNUSTEP_INSTANCE).def \
|
||||
$(GNUSTEP_OBJ_DIR)/$(DLL_NAME) \
|
||||
$(GNUSTEP_OBJ_DIR)/$(DLL_EXP_LIB) \
|
||||
after-$(GNUSTEP_INSTANCE)-all
|
||||
$(GNUSTEP_OBJ_DIR)/$(DLL_EXP_LIB)
|
||||
|
||||
internal-library-clean::
|
||||
rm -rf $(DERIVED_SOURCES)
|
||||
|
|
@ -196,10 +194,8 @@ $(GNUSTEP_OBJ_DIR)/$(DLL_NAME): $(OBJ_FILES_TO_LINK) \
|
|||
|
||||
else # BUILD_DLL
|
||||
|
||||
internal-library-all:: before-$(GNUSTEP_INSTANCE)-all \
|
||||
$(GNUSTEP_OBJ_DIR) \
|
||||
$(GNUSTEP_OBJ_DIR)/$(VERSION_LIBRARY_FILE) \
|
||||
after-$(GNUSTEP_INSTANCE)-all
|
||||
internal-library-all_:: $(GNUSTEP_OBJ_DIR) \
|
||||
$(GNUSTEP_OBJ_DIR)/$(VERSION_LIBRARY_FILE)
|
||||
|
||||
$(GNUSTEP_OBJ_DIR)/$(VERSION_LIBRARY_FILE): $(OBJ_FILES_TO_LINK)
|
||||
$(LIB_LINK_CMD)
|
||||
|
|
@ -209,9 +205,9 @@ endif # BUILD_DLL
|
|||
#
|
||||
# Install and uninstall targets
|
||||
#
|
||||
internal-library-install:: internal-install-dirs \
|
||||
internal-install-lib \
|
||||
shared-instance-headers-install
|
||||
internal-library-install_:: internal-install-dirs \
|
||||
internal-install-lib \
|
||||
shared-instance-headers-install
|
||||
|
||||
# Depend on creating all the dirs
|
||||
internal-install-dirs:: $(FINAL_LIBRARY_INSTALL_DIR) \
|
||||
|
|
@ -255,13 +251,13 @@ endif
|
|||
|
||||
ifeq ($(BUILD_DLL),yes)
|
||||
|
||||
internal-library-uninstall:: shared-instance-headers-uninstall
|
||||
internal-library-uninstall_:: shared-instance-headers-uninstall
|
||||
rm -f $(DLL_INSTALLATION_DIR)/$(DLL_NAME) \
|
||||
$(FINAL_LIBRARY_INSTALL_DIR)/$(DLL_EXP_LIB)
|
||||
|
||||
else
|
||||
|
||||
internal-library-uninstall:: shared-instance-headers-uninstall
|
||||
internal-library-uninstall_:: shared-instance-headers-uninstall
|
||||
rm -f $(FINAL_LIBRARY_INSTALL_DIR)/$(VERSION_LIBRARY_FILE) \
|
||||
$(FINAL_LIBRARY_INSTALL_DIR)/$(LIBRARY_FILE) \
|
||||
$(FINAL_LIBRARY_INSTALL_DIR)/$(SONAME_LIBRARY_FILE)
|
||||
|
|
|
|||
|
|
@ -30,9 +30,9 @@ ifeq ($(RULES_MAKE_LOADED),)
|
|||
include $(GNUSTEP_MAKEFILES)/rules.make
|
||||
endif
|
||||
|
||||
.PHONY: internal-objc_program-all \
|
||||
internal-objc_program-install \
|
||||
internal-objc_program-uninstall
|
||||
.PHONY: internal-objc_program-all_ \
|
||||
internal-objc_program-install_ \
|
||||
internal-objc_program-uninstall_
|
||||
|
||||
# This is the directory where the objc programs get installed. If you
|
||||
# don't specify a directory they will get installed in the Tools
|
||||
|
|
@ -67,17 +67,15 @@ TTMP_LIBS := $(TTMP_LIBS:%=-Dlib%_ISDLL=1)
|
|||
ALL_CPPFLAGS += $(TTMP_LIBS)
|
||||
endif
|
||||
|
||||
internal-objc_program-all:: \
|
||||
before-$(GNUSTEP_INSTANCE)-all \
|
||||
internal-objc_program-all_:: \
|
||||
$(GNUSTEP_OBJ_DIR) \
|
||||
$(GNUSTEP_OBJ_DIR)/$(GNUSTEP_INSTANCE)$(EXEEXT) \
|
||||
after-$(GNUSTEP_INSTANCE)-all
|
||||
$(GNUSTEP_OBJ_DIR)/$(GNUSTEP_INSTANCE)$(EXEEXT)
|
||||
|
||||
$(GNUSTEP_OBJ_DIR)/$(GNUSTEP_INSTANCE)$(EXEEXT): $(OBJ_FILES_TO_LINK)
|
||||
$(LD) $(ALL_LDFLAGS) -o $(LDOUT)$@ $(OBJ_FILES_TO_LINK) \
|
||||
$(ALL_OBJC_LIBS)
|
||||
|
||||
internal-objc_program-install:: $(OBJC_PROGRAM_INSTALLATION_DIR)
|
||||
internal-objc_program-install_:: $(OBJC_PROGRAM_INSTALLATION_DIR)
|
||||
$(INSTALL_PROGRAM) -m 0755 \
|
||||
$(GNUSTEP_OBJ_DIR)/$(GNUSTEP_INSTANCE)$(EXEEXT) \
|
||||
$(OBJC_PROGRAM_INSTALLATION_DIR)
|
||||
|
|
@ -85,7 +83,7 @@ internal-objc_program-install:: $(OBJC_PROGRAM_INSTALLATION_DIR)
|
|||
$(OBJC_PROGRAM_INSTALLATION_DIR):
|
||||
$(MKINSTALLDIRS) $@
|
||||
|
||||
internal-objc_program-uninstall::
|
||||
internal-objc_program-uninstall_::
|
||||
rm -f $(OBJC_PROGRAM_INSTALLATION_DIR)/$(GNUSTEP_INSTANCE)$(EXEEXT)
|
||||
|
||||
## Local variables:
|
||||
|
|
|
|||
|
|
@ -38,9 +38,9 @@ endif
|
|||
# palette.table (if any) is xxxpalette.table where xxx is the palette name
|
||||
#
|
||||
|
||||
.PHONY: internal-palette-all \
|
||||
internal-palette-install \
|
||||
internal-palette-uninstall \
|
||||
.PHONY: internal-palette-all_ \
|
||||
internal-palette-install_ \
|
||||
internal-palette-uninstall_ \
|
||||
internal-palette-distclean
|
||||
|
||||
# On Solaris we don't need to specifies the libraries the palette needs.
|
||||
|
|
@ -62,15 +62,14 @@ PALETTE_FILE = $(PALETTE_DIR_NAME)/$(GNUSTEP_TARGET_LDIR)/$(PALETTE_NAME)
|
|||
GNUSTEP_SHARED_INSTANCE_BUNDLE_RESOURCE_PATH = $(PALETTE_DIR_NAME)/Resources
|
||||
include $(GNUSTEP_MAKEFILES)/Instance/Shared/bundle.make
|
||||
|
||||
internal-palette-all:: before-$(GNUSTEP_INSTANCE)-all \
|
||||
$(GNUSTEP_OBJ_DIR) \
|
||||
$(PALETTE_DIR_NAME)/Resources \
|
||||
$(PALETTE_DIR_NAME)/$(GNUSTEP_TARGET_LDIR) \
|
||||
$(PALETTE_FILE) \
|
||||
$(PALETTE_DIR_NAME)/Resources/Info-gnustep.plist \
|
||||
$(PALETTE_DIR_NAME)/Resources/palette.table \
|
||||
shared-instance-bundle-all \
|
||||
after-$(GNUSTEP_INSTANCE)-all
|
||||
internal-palette-all_:: $(GNUSTEP_OBJ_DIR) \
|
||||
$(PALETTE_DIR_NAME)/Resources \
|
||||
$(PALETTE_DIR_NAME)/$(GNUSTEP_TARGET_LDIR) \
|
||||
$(PALETTE_FILE) \
|
||||
$(PALETTE_DIR_NAME)/Resources/Info-gnustep.plist \
|
||||
$(PALETTE_DIR_NAME)/Resources/palette.table \
|
||||
shared-instance-bundle-all
|
||||
|
||||
$(PALETTE_DIR_NAME)/$(GNUSTEP_TARGET_LDIR):
|
||||
$(MKDIRS) $(PALETTE_DIR_NAME)/$(GNUSTEP_TARGET_LDIR)
|
||||
|
||||
|
|
@ -121,7 +120,7 @@ $(PALETTE_DIR_NAME)/Resources/palette.table: $(PALETTE_DIR_NAME)/Resources
|
|||
# Install, clean targets
|
||||
#
|
||||
|
||||
internal-palette-install:: $(PALETTE_INSTALL_DIR)
|
||||
internal-palette-install_:: $(PALETTE_INSTALL_DIR)
|
||||
tar cf - $(PALETTE_DIR_NAME) | (cd $(PALETTE_INSTALL_DIR); tar xf -)
|
||||
ifneq ($(CHOWN_TO),)
|
||||
$(CHOWN) -R $(CHOWN_TO) $(PALETTE_INSTALL_DIR)/$(PALETTE_DIR_NAME)
|
||||
|
|
@ -133,7 +132,7 @@ endif
|
|||
$(PALETTE_INSTALL_DIR):
|
||||
$(MKINSTALLDIRS) $(PALETTE_INSTALL_DIR)
|
||||
|
||||
internal-palette-uninstall::
|
||||
internal-palette-uninstall_::
|
||||
rm -rf $(PALETTE_INSTALL_DIR)/$(PALETTE_DIR_NAME)
|
||||
|
||||
internal-palette-distclean::
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#
|
||||
# -*-makefile-*-
|
||||
# Instace/resource-set.make
|
||||
#
|
||||
# Instance makefile rules to install resource files
|
||||
|
|
@ -37,8 +37,8 @@ endif
|
|||
# is in the xxx_LOCALIZED_RESOURCE_FILES variable.
|
||||
#
|
||||
|
||||
.PHONY: internal-resource_set-install \
|
||||
internal-resource_set-uninstall
|
||||
.PHONY: internal-resource_set-install_ \
|
||||
internal-resource_set-uninstall_
|
||||
|
||||
# Determine installation dir
|
||||
RESOURCE_FILES_INSTALL_DIR = $($(GNUSTEP_INSTANCE)_RESOURCE_FILES_INSTALL_DIR)
|
||||
|
|
@ -87,7 +87,7 @@ LOCALIZED_RESOURCE_FILES = $($(GNUSTEP_INSTANCE)_LOCALIZED_RESOURCE_FILES)
|
|||
ifeq ($(GNUSTEP_DEVELOPER),)
|
||||
|
||||
# Standard one - just run a subshell and loop, and install everything.
|
||||
internal-resource_set-install: \
|
||||
internal-resource_set-install_: \
|
||||
$(RESOURCE_FILES_FULL_INSTALL_DIR) \
|
||||
$(addprefix $(RESOURCE_FILES_FULL_INSTALL_DIR)/,$(RESOURCE_DIRS))
|
||||
ifneq ($(RESOURCE_FILES),)
|
||||
|
|
@ -126,7 +126,7 @@ $(RESOURCE_FILES_FULL_INSTALL_DIR)/% : $(RESOURCE_FILES_DIR)/%
|
|||
$(INSTALL_DATA) $< $@
|
||||
|
||||
# This rule depends on having installed all files
|
||||
internal-resource_set-install: \
|
||||
internal-resource_set-install_: \
|
||||
$(RESOURCE_FILES_FULL_INSTALL_DIR) \
|
||||
$(addprefix $(RESOURCE_FILES_FULL_INSTALL_DIR)/,$(RESOURCE_DIRS)) \
|
||||
$(addprefix $(RESOURCE_FILES_FULL_INSTALL_DIR)/,$(RESOURCE_FILES)) \
|
||||
|
|
@ -170,7 +170,7 @@ endif # LOCALIZED_RESOURCE_FILES
|
|||
endif
|
||||
|
||||
|
||||
internal-resource_set-uninstall:
|
||||
internal-resource_set-uninstall_:
|
||||
ifneq ($(RESOURCE_FILES),)
|
||||
for file in $(RESOURCE_FILES); do \
|
||||
rm -rf $(RESOURCE_FILES_FULL_INSTALL_DIR)/$$file ; \
|
||||
|
|
|
|||
|
|
@ -28,12 +28,54 @@
|
|||
# the user can add them if he wants, but if he doesn't, make doesn't
|
||||
# complain about missing targets.
|
||||
|
||||
.PHONY: before-$(GNUSTEP_INSTANCE)-all after-$(GNUSTEP_INSTANCE)-all
|
||||
# NB: internal-$(GNUSTEP_TYPE)-all_ should not be declared .PHONY
|
||||
# here, because it's not implemented here. (example of how could go
|
||||
# wrong otherwise: if say internal-clibrary-all_ depends on
|
||||
# internal-library-all_, both of them should be declared .PHONY, while
|
||||
# here we would only declare one of them .PHONY, so it should be done
|
||||
# by the project specific makefile fragments).
|
||||
.PHONY: \
|
||||
before-$(GNUSTEP_INSTANCE)-all after-$(GNUSTEP_INSTANCE)-all \
|
||||
internal-$(GNUSTEP_TYPE)-all \
|
||||
before-$(GNUSTEP_INSTANCE)-install after-$(GNUSTEP_INSTANCE)-install \
|
||||
internal-$(GNUSTEP_TYPE)-install \
|
||||
before-$(GNUSTEP_INSTANCE)-uninstall after-$(GNUSTEP_INSTANCE)-uninstall \
|
||||
internal-$(GNUSTEP_TYPE)-uninstall
|
||||
|
||||
before-$(GNUSTEP_INSTANCE)-all::
|
||||
|
||||
after-$(GNUSTEP_INSTANCE)-all::
|
||||
|
||||
# Automatically run before-$(GNUSTEP_INSTANCE)-all before building,
|
||||
# and after-$(GNUSTEP_INSTANCE)-all after building.
|
||||
# The project-type specific makefile instance fragment only needs to provide
|
||||
# the internal-$(GNUSTEP_TYPE)-all_ rule.
|
||||
internal-$(GNUSTEP_TYPE)-all:: before-$(GNUSTEP_INSTANCE)-all \
|
||||
internal-$(GNUSTEP_TYPE)-all_ \
|
||||
after-$(GNUSTEP_INSTANCE)-all
|
||||
|
||||
before-$(GNUSTEP_INSTANCE)-install::
|
||||
|
||||
after-$(GNUSTEP_INSTANCE)-install::
|
||||
|
||||
internal-$(GNUSTEP_TYPE)-install:: before-$(GNUSTEP_INSTANCE)-install \
|
||||
internal-$(GNUSTEP_TYPE)-install_ \
|
||||
after-$(GNUSTEP_INSTANCE)-install
|
||||
|
||||
before-$(GNUSTEP_INSTANCE)-uninstall::
|
||||
|
||||
after-$(GNUSTEP_INSTANCE)-uninstall::
|
||||
|
||||
internal-$(GNUSTEP_TYPE)-uninstall:: before-$(GNUSTEP_INSTANCE)-uninstall \
|
||||
internal-$(GNUSTEP_TYPE)-uninstall_ \
|
||||
after-$(GNUSTEP_INSTANCE)-uninstall
|
||||
|
||||
|
||||
# before-$(GNUSTEP_INSTANCE)-clean and similar for after and distclean
|
||||
# are not supported -- they wouldn't be executed most of the times, since
|
||||
# most of the times we don't perform an Instance invocation at all on
|
||||
# make clean or make distclean.
|
||||
|
||||
|
||||
#
|
||||
# The list of Objective-C source files to be compiled
|
||||
|
|
|
|||
|
|
@ -33,10 +33,10 @@ endif
|
|||
# where xxx is the service name
|
||||
#
|
||||
|
||||
.PHONY: internal-service-all \
|
||||
.PHONY: internal-service-all_ \
|
||||
internal-service-distclean \
|
||||
internal-service-install \
|
||||
internal-service-uninstall \
|
||||
internal-service-install_ \
|
||||
internal-service-uninstall_ \
|
||||
service-resource-files
|
||||
|
||||
# Libraries that go before the GUI libraries
|
||||
|
|
@ -85,13 +85,11 @@ include $(GNUSTEP_MAKEFILES)/Instance/Shared/bundle.make
|
|||
#
|
||||
# Compilation targets
|
||||
#
|
||||
internal-service-all:: before-$(GNUSTEP_INSTANCE)-all \
|
||||
$(GNUSTEP_OBJ_DIR) \
|
||||
$(SERVICE_DIR_NAME)/$(GNUSTEP_TARGET_LDIR) \
|
||||
$(SERVICE_FILE) \
|
||||
$(SERVICE_DIR_NAME)/Resources/Info-gnustep.plist \
|
||||
shared-instance-bundle-all \
|
||||
after-$(GNUSTEP_INSTANCE)-all
|
||||
internal-service-all_:: $(GNUSTEP_OBJ_DIR) \
|
||||
$(SERVICE_DIR_NAME)/$(GNUSTEP_TARGET_LDIR) \
|
||||
$(SERVICE_FILE) \
|
||||
$(SERVICE_DIR_NAME)/Resources/Info-gnustep.plist \
|
||||
shared-instance-bundle-all
|
||||
|
||||
$(SERVICE_FILE): $(OBJ_FILES_TO_LINK)
|
||||
$(LD) $(ALL_LDFLAGS) -o $(LDOUT)$@ $(OBJ_FILES_TO_LINK) \
|
||||
|
|
@ -122,7 +120,7 @@ $(SERVICE_DIR_NAME)/Resources/Info-gnustep.plist: \
|
|||
$(GNUSTEP_SERVICES):
|
||||
$(MKINSTALLDIRS) $@
|
||||
|
||||
internal-service-install:: $(GNUSTEP_SERVICES)
|
||||
internal-service-install_:: $(GNUSTEP_SERVICES)
|
||||
rm -rf $(GNUSTEP_SERVICES)/$(SERVICE_DIR_NAME); \
|
||||
$(TAR) cf - $(SERVICE_DIR_NAME) | (cd $(GNUSTEP_SERVICES); $(TAR) xf -)
|
||||
ifneq ($(CHOWN_TO),)
|
||||
|
|
@ -132,7 +130,7 @@ ifeq ($(strip),yes)
|
|||
$(STRIP) $(GNUSTEP_SERVICES)/$(SERVICE_FILE)
|
||||
endif
|
||||
|
||||
internal-service-uninstall::
|
||||
internal-service-uninstall_::
|
||||
(cd $(GNUSTEP_SERVICES); rm -rf $(SERVICE_DIR_NAME))
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -24,9 +24,9 @@ ifeq ($(RULES_MAKE_LOADED),)
|
|||
include $(GNUSTEP_MAKEFILES)/rules.make
|
||||
endif
|
||||
|
||||
.PHONY: internal-subproject-all \
|
||||
internal-subproject-install \
|
||||
internal-subproject-uninstall
|
||||
.PHONY: internal-subproject-all_ \
|
||||
internal-subproject-install_ \
|
||||
internal-subproject-uninstall_
|
||||
|
||||
#
|
||||
# A subproject can have resources, which it stores into the
|
||||
|
|
@ -42,11 +42,9 @@ include $(GNUSTEP_MAKEFILES)/Instance/Shared/bundle.make
|
|||
#
|
||||
# Compilation targets
|
||||
#
|
||||
internal-subproject-all:: before-$(GNUSTEP_INSTANCE)-all \
|
||||
$(GNUSTEP_OBJ_DIR) \
|
||||
$(GNUSTEP_OBJ_DIR)/$(SUBPROJECT_PRODUCT) \
|
||||
shared-instance-bundle-all \
|
||||
after-$(GNUSTEP_INSTANCE)-all
|
||||
internal-subproject-all_:: $(GNUSTEP_OBJ_DIR) \
|
||||
$(GNUSTEP_OBJ_DIR)/$(SUBPROJECT_PRODUCT) \
|
||||
shared-instance-bundle-all
|
||||
|
||||
# We need to depend on SUBPROJECT_OBJ_FILES to account for sub-subprojects.
|
||||
$(GNUSTEP_OBJ_DIR)/$(SUBPROJECT_PRODUCT): $(OBJ_FILES_TO_LINK)
|
||||
|
|
@ -92,9 +90,9 @@ ifeq ($(FRAMEWORK_NAME),)
|
|||
|
||||
include $(GNUSTEP_MAKEFILES)/Instance/Shared/headers.make
|
||||
|
||||
internal-subproject-install:: shared-instance-headers-install
|
||||
internal-subproject-install_:: shared-instance-headers-install
|
||||
|
||||
internal-subproject-uninstall:: shared-instance-headers-uninstall
|
||||
internal-subproject-uninstall_:: shared-instance-headers-uninstall
|
||||
|
||||
endif # no FRAMEWORK_NAME
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#
|
||||
# -*-makefile-*-
|
||||
# Instance/test-application.make
|
||||
#
|
||||
# Copyright (C) 2002 Free Software Foundation, Inc.
|
||||
|
|
@ -25,5 +25,5 @@ endif
|
|||
|
||||
include $(GNUSTEP_MAKEFILES)/Instance/application.make
|
||||
|
||||
internal-test_app-all:: internal-app-all
|
||||
internal-test_app-all_:: internal-app-all_
|
||||
|
||||
|
|
|
|||
|
|
@ -83,8 +83,8 @@ ALL_TEST_LIBRARY_LIBS = \
|
|||
debug=$(debug) profile=$(profile) shared=$(shared) \
|
||||
libext=$(LIBEXT) shared_libext=$(SHARED_LIBEXT))
|
||||
|
||||
internal-test_lib-all:: before-$(GNUSTEP_INSTANCE)-all $(GNUSTEP_OBJ_DIR) \
|
||||
$(GNUSTEP_OBJ_DIR)/$(GNUSTEP_INSTANCE) after-$(GNUSTEP_INSTANCE)-all
|
||||
internal-test_lib-all_:: $(GNUSTEP_OBJ_DIR) \
|
||||
$(GNUSTEP_OBJ_DIR)/$(GNUSTEP_INSTANCE)
|
||||
|
||||
$(GNUSTEP_OBJ_DIR)/$(GNUSTEP_INSTANCE): $(OBJ_FILES_TO_LINK)
|
||||
$(LD) $(ALL_LDFLAGS) -o $(LDOUT)$@ \
|
||||
|
|
@ -136,9 +136,9 @@ $(SCRIPTS_DIRECTORY)/config/unix.exp: _FORCE
|
|||
echo "# Maintain your own code in local.exp"; \
|
||||
echo "source \"config/local.exp\"") >>$@)
|
||||
|
||||
internal-test_lib-install::
|
||||
internal-test_lib-install_::
|
||||
|
||||
internal-test_lib-uninstall::
|
||||
internal-test_lib-uninstall_::
|
||||
|
||||
#
|
||||
# Cleaning targets
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#
|
||||
# -*-makefile-*-
|
||||
# Instance/test-tool.make
|
||||
#
|
||||
# Copyright (C) 2002 Free Software Foundation, Inc.
|
||||
|
|
@ -25,5 +25,5 @@ endif
|
|||
|
||||
include $(GNUSTEP_MAKEFILES)/Instance/tool.make
|
||||
|
||||
internal-test_tool-all:: internal-tool-all
|
||||
internal-test_tool-all_:: internal-tool-all_
|
||||
|
||||
|
|
|
|||
|
|
@ -36,10 +36,10 @@ ifeq ($(TOOL_INSTALLATION_DIR),)
|
|||
TOOL_INSTALLATION_DIR = $(GNUSTEP_TOOLS)/$(GNUSTEP_TARGET_LDIR)
|
||||
endif
|
||||
|
||||
.PHONY: internal-tool-all \
|
||||
internal-tool-install \
|
||||
internal-tool-uninstall \
|
||||
internal-install-dirs \
|
||||
.PHONY: internal-tool-all_ \
|
||||
internal-tool-install_ \
|
||||
internal-tool-uninstall_ \
|
||||
internal-install-dirs \
|
||||
install-tool
|
||||
|
||||
ifneq ($(FRAMEWORK_NAME),)
|
||||
|
|
@ -76,13 +76,11 @@ endif
|
|||
#
|
||||
# Compilation targets
|
||||
#
|
||||
internal-tool-all:: before-$(GNUSTEP_INSTANCE)-all \
|
||||
$(GNUSTEP_OBJ_DIR) \
|
||||
$(GNUSTEP_OBJ_DIR)/$(GNUSTEP_INSTANCE)$(EXEEXT) \
|
||||
after-$(GNUSTEP_INSTANCE)-all
|
||||
internal-tool-all_:: $(GNUSTEP_OBJ_DIR) \
|
||||
$(GNUSTEP_OBJ_DIR)/$(GNUSTEP_INSTANCE)$(EXEEXT)
|
||||
|
||||
ifneq ($(FRAMEWORK_NAME),)
|
||||
internal-tool-all:: internal-install-dirs install-tool
|
||||
internal-tool-all_:: internal-install-dirs install-tool
|
||||
endif
|
||||
|
||||
$(GNUSTEP_OBJ_DIR)/$(GNUSTEP_INSTANCE)$(EXEEXT): $(OBJ_FILES_TO_LINK)
|
||||
|
|
@ -97,9 +95,9 @@ endif
|
|||
endif
|
||||
|
||||
ifeq ($(NULL_INSTALL),yes)
|
||||
internal-tool-install::
|
||||
internal-tool-install_::
|
||||
else
|
||||
internal-tool-install:: internal-install-dirs install-tool
|
||||
internal-tool-install_:: internal-install-dirs install-tool
|
||||
endif
|
||||
|
||||
# Depend on having created the installation dir
|
||||
|
|
@ -114,7 +112,7 @@ install-tool::
|
|||
$(GNUSTEP_OBJ_DIR)/$(GNUSTEP_INSTANCE)$(EXEEXT) \
|
||||
$(TOOL_INSTALLATION_DIR)
|
||||
|
||||
internal-tool-uninstall::
|
||||
internal-tool-uninstall_::
|
||||
rm -f $(TOOL_INSTALLATION_DIR)/$(GNUSTEP_INSTANCE)$(EXEEXT)
|
||||
|
||||
#
|
||||
|
|
@ -122,7 +120,7 @@ internal-tool-uninstall::
|
|||
#
|
||||
|
||||
# we don't have any cleaning targets for tools here, because we clean
|
||||
# at the first make invocation.
|
||||
# during the Master make invocation.
|
||||
|
||||
## Local variables:
|
||||
## mode: makefile
|
||||
|
|
|
|||
Loading…
Reference in a new issue