remove cruft from packaging scripts

diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build
index 7367028355b637de780b6c9d3fc06df3a6e97a5c..31995c5ea53f35d555adc7d265009eda22021b7d 100755 (executable)
--- a/tools/linux_packaging/build
+++ b/tools/linux_packaging/build
@@ -24,7 +24,6 @@ fi
 MIXBUS=
 WITH_HARRISON_LV2=
 WITH_X42_LV2=
-WITH_LADSPA=0
 WITH_HARVID=
 STRIP=all
 PRINT_SYSDEPS=
@@ -36,6 +35,7 @@ GCC5ABI=false
 USEWINE=false
 BUILDTYPE=""
 NOSTRIP="libsuil|libserd|libsord|liblilv|libsratom|liblrdf|libardour|libpbd|libevoral"
+
 : ${HARRISONCHANNELSTRIP=harrison_channelstrip}
 
 
@@ -61,7 +61,6 @@ while [ $# -gt 0 ] ; do
                WITH_HARRISON_LV2=1 ;
                WITH_X42_LV2=1 ;
                WITH_NLS=1 ;
-               WITH_LADSPA=;
                STRIP=all
                APPNAME=Mixbus ;
                VENDOR=Harrison ;
@@ -72,7 +71,6 @@ while [ $# -gt 0 ] ; do
                WITH_HARRISON_LV2=1 ;
                WITH_X42_LV2=1 ;
                WITH_NLS=1 ;
-               WITH_LADSPA=;
                STRIP=all
                APPNAME=Mixbus32C ;
                VENDOR=Harrison ;
@@ -82,23 +80,20 @@ while [ $# -gt 0 ] ; do
        --public)
                WITH_HARRISON_LV2=1 ;
                WITH_NLS=1 ;
-               WITH_LADSPA=;
                STRIP=all ;
                APPNAME=Ardour ;
                shift ;;
        --allinone)
                WITH_NLS= ;
-               WITH_LADSPA=1;
                STRIP=all;
                shift ;;
-       --test) WITH_LADSPA=; STRIP= ; shift ;;
+       --test) STRIP= ; shift ;;
 
        #
        # specific build flags
        #
 
        --nojack) INTERNAL_JACK= ; shift ;;
-       --noladspa) WITH_LADSPA= ; shift ;;
        --strip) STRIP=$2 ; shift ; shift ;;
        --sysdeps) PRINT_SYSDEPS=1; shift ;;
        --nls) WITH_NLS=1 ; shift ;;
@@ -361,20 +356,6 @@ cp $BUILD_ROOT/libs/clearlooks-newer/libclearlooks.so $Libraries
 cp $GTKSTACK_ROOT/lib/gtk-2.0/2.10.0/engines/libpixmap.so $Libraries
 (cd $GTK_ENGINE_DIR && ln -s ../../libpixmap.so . )
 
-# LADSPA
-if test x$WITH_LADSPA != x ; then
-       if test x$MIXBUS != x ; then
-               plugdir=mixbus_ladspa
-       else
-               plugdir=ladspa
-       fi
-       echo "Copying `ls $plugdir | wc -l` plugins ..."
-       if [ -d $plugdir ] ; then
-               mkdir -p $Plugins
-               cp -r $plugdir/* $Plugins
-       fi
-fi
-
 # Control Surfaces
 cp $BUILD_ROOT/libs/surfaces/*/libardour_*.so* $Surfaces
 cp $BUILD_ROOT/libs/surfaces/control_protocol/libardourcp.so* $Libraries

diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build
index e8d52f26a3def609da08f7a10bf07d7b48d75732..7c7020dd527979415b9ab99a7f4771bd540c0aba 100755 (executable)
--- a/tools/osx_packaging/osx_build
+++ b/tools/osx_packaging/osx_build
@@ -20,7 +20,6 @@ MIXBUS32C=
 WITH_HARVID=1
 WITH_HARRISON_LV2=
 WITH_X42_LV2=
-WITH_LADSPA=1
 STRIP=1
 PRINT_SYSDEPS=
 WITH_NLS=
@@ -39,7 +38,6 @@ while [ $# -gt 0 ] ; do
 
        --sae)
                SAE=1 ;
-               WITH_LADSPA=1;
                STRIP= ;
                PRODUCT_PKG_DIR=ArdourSAE ;
                APPNAME=Ardour ;
@@ -49,7 +47,6 @@ while [ $# -gt 0 ] ; do
                WITH_X42_LV2=1 ;
                WITH_NLS=1 ;
                SAE= ;
-               WITH_LADSPA=;
                STRIP= ;
                PRODUCT_PKG_DIR=Mixbus;
                APPNAME=Mixbus ;
@@ -60,7 +57,6 @@ while [ $# -gt 0 ] ; do
                WITH_X42_LV2=1 ;
                WITH_NLS=1 ;
                SAE= ;
-               WITH_LADSPA=;
                STRIP= ;
                PRODUCT_PKG_DIR=Mixbus32C;
                APPNAME=Mixbus32C-${major_version} ;
@@ -68,25 +64,22 @@ while [ $# -gt 0 ] ; do
                shift ;;
        --public)
                SAE= ;
-               WITH_LADSPA=1;
                WITH_HARRISON_LV2=1 ;
                WITH_X42_LV2=1 ;
                PRODUCT_PKG_DIR=Ardour;
                APPNAME=Ardour ;
                shift ;;
        --allinone) SAE= ;
-               WITH_LADSPA=1;
                STRIP= ;
                PRODUCT_PKG_DIR=Ardour ;
                shift ;;
-       --test) SAE= ; WITH_LADSPA=; STRIP= ; shift ;;
+       --test) SAE= ; STRIP= ; shift ;;
 
        #
        # specific build flags
        #
 
        --noharvid) WITH_HARVID= ; shift ;;
-       --noladspa) WITH_LADSPA= ; shift ;;
        --nostrip) STRIP= ; shift ;;
        --sysdeps) PRINT_SYSDEPS=1; shift ;;
        --nls) WITH_NLS=1 ; shift ;;
@@ -348,20 +341,6 @@ cp $GTKSTACK_ROOT/lib/gtk-2.0/2.10.0/engines/libpixmap.so $Frameworks
 (cd $GTK_ENGINE_DIR && ln -s ../../libpixmap.so)
 
 
-if test x$WITH_LADSPA != x ; then
-    if test x$SAE != x ; then
-       plugdir=sae_ladspa
-    elif test x$MIXBUS != x ; then
-       plugdir=mixbus_ladspa
-    else
-       plugdir=ladspa
-    fi
-    if [ -d $plugdir -a "x$(ls $plugdir)" != x ] ; then 
-        echo "Copying `ls $plugdir | wc -l` plugins ..."
-        cp -r $plugdir/* $Plugins
-    fi
-fi
-
 # Control Surface shared libraries
 cp $BUILD_ROOT/libs/surfaces/*/libardour_*.dylib $Surfaces
 cp $BUILD_ROOT/libs/surfaces/control_protocol/libardourcp*.dylib $Frameworks