Commit 8c36cdaf authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann

suggest to use pango-1-16.

2007-05-06  Sven Neumann  <sven@gimp.org>

	* HACKING: suggest to use pango-1-16.

	* configure.in: added --enable-gtk-doc-app option and an 
automake
	conditional for it.
	
	* devel-docs/Makefile.am: build the app directory conditionally.

	* devel-docs/app/Makefile.am: override disthook since we don't
	want to distribute any generated files.


svn path=/trunk/; revision=22426
parent a866971e
2007-05-06 Sven Neumann <sven@gimp.org>
* HACKING: suggest to use pango-1-16.
* configure.in: added --enable-gtk-doc-app option and an automake
conditional for it.
* devel-docs/Makefile.am: build the app directory conditionally.
* devel-docs/app/Makefile.am: override disthook since we don't
want to distribute any generated files.
2007-05-05 Michael Natterer <mitch@gimp.org>
* tools/pdbgen/app.pl (generate_pspec): use $flags and not a
......@@ -91,7 +91,7 @@ The interesting modules and the suggested stable branches to use are:
* gimp
* glib (glib-2-12)
* atk (gnome-2-16)
* pango (pango-1-14)
* pango (pango-1-16)
* gtk+ (gtk-2-10)
* libart_lgpl
* gtkhtml2
......
......@@ -1688,6 +1688,9 @@ dnl NOTE: We need to use a separate automake conditional for this
dnl to make this work with the tarballs.
AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
AC_ARG_ENABLE(gtk-doc-app, [ --enable-gtk-doc-app build developer documentation for app (default=no)], , enable_gtk_doc_app=no)
AM_CONDITIONAL(ENABLE_GTK_DOC_APP, test x$enable_gtk_doc_app = xyes)
#########################################
# Allow to configure the gimp environment
......
## Process this file with automake to produce Makefile.in
if ENABLE_GTK_DOC_APP
app = app
endif
SUBDIRS = \
tools \
libgimpbase \
libgimpcolor \
libgimpconfig \
......@@ -9,13 +14,12 @@ SUBDIRS = \
libgimpthumb \
libgimpwidgets \
libgimp \
tools
$(app)
EXTRA_DIST = \
ChangeLog \
README \
README.gtkdoc \
app \
debug-plug-ins.txt \
gbr.txt \
ggr.txt \
......@@ -34,6 +38,10 @@ EXTRA_DIST = \
#
if ENABLE_GTK_DOC
dist-check-gtk-doc:
if ENABLE_GTK_DOC_APP
@echo "*** gtk-doc-app must be disabled in order to make dist"
@false
endif
else
dist-check-gtk-doc:
@echo "*** gtk-doc must be enabled in order to make dist"
......
......@@ -49,9 +49,6 @@ HTML_IMAGES=
# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE)
content_files =
# Other files to distribute
extra_files =
# CFLAGS and LDFLAGS for compiling scan program. Only needed
# if $(DOC_MODULE).types is non-empty.
......@@ -113,4 +110,11 @@ GTKDOC_LIBS = \
include $(top_srcdir)/gtk-doc.make
# Other files to distribute
EXTRA_DIST += version.in
EXTRA_DIST += \
$(DOC_MODULE).types \
version.in
# Override dist-hook as we don't want to distribute generated files
dist-hook:
@true
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment