From fa583831ffd3d814714f849aa69838de9ad774f6 Mon Sep 17 00:00:00 2001
From: Ivica Ico Bukvic <ico@vt.edu>
Date: Sat, 26 Jan 2013 13:33:15 -0500
Subject: [PATCH] updated Makefiles for merged libraries, improved gem2pdp
 config file hopefully fixing Fero Kiraly's build error. Updated
 pd-l2ork-TODO.txt file reflecting newly synced externals.

---
 externals/Makefile             | 23 +++++++++--------------
 externals/gem2pdp/configure.ac |  1 -
 externals/pd-l2ork-TODO.txt    |  1 +
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/externals/Makefile b/externals/Makefile
index 6cbc67b6a..797adcab6 100644
--- a/externals/Makefile
+++ b/externals/Makefile
@@ -378,13 +378,15 @@ creb_install: creb
 		--version "0.9.2"
 	install -p $(externals_src)/creb/abs/*.pd $(DESTDIR)$(objectsdir)/$(CREB_NAME)
 	install -p $(CREB_OBJECTS:.c=.$(EXTENSION)) \
-		$(CREB_CXXOBJECTS:.cc=.$(EXTENSION)) 		$(DESTDIR)$(objectsdir)/$(CREB_NAME)
+		$(CREB_CXXOBJECTS:.cc=.$(EXTENSION)) \
+		$(DESTDIR)$(objectsdir)/$(CREB_NAME)
 	install -p $(externals_src)/creb/doc/*.* $(DESTDIR)$(objectsdir)/$(CREB_NAME)
-	install -d $(DESTDIR)$(readmesdir)
+	install -d $(DESTDIR)$(objectsdir)/$(CREB_NAME)/manual
 	install -p $(externals_src)/creb/doc/reference.txt \
-		$(DESTDIR)$(readmesdir)/$(CREB_NAME).txt
-	install -d $(DESTDIR)$(examplesdir)/$(CREB_NAME)
-	install -p $(externals_src)/creb/doc/examples/*.* $(DESTDIR)$(examplesdir)/$(CREB_NAME)
+		$(DESTDIR)$(objectsdir)/$(CREB_NAME)/manual
+	install -d $(DESTDIR)$(objectsdir)/$(CREB_NAME)/examples
+	install -p $(externals_src)/creb/doc/examples/*.* \
+		$(DESTDIR)$(objectsdir)/$(CREB_NAME)/examples
 
 creb_clean:
 	-rm -f -- $(CREB_OBJECTS:.c=.$(EXTENSION))
@@ -544,7 +546,7 @@ freeverb_clean:
 GEM2PDP_NAME=gem2pdp
 GEM2PDP_OBJECTS := $(wildcard $(externals_src)/gem2pdp/*.cpp)
 $(externals_src)/gem2pdp/configure: $(externals_src)/gem2pdp/configure.ac
-	cd $(externals_src)/gem2pdp && aclocal && autoconf
+	cd $(externals_src)/gem2pdp && autoconf
 
 $(externals_src)/gem2pdp/Makefile: $(externals_src)/gem2pdp/Makefile.in
 	cd $(externals_src)/gem2pdp && ./configure --with-pddir=$(pd_src) \
@@ -562,15 +564,8 @@ gem2pdp_install: gem2pdp
 #		--version "0.6"
 	install -p $(GEM2PDP_OBJECTS:.cpp=.$(EXTENSION)) $(DESTDIR)$(objectsdir)
 	install -p $(externals_src)/gem2pdp/*.pd  $(DESTDIR)$(objectsdir)
-#	install -d $(DESTDIR)$(manualsdir)/$(GEM2PDP_NAME)
-#	install -p $(externals_src)/gem2pdp/manual.txt \
-#		$(DESTDIR)$(manualsdir)/$(GEM2PDP_NAME)
-	install -d $(DESTDIR)$(readmesdir)
 	install -p $(externals_src)/gem2pdp/README \
-		$(DESTDIR)$(readmesdir)/$(GEM2PDP_NAME).txt
-#	install -d $(DESTDIR)$(examplesdir)/$(GEM2PDP_NAME)
-#	install -p $(externals_src)/gem2pdp/examples/*.pd \
-#		$(DESTDIR)$(examplesdir)/$(GEM2PDP_NAME)
+		$(DESTDIR)$(objectsdir)/$(GEM2PDP_NAME)-README.txt
 
 gem2pdp_clean:
 	-rm -rf -- $(externals_src)/gem2pdp/autom4te.cache
diff --git a/externals/gem2pdp/configure.ac b/externals/gem2pdp/configure.ac
index 74f3855b5..be8bf645b 100644
--- a/externals/gem2pdp/configure.ac
+++ b/externals/gem2pdp/configure.ac
@@ -38,7 +38,6 @@ fi
 
 AC_ISC_POSIX
 AC_PROG_CC
-AM_PROG_CC_STDC
 AC_HEADER_STDC
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
diff --git a/externals/pd-l2ork-TODO.txt b/externals/pd-l2ork-TODO.txt
index e7b9880c8..2e47f1715 100644
--- a/externals/pd-l2ork-TODO.txt
+++ b/externals/pd-l2ork-TODO.txt
@@ -3,6 +3,7 @@ AS OF 11/22/2012
 
 DONE:
 creb
+gem2pdp
 mrpeach
 
 MERGE:
-- 
GitLab