From b9f7ef11100f250767fd726b0ae9727a7e9a3f89 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Sat, 18 Dec 2010 21:33:37 +0000 Subject: [PATCH] build: Remove Cogl2 reference from the build scripts Keeping the Cogl 2.0 API reference in the build is getting far more troublesome than it's worth. It's breaking distcheck far too often, and it makes it impossible to rebuild the build environment from tarballs - which is something that some distributions (namely: the Debian-based ones, but not limited to them) do in order to change build scripts using their own rules. --- configure.ac | 16 ---------------- doc/reference/Makefile.am | 6 ------ 2 files changed, 22 deletions(-) diff --git a/configure.ac b/configure.ac index 7eb3fde..881f4df 100644 --- a/configure.ac +++ b/configure.ac @@ -1065,14 +1065,6 @@ AC_SUBST(CAIRO_PREFIX) AC_SUBST(GLIB_PREFIX) AC_SUBST(PANGO_PREFIX) -AC_ARG_ENABLE([cogl2-reference], - [AC_HELP_STRING([--enable-cogl2-reference=@<:@no/yes@:>@], - [Build Cogl-2.0 API Reference])], - [enable_cogl2_reference=$enableval], - [enable_cogl2_reference=no]) - -AM_CONDITIONAL([BUILD_COGL2_REFERENCE], [test "x$enable_gtk_doc" = "xyes" && test "x$enable_cogl2_reference" = "xyes"]) - dnl === Manual ================================================================ AC_ARG_ENABLE([docs], @@ -1164,14 +1156,6 @@ AC_CONFIG_FILES([ po/Makefile.in ]) -AS_IF([test "x$enable_cogl2_reference" = "xyes"], - [ - AC_CONFIG_FILES([ - doc/reference/cogl-2.0/Makefile - doc/reference/cogl-2.0/cogl-docs.xml - ]) -]) - AC_OUTPUT dnl === Summary =============================================================== diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am index f93f8f5..ab9b86b 100644 --- a/doc/reference/Makefile.am +++ b/doc/reference/Makefile.am @@ -1,9 +1,3 @@ SUBDIRS = cogl clutter cally DIST_SUBDIRS = cogl clutter cally - -if BUILD_COGL2_REFERENCE -SUBDIRS += cogl-2.0 - -DIST_SUBDIRS += cogl-2.0 -endif -- 2.7.4