[libshumate/tintou/memphis] Add build-system infrastructure for the memphis library
- From: Corentin Noël <corentinnoel src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libshumate/tintou/memphis] Add build-system infrastructure for the memphis library
- Date: Fri, 12 Mar 2021 09:28:25 +0000 (UTC)
commit 35dcf0faae8371948d868e022cdc6d64930a8159
Author: Corentin Noël <corentin noel collabora com>
Date: Fri Mar 12 10:14:04 2021 +0100
Add build-system infrastructure for the memphis library
.gitignore | 99 +-----------------------------------------------
meson.build | 9 +++++
meson_options.txt | 6 ++-
shumate/meson.build | 6 +++
subprojects/memphis.wrap | 6 +++
5 files changed, 27 insertions(+), 99 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f7c04f4..709e397 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,101 +1,4 @@
-Makefile
-Makefile.in
-aclocal.m4
-autom4te.cache
-*.pc
-.deps
-.libs
-*.o
-*.lo
-*.la
-*.stamp
-*.gir
-*.typelib
-*.gi
*~
*#*
-*.sw?
-*.pyc
build
-shumate-gtk/shumate-gtk-marshal.c
-shumate-gtk/shumate-gtk-marshal.h
-shumate-gtk/stamp-marshal
-shumate-gtk/shumate-gtk-enum-types.c
-shumate-gtk/shumate-gtk-enum-types.h
-shumate-gtk/stamp-enum-types
-shumate/shumate-marshal.c
-shumate/shumate-marshal.h
-shumate/stamp-marshal
-shumate/shumate-enum-types.c
-shumate/shumate-enum-types.h
-shumate/stamp-enum-types
-shumate/shumate-version.h
-shumate/shumate-features.h
-compile
-config.guess
-config.h
-config.h.in
-config.log
-config.status
-config.sub
-configure
-demos/animated-marker
-demos/launcher
-demos/launcher-gtk
-demos/polygons
-demos/url-marker
-demos/local-rendering
-demos/minimal
-demos/minimal-gtk
-demos/create-destroy-test
-demos/launcher-vala
-demos/launcher-vala.c
-demos/markers-vala.c
-depcomp
-compile
-docs/reference-gtk/libshumate-gtk-undeclared.txt
-docs/reference-gtk/libshumate-gtk-undocumented.txt
-docs/reference-gtk/libshumate-gtk-unused.txt
-docs/reference-gtk/libshumate-gtk.args
-docs/reference-gtk/libshumate-gtk.hierarchy
-docs/reference-gtk/libshumate-gtk.interfaces
-docs/reference-gtk/libshumate-gtk.prerequisites
-docs/reference-gtk/libshumate-gtk.signals
-docs/reference-gtk/version.xml
-docs/reference-gtk/libshumate-gtk-decl-list.txt
-docs/reference-gtk/libshumate-gtk-decl.txt
-docs/reference-gtk/libshumate-gtk-overrides.txt
-docs/reference-gtk/libshumate-gtk-types.txt
-docs/reference-gtk/html/*.*
-docs/reference-gtk/tmpl/*.*
-docs/reference-gtk/xml/*.*
-docs/reference/version.xml
-docs/reference/libshumate-undeclared.txt
-docs/reference/libshumate-undocumented.txt
-docs/reference/libshumate-unused.txt
-docs/reference/libshumate.args
-docs/reference/libshumate.hierarchy
-docs/reference/libshumate.interfaces
-docs/reference/libshumate.prerequisites
-docs/reference/libshumate.signals
-docs/reference/libshumate-decl-list.txt
-docs/reference/libshumate-decl.txt
-docs/reference/libshumate-overrides.txt
-docs/reference/libshumate-types.txt
-docs/reference/html/*.*
-docs/reference/tmpl/*.*
-docs/reference/xml/*.*
-gtk-doc.make
-install-sh
-libtool
-ltmain.sh
-missing
-stamp-h1
-tags
-INSTALL
-m4/libtool.m4
-m4/ltoptions.m4
-m4/ltsugar.m4
-m4/ltversion.m4
-m4/lt~obsolete.m4
-m4/gtk-doc.m4
\ No newline at end of file
+subprojects/memphis
diff --git a/meson.build b/meson.build
index 6564a49..a0e3761 100644
--- a/meson.build
+++ b/meson.build
@@ -100,6 +100,14 @@ if generate_vapi and not vapigen_dep.found()
generate_vapi = false
endif
+memphis_support = get_option('memphis')
+memphis_dep = []
+if memphis_support
+ memphis_dep = dependency('memphis',
+ fallback : ['memphis', 'memphis_dep'])
+ add_project_arguments('-DHAS_MEMPHIS=1', language: 'c')
+endif
+
subdir('data')
subdir('shumate')
@@ -121,6 +129,7 @@ summary = [
' Documentation: @0@'.format(build_gtk_doc),
' Introspection: @0@'.format(generate_gir),
' Vala API: @0@'.format(generate_vapi),
+ ' Memphis support: @0@'.format(memphis_support),
'',
'Directories:',
' prefix: @0@'.format(prefix),
diff --git a/meson_options.txt b/meson_options.txt
index 0ca9148..fec453c 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -11,4 +11,8 @@ option('gtk_doc',
option('demos',
type: 'boolean', value: false,
- description: 'Build demonstration programs')
\ No newline at end of file
+ description: 'Build demonstration programs')
+
+option('memphis',
+ type: 'boolean', value: false,
+ description: 'Build memphis support')
diff --git a/shumate/meson.build b/shumate/meson.build
index 37db9a0..4132d0a 100644
--- a/shumate/meson.build
+++ b/shumate/meson.build
@@ -68,6 +68,7 @@ libshumate_deps = [
cairo_dep,
sqlite_dep,
libsoup_dep,
+ memphis_dep
]
libshumate_c_args = [
@@ -225,6 +226,10 @@ libshumate_dep = declare_dependency(
sources: libshumate_dep_sources,
)
+extra_cflags = []
+if memphis_support
+ extra_cflags += '-DHAS_MEMPHIS=1'
+endif
libshumate_pc = pkg.generate(
libshumate_lib,
name: package_string,
@@ -232,4 +237,5 @@ libshumate_pc = pkg.generate(
requires: [glib_dep, gobject_dep, gtk_dep],
subdirs: package_string,
install_dir: pkgconfigdir,
+ extra_cflags: extra_cflags,
)
diff --git a/subprojects/memphis.wrap b/subprojects/memphis.wrap
new file mode 100644
index 0000000..cc4d205
--- /dev/null
+++ b/subprojects/memphis.wrap
@@ -0,0 +1,6 @@
+[wrap-git]
+directory=memphis
+url=https://github.com/tintou/memphis.git
+push-url=ssh://git github com:tintou/memphis.git
+revision=master
+depth=1
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]