From 9a683c2f8610b32ecc80fe256b1226568fcb95c5 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 16 Nov 2005 23:01:15 +0000 Subject: made a unique name for the build layout Makefile to make it distinct from other Makefiles svn path=/trunk/; revision=3948 --- packages/Makefile | 39 +++++++++++++++++++++++++++++------ packages/Makefile.buildlayout | 47 +++++++++++++++++++++++++++++++++++++++++++ packages/Makefile.dirs | 47 ------------------------------------------- 3 files changed, 80 insertions(+), 53 deletions(-) create mode 100644 packages/Makefile.buildlayout delete mode 100644 packages/Makefile.dirs (limited to 'packages') diff --git a/packages/Makefile b/packages/Makefile index c8889001..267a39bb 100644 --- a/packages/Makefile +++ b/packages/Makefile @@ -9,7 +9,7 @@ INSTALL_PREFIX = $(SRC_ROOT_DIR)/packages/build # default target all: abstractions -include Makefile.dirs +include Makefile.buildlayout DST_PATHS = APPLICATIONS_DEST=$(APPLICATIONS_DEST) \ DOCS_DEST=$(DOCS_DEST) \ @@ -17,15 +17,42 @@ DST_PATHS = APPLICATIONS_DEST=$(APPLICATIONS_DEST) \ MANUALS_DEST=$(MANUALS_DEST) \ OBJECTS_DEST=$(OBJECTS_DEST) -#------------------------------------------------------------------------------# +#==============================================================================# +# # BUILD TARGETS -#------------------------------------------------------------------------------# +# +#==============================================================================# + +#------------------------------------------------------------------------------ +# abstractions abstractions: - make -f $(ABSTRACTIONS_SRC)/Makefile $(DST_PATHS) + make -f $(ABSTRACTIONS_SRC)/Makefile $(DST_PATHS) install + +#------------------------------------------------------------------------------ +# doc +doc: + + +#------------------------------------------------------------------------------ +# externals +externals: +# doc + make -f $(EXTERNALS_SRC)/build/doc/makefile $(DST_PATHS) install + + +#------------------------------------------------------------------------------ +# Gem +gem: + + +#------------------------------------------------------------------------------ +# pd +pd: + -#------------------------------------------------------------------------------# +#==============================================================================# # CLEAN TARGETS -#------------------------------------------------------------------------------# +#==============================================================================# abstractions_clean: make -f $(ABSTRACTIONS_SRC)/Makefile $(DST_PATHS) clean diff --git a/packages/Makefile.buildlayout b/packages/Makefile.buildlayout new file mode 100644 index 00000000..1fa2a0fc --- /dev/null +++ b/packages/Makefile.buildlayout @@ -0,0 +1,47 @@ + +# 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. + +# $(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) + diff --git a/packages/Makefile.dirs b/packages/Makefile.dirs deleted file mode 100644 index 1fa2a0fc..00000000 --- a/packages/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-contained. - -# $(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