From 8403dd0615cfabca5f319599083801a3e1153e70 Mon Sep 17 00:00:00 2001
From: ddennedy <ddennedy@d19143bc-622f-0410-bfdd-b5b2a6649095>
Date: Thu, 4 Dec 2008 22:29:27 +0000
Subject: [PATCH] test/Makefile, swig/*/build: replace more mlt-config with
 pkg-config

git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt++@1254 d19143bc-622f-0410-bfdd-b5b2a6649095
---
 mlt++/swig/java/build       |    4 ++--
 mlt++/swig/perl/Makefile.PL |    4 ++--
 mlt++/swig/python/build     |    4 ++--
 mlt++/swig/ruby/build       |    4 ++--
 mlt++/swig/tcl/build        |    4 ++--
 mlt++/test/Makefile         |    4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/mlt++/swig/java/build b/mlt++/swig/java/build
index 690dd29..e0ae212 100755
--- a/mlt++/swig/java/build
+++ b/mlt++/swig/java/build
@@ -15,10 +15,10 @@ then
 
 	# Invoke swig
 	mkdir -p src_swig/net/sourceforge/mltpp
-	swig -c++ -I../../src `mlt-config --cflags` -java -outdir src_swig/net/sourceforge/mltpp -package net.sourceforge.mltpp mltpp.i || exit $?
+	swig -c++ -I../../src `pkg-config mlt-framework --cflags` -java -outdir src_swig/net/sourceforge/mltpp -package net.sourceforge.mltpp mltpp.i || exit $?
 
 	# Compile the wrapper
-	g++ -D_GNU_SOURCE -c -rdynamic -pthread -I../../src `mlt-config --cflags` mltpp_wrap.cxx $JAVA_INCLUDE || exit $?
+	g++ -D_GNU_SOURCE -c -rdynamic -pthread -I../../src `pkg-config mlt-framework --cflags` mltpp_wrap.cxx $JAVA_INCLUDE || exit $?
 	
 	# Create the module
 	ld -shared mltpp_wrap.o -L../../src -lmlt++ -o libmltpp_java.so || exit $?
diff --git a/mlt++/swig/perl/Makefile.PL b/mlt++/swig/perl/Makefile.PL
index 4bc0ec6..07e1827 100644
--- a/mlt++/swig/perl/Makefile.PL
+++ b/mlt++/swig/perl/Makefile.PL
@@ -4,10 +4,10 @@ use ExtUtils::MakeMaker;
 my $CXX = $ENV{'CXX'} || 'g++';
 
 system( "ln -sf ../mltpp.i ." );
-system( "swig -c++ -I../../src `mlt-config --cflags` -perl5 mltpp.i" ); 
+system( "swig -c++ -I../../src `pkg-config mlt-framework --cflags` -perl5 mltpp.i" ); 
 WriteMakefile(
 	'NAME'    => 'mltpp',
-	'CC'      => '${CXX} `mlt-config --cflags` -I../../src',
+	'CC'      => '${CXX} `pkg-config mlt-framework --cflags` -I../../src',
 	'OPTIMIZE' => '-O2 -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -m32 -march=i386',
 	'LIBS'    => ['-L../../src -lmlt++'],
 	'OBJECT'  => 'mltpp_wrap.o',
diff --git a/mlt++/swig/python/build b/mlt++/swig/python/build
index 5cd89d3..7b980c3 100755
--- a/mlt++/swig/python/build
+++ b/mlt++/swig/python/build
@@ -12,10 +12,10 @@ then
 	ln -sf ../mltpp.i .
 
 	# Invoke swig
-	swig -c++ -I../../src `mlt-config --cflags` -python mltpp.i || exit $?
+	swig -c++ -I../../src `pkg-config mlt-framework --cflags` -python mltpp.i || exit $?
 
 	# Compile the wrapper
-	g++ -fPIC -D_GNU_SOURCE -c -rdynamic -pthread `mlt-config --cflags` -I$PYTHON_INCLUDE mltpp_wrap.cxx || exit $?
+	g++ -fPIC -D_GNU_SOURCE -c -rdynamic -pthread `pkg-config mlt-framework --cflags` -I$PYTHON_INCLUDE mltpp_wrap.cxx || exit $?
 
 	# Create the module
 	ld -shared mltpp_wrap.o -L../../src -lmlt++ -o _mltpp.so || exit $?
diff --git a/mlt++/swig/ruby/build b/mlt++/swig/ruby/build
index 46f9cc1..bc2dda7 100755
--- a/mlt++/swig/ruby/build
+++ b/mlt++/swig/ruby/build
@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 require 'mkmf'
 system( "ln -sf ../mltpp.i mltpp.i" )
-system( "swig -c++ -ruby -I../../src `mlt-config --cflags` mltpp.i" )
-$CFLAGS += " -I../../src `mlt-config --cflags`"
+system( "swig -c++ -ruby -I../../src `pkg-config mlt-framework --cflags` mltpp.i" )
+$CFLAGS += " -I../../src `pkg-config mlt-framework --cflags`"
 $LDFLAGS += " -L../../src -lmlt++"
 create_makefile('mltpp')
 system( 'make' )
diff --git a/mlt++/swig/tcl/build b/mlt++/swig/tcl/build
index 548d3db..cb7cd63 100755
--- a/mlt++/swig/tcl/build
+++ b/mlt++/swig/tcl/build
@@ -7,10 +7,10 @@ then
 	ln -sf ../mltpp.i .
 
 	# Invoke swig
-	swig -c++ -I../../src `mlt-config --cflags` -tcl mltpp.i || exit 1
+	swig -c++ -I../../src `pkg-config mlt-framework --cflags` -tcl mltpp.i || exit 1
 
 	# Compile the wrapper
-	g++ -D_GNU_SOURCE -c -rdynamic -pthread -I../../src `mlt-config --cflags` mltpp_wrap.cxx || exit 1
+	g++ -D_GNU_SOURCE -c -rdynamic -pthread -I../../src `pkg-config mlt-framework --cflags` mltpp_wrap.cxx || exit 1
 
 	# Create the module
 	ld -shared mltpp_wrap.o -L../../src -lmlt++ -o mltpp.so || exit 1
diff --git a/mlt++/test/Makefile b/mlt++/test/Makefile
index 11a2474..5a10be2 100644
--- a/mlt++/test/Makefile
+++ b/mlt++/test/Makefile
@@ -1,7 +1,7 @@
 include ../config.mak
 
-CXXFLAGS+=-Wall -g `mlt-config --cflags` -I ../src
-LDFLAGS+=-L../src -lmlt++ -lmiracle -lvalerie `mlt-config --libs`
+CXXFLAGS+=-Wall -g `pkg-config mlt-framework --cflags` -I ../src
+LDFLAGS+=-L../src -lmlt++ -lmiracle -lvalerie `pkg-config mlt-framework --libs`
 CC=c++
 
 all:		play server
-- 
1.7.4.4