Various fixes to improve doc building.

petli · petli · commit facfebffb2ed · 2001-11-30T10:38:06.000Z
diff --git a/doc/ps/Makefile b/doc/ps/Makefile
@@ -1,12 +1,17 @@
 # Make postscript documentation for Python Xlib
 #
-# $Id: Makefile,v 1.1 2000-09-22 11:37:51 petli Exp $
+# $Id: Makefile,v 1.2 2001-11-30 10:38:06 petli Exp $
 
 include ../src/defs
 
-python-xlib.ps: $(SRCS)
-	texi2dvi -b $(TOPSRC)
+python-xlib.ps: python-xlib.dvi
 	dvips -o python-xlib.ps python-xlib.dvi
 
+python-xlib.dvi: $(SRCS)
+	cp python-xlib.aux python-xlib.auxtmp
+	texi2dvi -b $(TOPSRC)
+# If xref has changed, rebuild again to catch them
+	cmp python-xlib.aux python-xlib.auxtmp || texi2dvi -b $(TOPSRC)
+
 clean:
 	rm -f python-xlib.*
diff --git a/doc/src/Makefile b/doc/src/Makefile
@@ -3,5 +3,14 @@
 info:
 	(cd ..; make info)
 
+ps:
+	(cd ..; make ps)
+
+html:
+	(cd ..; make html)
+
+all:
+	(cd ..; make all)
+
 clean:
 	(cd ..; make clean)
diff --git a/doc/src/defs b/doc/src/defs
@@ -1,13 +1,14 @@
 # Definitions for documentation makefiles
 #
-# $Id: defs,v 1.1 2000-09-22 11:37:51 petli Exp $
+# $Id: defs,v 1.2 2001-11-30 10:38:06 petli Exp $
 
 SRCDIR = ../src
 
 TOPSRC = $(SRCDIR)/python-xlib.texi
 
 SRCS = $(TOPSRC) \
      $(SRCDIR)/concepts.texi $(SRCDIR)/package.texi \
-     $(SRCDIR)/connect.texi $(SRCDIR)/errors.texi $(SRCDIR)/events.texi
+     $(SRCDIR)/connect.texi $(SRCDIR)/errors.texi \
+     $(SRCDIR)/events.texi $(SRCDIR)/objects.texi
 
      
diff --git a/doc/src/objects.texi b/doc/src/objects.texi
@@ -465,9 +465,7 @@ Card16('height'),
 
 @code{Window} objects have additional objects, see @ref{Resource} and @ref{Drawable}.
 
-@defmethod Window create_window ( x, y, width, height, border_width, depth, window_class =  X.CopyFromParent,
-visual = X.CopyFromParent,
-**keys )
+@defmethod Window create_window ( x, y, width, height, border_width, depth, window_class =  X.CopyFromParent, visual = X.CopyFromParent, **keys )
 Returns Window
 @end defmethod
 
@@ -821,6 +819,6 @@ Int32('overall_right'),
 @defmethod Font close ( onerror = None )
 @end defmethod
 
-@defmethod Font create_glyph_cursor ( mask, source_char, mask_char, (fore_red, fore_green, fore_blue), (back_red, back_green, back_blue) ) 
+@defmethod Font create_glyph_cursor ( mask, source_char, mask_char, (fore_red, fore_green, fore_blue), (back_red, back_green, back_blue) )
 Returns Cursor.
 @end defmethod
