added HELP destination separate from DOCS destination

svn path=/trunk/; revision=3942

5 files changed, 72 insertions, 40 deletions

diff --git a/abstractions/Makefile b/abstractions/Makefile
index 9366098d..1e79f3c5 100644
--- a/abstractions/Makefile
+++ b/abstractions/Makefile
@@ -20,7 +20,7 @@ include Makefile.dirs
 final_setup:

 	chmod -R ugo-w $(INSTALL_PREFIX)

 

-objects: $(OBJECTS_DEST) $(DOCS_DEST) $(MANUALS_DEST)

+objects: $(OBJECTS_DEST) $(HELP_DEST) $(MANUALS_DEST)

 objects: objects_memento objects_nusmuk objects_rradical objects_keyboardkeys

 objects: objects_gyre objects_la-kitchen objects_nqpoly

 

@@ -53,9 +53,9 @@ objects_keyboardkeys:
 	install -d $(OBJECTS_DEST)/keyboardkeys

 	install -p $(ABSTRACTIONS_SRC)/keyboardkeys/keyboardkeys/*.pd \

 		 $(OBJECTS_DEST)/keyboardkeys

-	install -d $(DOCS_DEST)/keyboardkeys

+	install -d $(HELP_DEST)/keyboardkeys

 	install -p $(ABSTRACTIONS_SRC)/keyboardkeys/doc/*-help.pd \

-		 $(DOCS_DEST)/keyboardkeys

+		 $(HELP_DEST)/keyboardkeys

 

 applications_keyboardkeys:

 	install -d $(APPLICATIONS_DEST)/keyboardkeys

@@ -69,9 +69,9 @@ objects_la-kitchen:
 	install -d $(OBJECTS_DEST)/la-kitchen

 	install -p $(shell ls -1 $(ABSTRACTIONS_SRC)/La-kitchen/*.pd | \

 		grep -v '\-help.pd')    $(OBJECTS_DEST)/la-kitchen

-	install -d $(DOCS_DEST)/la-kitchen

+	install -d $(HELP_DEST)/la-kitchen

 	install -p $(ABSTRACTIONS_SRC)/La-kitchen/*-help.pd \

-		 $(DOCS_DEST)/la-kitchen

+		 $(HELP_DEST)/la-kitchen

 	install -d $(MANUALS_DEST)/la-kitchen

 	install -p $(ABSTRACTIONS_SRC)/La-kitchen/readme.txt \

 		 $(MANUALS_DEST)/la-kitchen

@@ -83,8 +83,8 @@ objects_memento:
 	install -d $(OBJECTS_DEST)/memento

 	install -p $(shell ls -1 $(ABSTRACTIONS_SRC)/rradical/memento/*.pd | \

 		grep -v '\-help.pd')  $(OBJECTS_DEST)/memento

-	install -d $(DOCS_DEST)/memento

-	install -p $(ABSTRACTIONS_SRC)/rradical/memento/*-help.pd $(DOCS_DEST)/memento

+	install -d $(HELP_DEST)/memento

+	install -p $(ABSTRACTIONS_SRC)/rradical/memento/*-help.pd $(HELP_DEST)/memento

 	install -d $(MANUALS_DEST)/memento

 	install -p $(ABSTRACTIONS_SRC)/rradical/memento/tutorial/*.* \

 		$(MANUALS_DEST)/memento

@@ -102,10 +102,10 @@ objects_nqpoly:
 	install -d $(OBJECTS_DEST)/nqpoly4

 	install -p $(shell ls -1 $(ABSTRACTIONS_SRC)/nqpoly/nqpoly4/*.pd | \

 		grep -v '\-help.pd')  $(OBJECTS_DEST)/nqpoly4

-	install -d $(DOCS_DEST)/nqpoly~

-	install -p $(ABSTRACTIONS_SRC)/nqpoly/nqpoly~/*.pd $(DOCS_DEST)/nqpoly~

-	install -d $(DOCS_DEST)/nqpoly4

-	install -p $(ABSTRACTIONS_SRC)/nqpoly/nqpoly4/*.pd $(DOCS_DEST)/nqpoly4

+	install -d $(HELP_DEST)/nqpoly~

+	install -p $(ABSTRACTIONS_SRC)/nqpoly/nqpoly~/*.pd $(HELP_DEST)/nqpoly~

+	install -d $(HELP_DEST)/nqpoly4

+	install -p $(ABSTRACTIONS_SRC)/nqpoly/nqpoly4/*.pd $(HELP_DEST)/nqpoly4

 	install -d $(MANUALS_DEST)/nqpoly

 	install -p $(ABSTRACTIONS_SRC)/nqpoly/*.html	$(MANUALS_DEST)/nqpoly

 	install -p $(ABSTRACTIONS_SRC)/nqpoly/nqpoly~/readme.txt	\

@@ -124,8 +124,8 @@ objects_nusmuk:
 	install -d $(OBJECTS_DEST)/nusmuk

 	install -p $(shell ls -1 $(ABSTRACTIONS_SRC)/nusmuk/*.* | \

 		grep -v '\-help.pd')  $(OBJECTS_DEST)/nusmuk

-	install -d $(DOCS_DEST)/nusmuk

-	install -p $(ABSTRACTIONS_SRC)/nusmuk/*-help.pd $(DOCS_DEST)/nusmuk

+	install -d $(HELP_DEST)/nusmuk

+	install -p $(ABSTRACTIONS_SRC)/nusmuk/*-help.pd $(HELP_DEST)/nusmuk

 

 

 #------------------------------

@@ -162,7 +162,7 @@ devsymlinks_keyboardkeys:
 # CLEAN TARGETS

 #------------------------------------------------------------------------------#

 objects_clean:

-	-rm -rf $(OBJECTS_DEST) $(DOCS_DEST)

+	-rm -rf $(OBJECTS_DEST) $(HELP_DEST)

 

 applications_clean:

 	-rm -rf $(APPLICATIONS_DEST)

@@ -171,7 +171,7 @@ applications_clean:
 clean: applications_clean objects_clean

 	-rm -f *~

 	rm -rf $(MANUALS_DEST)

-	rmdir $(DOCS_BASE) $(INSTALL_PREFIX)

+	rmdir $(DOCS_DEST) $(INSTALL_PREFIX)

 

 

 #------------------------------------------------------------------------------#

diff --git a/abstractions/Makefile.dirs b/abstractions/Makefile.dirs
index 6933557e..2c43a9d5 100644
--- a/abstractions/Makefile.dirs
+++ b/abstractions/Makefile.dirs
@@ -5,19 +5,23 @@
 
 # $(INSTALL_PREFIX) and $(SRC_ROOT_DIR) are set in Makefile
 
-# base
-DOCS_BASE = $(INSTALL_PREFIX)/doc
-
 # sources
 ABSTRACTIONS_SRC = $(SRC_ROOT_DIR)/abstractions
-DOCS_SRC = $(SRC_ROOT_DIR)/doc
+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_BASE)/examples
+APPLICATIONS_DEST = $(DOCS_DEST)/examples
+DOCS_DEST = $(INSTALL_PREFIX)/doc
 OBJECTS_DEST = $(INSTALL_PREFIX)/extra
-DOCS_DEST = $(DOCS_BASE)/5.reference
-MANUALS_DEST = $(DOCS_BASE)/manuals
+HELP_DEST = $(DOCS_DEST)/5.reference
+MANUALS_DEST = $(DOCS_DEST)/manuals
 
 #------------------------------------------------------------------------------#
 # DIRECTORY STRUCTURE TARGETS
@@ -29,11 +33,15 @@ $(INSTALL_PREFIX):
 $(APPLICATIONS_DEST):  $(INSTALL_PREFIX)
 	install -d $(APPLICATIONS_DEST)
 
-$(OBJECTS_DEST): $(INSTALL_PREFIX)
-	install -d $(OBJECTS_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 b/packages/Makefile
index 8580e4f9..c8889001 100644
--- a/packages/Makefile
+++ b/packages/Makefile
@@ -12,9 +12,10 @@ all: abstractions
 include Makefile.dirs
 
 DST_PATHS = APPLICATIONS_DEST=$(APPLICATIONS_DEST) \
-			   OBJECTS_DEST=$(OBJECTS_DEST) \
 				DOCS_DEST=$(DOCS_DEST) \
-				MANUALS_DEST=$(MANUALS_DEST)
+				HELP_DEST=$(HELP_DEST) \
+				MANUALS_DEST=$(MANUALS_DEST) \
+			   OBJECTS_DEST=$(OBJECTS_DEST) 
 
 #------------------------------------------------------------------------------#
 # BUILD TARGETS
@@ -30,5 +31,5 @@ abstractions_clean:
 
 clean: abstractions_clean
 	-rm -f *~
-	rm -rf $(MANUALS_DEST)
-	rmdir $(DOCS_BASE) $(INSTALL_PREFIX)
+	rm -rf $(MANUALS_DEST) $(HELP_DEST)
+	rmdir $(DOCS_DEST) $(INSTALL_PREFIX)
diff --git a/packages/Makefile.dirs b/packages/Makefile.dirs
index 6933557e..1fa2a0fc 100644
--- a/packages/Makefile.dirs
+++ b/packages/Makefile.dirs
@@ -1,23 +1,27 @@
 
 # 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.  <hans@at.or.at>
+# self-contained.  <hans@at.or.at>
 
 # $(INSTALL_PREFIX) and $(SRC_ROOT_DIR) are set in Makefile
 
-# base
-DOCS_BASE = $(INSTALL_PREFIX)/doc
-
 # sources
 ABSTRACTIONS_SRC = $(SRC_ROOT_DIR)/abstractions
-DOCS_SRC = $(SRC_ROOT_DIR)/doc
+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_BASE)/examples
+APPLICATIONS_DEST = $(DOCS_DEST)/examples
+DOCS_DEST = $(INSTALL_PREFIX)/doc
 OBJECTS_DEST = $(INSTALL_PREFIX)/extra
-DOCS_DEST = $(DOCS_BASE)/5.reference
-MANUALS_DEST = $(DOCS_BASE)/manuals
+HELP_DEST = $(DOCS_DEST)/5.reference
+MANUALS_DEST = $(DOCS_DEST)/manuals
 
 #------------------------------------------------------------------------------#
 # DIRECTORY STRUCTURE TARGETS
@@ -29,11 +33,15 @@ $(INSTALL_PREFIX):
 $(APPLICATIONS_DEST):  $(INSTALL_PREFIX)
 	install -d $(APPLICATIONS_DEST)
 
-$(OBJECTS_DEST): $(INSTALL_PREFIX)
-	install -d $(OBJECTS_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/TODO b/packages/TODO
index 9d55adb9..10b85331 100644
--- a/packages/TODO
+++ b/packages/TODO
@@ -1,4 +1,19 @@
 
+- hex convertor for setup function names, and object file names
+
+- merge in tigital's Makefile++
+
+- move purepd to abstractions 
+
+- add GRIPD for Anders
+
+- add reg keys for Martin Dupras
+
+- mDNS objects!
+
+- import nqpoly4 and write helpfiles based on website: 
+  			http://pix.test.at/pd/nqpoly/nqpoly4.html
+
 - global versioning system
   		the package releases should have versions of there own which apply to
   		all packages, regardless of format or OS.  This will make for easy and