it builds everything that the previous one did, plus the doc/makefile was folded into this one; next, make it actually do the C compiling instead of having the separate makefiles for each platform

svn path=/trunk/; revision=3961

3 files changed, 14 insertions, 181 deletions

diff --git a/externals/build/Makefile.buildlayout b/externals/build/Makefile.buildlayout
deleted file mode 100755
index a2e6ef06..00000000
--- a/externals/build/Makefile.buildlayout
+++ /dev/null
@@ -1,67 +0,0 @@
-
-## 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.or.at>
-
-# 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/externals/build/TODO b/externals/build/TODO
index 2f643ccd..e80174c8 100644
--- a/externals/build/TODO
+++ b/externals/build/TODO
@@ -1,4 +1,14 @@
 
+- fold externals/build/doc/makefile into externals/build/Makefile
+
+- get externals/build/src/prepend.c to compile in Pd mode, which means it will
+  have a right inlet when created without an argument
+
+- add in mtx_ objects with special characters using setup functions and
+  filenames with 0x escapes (mtx_/ and mtx_./ for example).  Make sure to have
+  the objects call the correct setup function since it can change the
+  functionality
+
 - fix compilation of netclient, netrec, netserver, piperead~, pipewrite~
 
 - include mp3 externals from iem_mp3 and unauthorized and make mp3*.libs files
@@ -17,9 +27,7 @@
   externals/build/PLATFORM directory.  The makefiles will use both:
   `test -f $*.libs && cat $*.libs` `test -f ../src/$*.libs && cat ../src/$*.libs`
 
-- make MinGW makefile for "win" so that the GNU Makefile method will be
-  standard on all platforms.
-
-- do symlink aliases in externals/build/src/makefile.common
-
-- write externals/build/doc/standardize-help.sh
+- add these to the build system:
+      PDContainer
+      ann
+		grh
diff --git a/externals/build/doc/makefile b/externals/build/doc/makefile
deleted file mode 100644
index 23a66929..00000000
--- a/externals/build/doc/makefile
+++ /dev/null
@@ -1,108 +0,0 @@
-
-#
-# makefile for copying all of the help docs into this folder for 
-# inclusion into the externals packages
-#
-
-CWD := $(shell pwd)
-
-# these are setup to be overridden by the packages/Makefile
-SRC_ROOT_DIR := $(CWD)/../../..
-INSTALL_PREFIX = .
-BUILDLAYOUT_DIR = $(CWD)/..
-
-all: install
-	echo "Completed externals/doc build!"
-
-include $(BUILDLAYOUT_DIR)/Makefile.buildlayout
-
-
-install: $(HELP_DEST)
-#----------------------------------------------------------------------------
-# all standard objs' help files
-#    it had to be broken up because the list is soo long
-	install -p \
-			$(EXTERNALS_SRC)/OSCx/doc/*.pd \
-			$(EXTERNALS_SRC)/control/*/*.pd \
-			$(EXTERNALS_SRC)/signal/*/*.pd \
-			$(EXTERNALS_SRC)/aenv~/*.pd \
-			$(EXTERNALS_SRC)/arraysize/*.pd \
-			$(EXTERNALS_SRC)/beatpipe/*.pd \
-			$(EXTERNALS_SRC)/build/*.pd \
-			$(EXTERNALS_SRC)/bbogart/chaos/tools/*.pd \
-			$(EXTERNALS_SRC)/bbogart/*/*.pd \
-			$(EXTERNALS_SRC)/creb/doc/*.pd \
-				$(HELP_DEST)
-	install -p \
-			$(EXTERNALS_SRC)/creb/doc/examples/*.pd \
-			$(EXTERNALS_SRC)/cxc/reference/*.pd \
-			$(EXTERNALS_SRC)/dfx/*/*.pd \
-			$(EXTERNALS_SRC)/ext13/doc/*.pd \
-			$(EXTERNALS_SRC)/ggee/*/*-help.pd \
-			$(EXTERNALS_SRC)/gem2pdp/*.pd \
-			$(EXTERNALS_SRC)/ff/*.pd \
-			$(EXTERNALS_SRC)/freeverb~/*.pd \
-			$(EXTERNALS_SRC)/hcs/*-help.pd \
-				$(HELP_DEST)
-	install -p \
-			$(EXTERNALS_SRC)/hcs/*/doc/*.pd \
-			$(EXTERNALS_SRC)/hcs/hid/examples/*.pd \
-			$(EXTERNALS_SRC)/hcs/pan/*-help.pd \
-			$(EXTERNALS_SRC)/iem/*/*/*-help.pd \
-			$(EXTERNALS_SRC)/markex/*.pd \
-			$(EXTERNALS_SRC)/maxlib/help/*.* \
-			$(EXTERNALS_SRC)/mjlib/doc/*.pd \
-			$(EXTERNALS_SRC)/motex/*.pd \
-			$(EXTERNALS_SRC)/nusmuk/line3/*.pd\
-				$(HELP_DEST)
-	install -p \
-			$(EXTERNALS_SRC)/pdogg/*/*.pd \
-			$(EXTERNALS_SRC)/plugin~/*.pd \
-			$(EXTERNALS_SRC)/pmpd/help/*.pd\
-			$(EXTERNALS_SRC)/rhythm_estimator/*.p? \
-			$(EXTERNALS_SRC)/sprinkler/sprinkler-help.pd \
-			$(EXTERNALS_SRC)/susloop~/*.pd \
-			$(EXTERNALS_SRC)/svf~/*.pd \
-			$(EXTERNALS_SRC)/vbap/*.pd \
-			$(EXTERNALS_SRC)/vst/*.pd \
-			$(EXTERNALS_SRC)/zhzxh~/*.pd \
-				$(HELP_DEST)
-#----------------------------------------------------------------------------
-# IEMlib uses its own dir and since its not maintained in CVS
-# its best not to change the objects
-	install -d $(HELP_DEST)/iemhelp
-	install -p $(EXTERNALS_SRC)/iemlib/iemhelp/*.* $(HELP_DEST)/iemhelp
-#----------------------------------------------------------------------------
-# PMDP examples
-	install -d  $(HELP_DEST)/pmpd
-# pmpd exemples files has to go in an other directory
-	install -p $(EXTERNALS_SRC)/pmpd/exemples/*.pd $(HELP_DEST)/pmpd
-# pmpd documentation
-	cp -Rp $(EXTERNALS_SRC)/pmpd/doc $(HELP_DEST)/pmpd/doc
-#----------------------------------------------------------------------------
-# zexy uses its own dir
-	install -d $(HELP_DEST)/zexy
-	install -p $(EXTERNALS_SRC)/zexy/zexy.pd  $(HELP_DEST)
-	install -p $(EXTERNALS_SRC)/zexy/examples/*.* $(HELP_DEST)/zexy
-#----------------------------------------------------------------------------
-# iemmatrix uses its own dir
-	install -d $(HELP_DEST)/iemmatrix
-	install -p $(EXTERNALS_SRC)/iem/iemmatrix/doc/*.pd  $(HELP_DEST)/iemmatrix
-
-
-#----------------------------------------------------------------------------
-# remove help files for objects that are not included due to conflicts, etc.
-#
-#  mjlib [prob] conflicts with cyclone's [prob]
-	rm $(HELP_DEST)/prob-help.pd
-#  maxlib conflicts with cyclone
-	rm $(HELP_DEST)/split-help.pd
-
-
-#----------------------------------------------------------------------------
-# this is mildly dangerous, since it just deletes everything
-clean:
-	cd $(HELP_DEST) && rm -f -- *.pd *.ps *.txt test.som *~
-	rm -Rf -- $(HELP_DEST)/iemhelp $(HELP_DEST)/zexy \
-		$(HELP_DEST)/pmpd $(HELP_DEST)/iemmatrix
-