[Gnucash-changes] r12137 - gnucash/trunk - Remove dependency on gtk-doc from private libgsf build.

[Derek Atkins]

Author: warlord
Date: 2005-12-06 14:24:42 -0500 (Tue, 06 Dec 2005)
New Revision: 12137
Trac: http://svn.gnucash.org/trac/changeset/12137

Modified:
   gnucash/trunk/ChangeLog
   gnucash/trunk/configure.in
   gnucash/trunk/lib/libgsf-1.12.3/Makefile.am
Log:
Remove dependency on gtk-doc from private libgsf build.

	* configure.in:
	  - remove libgsf/doc*
	  - remove GTK_DOC checks
	* lib/libgsf/Makefile.am: remove 'doc' from SUBDIRS and
	  remove distcheck extra flags.



Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog	2005-12-06 19:02:07 UTC (rev 12136)
+++ gnucash/trunk/ChangeLog	2005-12-06 19:24:42 UTC (rev 12137)
@@ -3,6 +3,12 @@
 	* configure.in: remove libgsf/po/Makefile and goffice/po/Makefile
 	  because we never build these directories.
 
+	* configure.in:
+	  - remove libgsf/doc*
+	  - remove GTK_DOC checks
+	* lib/libgsf/Makefile.am: remove 'doc' from SUBDIRS and
+	  remove distcheck extra flags.
+	
 2005-12-05  Christian Stimming  <stimming at tuhh.de>
 
 	* src/backend/file/gnc-backend-file.c: Don't chown() the owner,

Modified: gnucash/trunk/configure.in
===================================================================
--- gnucash/trunk/configure.in	2005-12-06 19:02:07 UTC (rev 12136)
+++ gnucash/trunk/configure.in	2005-12-06 19:24:42 UTC (rev 12137)
@@ -691,12 +691,12 @@
 ##################################################
 # Checks for gtk-doc and docbook-tools
 ##################################################
-gtk_doc_installed=true
+# gtk_doc_installed=true
 #ifdef([GTK_DOC_CHECK],[GTK_DOC_CHECK([1.0])],[gtk_doc_installed=false])
 # I would have liked to conditionalize this, but 
 # that appears to break other things http://bugzilla.gnome.org/show_bug.cgi?id=156399
-GTK_DOC_CHECK([1.0])
-AM_CONDITIONAL(GTK_DOC_INSTALLED, $gtk_doc_installed)
+# dnl GTK_DOC_CHECK([1.0])
+# dnl AM_CONDITIONAL(GTK_DOC_INSTALLED, $gtk_doc_installed)
 
 dnl ***********************************************************************************
 # Check for zlib.
@@ -827,9 +827,9 @@
 
 AM_CONDITIONAL(OS_WIN32, false)
 AM_CONDITIONAL(PLATFORM_WIN32, false)
-AM_CONDITIONAL(GTK_DOC_INSTALLED, false)
- AM_CONDITIONAL(ENABLE_GTK_DOC, false)
- AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, false)
+# dnl AM_CONDITIONAL(GTK_DOC_INSTALLED, false)
+# dnl  AM_CONDITIONAL(ENABLE_GTK_DOC, false)
+# dnl  AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, false)
 AM_CONDITIONAL(WITH_LIBGSF_GNOME, false)
 AM_CONDITIONAL(WITH_GCONF, false)
 AM_CONDITIONAL(WITH_PYTHON, false)
@@ -1994,7 +1994,6 @@
           lib/srfi/Makefile
           lib/libc/Makefile
           lib/libgsf-1.12.3/Makefile
-          lib/libgsf-1.12.3/doc/Makefile
           lib/libgsf-1.12.3/gsf/Makefile
           lib/libgsf-1.12.3/gsf-gnome/Makefile
           lib/libgsf-1.12.3/gsf-win32/Makefile
@@ -2002,7 +2001,6 @@
           lib/libgsf-1.12.3/python/Makefile
           lib/libgsf-1.12.3/thumbnailer/Makefile
           lib/libgsf-1.12.3/gsf/version.c
-          lib/libgsf-1.12.3/doc/version.xml
           lib/libgsf-1.12.3/libgsf-1.pc
           lib/libgsf-1.12.3/libgsf-1.spec
           lib/libgsf-1.12.3/libgsf-gnome-1.pc

Modified: gnucash/trunk/lib/libgsf-1.12.3/Makefile.am
===================================================================
--- gnucash/trunk/lib/libgsf-1.12.3/Makefile.am	2005-12-06 19:02:07 UTC (rev 12136)
+++ gnucash/trunk/lib/libgsf-1.12.3/Makefile.am	2005-12-06 19:24:42 UTC (rev 12137)
@@ -8,7 +8,8 @@
   pkgconfig_DATA += libgsf-win32-1.pc
 endif
 
-SUBDIRS = gsf gsf-gnome gsf-win32 doc tests
+SUBDIRS = gsf gsf-gnome gsf-win32 tests
+# doc (before tests)
 # po 
 
 if WITH_PYTHON
@@ -27,4 +28,4 @@
 
 DISTCLEANFILES = intltool-extract intltool-merge intltool-update
 
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
+#DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc