using centralized buildlayout file. If some package needs a local copy, it can be added back

svn path=/trunk/; revision=4105

2 files changed, 1 insertions, 235 deletions

diff --git a/extensions/Makefile b/extensions/Makefile
index 4be10189..5841fa06 100644
--- a/extensions/Makefile
+++ b/extensions/Makefile
@@ -12,7 +12,7 @@ CWD := $(shell pwd)
 # these are designed to be overridden by the packages/Makefile
 cvs_root_dir = $(CWD)/..
 DESTDIR = $(CWD)/build/
-BUILDLAYOUT_DIR = $(CWD)
+BUILDLAYOUT_DIR = $(cvs_root_dir)/packages
 
 # default target
 all: gripd
diff --git a/extensions/Makefile.buildlayout b/extensions/Makefile.buildlayout
deleted file mode 100644
index 5bc5f28b..00000000
--- a/extensions/Makefile.buildlayout
+++ /dev/null
@@ -1,234 +0,0 @@
-#==============================================================================#
-#
-# Centralized cross-platform build system Makefile.buildsystem
-#
-# this file contains all the common locations and targets
-#  <hans@at.or.at>
-#
-#==============================================================================#
-# 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 $(prefix) and $(cvs_root_dir).
-#
-# $(cvs_root_dir) is the base directory of src tree, equivalent to the root
-# level of the pure-data CVS.
-#
-# $(prefix) is the base directory to where all of the resulting files
-# will be copied.
-#
-# This file is currently located in these places: 
-#	  abstractions
-#    extensions
-#	  externals
-# 	  packages
-#    doc
-#
-# it will be going here too:
-#    gem
-#    pd
-#
-# <hans@at.or.at>
-
-#==============================================================================#
-#
-## PLATFORM-SPECIFIC SETTINGS
-#
-#==============================================================================#
-# which OS to compile for
-UNAME := $(shell uname -s)
-ifeq ($(UNAME),Linux)
-  OS_NAME = linux
-  EXTENSION = pd_linux
-  prefix = /usr/local
-else 
-  ifeq ($(UNAME),Darwin)
-    OS_NAME = darwin
-    EXTENSION = pd_darwin
-  else
-    ifeq (MINGW,$(findstring MINGW,$(UNAME)))
-      OS_NAME = win
-      EXTENSION = dll
-    else
-      OS_NAME = unknown
-      EXTENSION = so
-      $(warning WARNING: unknown environment "$(UNAME)".)
-    endif
-  endif
-endif
-
-#==============================================================================#
-#
-# DIRECTORY STRUCTURE
-#
-#==============================================================================#
-
-# sources
-abstractions_src = $(cvs_root_dir)/abstractions
-doc_src = $(cvs_root_dir)/doc
-extensions_src = $(cvs_root_dir)/extensions
-externals_src = $(cvs_root_dir)/externals
-flext_src = $(cvs_root_dir)/externals/grill/flext
-gem_src = $(cvs_root_dir)/Gem
-packages_src = $(cvs_root_dir)/packages
-pd_src = $(cvs_root_dir)/pd
-scripts_src = $(cvs_root_dir)/scripts
-
-
-# destinations
-bindir = $(DESTDIR)$(prefix)/bin
-includedir = $(DESTDIR)$(prefix)/include
-libdir = $(DESTDIR)$(prefix)/lib
-mandir = $(DESTDIR)$(prefix)/man
-
-ifeq ($(OS_NAME),darwin)
-  objectsdir = $(DESTDIR)$(prefix)/extra
-  pddocdir = $(DESTDIR)$(prefix)/doc
-  else
-    ifeq ($(OS_NAME),win)
-      objectsdir = $(DESTDIR)$(prefix)/extra
-      pddocdir = $(DESTDIR)$(prefix)/doc
-    else
-      objectsdir = $(libdir)/pd/extra
-      pddocdir = $(libdir)/pd/doc
-    endif
-endif
-
-examplesdir = $(pddocdir)/examples
-helpdir = $(pddocdir)/5.reference
-manualsdir = $(pddocdir)/manuals
-
-
-#==============================================================================#
-#
-# DIRECTORY STRUCTURE TARGETS
-#
-#==============================================================================#
-
-# first make sure that the directory structure is setup
-$(DESTDIR):
-	install -d $(DESTDIR)
-
-$(bindir): $(DESTDIR)
-	install -d $(bindir)
-
-$(examplesdir): $(DESTDIR)
-	install -d $(examplesdir)
-
-$(includedir): $(DESTDIR)
-	install -d $(includedir)
-
-$(pddocdir): $(DESTDIR)
-	install -d $(pddocdir)
-
-$(helpdir): $(DESTDIR)
-	install -d $(helpdir)
-
-$(manualsdir): $(DESTDIR)
-	install -d $(manualsdir)
-
-$(objectsdir): $(DESTDIR)
-	install -d $(objectsdir)
-
-installdirs: $(DESTDIR) $(bindir) $(examplesdir) $(pddocdir) $(includedir) $(helpdir) $(manualsdir) $(objectsdir)
-
-#==============================================================================#
-#
-# PD VERSION AND PACKAGE NAMING
-#
-#==============================================================================#
-
-
-PD_MAJOR_VERSION := $(shell grep 'Pd version' $(pd_src)/src/s_main.c | \
-	sed 's/char pd_version\[\] = "Pd version \([0-9]\)\.[0-9]*[. TES-]*[0-9]*[0-9extndRC.-]*.n";/\1/')
-PD_MINOR_VERSION := $(shell grep 'Pd version' $(pd_src)/src/s_main.c | \
-	sed 's/char pd_version\[\] = "Pd version [0-9]\.\([0-9]*\)[. TES-]*\([0-9]*\)[0-9extndRC.-]*.n";/\1/')
-PD_BUGFIX_VERSION := $(shell grep 'Pd version' $(pd_src)/src/s_main.c | \
-	sed 's/char pd_version\[\] = "Pd version [0-9]\.[0-9]*[. TES-]*\([0-9]*\)[0-9extndRC.-]*.n";/\1/')
-# the separators [.-] need to be the same as in s_main.c or the regexps break
-PD_VERSION = $(PD_MAJOR_VERSION).$(PD_MINOR_VERSION).$(PD_BUGFIX_VERSION)
-
-
-# release version for this distro
-PACKAGE_VERSION = extended-RC5
-PACKAGE_NAME = Pd-$(PD_VERSION)-$(PACKAGE_VERSION)
-
-
-
-#==============================================================================#
-#
-# CLEAN TARGETS
-#
-#==============================================================================#
-
-applications_clean:
-	-rm -f -- $(examplesdir)/*/*/*/*/*.*
-	-rm -f -- $(examplesdir)/*/*/*/*.*
-	-rm -f -- $(examplesdir)/*/*/*.*
-	-rm -f -- $(examplesdir)/*/*.*
-	-rmdir $(examplesdir)/*/*/*/*
-	-rmdir $(examplesdir)/*/*/*
-	-rmdir $(examplesdir)/*/*
-	-rmdir $(examplesdir)/*
-	-rmdir $(examplesdir)
-
-
-help_clean:
-	-rm -f -- $(helpdir)/*/*/*.*
-	-rm -f -- $(helpdir)/*/*.*
-	-rm -f -- $(helpdir)/*.*
-	-rmdir $(helpdir)/*/*
-	-rmdir $(helpdir)/*
-	-rmdir $(helpdir)
-
-
-manuals_clean:
-	-rm -f -- $(manualsdir)/*/*/*.*
-	-rm -f -- $(manualsdir)/*/*.*
-	-rmdir $(manualsdir)/*/*
-	-rmdir $(manualsdir)/*
-	-rmdir $(manualsdir)
-
-
-objects_clean:
-	-rm $(objectsdir)/*/*/*.pd
-	-rm $(objectsdir)/*/*.pd
-	-rm $(objectsdir)/*.pd
-	-rm $(objectsdir)/*/*/*.$(EXTENSION)
-	-rm $(objectsdir)/*/*.$(EXTENSION)
-	-rm $(objectsdir)/*.$(EXTENSION)
-	-rmdir $(objectsdir)/*/*
-	-rmdir $(objectsdir)/*
-	-rmdir $(objectsdir)
-
-
-install_clean: applications_clean help_clean manuals_clean objects_clean
-	-rmdir $(pddocdir)
-	-rmdir $(DESTDIR)$(prefix)
-	-rmdir $(DESTDIR)
-	@echo " "
-	@echo "Build destination cleaned: $(DESTDIR)"
-
-
-cruft_clean:
-# emacs litter
-	-rm -f -- */*/*/*/*.*~
-	-rm -f -- */*/*/*.*~
-	-rm -f -- */*/*.*~
-	-rm -f -- */*.*~
-	-rm -f -- *.*~
-	-rm -f -- Makefile~ Makefile.buildlayout~
-# sed replace litter
-	-rm -f -- */*/*/*/*.*.bak
-	-rm -f -- */*/*/*.*.bak
-	-rm -f -- */*/*.*.bak
-	-rm -f -- */*.*.bak
-	-rm -f -- *.*.bak
-# autoconf cache
-	-rm -rf -- */*/*/*/autom4te.cache
-	-rm -rf -- */*/*/autom4te.cache
-	-rm -rf -- */*/autom4te.cache
-	-rm -rf -- */autom4te.cache
-	-rm -rf -- autom4te.cache
-
-