diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-07-17 19:50:13 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-07-17 19:50:13 +0100 |
| commit | 43cc9d6e1b1e1957288c545cc55f5a0df8492b55 (patch) | |
| tree | 025f84f17ac0a4b28b8b0873ef553fa8269f26f2 | |
| parent | 22c2111406075c98a2bf5feeaa92fa16293bc15a (diff) | |
Fix up install.
| -rw-r--r-- | asdcplib/src/wscript | 4 | ||||
| -rw-r--r-- | libdcp.pc.in | 9 | ||||
| -rw-r--r-- | src/wscript | 8 | ||||
| -rw-r--r-- | wscript | 6 |
4 files changed, 24 insertions, 3 deletions
diff --git a/asdcplib/src/wscript b/asdcplib/src/wscript index 77d67d5f..2d118aed 100644 --- a/asdcplib/src/wscript +++ b/asdcplib/src/wscript @@ -9,7 +9,7 @@ def configure(conf): def build(bld): obj = bld(features = 'cxx cxxshlib') obj.name = 'libkumu-libdcp' - obj.target = 'libkumu-libdcp' + obj.target = 'kumu-libdcp' obj.uselib = 'EXPAT' obj.includes = ['.'] obj.export_includes = ['.'] @@ -24,7 +24,7 @@ def build(bld): obj = bld(features = 'cxx cxxshlib') obj.name = 'libasdcp-libdcp' - obj.target = 'libasdcp-libdcp' + obj.target = 'asdcp-libdcp' obj.uselib = 'EXPAT' obj.includes = ['.'] obj.export_includes = ['.'] diff --git a/libdcp.pc.in b/libdcp.pc.in new file mode 100644 index 00000000..0362ca44 --- /dev/null +++ b/libdcp.pc.in @@ -0,0 +1,9 @@ +prefix=@prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: libdcp +Description: DCP creation library +Version: @version@ +Libs: @libs@ +Cflags: -I${includedir} diff --git a/src/wscript b/src/wscript index fce3959a..df41cb2c 100644 --- a/src/wscript +++ b/src/wscript @@ -1,6 +1,7 @@ def build(bld): obj = bld(features = 'cxx cxxshlib') obj.name = 'libdcp' + obj.target = 'dcp' obj.export_includes = ['.'] obj.uselib = 'BOOST_FILESYSTEM OPENSSL SIGC++' obj.use = 'libkumu-libdcp libasdcp-libdcp' @@ -12,4 +13,9 @@ def build(bld): util.cc tags.cc """ - obj.target = 'libdcp' + + headers = """ + dcp.h + """ + + bld.install_files('${PREFIX}/include/libdcp', headers) @@ -25,6 +25,12 @@ def configure(conf): conf.recurse('asdcplib') def build(bld): + bld(source = 'libdcp.pc.in', + version = VERSION, + includedir = '%s/include' % bld.env.PREFIX, + libs = "-L${libdir} -ldcp -lkumu-libdcp -lasdcp-libdcp", + install_path = '${LIBDIR}/pkgconfig') + bld.recurse('src') bld.recurse('test') bld.recurse('asdcplib') |
