Improve swig build with help from Michael Forney.

diff --git a/Makefile b/Makefile
index ce1fa0d259bc47739918307e1d3484b46157d047..de66bb7407151d1c12bb9a530442973d726503c2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,7 @@ SUBDIRS = src/framework \
                  src/mlt++ \
                  src/melt \
                  src/modules \
+                 src/swig \
                  profiles
 
 all clean:

diff --git a/src/swig/Makefile b/src/swig/Makefile
index 5a1d30ba03ebc84be0dc637d2453e9d3ec32159b..79c6951f0d3dc24260f5715a720dc19f49306819 100644 (file)
--- a/src/swig/Makefile
+++ b/src/swig/Makefile
@@ -1,7 +1,7 @@
 include ../../config.mak
 include config.mak
 
-all clean depend install:
+all clean:
        list='$(SUBDIRS)'; \
        for subdir in $$list; do \
                if [ -x $$subdir/build -a ! -f .$$subdir -o $@ = clean ] ; \
@@ -20,3 +20,7 @@ all clean depend install:
                        fi ; \
                fi \
        done
+
+depend:
+
+install:

diff --git a/src/swig/configure b/src/swig/configure
index 6aa25d5ccfa7cb64ad242d661be8fc98fd3e85a9..2587bf90206548b3f65cc111296d7c17894349b3 100755 (executable)
--- a/src/swig/configure
+++ b/src/swig/configure
@@ -20,10 +20,16 @@ else
        do
                case $i in
                        --swig-languages=* ) languages=${i#--swig-languages=}
+                               [ "$languages" = "none" ] && languages=""
+                               if [ -z "$languages" ]; then
+                                       echo SUBDIRS = $languages > config.mak
+                                       continue
+                               fi
                                which swig > /dev/null 2>&1
                                [ $? != 0 ] && echo "Please install swig" && exit 1
                                [ "$languages" = "all" ] && languages="java lua perl php python ruby tcl"
-                               echo SUBDIRS = ${i#--swig-languages=} > config.mak ;;
+                               echo SUBDIRS = $languages > config.mak
+                       ;;
                esac
        done
 fi