Moved before-$(GNUSTEP_INSTANCE)-all and after-$(GNUSTEP_INSTANCE)-all into

Instance/rules.make


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@12878 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2002-02-28 13:09:11 +00:00
parent 6ef73ad560
commit 81b81271a5
17 changed files with 12 additions and 68 deletions

View file

@ -104,10 +104,6 @@ internal-app-all:: before-$(GNUSTEP_INSTANCE)-all \
app-resource-files \
after-$(GNUSTEP_INSTANCE)-all
before-$(GNUSTEP_INSTANCE)-all::
after-$(GNUSTEP_INSTANCE)-all::
$(GNUSTEP_INSTANCE).iconheader:
@(echo "F $(GNUSTEP_INSTANCE).$(APP_EXTENSION) $(GNUSTEP_INSTANCE) $(APP_EXTENSION)"; \
echo "F $(GNUSTEP_INSTANCE) $(GNUSTEP_INSTANCE) app") >$@
@ -126,10 +122,6 @@ internal-app-all:: before-$(GNUSTEP_INSTANCE)-all \
app-localized-resource-files \
after-$(GNUSTEP_INSTANCE)-all
before-$(GNUSTEP_INSTANCE)-all::
after-$(GNUSTEP_INSTANCE)-all::
$(APP_DIR_NAME)/$(GNUSTEP_TARGET_LDIR):
@$(MKDIRS) $(APP_DIR_NAME)/$(GNUSTEP_TARGET_LDIR)

View file

@ -95,10 +95,6 @@ internal-bundle-all:: before-$(GNUSTEP_INSTANCE)-all \
build-macosx-bundle \
after-$(GNUSTEP_INSTANCE)-all
before-$(GNUSTEP_INSTANCE)-all::
after-$(GNUSTEP_INSTANCE)-all::
BUNDLE_DIR_NAME := $(GNUSTEP_INSTANCE:=$(BUNDLE_EXTENSION))
BUNDLE_FILE := \
$(BUNDLE_DIR_NAME)/$(GNUSTEP_TARGET_LDIR)/$(GNUSTEP_INSTANCE)$(BUNDLE_OBJ_EXT)

View file

@ -84,10 +84,6 @@ $(GNUSTEP_OBJ_DIR)/$(GNUSTEP_INSTANCE)$(EXEEXT): $(C_OBJ_FILES) \
$(C_OBJ_FILES) $(SUBPROJECT_OBJ_FILES) \
$(ALL_TOOL_LIBS)
before-$(GNUSTEP_INSTANCE)-all::
after-$(GNUSTEP_INSTANCE)-all::
internal-ctool-install:: $(CTOOL_INSTALLATION_DIR)
$(INSTALL_PROGRAM) -m 0755 \
$(GNUSTEP_OBJ_DIR)/$(GNUSTEP_INSTANCE)$(EXEEXT) \

View file

@ -138,10 +138,6 @@ $(GNUSTEP_INSTANCE): $(TEXI_FILES) $(TEXT_MAIN)
endif # TEXI_FILES
before-$(GNUSTEP_INSTANCE)-all::
after-$(GNUSTEP_INSTANCE)-all::
#
# Compilation of gsdoc files

View file

@ -123,10 +123,6 @@ internal-framework-all:: before-$(GNUSTEP_INSTANCE)-all \
build-framework \
after-$(GNUSTEP_INSTANCE)-all
before-$(GNUSTEP_INSTANCE)-all::
after-$(GNUSTEP_INSTANCE)-all::
FRAMEWORK_RESOURCE_DIRS = $(addprefix $(FRAMEWORK_VERSION_DIR_NAME)/Resources/,$(RESOURCE_DIRS))
FRAMEWORK_WEBSERVER_RESOURCE_DIRS = $(addprefix $(FRAMEWORK_VERSION_DIR_NAME)/WebServerResources/,$(WEBSERVER_RESOURCE_DIRS))

View file

@ -129,10 +129,6 @@ internal-gswapp-all:: \
$(GSWAPP_DIR_NAME)/$(GNUSTEP_INSTANCE).sh \
after-$(GNUSTEP_INSTANCE)-all
before-$(GNUSTEP_INSTANCE)-all::
after-$(GNUSTEP_INSTANCE)-all::
$(GNUSTEP_INSTANCE).iconheader:
@(echo "F $(GNUSTEP_INSTANCE).$(GSWAPP_EXTENSION) $(GNUSTEP_INSTANCE) $(GSWAPP_EXTENSION)"; \
echo "F $(GNUSTEP_INSTANCE) $(GNUSTEP_INSTANCE) app") >$@

View file

@ -87,10 +87,6 @@ internal-gswbundle-all:: before-$(GNUSTEP_INSTANCE)-all \
build-bundle \
after-$(GNUSTEP_INSTANCE)-all
before-$(GNUSTEP_INSTANCE)-all::
after-$(GNUSTEP_INSTANCE)-all::
GSWBUNDLE_DIR_NAME := $(GNUSTEP_INSTANCE:=$(GSWBUNDLE_EXTENSION))
GSWBUNDLE_FILE := \
$(GSWBUNDLE_DIR_NAME)/$(GNUSTEP_TARGET_LDIR)/$(GNUSTEP_INSTANCE)

View file

@ -54,10 +54,6 @@ internal-java_tool-all:: before-$(GNUSTEP_INSTANCE)-all \
shared-instance-java-all \
after-$(GNUSTEP_INSTANCE)-all
before-$(GNUSTEP_INSTANCE)-all::
after-$(GNUSTEP_INSTANCE)-all::
internal-java_tool-install:: shared-instance-java-install \
$(JAVA_TOOL_INSTALLATION_DIR)/$(GNUSTEP_INSTANCE)

View file

@ -79,10 +79,6 @@ internal-java_package-all:: before-$(GNUSTEP_INSTANCE)-all \
shared-instance-java-all \
after-$(GNUSTEP_INSTANCE)-all
before-$(GNUSTEP_INSTANCE)-all::
after-$(GNUSTEP_INSTANCE)-all::
internal-java_package-install:: shared-instance-java-install
internal-java_package-clean:: shared-instance-java-clean

View file

@ -206,10 +206,6 @@ $(GNUSTEP_OBJ_DIR)/$(VERSION_LIBRARY_FILE): $(OBJ_FILES_TO_LINK)
endif # BUILD_DLL
before-$(GNUSTEP_INSTANCE)-all::
after-$(GNUSTEP_INSTANCE)-all::
#
# Install and uninstall targets
#

View file

@ -79,10 +79,6 @@ $(GNUSTEP_OBJ_DIR)/$(GNUSTEP_INSTANCE)$(EXEEXT): $(OBJ_FILES_TO_LINK)
$(LD) $(ALL_LDFLAGS) -o $(LDOUT)$@ $(OBJ_FILES_TO_LINK) \
$(ALL_OBJC_LIBS)
before-$(GNUSTEP_INSTANCE)-all::
after-$(GNUSTEP_INSTANCE)-all::
internal-objc_program-install:: $(OBJC_PROGRAM_INSTALLATION_DIR)
$(INSTALL_PROGRAM) -m 0755 \
$(GNUSTEP_OBJ_DIR)/$(GNUSTEP_INSTANCE)$(EXEEXT) \

View file

@ -66,10 +66,6 @@ internal-palette-all:: before-$(GNUSTEP_INSTANCE)-all \
build-palette \
after-$(GNUSTEP_INSTANCE)-all
before-$(GNUSTEP_INSTANCE)-all::
after-$(GNUSTEP_INSTANCE)-all::
PALETTE_DIR_NAME := $(GNUSTEP_INSTANCE).palette
PALETTE_FILE := $(PALETTE_DIR_NAME)/$(GNUSTEP_TARGET_LDIR)/$(PALETTE_NAME)
PALETTE_RESOURCE_DIRS = $(foreach d, $(RESOURCE_DIRS), $(PALETTE_DIR_NAME)/Resources/$(d))

View file

@ -21,6 +21,18 @@
# If not, write to the Free Software Foundation,
# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# Every project should have its internal-xxx-all depend first on
# before-$(GNUSTEP_INSTANCE)-all, and last on
# after-$(GNUSTEP_INSTANCE)-all. We declare them here, empty, so that
# the user can add them if he wants, but if he doesn't, make doesn't
# complain about missing targets.
before-$(GNUSTEP_INSTANCE)-all::
after-$(GNUSTEP_INSTANCE)-all::
#
# The list of Objective-C source files to be compiled
# are in the OBJC_FILES variable.

View file

@ -96,10 +96,6 @@ internal-service-all:: before-$(GNUSTEP_INSTANCE)-all \
service-resource-files \
after-$(GNUSTEP_INSTANCE)-all
before-$(GNUSTEP_INSTANCE)-all::
after-$(GNUSTEP_INSTANCE)-all::
$(SERVICE_DIR_NAME)/$(GNUSTEP_TARGET_LDIR):
@$(MKDIRS) $(SERVICE_DIR_NAME)/$(GNUSTEP_TARGET_LDIR)

View file

@ -57,10 +57,6 @@ endif
$(GNUSTEP_OBJ_DIR)/$(SUBPROJECT_PRODUCT): $(OBJ_FILES_TO_LINK)
$(OBJ_MERGE_CMD)
before-$(GNUSTEP_INSTANCE)-all::
after-$(GNUSTEP_INSTANCE)-all::
ifneq ($(FRAMEWORK_NAME),)
.PHONY: internal-subproject-build-headers \
framework-components \

View file

@ -86,10 +86,6 @@ ALL_TEST_LIBRARY_LIBS = \
internal-testlib-all:: before-$(GNUSTEP_INSTANCE)-all $(GNUSTEP_OBJ_DIR) \
$(GNUSTEP_OBJ_DIR)/$(GNUSTEP_INSTANCE) after-$(GNUSTEP_INSTANCE)-all
before-$(GNUSTEP_INSTANCE)-all::
after-$(GNUSTEP_INSTANCE)-all::
$(GNUSTEP_OBJ_DIR)/$(GNUSTEP_INSTANCE): $(OBJ_FILES_TO_LINK)
$(LD) $(ALL_LDFLAGS) -o $(LDOUT)$@ \
$(OBJ_FILES_TO_LINK) \

View file

@ -92,10 +92,6 @@ $(GNUSTEP_OBJ_DIR)/$(GNUSTEP_INSTANCE)$(EXEEXT): $(OBJ_FILES_TO_LINK)
$(OBJ_FILES_TO_LINK) \
$(ALL_TOOL_LIBS)
before-$(GNUSTEP_INSTANCE)-all::
after-$(GNUSTEP_INSTANCE)-all::
ifneq ($(FRAMEWORK_NAME),)
ifneq ($(FRAMEWORK_OPERATION),all)
NULL_INSTALL = yes