From d351824253b1af0a53f9a628ee4a9628ab9720a2 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Thu, 17 Nov 2005 00:01:55 +0000 Subject: got everything working properly with the centralized build system svn path=/trunk/; revision=3951 --- abstractions/Makefile | 11 ++++--- abstractions/Makefile.buildlayout | 67 +++++++++++++++++++++++++++++++++++++++ abstractions/Makefile.dirs | 47 --------------------------- 3 files changed, 74 insertions(+), 51 deletions(-) create mode 100755 abstractions/Makefile.buildlayout delete mode 100644 abstractions/Makefile.dirs (limited to 'abstractions') diff --git a/abstractions/Makefile b/abstractions/Makefile index f5a97068..235f98ca 100644 --- a/abstractions/Makefile +++ b/abstractions/Makefile @@ -6,14 +6,17 @@ # #==============================================================================# -# these are setup to be overridden by the packages/*/Makefiles -SRC_ROOT_DIR := $(shell pwd)/.. +CWD := $(shell pwd) + +# these are setup to be overridden by the packages/Makefile +SRC_ROOT_DIR = $(CWD)/.. INSTALL_PREFIX = build +BUILDLAYOUT_DIR = $(CWD) # default target -all: objects applications +install: objects applications -include Makefile.dirs +include $(BUILDLAYOUT_DIR)/Makefile.buildlayout #==============================================================================# # diff --git a/abstractions/Makefile.buildlayout b/abstractions/Makefile.buildlayout new file mode 100755 index 00000000..a2e6ef06 --- /dev/null +++ b/abstractions/Makefile.buildlayout @@ -0,0 +1,67 @@ + +## Makefile.buildlayout + +# This file should be exactly the same in each section of the CVS. A copy is +# kept in each section of the CVS so that each section will be self-contained. +# To use it, you need to include it in your Makefile (i.e. "include +# Makefile.buildlayout") and then define $(INSTALL_PREFIX) and $(SRC_ROOT_DIR). +# +# $(SRC_ROOT_DIR) is the base directory of src tree, equivalent to the root +# level of the pure-data CVS. +# +# $(INSTALL_PREFIX) is the base directory to where all of the resulting files +# will be copied. +# +# This file is currently located in these places: +# abstractions +# externals/build +# packages +# +# it will be going here too: +# doc +# extensions +# gem +# pd +# +# + +# sources +ABSTRACTIONS_SRC = $(SRC_ROOT_DIR)/abstractions +DOC_SRC = $(SRC_ROOT_DIR)/doc +EXTERNALS_SRC = $(SRC_ROOT_DIR)/externals +FLEXT_SRC = $(SRC_ROOT_DIR)/externals/grill/flext +GEM_SRC = $(SRC_ROOT_DIR)/Gem +GEMLIBS_SRC = $(SRC_ROOT_DIR)/GemLibs +PD_SRC = $(SRC_ROOT_DIR)/pd +SCRIPTS_SRC = $(SRC_ROOT_DIR)/scripts + + +# destinations +APPLICATIONS_DEST = $(DOCS_DEST)/examples +DOCS_DEST = $(INSTALL_PREFIX)/doc +OBJECTS_DEST = $(INSTALL_PREFIX)/extra +HELP_DEST = $(DOCS_DEST)/5.reference +MANUALS_DEST = $(DOCS_DEST)/manuals + +#------------------------------------------------------------------------------# +# DIRECTORY STRUCTURE TARGETS +#------------------------------------------------------------------------------# +# first make sure that the directory structure is setup +$(INSTALL_PREFIX): + install -d $(INSTALL_PREFIX) + +$(APPLICATIONS_DEST): $(INSTALL_PREFIX) + install -d $(APPLICATIONS_DEST) + +$(DOCS_DEST): $(INSTALL_PREFIX) + install -d $(DOCS_DEST) + +$(HELP_DEST): $(INSTALL_PREFIX) + install -d $(HELP_DEST) + +$(MANUALS_DEST): $(INSTALL_PREFIX) + install -d $(MANUALS_DEST) + +$(OBJECTS_DEST): $(INSTALL_PREFIX) + install -d $(OBJECTS_DEST) + diff --git a/abstractions/Makefile.dirs b/abstractions/Makefile.dirs deleted file mode 100644 index 2c43a9d5..00000000 --- a/abstractions/Makefile.dirs +++ /dev/null @@ -1,47 +0,0 @@ - -# this file should be exactly the same in each section of the CVS. A copy is -# kept in each section of the CVS so that each section will be -# self-sufficient. - -# $(INSTALL_PREFIX) and $(SRC_ROOT_DIR) are set in Makefile - -# sources -ABSTRACTIONS_SRC = $(SRC_ROOT_DIR)/abstractions -DOC_SRC = $(SRC_ROOT_DIR)/doc -EXTERNALS_SRC = $(SRC_ROOT_DIR)/externals -FLEXT_SRC = $(SRC_ROOT_DIR)/externals/grill/flext -GEM_SRC = $(SRC_ROOT_DIR)/Gem -GEMLIBS_SRC = $(SRC_ROOT_DIR)/GemLibs -PD_SRC = $(SRC_ROOT_DIR)/pd -SCRIPTS_SRC = $(SRC_ROOT_DIR)/scripts - - -# destinations -APPLICATIONS_DEST = $(DOCS_DEST)/examples -DOCS_DEST = $(INSTALL_PREFIX)/doc -OBJECTS_DEST = $(INSTALL_PREFIX)/extra -HELP_DEST = $(DOCS_DEST)/5.reference -MANUALS_DEST = $(DOCS_DEST)/manuals - -#------------------------------------------------------------------------------# -# DIRECTORY STRUCTURE TARGETS -#------------------------------------------------------------------------------# -# first make sure that the directory structure is setup -$(INSTALL_PREFIX): - install -d $(INSTALL_PREFIX) - -$(APPLICATIONS_DEST): $(INSTALL_PREFIX) - install -d $(APPLICATIONS_DEST) - -$(DOCS_DEST): $(INSTALL_PREFIX) - install -d $(DOCS_DEST) - -$(HELP_DEST): $(INSTALL_PREFIX) - install -d $(HELP_DEST) - -$(MANUALS_DEST): $(INSTALL_PREFIX) - install -d $(MANUALS_DEST) - -$(OBJECTS_DEST): $(INSTALL_PREFIX) - install -d $(OBJECTS_DEST) - -- cgit v1.2.1