Broken into Master and Instace

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@12666 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2002-02-22 12:49:08 +00:00
parent aadf0085d0
commit 92e0ee3979
6 changed files with 277 additions and 184 deletions

29
Instance/test-tool.make Normal file
View file

@ -0,0 +1,29 @@
#
# Instance/test-tool.make
#
# Copyright (C) 2002 Free Software Foundation, Inc.
#
# Author: Nicola Pero <nicola@brainstorm.co.uk>
#
# This file is part of the GNUstep Makefile Package.
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# You should have received a copy of the GNU General Public
# License along with this library; see the file COPYING.LIB.
# If not, write to the Free Software Foundation,
# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
ifeq ($(RULES_MAKE_LOADED),)
include $(GNUSTEP_MAKEFILES)/rules.make
endif
# Just inherit the build rule from tool.make
include $(GNUSTEP_MAKEFILES)/Instance/tool.make
internal-test_tool-all:: internal-tool-all

135
Instance/tool.make Normal file
View file

@ -0,0 +1,135 @@
#
# Instance/tool.make
#
# Instance Makefile rules to build GNUstep-based command line tools.
#
# Copyright (C) 1997, 2001 Free Software Foundation, Inc.
#
# Author: Scott Christley <scottc@net-community.com>
# Author: Nicola Pero <nicola@brainstorm.co.uk>
#
# This file is part of the GNUstep Makefile Package.
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# You should have received a copy of the GNU General Public
# License along with this library; see the file COPYING.LIB.
# If not, write to the Free Software Foundation,
# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
# The name of the tools is in the TOOL_NAME variable.
#
# xxx We need to prefix the target name when cross-compiling
#
ifeq ($(RULES_MAKE_LOADED),)
include $(GNUSTEP_MAKEFILES)/rules.make
endif
# This is the directory where the tools get installed. If you don't specify a
# directory they will get installed in the GNUstep Local Root.
ifeq ($(TOOL_INSTALLATION_DIR),)
TOOL_INSTALLATION_DIR = $(GNUSTEP_TOOLS)/$(GNUSTEP_TARGET_LDIR)
endif
.PHONY: internal-tool-all \
internal-tool-install \
internal-tool-uninstall \
before-$(TARGET)-all \
after-$(TARGET)-all \
internal-install-dirs \
install-tool
ifneq ($(FRAMEWORK_NAME),)
TOOL_INSTALLATION_DIR = $(FRAMEWORK_VERSION_DIR_NAME)/Resources/$(GNUSTEP_TARGET_LDIR)
endif
ALL_TOOL_LIBS = \
$(shell $(WHICH_LIB_SCRIPT) \
$(ALL_LIB_DIRS) \
$(ADDITIONAL_TOOL_LIBS) $(AUXILIARY_TOOL_LIBS) $(FND_LIBS) \
$(ADDITIONAL_OBJC_LIBS) $(AUXILIARY_OBJC_LIBS) $(OBJC_LIBS) \
$(TARGET_SYSTEM_LIBS) \
debug=$(debug) profile=$(profile) shared=$(shared) \
libext=$(LIBEXT) shared_libext=$(SHARED_LIBEXT))
ifeq ($(WITH_DLL),yes)
TTMP_LIBS := $(ALL_TOOL_LIBS)
TTMP_LIBS := $(filter -l%, $(TTMP_LIBS))
# filter all non-static libs (static libs are those ending in _ds, _s, _ps..)
TTMP_LIBS := $(filter-out -l%_ds, $(TTMP_LIBS))
TTMP_LIBS := $(filter-out -l%_s, $(TTMP_LIBS))
TTMP_LIBS := $(filter-out -l%_dps,$(TTMP_LIBS))
TTMP_LIBS := $(filter-out -l%_ps, $(TTMP_LIBS))
# strip away -l, _p and _d ..
TTMP_LIBS := $(TTMP_LIBS:-l%=%)
TTMP_LIBS := $(TTMP_LIBS:%_d=%)
TTMP_LIBS := $(TTMP_LIBS:%_p=%)
TTMP_LIBS := $(TTMP_LIBS:%_dp=%)
TTMP_LIBS := $(shell echo $(TTMP_LIBS)|tr '-' '_')
TTMP_LIBS := $(TTMP_LIBS:%=-Dlib%_ISDLL=1)
ALL_CPPFLAGS += $(TTMP_LIBS)
endif
#
# Compilation targets
#
internal-tool-all:: before-$(TARGET)-all \
$(GNUSTEP_OBJ_DIR) \
$(GNUSTEP_OBJ_DIR)/$(INTERNAL_tool_NAME)$(EXEEXT) \
after-$(TARGET)-all
ifneq ($(FRAMEWORK_NAME),)
internal-tool-all:: internal-install-dirs install-tool
endif
$(GNUSTEP_OBJ_DIR)/$(INTERNAL_tool_NAME)$(EXEEXT): $(OBJ_FILES_TO_LINK)
$(LD) $(ALL_LDFLAGS) -o $(LDOUT)$@ \
$(OBJ_FILES_TO_LINK) \
$(ALL_TOOL_LIBS)
before-$(TARGET)-all::
after-$(TARGET)-all::
ifneq ($(FRAMEWORK_NAME),)
ifneq ($(FRAMEWORK_OPERATION),all)
NULL_INSTALL = yes
endif
endif
ifeq ($(NULL_INSTALL),yes)
internal-tool-install::
else
internal-tool-install:: internal-install-dirs install-tool
endif
# Depend on having created the installation dir
internal-install-dirs:: $(TOOL_INSTALLATION_DIR)
# This rule runs $(MKDIRS) only if needed
$(TOOL_INSTALLATION_DIR):
$(MKINSTALLDIRS) $@
install-tool::
$(INSTALL_PROGRAM) -m 0755 \
$(GNUSTEP_OBJ_DIR)/$(INTERNAL_tool_NAME)$(EXEEXT) \
$(TOOL_INSTALLATION_DIR)
internal-tool-uninstall::
rm -f $(TOOL_INSTALLATION_DIR)/$(INTERNAL_tool_NAME)$(EXEEXT)
#
# Cleaning targets
#
# we don't have any cleaning targets for tools here, because we clean
# at the first make invocation.
## Local variables:
## mode: makefile
## End:

51
Master/test-tool.make Normal file
View file

@ -0,0 +1,51 @@
#
# Master/test-tool.make
#
# Copyright (C) 1997, 2001 Free Software Foundation, Inc.
#
# Author: Scott Christley <scottc@net-community.com>
# Author: Nicola Pero <nicola@brainstorm.co.uk>
#
# This file is part of the GNUstep Makefile Package.
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# You should have received a copy of the GNU General Public
# License along with this library; see the file COPYING.LIB.
# If not, write to the Free Software Foundation,
# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
TEST_TOOL_NAME := $(strip $(TEST_TOOL_NAME))
ifeq ($(RULES_MAKE_LOADED),)
include $(GNUSTEP_MAKEFILES)/rules.make
endif
# Building of test tools works as in tool.make, except we don't install them.
internal-all:: $(TEST_TOOL_NAME:=.all.test-tool.variables)
internal-clean:: $(TEST_TOOL_NAME:=.clean.test-tool.subprojects)
rm -rf $(GNUSTEP_OBJ_DIR)
internal-distclean:: $(TEST_TOOL_NAME:=.distclean.test-tool.subprojects)
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
$(TEST_TOOL_NAME)::
@$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory \
$@.all.test-tool.variables
internal-install::
@ echo Skipping installation of test tools...
internal-uninstall::
@ echo Skipping uninstallation of test tools...
## Local variables:
## mode: makefile
## End:

49
Master/tool.make Normal file
View file

@ -0,0 +1,49 @@
#
# Master/tool.make
#
# Master Makefile rules to build GNUstep-based command line tools.
#
# Copyright (C) 1997, 2001 Free Software Foundation, Inc.
#
# Author: Scott Christley <scottc@net-community.com>
# Author: Nicola Pero <nicola@brainstorm.co.uk>
#
# This file is part of the GNUstep Makefile Package.
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# You should have received a copy of the GNU General Public
# License along with this library; see the file COPYING.LIB.
# If not, write to the Free Software Foundation,
# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
TOOL_NAME := $(strip $(TOOL_NAME))
ifeq ($(RULES_MAKE_LOADED),)
include $(GNUSTEP_MAKEFILES)/rules.make
endif
internal-all:: $(TOOL_NAME:=.all.tool.variables)
internal-install:: $(TOOL_NAME:=.install.tool.variables)
internal-uninstall:: $(TOOL_NAME:=.uninstall.tool.variables)
internal-clean:: $(TOOL_NAME:=.clean.tool.subprojects)
rm -rf $(GNUSTEP_OBJ_DIR)
internal-distclean:: $(TOOL_NAME:=.distclean.tool.subprojects)
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
$(TOOL_NAME):
@$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going \
$@.all.tool.variables
## Local variables:
## mode: makefile
## End:

View file

@ -1,9 +1,10 @@
#
# test-tool.make
#
# Copyright (C) 1997, 2001 Free Software Foundation, Inc.
# Makefile rules to build GNUstep-based test tools.
#
# Copyright (C) 2002 Free Software Foundation, Inc.
#
# Author: Scott Christley <scottc@net-community.com>
# Author: Nicola Pero <nicola@brainstorm.co.uk>
#
# This file is part of the GNUstep Makefile Package.
@ -18,50 +19,15 @@
# If not, write to the Free Software Foundation,
# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# prevent multiple inclusions
ifeq ($(TEST_TOOL_MAKE_LOADED),)
TEST_TOOL_MAKE_LOADED=yes
TEST_TOOL_NAME:=$(strip $(TEST_TOOL_NAME))
#
# Include in the common makefile rules
#
ifeq ($(RULES_MAKE_LOADED),)
include $(GNUSTEP_MAKEFILES)/rules.make
endif
# building of test tools works as in tool.make
ifeq ($(INTERNAL_tool_NAME),)
internal-all:: $(TEST_TOOL_NAME:=.all.tool.variables)
internal-clean:: $(TEST_TOOL_NAME:=.clean.tool.subprojects)
rm -rf $(GNUSTEP_OBJ_DIR)
internal-distclean:: $(TEST_TOOL_NAME:=.distclean.tool.subprojects)
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
$(TEST_TOOL_NAME)::
@$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory $@.all.tool.variables
# However, we don't install/uninstall test-tools
internal-install::
@ echo Skipping installation of test tools...
internal-uninstall::
@ echo Skipping uninstallation of test tools...
ifeq ($(GNUSTEP_INSTANCE),)
include $(GNUSTEP_MAKEFILES)/Master/test-tool.make
else
# We use the tool.make rules for building
include $(GNUSTEP_MAKEFILES)/tool.make
ifeq ($(GNUSTEP_TYPE),test_tool)
include $(GNUSTEP_MAKEFILES)/Instance/test-tool.make
endif
endif # test-tool.make loaded
endif
## Local variables:
## mode: makefile

147
tool.make
View file

@ -3,9 +3,8 @@
#
# Makefile rules to build GNUstep-based command line tools.
#
# Copyright (C) 1997, 2001 Free Software Foundation, Inc.
# Copyright (C) 2002 Free Software Foundation, Inc.
#
# Author: Scott Christley <scottc@net-community.com>
# Author: Nicola Pero <nicola@brainstorm.co.uk>
#
# This file is part of the GNUstep Makefile Package.
@ -20,151 +19,15 @@
# If not, write to the Free Software Foundation,
# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
# The name of the tools is in the TOOL_NAME variable.
#
# xxx We need to prefix the target name when cross-compiling
#
# prevent multiple inclusions
ifeq ($(TOOL_MAKE_LOADED),)
TOOL_MAKE_LOADED=yes
TOOL_NAME:=$(strip $(TOOL_NAME))
#
# Include in the common makefile rules
#
ifeq ($(RULES_MAKE_LOADED),)
include $(GNUSTEP_MAKEFILES)/rules.make
endif
# This is the directory where the tools get installed. If you don't specify a
# directory they will get installed in the GNUstep Local Root.
ifeq ($(TOOL_INSTALLATION_DIR),)
TOOL_INSTALLATION_DIR = $(GNUSTEP_TOOLS)/$(GNUSTEP_TARGET_LDIR)
endif
ifeq ($(INTERNAL_tool_NAME),)
internal-all:: $(TOOL_NAME:=.all.tool.variables)
internal-install:: $(TOOL_NAME:=.install.tool.variables)
internal-uninstall:: $(TOOL_NAME:=.uninstall.tool.variables)
internal-clean:: $(TOOL_NAME:=.clean.tool.subprojects)
rm -rf $(GNUSTEP_OBJ_DIR)
internal-distclean:: $(TOOL_NAME:=.distclean.tool.subprojects)
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
$(TOOL_NAME):
@$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going \
$@.all.tool.variables
else # second pass
.PHONY: internal-tool-all \
internal-tool-install \
internal-tool-uninstall \
before-$(TARGET)-all \
after-$(TARGET)-all \
internal-install-dirs \
install-tool
ifneq ($(FRAMEWORK_NAME),)
TOOL_INSTALLATION_DIR = $(FRAMEWORK_VERSION_DIR_NAME)/Resources/$(GNUSTEP_TARGET_LDIR)
endif
ALL_TOOL_LIBS = \
$(shell $(WHICH_LIB_SCRIPT) \
$(ALL_LIB_DIRS) \
$(ADDITIONAL_TOOL_LIBS) $(AUXILIARY_TOOL_LIBS) $(FND_LIBS) \
$(ADDITIONAL_OBJC_LIBS) $(AUXILIARY_OBJC_LIBS) $(OBJC_LIBS) \
$(TARGET_SYSTEM_LIBS) \
debug=$(debug) profile=$(profile) shared=$(shared) \
libext=$(LIBEXT) shared_libext=$(SHARED_LIBEXT))
ifeq ($(WITH_DLL),yes)
TTMP_LIBS := $(ALL_TOOL_LIBS)
TTMP_LIBS := $(filter -l%, $(TTMP_LIBS))
# filter all non-static libs (static libs are those ending in _ds, _s, _ps..)
TTMP_LIBS := $(filter-out -l%_ds, $(TTMP_LIBS))
TTMP_LIBS := $(filter-out -l%_s, $(TTMP_LIBS))
TTMP_LIBS := $(filter-out -l%_dps,$(TTMP_LIBS))
TTMP_LIBS := $(filter-out -l%_ps, $(TTMP_LIBS))
# strip away -l, _p and _d ..
TTMP_LIBS := $(TTMP_LIBS:-l%=%)
TTMP_LIBS := $(TTMP_LIBS:%_d=%)
TTMP_LIBS := $(TTMP_LIBS:%_p=%)
TTMP_LIBS := $(TTMP_LIBS:%_dp=%)
TTMP_LIBS := $(shell echo $(TTMP_LIBS)|tr '-' '_')
TTMP_LIBS := $(TTMP_LIBS:%=-Dlib%_ISDLL=1)
ALL_CPPFLAGS += $(TTMP_LIBS)
endif
#
# Compilation targets
#
internal-tool-all:: before-$(TARGET)-all \
$(GNUSTEP_OBJ_DIR) \
$(GNUSTEP_OBJ_DIR)/$(INTERNAL_tool_NAME)$(EXEEXT) \
after-$(TARGET)-all
ifneq ($(FRAMEWORK_NAME),)
internal-tool-all:: internal-install-dirs install-tool
endif
$(GNUSTEP_OBJ_DIR)/$(INTERNAL_tool_NAME)$(EXEEXT): $(OBJ_FILES_TO_LINK)
$(LD) $(ALL_LDFLAGS) -o $(LDOUT)$@ \
$(OBJ_FILES_TO_LINK) \
$(ALL_TOOL_LIBS)
before-$(TARGET)-all::
after-$(TARGET)-all::
ifneq ($(FRAMEWORK_NAME),)
ifneq ($(FRAMEWORK_OPERATION),all)
NULL_INSTALL = yes
endif
endif
ifeq ($(NULL_INSTALL),yes)
internal-tool-install::
ifeq ($(GNUSTEP_INSTANCE),)
include $(GNUSTEP_MAKEFILES)/Master/tool.make
else
internal-tool-install:: internal-install-dirs install-tool
endif
# Depend on having created the installation dir
internal-install-dirs:: $(TOOL_INSTALLATION_DIR)
# This rule runs $(MKDIRS) only if needed
$(TOOL_INSTALLATION_DIR):
$(MKINSTALLDIRS) $@
install-tool::
$(INSTALL_PROGRAM) -m 0755 \
$(GNUSTEP_OBJ_DIR)/$(INTERNAL_tool_NAME)$(EXEEXT) \
$(TOOL_INSTALLATION_DIR)
internal-tool-uninstall::
rm -f $(TOOL_INSTALLATION_DIR)/$(INTERNAL_tool_NAME)$(EXEEXT)
#
# Cleaning targets
#
# we don't have any cleaning targets for tools here, because we clean
# at the first make invocation.
ifeq ($(GNUSTEP_TYPE),tool)
include $(GNUSTEP_MAKEFILES)/Instance/tool.make
endif
endif
# tool.make loaded
## Local variables:
## mode: makefile