added pkgconfig files.

fixed broken dist-clean make target.

git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@256 d19143bc-622f-0410-bfdd-b5b2a6649095

diff --git a/Makefile b/Makefile
index 11dba7d73c584f74966487b7b5cb1c4da82f4e3d..c891dd92906f4df4b65c9b4ceb41da35bc561c0c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -15,23 +15,25 @@ all clean depend:
        done
 
 dist-clean:
-       rm mlt-config packages.dat config.mak; \
+       rm mlt-config packages.dat; \
        list='$(SUBDIRS)'; \
        for subdir in $$list; do \
                $(MAKE) -C $$subdir $@; \
-       done
+       done; \
+       rm config.mak;
 
 
 install:
        install -d "$(prefix)/bin"
        install -d "$(prefix)/include"
        install -d "$(prefix)/lib"
+       install -d "$(prefix)/lib/pkgconfig"
        install -d "$(prefix)/share/mlt/modules"
        install -c -m 755 mlt-config "$(bindir)"
+       install -c -m 644 *.pc "$(prefix)/lib/pkgconfig"
        install -m 644 packages.dat "$(prefix)/share/mlt/"
        list='$(SUBDIRS)'; \
        for subdir in $$list; do \
                $(MAKE) -C $$subdir $@; \
        done; \
        /sbin/ldconfig || true
-

diff --git a/README b/README
index c431c0216ec282501b27fdcce8db3933a8e99fbf..1b6aa5b6e1a1095478ae2fbc3300e0551e889e4d 100644 (file)
--- a/README
+++ b/README
@@ -1,8 +1,15 @@
-README
-------
+MLT/Miracle README
+------------------
 
+       Copyright (C) 2003-2004 Ushodaya Enterprises Limited
+       by Charles Yates <charles.yates@pandora.be>
+       and Dan Dennedy <dan@dennedy.org>
+
+       MLT is a multimedia framework designed for television broadcasting, and 
+       Miracle is a multi-unit video playout server with realtime effects.
        This document provides a quick reference for the minimal configuration,
-       build and installation of MLT.
+       build and installation of MLT. See the docs directory for usage and
+       development details.
 
 Configuration
 -------------

diff --git a/configure b/configure
index 647e4a4a51b45d119a766b819141f6735b97291f..f77470ac6527b7077ae88b9e266d3c6f03c0466c 100755 (executable)
--- a/configure
+++ b/configure
@@ -22,7 +22,7 @@ EOF
 function build_config
 {
        (
-               echo version=0.1.0
+               echo version=$version
                echo prefix=$prefix
                echo bindir=$prefix/bin
        ) > config.mak
@@ -34,6 +34,21 @@ function build_config
        echo -n > packages.dat
 }
 
+function build_pkgconfig
+{
+       for i in framework valerie miracle
+       do
+               echo "prefix=$prefix" >mlt-$i.pc
+               echo "exec_prefix=$prefix" >>mlt-$i.pc
+               echo "libdir=$prefix/lib" >>mlt-$i.pc
+               echo "includedir=$prefix/include" >>mlt-$i.pc
+               echo "version=$version" >>mlt-$i.pc
+               echo "cflags=`grep ^$i packages.dat | cut -f 2`" >>mlt-$i.pc
+               echo "libs=`grep ^$i packages.dat | cut -f 3`" >>mlt-$i.pc
+               cat mlt-$i.pc.in >>mlt-$i.pc
+       done
+}
+
 # Debug mode
 set +x
 
@@ -41,6 +56,7 @@ set +x
 export build_dir=`dirname $0`
 export prefix=/usr/local
 export help=0
+export version=0.1.0
 
 # Iterate through arguments
 for i in $*
@@ -52,7 +68,7 @@ do
 done
 
 # Show help if requested
-[ $help = 1 ] && show_help || build_config 
+[ $help = 1 ] && show_help || build_config
 
 # Iterate through each of the components
 for i in framework modules inigo valerie miracle humperdink
@@ -67,3 +83,5 @@ do
        fi
 done
 
+# Build the pkg-config files
+build_pkgconfig

diff --git a/mlt-framework.pc.in b/mlt-framework.pc.in
new file mode 100644 (file)
index 0000000..5748867
--- /dev/null
+++ b/mlt-framework.pc.in
@@ -0,0 +1,7 @@
+
+Name: mlt-framework
+Description: MLT multimedia framework
+Version: ${version}
+Requires:
+Libs: -L${libdir} ${libs}
+Cflags: ${cflags}

diff --git a/mlt-miracle.pc.in b/mlt-miracle.pc.in
new file mode 100644 (file)
index 0000000..593055e
--- /dev/null
+++ b/mlt-miracle.pc.in
@@ -0,0 +1,7 @@
+
+Name: mlt-miracle
+Description: MLT Miracle server API
+Version: ${version}
+Requires:
+Libs: -L${libdir} ${libs}
+Cflags: ${cflags}

diff --git a/mlt-valerie.pc.in b/mlt-valerie.pc.in
new file mode 100644 (file)
index 0000000..7750ba3
--- /dev/null
+++ b/mlt-valerie.pc.in
@@ -0,0 +1,7 @@
+
+Name: mlt-valerie
+Description: MLT Valerie client API
+Version: ${version}
+Requires:
+Libs: -L${libdir} ${libs}
+Cflags: ${cflags}