Permalink
Browse files

Fix distcheck, disable introspection

  • Loading branch information...
1 parent ac9383a commit 516d0ab05a0e2692b421ba0c0b0830f80859a950 @nzjrs committed Mar 19, 2011
Showing with 14 additions and 13 deletions.
  1. +1 −2 Makefile.am
  2. +3 −2 autogen.sh
  3. +5 −5 configure.ac
  4. +5 −4 docs/reference/Makefile.am
View
@@ -3,8 +3,7 @@
SUBDIRS = src examples docs
DISTCHECK_CONFIGURE_FLAGS = \
--enable-gtk-doc \
- --enable-maintainer-flags \
- --enable-introspection
+ --enable-maintainer-flags
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
View
@@ -5,7 +5,7 @@ srcdir=`dirname $0`
test -z "$srcdir" && srcdir=.
PKG_NAME="osm-gps-map"
-# REQUIRED_M4MACROS=introspection.m4
+#REQUIRED_M4MACROS=introspection.m4
(test -f $srcdir/configure.ac) || {
echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
@@ -18,5 +18,6 @@ which gnome-autogen.sh || {
exit 1
}
-. gnome-autogen.sh --enable-gtk-doc "$@"
+REQUIRED_AUTOMAKE_VERSION=1.11 USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh --enable-gtk-doc "$@"
+
View
@@ -1,22 +1,20 @@
-AC_PREREQ([2.62])
+AC_PREREQ([2.63])
AC_INIT([osm-gps-map],
[0.7.3],
[http://github.com/nzjrs/osm-gps-map/issues],
[osm-gps-map])
-AM_INIT_AUTOMAKE([1.10])
+AM_INIT_AUTOMAKE([1.11])
AC_CONFIG_HEADER([config.h])
AC_CONFIG_SRCDIR([src/osm-gps-map.h])
AC_CONFIG_MACRO_DIR([m4])
-AM_MAINTAINER_MODE
-
AM_PROG_CC_C_O
AC_LIBTOOL_WIN32_DLL
AM_PROG_LIBTOOL
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+AM_SILENT_RULES([yes])
# Library dependencies
PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.16])
@@ -61,7 +59,9 @@ LT_VERSION_INFO=2:1:0
AC_SUBST(LT_VERSION_INFO)
GTK_DOC_CHECK([1.12])
+
GOBJECT_INTROSPECTION_CHECK([0.6.7])
+
GNOME_COMPILE_WARNINGS([maximum])
GNOME_MAINTAINER_MODE_DEFINES
@@ -89,7 +89,8 @@ include $(top_srcdir)/gtk-doc.make
# e.g. EXTRA_DIST += version.xml.in
EXTRA_DIST += version.xml.in
-if ENABLE_GTK_DOC
-TESTS_ENVIRONMENT = cd $(srcdir) &&
-TESTS = $(GTKDOC_CHECK)
-endif
+# disable gtkdoc-check, I hate it
+#if ENABLE_GTK_DOC
+#TESTS_ENVIRONMENT = cd $(srcdir) &&
+#TESTS = $(GTKDOC_CHECK)
+#endif

0 comments on commit 516d0ab

Please sign in to comment.