From d653dcd28efa770dec9ee2dc8cbe7eb8eedd751b Mon Sep 17 00:00:00 2001 From: Dan Dennedy Date: Thu, 10 Sep 2009 19:20:19 -0700 Subject: [PATCH] Improve swig build with help from Michael Forney. --- Makefile | 1 + src/swig/Makefile | 6 +++++- src/swig/configure | 8 +++++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index ce1fa0d2..de66bb74 100644 --- 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 5a1d30ba..79c6951f 100644 --- 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 6aa25d5c..2587bf90 100755 --- 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 -- 2.39.2