- added gem2pdp to the build system by following the template of pdp/pidip

  where externals/Makefile calls autoconf and ./configure

svn path=/trunk/; revision=7606

1 files changed, 51 insertions, 52 deletions

diff --git a/externals/Makefile b/externals/Makefile
index bae3bc81..27d8873a 100644
--- a/externals/Makefile
+++ b/externals/Makefile
@@ -131,10 +131,10 @@ ifeq ($(OS_NAME),windows)
   LIB_TARGETS += 
 else
   ifeq ($(OS_NAME),darwin)
-    LIB_TARGETS += hid hidio pidip wiiremote
+    LIB_TARGETS += hid hidio pidip wiiremote gem2pdp
   else
     # GNU/Linux, BSD, IRIX, etc.
-    LIB_TARGETS += hid hidio pdp pidip hdspm_mixer
+    LIB_TARGETS += hid hidio pdp pidip hdspm_mixer gem2pdp
   endif
 endif
 
@@ -199,7 +199,6 @@ flatspace_install: flatspace $(helpdir) $(objectsdir)
 			$(externals_src)/dfx/*/*.pd \
 			$(externals_src)/ggee/*/*-help.pd \
 			$(externals_src)/ggee/*/*.gif \
-			$(externals_src)/gem2pdp/*.pd \
 			$(externals_src)/ff/*.pd \
 			$(externals_src)/hcs/*-help.pd \
 				$(helpdir)/$(FLATSPACE_NAME)
@@ -795,6 +794,55 @@ freeverb_clean:
 	-rm -f -- $(externals_src)/freeverb~/*.*~
 
 
+
+#------------------------------------------------------------------------------#
+# GEM2PDP
+GEM2PDP_NAME=gem2pdp
+GEM2PDP_OBJECTS := $(wildcard $(externals_src)/gem2pdp/*.c)
+$(externals_src)/gem2pdp/configure: $(externals_src)/gem2pdp/configure.ac
+	cd $(externals_src)/gem2pdp && autoconf
+
+$(externals_src)/gem2pdp/Makefile: $(externals_src)/gem2pdp/Makefile.in
+	cd $(externals_src)/gem2pdp && ./configure --with-pddir=$(pd_src) \
+		--with-gemdir=$(gem_src)  --with-pdpdir=$(externals_src)/pdp
+
+$(externals_src)/gem2pdp/gem2pdp.$(EXTENSION): \
+$(externals_src)/gem2pdp/configure $(externals_src)/gem2pdp/Makefile 
+	$(MAKE) -C $(externals_src)/gem2pdp
+
+gem2pdp: $(externals_src)/gem2pdp/gem2pdp.$(EXTENSION)
+
+gem2pdp_install: gem2pdp
+#	install -d $(objectsdir)/$(GEM2PDP_NAME)
+#	$(scripts_src)/generate-libdir-metafile.sh $(objectsdir) $(GEM2PDP_NAME) \
+#		--author "Yves Degoyon, Jamie Tittle, Georg Holzmann" \
+#		--description "Bridges between Gem and PDP" \
+#		--version "0.6"
+	install -p $(wildcard $(externals_src)/gem2pdp/*.$(EXTENSION)) $(objectsdir)
+#	install -d $(helpdir)/$(GEM2PDP_NAME)
+	install -p $(externals_src)/gem2pdp/*.pd  $(helpdir)
+#	install -d $(manualsdir)/$(GEM2PDP_NAME)
+#	install -p $(externals_src)/gem2pdp/manual.txt \
+#		$(manualsdir)/$(GEM2PDP_NAME)
+	install -d $(readmesdir)
+	install -p $(externals_src)/gem2pdp/README \
+		$(readmesdir)/$(GEM2PDP_NAME).txt
+#	install -d $(examplesdir)/$(GEM2PDP_NAME)
+#	install -p $(externals_src)/gem2pdp/examples/*.pd \
+#		$(examplesdir)/$(GEM2PDP_NAME)
+
+gem2pdp_clean:
+	-rm -rf -- $(externals_src)/gem2pdp/autom4te.cache
+	-rm -f -- $(externals_src)/gem2pdp/config.status
+	-rm -f -- $(externals_src)/gem2pdp/config.log
+	-rm -f -- $(externals_src)/gem2pdp/configure
+	-rm -f -- $(externals_src)/gem2pdp/Makefile
+	-rm -f -- $(externals_src)/gem2pdp/*.$(EXTENSION)
+	-rm -f -- $(externals_src)/gem2pdp/*.o
+	-rm -f -- $(externals_src)/gem2pdp/*.bak
+	-rm -f -- $(externals_src)/gem2pdp/*.*~
+
+
 #------------------------------------------------------------------------------#
 # GGEE
 GGEE_NAME=ggee
@@ -1819,55 +1867,6 @@ pdp_clean:
 
 
 
-
-#------------------------------------------------------------------------------#
-# GEM2PDP
-GEM2PDP_NAME=gem2pdp
-GEM2PDP_OBJECTS := $(wildcard $(externals_src)/gem2pdp/*.c)
-$(externals_src)/gem2pdp/configure: $(externals_src)/gem2pdp/configure.ac
-	cd $(externals_src)/pdp && autoconf
-
-$(externals_src)/gem2pdp/Makefile.config: $(externals_src)/gem2pdp/Makefile.config.in
-	cd $(externals_src)/pdp && ./configure PD_CPPFLAGS="-I$(pd_src)/src" \
-		--disable-quicktime
-
-$(externals_src)/gem2pdp/pdp.$(EXTENSION):  $(externals_src)/gem2pdp/configure \
-$(externals_src)/pdp/Makefile.config 
-	$(MAKE) -C $(externals_src)/pdp PD_EXECUTABLE="$(pd_src)/bin/pd"
-
-gem2pdp: $(externals_src)/gem2pdp/gem2pdp.$(EXTENSION)
-
-gem2pdp: $(GEM2PDP_OBJECTS:.c=.$(EXTENSION))
-
-gem2pdp_install: gem2pdp
-	install -d $(objectsdir)/$(GEM2PDP_NAME)
-	$(scripts_src)/generate-libdir-metafile.sh $(objectsdir) $(GEM2PDP_NAME) \
-		--author "Yves Degoyon, Jamie Tittle, Georg Holzmann" \
-		--description "Bridges between Gem and PDP" \
-		--version "0.6"
-	install -p $(wildcard $(externals_src)/gem2pdp/*.$(EXTENSION)) \
-		$(objectsdir)/$(GEM2PDP_NAME)
-	install -d $(helpdir)/$(GEM2PDP_NAME)
-	install -p $(externals_src)/gem2pdp/help/*.pd \
-		$(helpdir)/$(GEM2PDP_NAME)
-#	install -d $(manualsdir)/$(GEM2PDP_NAME)
-#	install -p $(externals_src)/gem2pdp/manual.txt \
-#		$(manualsdir)/$(GEM2PDP_NAME)
-	install -d $(readmesdir)
-	install -p $(externals_src)/gem2pdp/README \
-		$(readmesdir)/$(GEM2PDP_NAME).txt
-#	install -d $(examplesdir)/$(GEM2PDP_NAME)
-#	install -p $(externals_src)/gem2pdp/examples/*.pd \
-#		$(examplesdir)/$(GEM2PDP_NAME)
-
-gem2pdp_clean:
-	-rm -f -- $(externals_src)/gem2pdp/*.$(EXTENSION)
-	-rm -f -- $(externals_src)/gem2pdp/*.o
-	-rm -f -- $(externals_src)/gem2pdp/*.bak
-	-rm -f -- $(externals_src)/gem2pdp/*.*~
-
-
-
 #------------------------------------------------------------------------------#
 # PIDIP
 PIDIP_NAME=pidip