Commit 8d7c08d9 authored by Uli Schlachter's avatar Uli Schlachter
Browse files

Merge branch 'csi' into 'master'

meson: Generate cairo-script-interpreter.pc needed by GTK+

See merge request cairo/cairo!70
parents 7b258a2f ebbaebde
......@@ -136,9 +136,11 @@ dnl
dnl Generate .pc files
dnl
dnl All .pc files are generated automatically except for this one
dnl All .pc files are generated automatically except for these
AC_CONFIG_FILES([src/cairo.pc])dnl
AC_CONFIG_FILES([cairo-uninstalled.pc:src/cairo-uninstalled.pc.in])dnl
AC_CONFIG_FILES([util/cairo-script/cairo-script-interpreter.pc])dnl
AC_CONFIG_FILES([util/cairo-script/cairo-script-interpreter-uninstalled.pc:util/cairo-script/cairo-script-interpreter-uninstalled.pc.in])dnl
dnl pkg-config requires, non-pkgconfig cflags and libs, and total cflags and libs
CAIRO_FEATURE_VARS_REGISTER([BASE],[cairo])dnl
......
......@@ -17,6 +17,9 @@ libcairo_script_interpreter_la_CFLAGS = $(CAIRO_CFLAGS)
libcairo_script_interpreter_la_LDFLAGS = -version-info $(CAIRO_LIBTOOL_VERSION_INFO) -no-undefined $(export_symbols)
libcairo_script_interpreter_la_LIBADD = $(top_builddir)/src/libcairo.la $(CAIRO_LIBS) $(lzo_LIBS) -lz
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = cairo-script-interpreter.pc
csi_replay_SOURCES = csi-replay.c
csi_replay_CFLAGS = $(CAIRO_CFLAGS)
csi_replay_LDADD = libcairo-script-interpreter.la $(top_builddir)/src/libcairo.la $(CAIRO_LIBS)
......
Name: cairo-script-interpreter
Description: script surface backend for cairo graphics library
Version: @VERSION@
Requires: cairo
Libs: ${pc_top_builddir}/${pcfiledir}/util/cairo-script/libcairo-script-interpreter.la
Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@/util/cairo-script
prefix=@prefix@
libdir=@libdir@
includedir=@includedir@
Name: cairo-script-interpreter
Description: script surface backend for cairo graphics library
Version: @VERSION@
Requires: cairo
Libs: -L${libdir} -lcairo-script-interpreter
Cflags: -I${includedir}/cairo
......@@ -38,7 +38,16 @@ libcairoscript = library('cairo-script-interpreter',
inccairoscript = include_directories('.')
libcairoscript_dep = declare_dependency(link_with: libcairoscript,
include_directories: [incbase, inccairoscript])
include_directories: [inccairoscript],
dependencies: libcairo_dep)
pkgmod.generate(libcairoscript,
libraries: [libcairo],
description: 'script surface backend for cairo graphics library',
subdirs: [meson.project_name()],
)
meson.override_dependency('cairo-script-interpreter', libcairoscript_dep)
csi_replay_exe = executable('csi-replay', csi_replay_sources,
c_args: ['-DHAVE_CONFIG_H'],
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment