]> saetta.ns0.it Git - zakform/libzakform/commitdiff
Merge branch 'array' into gtk-doc gtk-doc
authorAndrea Zagli <azagli@libero.it>
Tue, 13 Jun 2017 19:15:31 +0000 (21:15 +0200)
committerAndrea Zagli <azagli@libero.it>
Tue, 13 Jun 2017 19:15:31 +0000 (21:15 +0200)
1  2 
.gitignore
Makefile.am
configure.ac

diff --cc .gitignore
index a6032c79272d5af1ef3779135325217ef334d3ae,7e7e8dbc18717e70a923fe9f5bdbcfd14aafc5b1..c5af0fdc32a2cbc0abfb1a2ae2db4ecb6fee3e2e
@@@ -61,4 -51,5 +61,6 @@@ Rules-quo
  *.exe
  *.csv
  src/*marshal*.[ch]
- test-driver
++test-driver
+ *.gir
 -*.typelib
++*.typelib
diff --cc Makefile.am
index 6e50ffac086daac30db391fa1d9779504866245f,02ba24519a6ab479744499b7677ab646e61f9442..5be919414bf534e486c530061d9859ffe1dca7f7
@@@ -1,6 -1,6 +1,6 @@@
- DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
 -DISTCHECK_CONFIGURE_FLAGS = --enable-introspection
++DISTCHECK_CONFIGURE_FLAGS = --enable-introspection --enable-gtk-doc
  
 -SUBDIRS = po src tests
 +SUBDIRS = po src tests docs
  
  ACLOCAL_AMFLAGS = -I m4
  
diff --cc configure.ac
index 12baf731e9e76b4f0b2a9c8ce4bef1cdb8d2f0aa,26b409307c2c4314b41b34405c6ac29119294499..e9e8e7707795c816027f99a1b0196d8e0bf984ce
@@@ -29,7 -29,10 +29,10 @@@ AC_PROG_MAKE_SE
  AC_PROG_LIBTOOL
  AC_PROG_RANLIB
  
 -GTK_DOC_CHECK(1.0)
 +GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
+ GOBJECT_INTROSPECTION_CHECK([1.30.0])
  IT_PROG_INTLTOOL
  
  dnl ******************************