Diff of /docs/reference/Makefile.am [633c7b] .. [990baa] Maximize Restore

  Switch to side-by-side view

--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -1,11 +1,10 @@
 ## Process this file with automake to produce Makefile.in
 
 # We require automake 1.6 at least.
-#AUTOMAKE_OPTIONS = 1.6
+AUTOMAKE_OPTIONS = 1.6
 
 # The name of the module, e.g. 'glib'.
 DOC_MODULE=gtkextra
-DOC_MODULE_VERSION=$(GTK_EXTRA_MAJOR_VERSION)
 
 # The top-level SGML file. You can change this if you want to.
 DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
@@ -13,7 +12,7 @@
 # The directory containing the source code. Relative to $(srcdir).
 # gtk-doc will search all .c & .h files beneath here for inline comments
 # documenting the functions and macros.
-DOC_SOURCE_DIR=$(top_builddir)/gtkextra
+DOC_SOURCE_DIR=$(top_srcdir)/gtkextra
 
 # Extra options to pass to gtkdoc-scangobj. Not normally needed.
 SCANGOBJ_OPTIONS=
@@ -31,7 +30,7 @@
 
 # Extra options to supply to gtkdoc-fixref. Not normally needed.
 # e.g. FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html
-FIXXREF_OPTIONS= 
+FIXXREF_OPTIONS=
 
 # Used for dependencies. The docs will be rebuilt if any of these change.
 # e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
@@ -41,49 +40,28 @@
 
 # Header files to ignore when scanning.
 # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
-IGNORE_HFILES= 			\
-	pixmaps.h		\
-	icons.h			\
-	gtkextra-marshal.h	\
-	gtkextra-marshal.list	\
-	gtkextratypebuiltins.h
+IGNORE_HFILES=
 
 # Images to copy into HTML directory.
 # e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
-HTML_IMAGES= \
-	pics/gtkbordercombo.jpg	\
-	pics/gtkcharsel.jpg	\
-	pics/gtkcolorcombo.jpg	\
-	pics/gtkfilelist.jpg	\
-	pics/gtkiconlist.jpg
-
-
-
-#	$(top_srcdir)/docs/reference/pics/gtkiconlist.jpg	
-		
+HTML_IMAGES=
 
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
 # e.g. content_files=running.sgml building.sgml changes-2.0.sgml
-content_files= version.xml	\
-        compiling.sgml	\
-        resources.sgml                          
-
+content_files=
 
 # SGML files where gtk-doc abbrevations (#GtkWidget) are expanded
 # These files must be listed here *and* in content_files
 # e.g. expand_content_files=running.sgml
-expand_content_files=				\
-        version.xml                             \
-        compiling.sgml                          \
-        resources.sgml                          
+expand_content_files=
 
 # CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library.
 # Only needed if you are using gtkdoc-scangobj to dynamically query widget
 # signals and properties.
 # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
-AM_CPPFLAGS =-I$(top_srcdir) -I$(top_srcdir)/gtkextra -I$(top_builddir) $(GTK_CFLAGS)
-GTKDOC_LIBS=$(top_builddir)/gtkextra/libgtkextra-x11-3.0.la $(GTK_LIBS)
+INCLUDES=-I$(top_srcdir) -I$(top_srcdir)/gtkextra -I$(top_builddir) $(GTK_CFLAGS)
+GTKDOC_LIBS=$(top_builddir)/gtkextra/libgtkextra-x11-2.0.la $(GTK_LIBS)
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make