moving Gem from pure-data/ to pure-data/externals/

there is really no difference between Gem and (e.g.) fftease, why should they live in different directories?

svn path=/trunk/; revision=15064

5 files changed, 81 insertions, 76 deletions

diff --git a/externals/Makefile b/externals/Makefile
index 8c8e13b6..3eb7978b 100644
--- a/externals/Makefile
+++ b/externals/Makefile
@@ -128,7 +128,7 @@ CXXFLAGS = $(CFLAGS)
 #
 # WARNING!  this MUST be all on one line because the automatic package
 # building scripts rely on it being that way.
-LIB_TARGETS = adaptive arraysize bassemu boids bsaylor comport creb cw_binaural cxc cyclone earplug ekext ext13 extra freeverb ggee hcs iem_ambi iem_bin_ambi iemlib iemgui iemguts iem_adaptfilt iemmatrix iemxmlrpc iem_delay iem_roomsim iem_spec2 iem_tab jasch_lib loaders-hexloader loaders-libdir log mapping markex maxlib mjlib moocow moonlib motex mrpeach oscx pan pdcontainer pddp loaders-pdlua pdogg plugin pmpd sigpack smlib tof unauthorized vanilla vbap windowing zexy
+LIB_TARGETS = adaptive arraysize bassemu boids bsaylor comport creb cw_binaural cxc cyclone earplug ekext ext13 extra freeverb gem ggee hcs iem_ambi iem_bin_ambi iemlib iemgui iemguts iem_adaptfilt iemmatrix iemxmlrpc iem_delay iem_roomsim iem_spec2 iem_tab jasch_lib loaders-hexloader loaders-libdir log mapping markex maxlib mjlib moocow moonlib motex mrpeach oscx pan pdcontainer pddp loaders-pdlua pdogg plugin pmpd sigpack smlib tof unauthorized vanilla vbap windowing zexy
 
 # this is for libraries that don't compile (yet) on all platforms
 ifeq ($(OS_NAME),windows)
@@ -549,6 +549,75 @@ freeverb_clean:
 	make -C $(externals_src)/freeverb~ clean
 
 
+#------------------------------------------------------------------------------
+# GEM
+GEM_NAME = Gem
+$(gem_src)/src/configure:
+	cd $(gem_src)/src && ./autogen.sh
+
+$(gem_src)/src/Gem.dll: $(gem_src)/src/configure
+
+$(gem_src)/src/Gem.pd_linux: $(gem_src)/src/configure
+	cd $(gem_src)/src && ./configure \
+		CXXFLAGS="-DHAVE_S_STUFF_H $(OPT_CFLAGS)" \
+		--with-video=plugins \
+		--with-film=plugins \
+		--with-pd=$(pd_src)
+	$(MAKE) -C $(gem_src)/src
+
+$(gem_src)/src/Gem.pd_darwin: $(gem_src)/src/configure
+	cd $(gem_src)/src && ./configure \
+		CXXFLAGS="-DHAVE_S_STUFF_H $(OPT_CFLAGS)" \
+		PKG_FTGL_CFLAGS="-I/sw/include -I/sw/include/freetype2 -I/sw/include/FTGL" \
+		--without-ALL \
+		--disable-mmx \
+		--with-ftgl --with-ftgl-libs=/sw/lib \
+		--with-artoolkit-includes=/sw/include --with-artoolkit-libs=/sw/lib \
+		--with-video=plugins \
+		--with-film=plugins \
+		--with-pd=$(pd_src)
+	$(MAKE) -C $(gem_src)/src
+
+gem: $(gem_src)/src/Gem.$(EXTENSION)
+
+gem_install: gem
+	install -d $(DESTDIR)$(objectsdir)/$(GEM_NAME)
+ifneq ($(OS_NAME),windows)
+	install -p $(gem_src)/src/Gem.$(EXTENSION) $(DESTDIR)$(objectsdir)/$(GEM_NAME)/
+endif
+	(test -e $(gem_src)/src/plugins/filmAVI/.libs/gem_filmAVI.so && \
+		install -p $(gem_src)/src/plugins/*/.libs/gem_*.so $(DESTDIR)$(objectsdir)/$(GEM_NAME)/ ) || true
+	(test -e $(gem_src)/src/plugins/filmAVI/.libs/gem_filmAVI.dll && \
+		install -p $(gem_src)/src/plugins/*/.libs/gem_*.dll $(DESTDIR)$(objectsdir)/$(GEM_NAME)/ ) || true
+	install -p $(gem_src)/help/*.*  $(DESTDIR)$(objectsdir)/$(GEM_NAME)/
+	install -p $(gem_src)/abstractions/*.* $(DESTDIR)$(objectsdir)/$(GEM_NAME)
+	install -d $(DESTDIR)$(objectsdir)/$(GEM_NAME)/manual
+	install -p $(gem_src)/doc/*.* $(DESTDIR)$(objectsdir)/$(GEM_NAME)/manual
+	install -d $(DESTDIR)$(objectsdir)/$(GEM_NAME)/manual/html
+# in Gem 0.92, $(gem_src)/manual moved to $(gem_src)/doc/manual
+	(test -d $(gem_src)/manual && \
+		install -p $(gem_src)/manual/*.* $(DESTDIR)$(objectsdir)/$(GEM_NAME)/manual/html ) || \
+		install -p $(gem_src)/doc/manual/*.* $(DESTDIR)$(objectsdir)/$(GEM_NAME)/manual/html
+	for dir in $(shell ls -1 $(gem_src)/examples | grep -v CVS); do \
+		echo "installing $$dir"; \
+		install -d $(DESTDIR)$(objectsdir)/$(GEM_NAME)/examples/$$dir ; \
+		install -p $(gem_src)/examples/$$dir/*.* $(DESTDIR)$(objectsdir)/$(GEM_NAME)/examples/$$dir ;\
+	done
+# install Gem headers to make it easier to build standalone Gem objects
+	install -d $(DESTDIR)$(includedir)/Base
+	install -p $(gem_src)/src/Base/*.h $(DESTDIR)$(includedir)/Base/
+# links to keep the old-style placement for Gem examples in the Help Browser
+ifneq ($(OS_NAME),windows)
+	install -d $(DESTDIR)$(examplesdir)
+	ln -s ../../extra/$(GEM_NAME)/examples $(DESTDIR)$(examplesdir)/$(GEM_NAME)
+	install -d  $(DESTDIR)$(manualsdir)
+	ln -s ../../extra/$(GEM_NAME)/manual $(DESTDIR)$(manualsdir)/$(GEM_NAME)
+endif
+
+gem_clean:
+	-$(MAKE) -C $(gem_src)/src clean
+
+
 
 #------------------------------------------------------------------------------#
 # GEM2PDP
@@ -868,7 +937,7 @@ IEMMATRIX_SRC := $(wildcard $(IEMMATRIX_ROOT)/src/m[at]*.c)
 IEMMATRIX_ALIAS := $(wildcard $(IEMMATRIX_ROOT)/alias/*.c)
 IEMMATRIX_OBJ := $(IEMMATRIX_SRC:.c=.o) $(IEMMATRIX_ALIAS:.c=.o)
 IEMMATRIX_SHARED := $(wildcard $(IEMMATRIX_ROOT)/src/iemmatrix_binops.c) \
-                    $(wildcard $(IEMMATRIX_ROOT)/src/iemmatrix_utility.c)
+		    $(wildcard $(IEMMATRIX_ROOT)/src/iemmatrix_utility.c)
 
 iemmatrix: $(IEMMATRIX_OBJ:.o=.$(EXTENSION))
 
@@ -1759,7 +1828,7 @@ zexy_clean:
 PDCONTAINER_NAME = pdcontainer
 PDCONTAINER_INCLUDE = -I$(externals_src)/grh/PDContainer
 PDCONTAINER_SRC = $(wildcard $(externals_src)/grh/PDContainer/src/[hH]*.cpp) \
-                  $(wildcard $(externals_src)/grh/PDContainer/tinyxml/*.cpp)
+		  $(wildcard $(externals_src)/grh/PDContainer/tinyxml/*.cpp)
 PDCONTAINER_OBJ = $(PDCONTAINER_SRC:.cpp=.o)
 PDCONTAINER_TMP = $(wildcard $(externals_src)/grh/PDContainer/src/h_*.cpp)
 PDCONTAINER_TARGETS = $(PDCONTAINER_TMP:.cpp=.$(EXTENSION))
@@ -2153,7 +2222,7 @@ iemxmlrpc_install: iemxmlrpc
 		$(DESTDIR)$(readmesdir)/$(IEMXMLRPC_NAME).txt
 	install -d $(DESTDIR)$(examplesdir)/$(IEMXMLRPC_NAME)
 	install -p $(externals_src)/iem/iemxmlrpc/*.pd \
-                   $(externals_src)/iem/iemxmlrpc/*.py \
+		   $(externals_src)/iem/iemxmlrpc/*.py \
 		   $(DESTDIR)$(examplesdir)/$(IEMXMLRPC_NAME)
 
 iemxmlrpc_clean:
diff --git a/packages/Makefile b/packages/Makefile
index d929cf9e..92eeb6ee 100644
--- a/packages/Makefile
+++ b/packages/Makefile
@@ -15,7 +15,7 @@ BUILDLAYOUT_DIR = $(CWD)
 
 
 ## default target
-all: pd abstractions doc gem externals
+all: pd abstractions doc externals
 	@echo "Complete build succeeded!"
 
 include $(BUILDLAYOUT_DIR)/Makefile.buildlayout
@@ -180,7 +180,7 @@ endif
 
 # this is used for installing into a pre-build Pd binary
 extended_install: abstractions_install doc_install \
-gem_install externals_install readme_install welcome_install \
+externals_install readme_install welcome_install \
 license_install noncvs_install
 
 
@@ -216,69 +216,6 @@ extensions_install:
 externals_install: 
 	$(MAKE) -C $(externals_src) $(DEST_PATHS) install
 
-
-#------------------------------------------------------------------------------
-# gem_install
-GEM_NAME = Gem
-$(gem_src)/src/configure: 
-	cd $(gem_src)/src && ./autogen.sh
-
-$(gem_src)/src/Gem.dll: $(gem_src)/src/configure
-
-$(gem_src)/src/Gem.pd_linux: $(gem_src)/src/configure
-	cd $(gem_src)/src && ./configure \
-		CXXFLAGS="-DHAVE_S_STUFF_H $(OPT_CFLAGS)" \
-		--with-pd=$(pd_src) 
-	$(MAKE) -C $(gem_src)/src
-
-$(gem_src)/src/Gem.pd_darwin: $(gem_src)/src/configure
-	cd $(gem_src)/src && ./configure \
-		CXXFLAGS="-DHAVE_S_STUFF_H $(OPT_CFLAGS)" \
-		PKG_FTGL_CFLAGS="-I/sw/include -I/sw/include/freetype2 -I/sw/include/FTGL" \
-		--without-ALL \
-		--disable-mmx \
-		--with-ftgl --with-ftgl-libs=/sw/lib \
-		--with-artoolkit-includes=/sw/include --with-artoolkit-libs=/sw/lib \
-		--with-pd=$(pd_src)
-	$(MAKE) -C $(gem_src)/src
-
-gem: $(gem_src)/src/Gem.$(EXTENSION)
-
-gem_install: gem
-	install -d $(DESTDIR)$(objectsdir)/$(GEM_NAME)
-ifneq ($(OS_NAME),windows)
-	install -p $(gem_src)/src/Gem.$(EXTENSION) $(DESTDIR)$(objectsdir)/$(GEM_NAME)/
-endif
-	(test -e $(gem_src)/src/plugins/filmAVI/.libs/gem_filmAVI.so && \
-		install -p $(gem_src)/src/plugins/*/.libs/gem_*.so $(DESTDIR)$(objectsdir)/$(GEM_NAME)/ ) || true
-	(test -e $(gem_src)/src/plugins/filmAVI/.libs/gem_filmAVI.dll && \
-		install -p $(gem_src)/src/plugins/*/.libs/gem_*.dll $(DESTDIR)$(objectsdir)/$(GEM_NAME)/ ) || true
-	install -p $(gem_src)/help/*.*  $(DESTDIR)$(objectsdir)/$(GEM_NAME)/
-	install -p $(gem_src)/abstractions/*.* $(DESTDIR)$(objectsdir)/$(GEM_NAME)
-	install -d $(DESTDIR)$(objectsdir)/$(GEM_NAME)/manual
-	install -p $(gem_src)/doc/*.* $(DESTDIR)$(objectsdir)/$(GEM_NAME)/manual
-	install -d $(DESTDIR)$(objectsdir)/$(GEM_NAME)/manual/html
-# in Gem 0.92, $(gem_src)/manual moved to $(gem_src)/doc/manual
-	(test -d $(gem_src)/manual && \
-		install -p $(gem_src)/manual/*.* $(DESTDIR)$(objectsdir)/$(GEM_NAME)/manual/html ) || \
-		install -p $(gem_src)/doc/manual/*.* $(DESTDIR)$(objectsdir)/$(GEM_NAME)/manual/html
-	for dir in $(shell ls -1 $(gem_src)/examples | grep -v CVS); do \
-		echo "installing $$dir"; \
-		install -d $(DESTDIR)$(objectsdir)/$(GEM_NAME)/examples/$$dir ; \
-		install -p $(gem_src)/examples/$$dir/*.* $(DESTDIR)$(objectsdir)/$(GEM_NAME)/examples/$$dir ;\
-	done
-# install Gem headers to make it easier to build standalone Gem objects
-	install -d $(DESTDIR)$(includedir)/Base
-	install -p $(gem_src)/src/Base/*.h $(DESTDIR)$(includedir)/Base/
-# links to keep the old-style placement for Gem examples in the Help Browser
-ifneq ($(OS_NAME),windows)
-	install -d $(DESTDIR)$(examplesdir)
-	ln -s ../../extra/$(GEM_NAME)/examples $(DESTDIR)$(examplesdir)/$(GEM_NAME)
-	install -d  $(DESTDIR)$(manualsdir)
-	ln -s ../../extra/$(GEM_NAME)/manual $(DESTDIR)$(manualsdir)/$(GEM_NAME)
-endif
-
-
 #------------------------------------------------------------------------------
 # noncvs_install
 # this is for including pre-compiled binaries in a build
@@ -493,14 +430,11 @@ doc_clean:
 externals_clean:
 	-$(MAKE) -C $(externals_src) $(DEST_PATHS) clean
 
-gem_clean:
-	-$(MAKE) -C $(gem_src)/src clean
-
 pd_clean:
 	-$(MAKE) -C $(pd_src)/src $(DEST_PATHS) clean
 
 # these targets are all from Makefile.buildlayout: install_clean cruft_clean
-clean: abstractions_clean doc_clean externals_clean gem_clean pd_clean 
+clean: abstractions_clean doc_clean externals_clean pd_clean 
 	echo "Complete clean finished."
 
 
diff --git a/packages/Makefile.buildlayout b/packages/Makefile.buildlayout
index b6c6bc65..aa1c2cd3 100644
--- a/packages/Makefile.buildlayout
+++ b/packages/Makefile.buildlayout
@@ -92,7 +92,7 @@ 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
+gem_src = $(cvs_root_dir)/externals/Gem
 packages_src = $(cvs_root_dir)/packages
 pd_src = $(cvs_root_dir)/pd
 scripts_src = $(cvs_root_dir)/scripts
diff --git a/scripts/checkout-developer-layout.sh b/scripts/checkout-developer-layout.sh
index 18ad4197..ba05d90c 100755
--- a/scripts/checkout-developer-layout.sh
+++ b/scripts/checkout-developer-layout.sh
@@ -38,10 +38,12 @@ svn checkout $SVNOPTIONS $PDAUTH $URL pure-data
 
 cd pure-data
 
-for section in Gem videoIO; do
+cd externals
+for section in Gem; do
          echo "checking out Gem::${section}"
          svn checkout $SVNOPTIONS ${PDAUTH} ${GEMURL}/${section} ${section}
 done
+cd ..
 
 
 # make the symlinks which simulate the files being installed into the packages
diff --git a/scripts/update-developer-layout.sh b/scripts/update-developer-layout.sh
index 2d8297fb..58a684e9 100755
--- a/scripts/update-developer-layout.sh
+++ b/scripts/update-developer-layout.sh
@@ -15,7 +15,7 @@ cd $cvs_root_dir
 echo "Running svn update:"
 svn update ${SVNOPTIONS}
 echo "Running svn update for Gem:"
-for section in Gem abstractions doc externals packages pd scripts; do
+for section in externals/Gem abstractions doc externals packages pd scripts; do
 	 echo "$section"
 	 cd $section
          svn update ${SVNOPTIONS}