From ff0b5c0e4d6dfd53f26d0dcab6715bce3fe068e3 Mon Sep 17 00:00:00 2001 From: Luca Bigliardi Date: Thu, 15 Jan 2009 18:35:58 +0100 Subject: [PATCH] Define swig command options with a variable. Use swig with options defined in configure.in to simplify parameters handling. --- bindings/java/Makefile.am | 4 +--- bindings/perl/Makefile.am | 3 +-- bindings/python/Makefile.am | 3 +-- bindings/ruby/Makefile.am | 3 +-- configure.in | 4 ++++ 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/bindings/java/Makefile.am b/bindings/java/Makefile.am index 5960850c..fff3ec11 100644 --- a/bindings/java/Makefile.am +++ b/bindings/java/Makefile.am @@ -9,9 +9,7 @@ FREEJ_FLAGS = @SDL_CFLAGS@ @FT2_CFLAGS@ @XIPH_CFLAGS@ @UNICAP_CFLAGS@ @FFMPEG_CF BUILT_SOURCES = freej_java.cpp freej_java.cpp: $(top_srcdir)/bindings/freej.i - swig -I$(top_srcdir)/src/include/ -I$(top_srcdir)/bindings \ - -java -c++ -O \ - -o freej_java.cpp $(top_srcdir)/bindings/freej.i + @SWIG_COMMAND@ -java -o freej_java.cpp @SWIG_IFACE@ pkgjavaexecdir = /usr/lib/jni pkgjavaexec_LTLIBRARIES = libfreej_g.la diff --git a/bindings/perl/Makefile.am b/bindings/perl/Makefile.am index c14fa33c..5d2b1f76 100644 --- a/bindings/perl/Makefile.am +++ b/bindings/perl/Makefile.am @@ -13,8 +13,7 @@ BUILT_SOURCES = $(PERL_SOURCE) perl_archdir = @PERL_ARCHLIB@ freej_perl.cpp: $(top_srcdir)/bindings/freej.i - swig -I$(top_srcdir)/src/include -perl -c++ -O \ - -o $(PERL_SOURCE) $(top_srcdir)/bindings/freej.i + @SWIG_COMMAND@ -perl -o $(PERL_SOURCE) @SWIG_IFACE@ pkgperl_PERL = freej.pm diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am index b67aa37a..e75ee65a 100644 --- a/bindings/python/Makefile.am +++ b/bindings/python/Makefile.am @@ -14,8 +14,7 @@ FREEJ_FLAGS = @SDL_CFLAGS@ @FT2_CFLAGS@ @XIPH_CFLAGS@ @UNICAP_CFLAGS@ @FFMPEG_CF BUILT_SOURCES = freej_py.cpp freej_py.cpp: $(top_srcdir)/bindings/freej.i - swig -I$(top_srcdir)/src/include/ -python -threads -c++ -shadow -O \ - -o freej_py.cpp $(top_srcdir)/bindings/freej.i + @SWIG_COMMAND@ -python -threads -shadow -o freej_py.cpp @SWIG_IFACE@ pkgpython_PYTHON = freej.py pkgpyexec_LTLIBRARIES = _freej.la diff --git a/bindings/ruby/Makefile.am b/bindings/ruby/Makefile.am index d5f76abc..17f62962 100644 --- a/bindings/ruby/Makefile.am +++ b/bindings/ruby/Makefile.am @@ -14,8 +14,7 @@ FREEJ_FLAGS = @SDL_CFLAGS@ @FT2_CFLAGS@ @XIPH_CFLAGS@ @UNICAP_CFLAGS@ @FFMPEG_CF BUILT_SOURCES = freej_ruby.cpp freej_ruby.cpp: $(top_srcdir)/bindings/freej.i - swig -I$(top_srcdir)/src/include/ -ruby -initname Freej -c++ -O \ - -o freej_ruby.cpp $(top_srcdir)/bindings/freej.i + @SWIG_COMMAND@ -ruby -initname Freej -o freej_ruby.cpp @SWIG_IFACE@ pkgrubyexecdir = @RUBY_ARCHDIR@ pkgrubyexec_LTLIBRARIES = Freej.la diff --git a/configure.in b/configure.in index 87f3ab23..955d535b 100644 --- a/configure.in +++ b/configure.in @@ -143,6 +143,10 @@ SWIG_ENABLE_CXX if test -z "$SWIG"; then AC_MSG_RESULT(No language bindings will be created) else +SWIG_COMMAND='swig -c++ -O -Wall -I$(top_srcdir) -I$(top_srcdir)/src/include' +AC_SUBST(SWIG_COMMAND) +SWIG_IFACE='$(top_srcdir)/bindings/freej.i' +AC_SUBST(SWIG_IFACE) AC_ARG_ENABLE(python, [ --enable-python enable Python language bindings (no)],