From: Andrea Zagli <azagli@libero.it>
Date: Sun, 11 Jun 2017 07:31:37 +0000 (+0200)
Subject: Enabled gir.
X-Git-Tag: v0.1.0~1^2~3
X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=b935e647dcfb92a50454b5f2efc715ee7970b411;p=zakform%2Fgtk

Enabled gir.
---

diff --git a/.gitignore b/.gitignore
index 8129d06..7f925fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,3 +50,5 @@ intltool-*
 Rules-quot
 *.exe
 *.csv
+*.gir
+*.typelib
\ No newline at end of file
diff --git a/Makefile.am b/Makefile.am
index b10e3bf..5e943c5 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 c875c6c..43331d8 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 b8fae43..d5a6e19 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -29,8 +29,7 @@ libzakformgtk_la_SOURCES = \
 
 libzakformgtk_la_LDFLAGS = -no-undefined
 
-libzakformgtk_include_HEADERS = \
-                             libzakformgtk.h \
+gir_include = \
                              form.h \
                              formelement.h \
                              formelementcheck.h \
@@ -41,6 +40,10 @@ libzakformgtk_include_HEADERS = \
                              formelementspin.h \
                              formelementtextview.h
 
+libzakformgtk_include_HEADERS = \
+                             libzakformgtk.h \
+                             $(git_include)
+
 libzakformgtk_includedir = $(includedir)/libzakformgtk
 
 install-exec-hook:
@@ -49,3 +52,29 @@ install-exec-hook:
 
 uninstall-hook:
 	rm -f $(libzakformmodulesdir)/libzakformgtk$(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 = $(libzakformgtk_la_SOURCES) $(gir_include)
+
+ZakFormGtk-1.0.gir: libzakformgtk.la
+ZakFormGtk_1_0_gir_INCLUDES = Gtk-3.0 ZakForm-1.0
+ZakFormGtk_1_0_gir_CFLAGS = $(AM_CPPFLAGS)
+ZakFormGtk_1_0_gir_LIBS = libzakformgtk.la
+ZakFormGtk_1_0_gir_FILES = $(introspection_sources)
+INTROSPECTION_GIRS += ZakFormGtk-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/formelement.c b/src/formelement.c
index 4cde39f..6897cc2 100644
--- a/src/formelement.c
+++ b/src/formelement.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2015-2017 Andrea Zagli <azagli@libero.it>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,6 +20,8 @@
 	#include <config.h>
 #endif
 
+#include <glib/gi18n-lib.h>
+
 #include "formelement.h"
 
 enum
diff --git a/src/formelement.h b/src/formelement.h
index 91a71cb..4440288 100644
--- a/src/formelement.h
+++ b/src/formelement.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2015-2017 Andrea Zagli <azagli@libero.it>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -21,7 +21,6 @@
 
 
 #include <glib-object.h>
-#include <glib/gi18n-lib.h>
 
 #include <gtk/gtk.h>