From 2dc71ce28a7a4556a16147ebab3cc2945d0c54f3 Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Sat, 10 Jun 2017 12:24:06 +0200 Subject: [PATCH] Enabled gir. --- .gitignore | 2 ++ Makefile.am | 2 ++ configure.ac | 2 ++ src/Makefile.am | 26 ++++++++++++++++++++++++++ src/session.c | 4 ++-- 5 files changed, 34 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6e5655f..8c7bba6 100644 --- a/.gitignore +++ b/.gitignore @@ -59,3 +59,5 @@ tests/redirect tests/session tests/tag tests/url +*.gir +*.typelib \ No newline at end of file diff --git a/Makefile.am b/Makefile.am index c87fc2b..4b71779 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,5 @@ +DISTCHECK_CONFIGURE_FLAGS = --enable-introspection + SUBDIRS = src tests ACLOCAL_AMFLAGS = -I m4 diff --git a/configure.ac b/configure.ac index df5a82b..f73f65a 100644 --- a/configure.ac +++ b/configure.ac @@ -20,6 +20,8 @@ LT_INIT AC_LIBTOOL_WIN32_DLL +GOBJECT_INTROSPECTION_CHECK([1.30.0]) + # Checks for programs. AC_PROG_CC AC_PROG_CXX diff --git a/src/Makefile.am b/src/Makefile.am index 6ce8ee2..fd4c311 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -21,3 +21,29 @@ libzakcgi_include_HEADERS = libzakcgi.h \ url.h libzakcgi_includedir = $(includedir)/libzakcgi + +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 = $(libzakcgi_la_SOURCES) $(libzakcgi_include_HEADERS) + +ZakCgi-1.0.gir: libzakcgi.la +ZakCgi_1_0_gir_INCLUDES = GObject-2.0 GLib-2.0 Gio-2.0 +ZakCgi_1_0_gir_CFLAGS = $(AM_CPPFLAGS) +ZakCgi_1_0_gir_LIBS = libzakcgi.la +ZakCgi_1_0_gir_FILES = $(introspection_sources) +INTROSPECTION_GIRS += ZakCgi-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 diff --git a/src/session.c b/src/session.c index 2c064f0..95ddb49 100644 --- a/src/session.c +++ b/src/session.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015-2016 Andrea Zagli + * Copyright (C) 2015-2017 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -113,7 +113,7 @@ zak_cgi_session_init (ZakCgiSession *zak_cgi_session) } /** - * zak_cgi_session_new: + * zak_cgi_session_new_minutes: * @zakcgimain: * @base_uri: * @path: -- 2.49.0