[PD-cvs] packages Makefile,1.3,1.4 Makefile.buildlayout,1.1,1.2

[Hans-Christoph Steiner]

Update of /cvsroot/pure-data/packages
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10402

Modified Files:
	Makefile Makefile.buildlayout 
Log Message:
abstractions and externals/build/doc are now working as part of the centralized build system; also added is a way to specify Makefile.biuldlayout from the main Makefile, so then it doesn't realy matter if the other copies of Makefile.buildlayout get out of sync

Index: Makefile
===================================================================
RCS file: /cvsroot/pure-data/packages/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile	16 Nov 2005 23:01:15 -0000	1.3
--- Makefile	17 Nov 2005 00:06:46 -0000	1.4
***************
*** 1,20 ****
  #
  #
  #
  
! # these are setup to be overridden by the packages/*/Makefiles
! SRC_ROOT_DIR := $(shell pwd)/..
  INSTALL_PREFIX = $(SRC_ROOT_DIR)/packages/build
  
  # default target
! all: abstractions
  
! include Makefile.buildlayout
  
! DST_PATHS = APPLICATIONS_DEST=$(APPLICATIONS_DEST) \
! 				DOCS_DEST=$(DOCS_DEST) \
! 				HELP_DEST=$(HELP_DEST) \
! 				MANUALS_DEST=$(MANUALS_DEST) \
! 			   OBJECTS_DEST=$(OBJECTS_DEST) 
  
  #==============================================================================#
--- 1,35 ----
+ #==============================================================================#
  #
+ # Centralized cross-platform build system 
  #
+ # see README for instructions  <hans at at.or.at>
  #
+ #==============================================================================#
  
! CWD := $(shell pwd)
! 
! SRC_ROOT_DIR = $(CWD)/..
  INSTALL_PREFIX = $(SRC_ROOT_DIR)/packages/build
+ BUILDLAYOUT_DIR = $(CWD)
+ 
+ # get the platform
+ UNAME := $(shell uname)
  
  # default target
! all: abstractions doc externals gem pd
! 	echo "Complete build succeeded!"
  
! include $(BUILDLAYOUT_DIR)/Makefile.buildlayout
  
! # these are sent to all of the various Makefiles so that they all copy their
! # output to the same directory tree
! DEST_PATHS = BUILDLAYOUT_DIR=$(BUILDLAYOUT_DIR) \
! 				SRC_ROOT_DIR=$(SRC_ROOT_DIR) \
! 				INSTALL_PREFIX=$(INSTALL_PREFIX)
! #				APPLICATIONS_DEST=$(APPLICATIONS_DEST) \
! #				DOCS_DEST=$(DOCS_DEST) \
! #				HELP_DEST=$(HELP_DEST) \
! #				MANUALS_DEST=$(MANUALS_DEST) \
! #			   OBJECTS_DEST=$(OBJECTS_DEST) 
  
  #==============================================================================#
***************
*** 27,31 ****
  # abstractions
  abstractions:
! 	make -f $(ABSTRACTIONS_SRC)/Makefile $(DST_PATHS) install
  
  #------------------------------------------------------------------------------
--- 42,46 ----
  # abstractions
  abstractions:
! 	make -f $(ABSTRACTIONS_SRC)/Makefile $(DEST_PATHS) install
  
  #------------------------------------------------------------------------------
***************
*** 38,42 ****
  externals:
  # doc
! 	make -f $(EXTERNALS_SRC)/build/doc/makefile $(DST_PATHS) install
  
  
--- 53,57 ----
  externals:
  # doc
! 	make -f $(EXTERNALS_SRC)/build/doc/makefile $(DEST_PATHS) install
  
  
***************
*** 55,59 ****
  #==============================================================================#
  abstractions_clean:
! 	make -f $(ABSTRACTIONS_SRC)/Makefile $(DST_PATHS) clean
  
  clean: abstractions_clean
--- 70,74 ----
  #==============================================================================#
  abstractions_clean:
! 	make -f $(ABSTRACTIONS_SRC)/Makefile $(DEST_PATHS) clean
  
  clean: abstractions_clean

Index: Makefile.buildlayout
===================================================================
RCS file: /cvsroot/pure-data/packages/Makefile.buildlayout,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile.buildlayout	16 Nov 2005 23:01:15 -0000	1.1
--- Makefile.buildlayout	17 Nov 2005 00:06:46 -0000	1.2
***************
*** 1,8 ****
  
! # 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.  <hans at at.or.at>
  
! # $(INSTALL_PREFIX) and $(SRC_ROOT_DIR) are set in Makefile
  
  # sources
--- 1,28 ----
  
! ## 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
! #
! # <hans at at.or.at>
  
  # sources