diff --git a/externals/Makefile b/externals/Makefile
index 9bea526c6e093669a60e98e0d5e93387c237a223..3fc3c0945ecfe6597bd2fa56c5e29f47318065c2 100644
--- a/externals/Makefile
+++ b/externals/Makefile
@@ -146,7 +146,7 @@ else
endif
else
# GNU/Linux, BSD, IRIX, etc.
- LIB_TARGETS += hid pdp gem2pdp iem16
+ LIB_TARGETS += gem hid pdp gem2pdp iem16
endif
endif
@@ -583,6 +583,58 @@ freeverb_clean:
make -C $(externals_src)/freeverb~ clean
+#------------------------------------------------------------------------------
+# GEM
+GEM_NAME = Gem
+$(gem_src)/configure:
+ cd $(gem_src) && ./autogen.sh
+
+$(gem_src)/Gem.dll: $(gem_src)/configure
+ cd $(gem_src) && ./configure \
+ CXXFLAGS="-DHAVE_S_STUFF_H" \
+ --prefix=$(prefix) \
+ --libdir=$(objectsdir) \
+ --disable-rpath \
+ --enable-sse2 \
+ --without-quicktime \
+ --with-video=plugins \
+ --with-film=plugins \
+ --with-pd=$(pd_src) \
+ --with-extension=dll
+ $(MAKE) -C $(gem_src)
+
+$(gem_src)/Gem.pd_linux: $(gem_src)/configure
+ cd $(gem_src) && ./configure \
+ CXXFLAGS="-DHAVE_S_STUFF_H" \
+ --prefix=$(prefix) \
+ --with-video=plugins \
+ --with-film=plugins \
+ --with-pd=$(pd_src)
+ $(MAKE) -C $(gem_src)
+
+$(gem_src)/Gem.pd_darwin: $(gem_src)/configure
+ cd $(gem_src) && ./configure \
+ CXXFLAGS="-DHAVE_S_STUFF_H" \
+ PKG_FTGL_CFLAGS="-I/sw/include -I/sw/include/freetype2 -I/sw/include/FTGL" \
+ --prefix=$(prefix) \
+ --libdir=$(objectsdir) \
+ --without-ALL \
+ --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)
+
+gem: $(gem_src)/Gem.$(EXTENSION)
+
+gem_install: gem
+ $(MAKE) -C $(gem_src) DESTDIR=$(DESTDIR) prefix=$(prefix) \
+ libdir=$(objectsdir) pkglibdir=$(objectsdir)/Gem install
+
+gem_clean:
+ -$(MAKE) -C $(gem_src) clean
+
#------------------------------------------------------------------------------#
# GEM2PDP
diff --git a/packages/Makefile b/packages/Makefile
index 54a0c5afec576be8565defb2f32a2edee671b2e6..3d74018f4070c1fc37a2299ca9639dc0b4637a8b 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
@@ -173,7 +173,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
@@ -210,65 +210,6 @@ externals_install:
$(MAKE) -C $(externals_src) $(DEST_PATHS) install
-#------------------------------------------------------------------------------
-# gem_install
-GEM_NAME = Gem
-$(gem_src)/src/configure:
- cd $(gem_src) && ./autogen.sh
-
-$(gem_src)/src/Gem.dll: $(gem_src)/configure
-
-$(gem_src)/src/.libs/Gem.pd_linux: $(gem_src)/configure
- cd $(gem_src) && ./configure \
- --with-pd=$(pd_src)
- $(MAKE) -C $(gem_src)
-
-$(gem_src)/src/Gem.pd_darwin: $(gem_src)/src/configure
- cd $(gem_src)/src && ./configure \
- PKG_FTGL_CFLAGS="-I/sw/include -I/sw/include/freetype2 -I/sw/include/FTGL" \
- --without-ALL \
- --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/.libs/Gem.$(EXTENSION)
-
-gem_install: gem
- install -d $(DESTDIR)$(objectsdir)/$(GEM_NAME)
-ifneq ($(OS_NAME),windows)
- install -p $(gem_src)/src/.libs/Gem.$(EXTENSION) $(DESTDIR)$(objectsdir)/$(GEM_NAME)/
-endif
- (test -e $(gem_src)/plugins/filmAVIPLAY/.libs/gem_filmAVIPLAY.so && \
- install -p $(gem_src)/plugins/*/.libs/gem_*.so $(DESTDIR)$(objectsdir)/$(GEM_NAME)/ ) || true
- (test -e $(gem_src)/plugins/filmAVIPLAY/.libs/gem_filmAVI.dll && \
- install -p $(gem_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 Makefile | 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 -sf ../../extra/$(GEM_NAME)/examples $(DESTDIR)$(examplesdir)/$(GEM_NAME)
- install -d $(DESTDIR)$(manualsdir)
- ln -sf ../../extra/$(GEM_NAME)/manual $(DESTDIR)$(manualsdir)/$(GEM_NAME)
-endif
-
-
#------------------------------------------------------------------------------
# noncvs_install
# this is for including pre-compiled binaries in a build
@@ -276,10 +217,6 @@ noncvs_install:
-install -p $(packages_src)/noncvs/$(OS_NAME)/bin/*.* $(DESTDIR)$(bindir)
-install -p $(packages_src)/noncvs/$(OS_NAME)/doc/5.reference/*.* $(DESTDIR)$(helpdir)
-install -p $(packages_src)/noncvs/$(OS_NAME)/extra/*.* $(DESTDIR)$(objectsdir)
-ifeq ($(OS_NAME),windows)
- -install -p $(packages_src)/noncvs/windows/extra/Gem/*.* \
- $(DESTDIR)$(objectsdir)/$(GEM_NAME)/
-endif
-test -d $(packages_src)/noncvs/$(OS_NAME)/gripd && \
install -d $(DESTDIR)$(prefix)/gripd
-install -p $(packages_src)/noncvs/$(OS_NAME)/gripd/*.* \
@@ -654,14 +591,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."