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

Updated to use GNUSTEP_INSTANCE

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@12671 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2002-02-22 13:12:00 +00:00
parent be3c38cd58
commit 938778fc79
2 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Instance/test-library.make
View file

@ -83,14 +83,14 @@ ALL_TEST_LIBRARY_LIBS = \
debug=$(debug) profile=$(profile) shared=$(shared) \
libext=$(LIBEXT) shared_libext=$(SHARED_LIBEXT))
internal-testlib-all:: before-$(TARGET)-all $(GNUSTEP_OBJ_DIR) \
$(GNUSTEP_OBJ_DIR)/$(INTERNAL_testlib_NAME) after-$(TARGET)-all
internal-testlib-all:: before-$(GNUSTEP_INSTANCE)-all $(GNUSTEP_OBJ_DIR) \
$(GNUSTEP_OBJ_DIR)/$(GNUSTEP_INSTANCE) after-$(GNUSTEP_INSTANCE)-all
before-$(TARGET)-all::
before-$(GNUSTEP_INSTANCE)-all::
after-$(TARGET)-all::
after-$(GNUSTEP_INSTANCE)-all::
$(GNUSTEP_OBJ_DIR)/$(INTERNAL_testlib_NAME): $(OBJ_FILES_TO_LINK)
$(GNUSTEP_OBJ_DIR)/$(GNUSTEP_INSTANCE): $(OBJ_FILES_TO_LINK)
$(LD) $(ALL_LDFLAGS) -o $(LDOUT)$@ \
$(OBJ_FILES_TO_LINK) \
$(ALL_TEST_LIBRARY_LIBS)
@ -107,10 +107,10 @@ really-testlib-check:
. $(GNUSTEP_MAKEFILES)/ld_lib_path.sh; \
for f in $(CHECK_SCRIPT_DIRS); do \
if [ "$(SCRIPTS_DIRECTORY)" != "" ]; then \
echo "cd $(SCRIPTS_DIRECTORY); runtest --tool $$f --srcdir . PROG=../$(GNUSTEP_OBJ_DIR)/$(INTERNAL_testlib_NAME) $(dejagnu_vars) $(ADDITIONAL_DEJAGNU_VARS)"; \
(cd $(SCRIPTS_DIRECTORY); runtest --tool $$f --srcdir . PROG=../$(GNUSTEP_OBJ_DIR)/$(INTERNAL_testlib_NAME) $(dejagnu_vars) $(ADDITIONAL_DEJAGNU_VARS)); \
echo "cd $(SCRIPTS_DIRECTORY); runtest --tool $$f --srcdir . PROG=../$(GNUSTEP_OBJ_DIR)/$(GNUSTEP_INSTANCE) $(dejagnu_vars) $(ADDITIONAL_DEJAGNU_VARS)"; \
(cd $(SCRIPTS_DIRECTORY); runtest --tool $$f --srcdir . PROG=../$(GNUSTEP_OBJ_DIR)/$(GNUSTEP_INSTANCE) $(dejagnu_vars) $(ADDITIONAL_DEJAGNU_VARS)); \
else \
runtest --tool $$f --srcdir . PROG=./$(INTERNAL_testlib_NAME) \
runtest --tool $$f --srcdir . PROG=./$(GNUSTEP_INSTANCE) \
$(dejagnu_vars) $(ADDITIONAL_DEJAGNU_VARS); \
fi; \
done)

20
Instance/tool.make
View file

@ -39,8 +39,8 @@ endif
.PHONY: internal-tool-all \
internal-tool-install \
internal-tool-uninstall \
before-$(TARGET)-all \
after-$(TARGET)-all \
before-$(GNUSTEP_INSTANCE)-all \
after-$(GNUSTEP_INSTANCE)-all \
internal-install-dirs \
install-tool
@ -78,23 +78,23 @@ endif
#
# Compilation targets
#
internal-tool-all:: before-$(TARGET)-all \
internal-tool-all:: before-$(GNUSTEP_INSTANCE)-all \
$(GNUSTEP_OBJ_DIR) \
$(GNUSTEP_OBJ_DIR)/$(INTERNAL_tool_NAME)$(EXEEXT) \
after-$(TARGET)-all
$(GNUSTEP_OBJ_DIR)/$(GNUSTEP_INSTANCE)$(EXEEXT) \
after-$(GNUSTEP_INSTANCE)-all
ifneq ($(FRAMEWORK_NAME),)
internal-tool-all:: internal-install-dirs install-tool
endif
$(GNUSTEP_OBJ_DIR)/$(INTERNAL_tool_NAME)$(EXEEXT): $(OBJ_FILES_TO_LINK)
$(GNUSTEP_OBJ_DIR)/$(GNUSTEP_INSTANCE)$(EXEEXT): $(OBJ_FILES_TO_LINK)
$(LD) $(ALL_LDFLAGS) -o $(LDOUT)$@ \
$(OBJ_FILES_TO_LINK) \
$(ALL_TOOL_LIBS)
before-$(TARGET)-all::
before-$(GNUSTEP_INSTANCE)-all::
after-$(TARGET)-all::
after-$(GNUSTEP_INSTANCE)-all::
ifneq ($(FRAMEWORK_NAME),)
ifneq ($(FRAMEWORK_OPERATION),all)
@ -117,11 +117,11 @@ $(TOOL_INSTALLATION_DIR):
install-tool::
$(INSTALL_PROGRAM) -m 0755 \
$(GNUSTEP_OBJ_DIR)/$(INTERNAL_tool_NAME)$(EXEEXT) \
$(GNUSTEP_OBJ_DIR)/$(GNUSTEP_INSTANCE)$(EXEEXT) \
$(TOOL_INSTALLATION_DIR)
internal-tool-uninstall::
rm -f $(TOOL_INSTALLATION_DIR)/$(INTERNAL_tool_NAME)$(EXEEXT)
rm -f $(TOOL_INSTALLATION_DIR)/$(GNUSTEP_INSTANCE)$(EXEEXT)
#
# Cleaning targets