From e53837cdb2f49fa5381f0aff5c303df514b47e5f Mon Sep 17 00:00:00 2001
From: Sojourner Truth <jon.w.wilkes@gmail.com>
Date: Thu, 21 Jul 2016 22:17:33 -0400
Subject: [PATCH] use lyonpotpourri instead of lyon, clean up tar_em_up.sh and
external/Makefile
---
.gitmodules | 2 +-
externals/Makefile | 24 +++++++++++++-----------
externals/{lyon => lyonpotpourri} | 0
l2ork_addons/tar_em_up.sh | 16 ++++++++--------
4 files changed, 22 insertions(+), 20 deletions(-)
rename externals/{lyon => lyonpotpourri} (100%)
diff --git a/.gitmodules b/.gitmodules
index a50c90651..be5122234 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -8,7 +8,7 @@
path = l2ork_addons/cwiid
url = https://github.com/pd-l2ork/cwiid
[submodule "l2ork_addons/lyonpotpourri"]
- path = externals/lyon
+ path = externals/lyonpotpourri
url = https://github.com/pd-projects/lyonpotpourri
[submodule "l2ork_addons/fftease3.0-32bit"]
path = l2ork_addons/fftease3.0-32bit
diff --git a/externals/Makefile b/externals/Makefile
index 897ecd5e1..6f30a99d0 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 cxc cyclone earplug ekext ext13 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 mapping markex maxlib mjlib moocow moonlib motex mrpeach oscx pan pdcontainer pddp pdogg plugin pmpd sigpack smlib tof unauthorized vbap windowing zexy flext
+LIB_TARGETS = adaptive arraysize bassemu boids bsaylor comport creb cxc cyclone earplug ekext ext13 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 lyonpotpourri mapping markex maxlib mjlib moocow moonlib motex mrpeach oscx pan pdcontainer pddp pdogg plugin pmpd sigpack smlib tof unauthorized vbap windowing zexy flext
# DISABLED: flatgui
@@ -1105,32 +1105,34 @@ loaders-libdir_clean:
#------------------------------------------------------------------------------#
# LYON
-LYON_NAME=lyon
+LYON_NAME=lyonpotpourri
-lyon:
+lyonpotpourri:
make -C $(externals_src)/$(LYON_NAME)
-lyon_install:
+lyonpotpourri_install:
+ #make -C $(externals_src)/$(LYON_NAME) DESTDIR="$(DESTDIR)" \
+ # objectsdir="$(objectsdir)" install
install -d $(DESTDIR)$(objectsdir)/$(LYON_NAME)
install -p $(wildcard $(externals_src)/$(LYON_NAME)/*.$(EXTENSION)) \
$(DESTDIR)$(objectsdir)/$(LYON_NAME)
install -p $(externals_src)/$(LYON_NAME)/*.pd \
$(DESTDIR)$(objectsdir)/$(LYON_NAME)
# don't include cartopol/poltocar-- cyclone library already has those
- rm $(DESTDIR)$(objectsdir)/$(LYON_NAME)/cartopol.pd
- rm $(DESTDIR)$(objectsdir)/$(LYON_NAME)/poltocar.pd
- rm $(DESTDIR)$(objectsdir)/$(LYON_NAME)/cartopol.$(EXTENSION)
- rm $(DESTDIR)$(objectsdir)/$(LYON_NAME)/poltocar.$(EXTENSION)
- install -p $(wildcard $(externals_src)/$(LYON_NAME)/sound/*.*) \
+ rm $(DESTDIR)$(objectsdir)/$(LYON_NAME)/cartopol*.pd
+ rm $(DESTDIR)$(objectsdir)/$(LYON_NAME)/poltocar*.pd
+ rm $(DESTDIR)$(objectsdir)/$(LYON_NAME)/cartopol*.$(EXTENSION)
+ rm $(DESTDIR)$(objectsdir)/$(LYON_NAME)/poltocar*.$(EXTENSION)
+ install -p $(externals_src)/$(LYON_NAME)/sound/*.* \
$(DESTDIR)$(objectsdir)/$(LYON_NAME)
# copy the meta file and the shared lib
- install -p $(wildcard $(externals_src)/$(LYON_NAME)/*lyon*) \
+ install -p $(externals_src)/$(LYON_NAME)/*lyonpotpourri* \
$(DESTDIR)$(objectsdir)/$(LYON_NAME)
# license and readme
install -p $(externals_src)/$(LYON_NAME)/*.txt \
$(DESTDIR)$(objectsdir)/$(LYON_NAME)
-lyon_clean:
+lyonpotpourri_clean:
make -C $(externals_src)/$(LYON_NAME) clean
#------------------------------------------------------------------------------#
diff --git a/externals/lyon b/externals/lyonpotpourri
similarity index 100%
rename from externals/lyon
rename to externals/lyonpotpourri
diff --git a/l2ork_addons/tar_em_up.sh b/l2ork_addons/tar_em_up.sh
index fb755d3c1..9020bccc2 100755
--- a/l2ork_addons/tar_em_up.sh
+++ b/l2ork_addons/tar_em_up.sh
@@ -345,16 +345,16 @@ then
cp -f autotune_scale_warp.png ../../packages/linux_make/build$inst_dir/lib/pd-l2ork/extra/images
cd ../
# install lyonpotpourri
- cd lyonpotpourri/
+# cd lyonpotpourri/
#git submodule update
- make
- mkdir -p ../../packages/linux_make/build$inst_dir/lib/pd-l2ork/extra/lyon
+# make
+# mkdir -p ../../packages/linux_make/build$inst_dir/lib/pd-l2ork/extra/lyon
# do not include cartopol and poltocar since cyclone library already has those
- cp `ls *.pd_linux | egrep -v '^cartopol*' | egrep -v '^poltocar*'` ../../packages/linux_make/build$inst_dir/lib/pd-l2ork/extra/lyon/
- cp `ls *.pd | egrep -v '^cartopol*' | egrep -v '^poltocar*'` ../../packages/linux_make/build$inst_dir/lib/pd-l2ork/extra/lyon/
- cp -rf sound ../../packages/linux_make/build$inst_dir/lib/pd-l2ork/extra/lyon/
- cp -rf lib*.so ../../packages/linux_make/build$inst_dir/lib/pd-l2ork/extra/lyon/
- cd ../
+# cp `ls *.pd_linux | egrep -v '^cartopol*' | egrep -v '^poltocar*'` ../../packages/linux_make/build$inst_dir/lib/pd-l2ork/extra/lyon/
+# cp `ls *.pd | egrep -v '^cartopol*' | egrep -v '^poltocar*'` ../../packages/linux_make/build$inst_dir/lib/pd-l2ork/extra/lyon/
+# cp -rf sound ../../packages/linux_make/build$inst_dir/lib/pd-l2ork/extra/lyon/
+# cp -rf lib*.so ../../packages/linux_make/build$inst_dir/lib/pd-l2ork/extra/lyon/
+# cd ../
# install fftease
cd fftease*
make
--
GitLab