brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: Remove Cogl2 reference from the build scripts

Browse Source 
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.
This commit is contained in:
Emmanuele Bassi 2010-12-18 21:33:37 +00:00
parent 491bbc226e
commit b9f7ef1110
2 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
configure.ac
View File

@ -1065,14 +1065,6 @@ AC_SUBST(CAIRO_PREFIX)
AC_SUBST(GLIB_PREFIX) AC_SUBST(GLIB_PREFIX)
AC_SUBST(PANGO_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 ================================================================ dnl === Manual ================================================================
AC_ARG_ENABLE([docs], AC_ARG_ENABLE([docs],
@ -1164,14 +1156,6 @@ AC_CONFIG_FILES([
po/Makefile.in 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 AC_OUTPUT
dnl === Summary =============================================================== dnl === Summary ===============================================================

6
doc/reference/Makefile.am
View File

@ -1,9 +1,3 @@
SUBDIRS = cogl clutter cally SUBDIRS = cogl clutter cally
DIST_SUBDIRS = cogl clutter cally DIST_SUBDIRS = cogl clutter cally
if BUILD_COGL2_REFERENCE
SUBDIRS += cogl-2.0
DIST_SUBDIRS += cogl-2.0
endif