From 47bd76a4168a802cdabf42a2f4bebdaec7e058e4 Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Sun, 11 Jun 2017 10:14:28 +0200 Subject: [PATCH] Abilitato gir. --- .gitignore | 2 ++ Makefile.am | 2 ++ configure.ac | 2 ++ src/Makefile.am | 51 ++++++++++++++++++++++++++++++++++++++++++++++--- 4 files changed, 54 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 32adc7e..c6955c9 100644 --- a/.gitignore +++ b/.gitignore @@ -70,3 +70,5 @@ tests/utils_infobar tests/utils_message_dialog tests/utils_round *.csv +*.gir +*.typelib \ No newline at end of file diff --git a/Makefile.am b/Makefile.am index 9126d4a..95390d7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,5 @@ +DISTCHECK_CONFIGURE_FLAGS = --enable-introspection + SUBDIRS = src data tests ACLOCAL_AMFLAGS = -I m4 diff --git a/configure.ac b/configure.ac index 8729386..512c6d2 100644 --- a/configure.ac +++ b/configure.ac @@ -29,6 +29,8 @@ AC_PROG_MAKE_SET AC_PROG_LIBTOOL AC_PROG_RANLIB +GOBJECT_INTROSPECTION_CHECK([1.30.0]) + dnl ****************************** dnl Translations dnl ****************************** diff --git a/src/Makefile.am b/src/Makefile.am index a5a99f1..6b4c0c8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -55,7 +55,7 @@ libsolipa_la_SOURCES = solipa.c \ libsolipa_la_LDFLAGS = -no-undefined -libsolipa_include_HEADERS = libsolipa.h \ +gir_include = \ solipa.h \ allegato.h \ formelementvalidatorcodfisc.h \ @@ -66,11 +66,15 @@ libsolipa_include_HEADERS = libsolipa.h \ camelsession.h \ camel.h +libsolipa_include_HEADERS = libsolipa.h \ + $(gir_include) + libsolipa_includedir = $(includedir)/libsolipa -libsolipactpl_la_LIBADD = libsolipa.la +libsolipactpl_la_LIBADD = libsolipa.la \ + $(CTPL_LIBS) -libsolipactpl_la_CFLAGS = +libsolipactpl_la_CFLAGS = $(CTPL_CFLAGS) libsolipactpl_la_LDFLAGS = -no-undefined @@ -114,3 +118,44 @@ install-exec-hook: uninstall-hook: rm -f $(libzakformmodulesdir)/libsolipa$(libmodulesext) + +CLEANFILES = + +-include $(INTROSPECTION_MAKEFILE) +INTROSPECTION_GIRS = +INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --warn-all +INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) + +if HAVE_INTROSPECTION +introspection_sources = $(libsolipa_la_SOURCES) $(gir_include) + +Solipa-1.0.gir: libsolipa.la +Solipa_1_0_gir_INCLUDES = GObject-2.0 +Solipa_1_0_gir_CFLAGS = $(AM_CPPFLAGS) +Solipa_1_0_gir_LIBS = libsolipa.la +Solipa_1_0_gir_FILES = $(introspection_sources) + +SolipaCtpl-1.0.gir: libsolipactpl.la +SolipaCtpl_1_0_gir_INCLUDES = GObject-2.0 +SolipaCtpl_1_0_gir_CFLAGS = $(AM_CPPFLAGS) $(CTPL_CFLAGS) +SolipaCtpl_1_0_gir_LIBS = libsolipa.la libsolipactpl.la +SolipaCtpl_1_0_gir_LDFLAGS = $(CTPL_LIBS) +SolipaCtpl_1_0_gir_FILES = $(libsolipactpl_la_SOURCES) $(libsolipactpl_include_HEADERS) + +SolipaOoo-1.0.gir: libsolipaooo.la +SolipaOoo_1_0_gir_INCLUDES = GObject-2.0 +SolipaOoo_1_0_gir_CFLAGS = $(AM_CPPFLAGS) $(PYTHON_CFLAGS) +SolipaOoo_1_0_gir_LIBS = libsolipa.la libsolipaooo.la +SolipaOoo_1_0_gir_LDFLAGS = $(PYTHON_LIBS) +SolipaOoo_1_0_gir_FILES = $(libsolipaooo_la_SOURCES) $(libsolipaooo_include_HEADERS) + +INTROSPECTION_GIRS += Solipa-1.0.gir SolipaCtpl-1.0.gir SolipaOoo-1.0.gir + +girdir = $(datadir)/gir-1.0 +gir_DATA = $(INTROSPECTION_GIRS) + +typelibdir = $(libdir)/girepository-1.0 +typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) + +CLEANFILES += $(gir_DATA) $(typelib_DATA) +endif -- 2.49.0