build: Update autotools for API reference changeswip/meson

3 files changed, 54 insertions, 67 deletions

diff --git a/docs/reference/gdk/Makefile.am b/docs/reference/gdk/Makefile.am
index 8c78f1aaa5..68b08e3bc3 100644
--- a/docs/reference/gdk/Makefile.am
+++ b/docs/reference/gdk/Makefile.am
@@ -1,26 +1,22 @@
-## Process this file with automake to produce Makefile.in
-
-AUTOMAKE_OPTIONS = 1.6
-
-# The name of the module.
-DOC_MODULE=gdk4
-
-# The top-level SGML file.
-DOC_MAIN_SGML_FILE=gdk4-docs.xml
-
-# Extra options to supply to gtkdoc-scan
-SCAN_OPTIONS=--deprecated-guards=GDK_DISABLE_DEPRECATED \
-             --ignore-decorators=G_GNUC_WARN_UNUSED_RESULT
-
-# The directory containing the source code. Relative to $(srcdir)
-DOC_SOURCE_DIR=$(top_srcdir)/gdk $(top_srcdir)/gdk/x11
-
-# Used for dependencies
-HFILE_GLOB=$(top_srcdir)/gdk/*.h $(top_srcdir)/gdk/x11/gdkx.h
-CFILE_GLOB=$(top_srcdir)/gdk/*.c
-
-# Header files to ignore when scanning
-IGNORE_HFILES= 			\
+DOC_MODULE = gdk4
+DOC_MAIN_SGML_FILE = gdk4-docs.xml
+SCAN_OPTIONS = \
+	--deprecated-guards=GDK_DISABLE_DEPRECATED \
+        --ignore-decorators=G_GNUC_WARN_UNUSED_RESULT
+
+DOC_SOURCE_DIR = \
+	$(top_srcdir)/gdk \
+	$(top_srcdir)/gdk/x11 \
+	$(top_builddir)/gdk
+
+HFILE_GLOB = \
+	$(top_srcdir)/gdk/*.h \
+	$(top_srcdir)/gdk/x11/gdkx.h \
+	$(top_builddir)/gdk/*.h
+CFILE_GLOB = \
+	$(top_srcdir)/gdk/*.c
+
+IGNORE_HFILES =			\
 	gdkintl.h		\
 	gdkmarshalers.h		\
 	gdkkeysyms.h		\
@@ -49,15 +45,14 @@ IGNORE_HFILES= 			\
 	x11			\
 	quartz			\
 	broadway		\
-	wayland
+	wayland			\
+	$()
 
-# Extra files to add when scanning
-EXTRA_HFILES=			\
-	$(top_srcdir)/gdk/x11/gdkx.h
+EXTRA_HFILES = \
+	$(top_srcdir)/gdk/x11/gdkx.h \
+	$()
 
-# CFLAGS and LDFLAGS for compiling scan program. Only needed
-# if $(DOC_MODULE).types is non-empty.
-AM_CPPFLAGS = 			\
+AM_CPPFLAGS = \
 	-I$(top_srcdir)		\
 	-I$(top_builddir)	\
 	-I$(top_builddir)/gdk	\
@@ -66,15 +61,13 @@ AM_CPPFLAGS = 			\
 
 GTKDOC_LIBS = $(top_builddir)/gtk/libgtk-4.la $(GDK_DEP_LIBS)
 
-# Extra options to supply to gtkdoc-mkdb
-MKDB_OPTIONS=--output-format=xml --name-space=gdk
+MKDB_OPTIONS = --output-format=xml --name-space=gdk
 
-# Extra SGML files that are included by DOC_MAIN_SGML_FILE
-content_files = 		\
-	version.xml
+content_files = \
+	version.xml \
+	$()
 
-# Images to copy into HTML directory
-HTML_IMAGES = 				\
+HTML_IMAGES = \
 	images/rotated-text.png		\
 	images/X_cursor.png		\
 	images/arrow.png		\
@@ -188,11 +181,12 @@ HTML_IMAGES = 				\
 	images/w_resize_cursor.png	\
 	images/X_cursor.png		\
 	images/zoom_in_cursor.png	\
-	images/zoom_out_cursor.png
+	images/zoom_out_cursor.png	\
+	$()
 
 if ENABLE_DOC_CROSS_REFERENCES
 # Extra options to supply to gtkdoc-fixref
-FIXXREF_OPTIONS= \
+FIXXREF_OPTIONS = \
 	--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gobject \
 	--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib \
 	--extra-dir=$(CAIRO_PREFIX)/share/gtk-doc/html/cairo
diff --git a/docs/reference/gsk/Makefile.am b/docs/reference/gsk/Makefile.am
index 27cc3acf33..edd4f363c9 100644
--- a/docs/reference/gsk/Makefile.am
+++ b/docs/reference/gsk/Makefile.am
@@ -1,11 +1,11 @@
 ## Process this file with automake to produce Makefile.in
 DOC_MODULE = gsk4
-DOC_MAIN_SGML_FILE = gsk-docs.xml
+DOC_MAIN_SGML_FILE = gsk4-docs.xml
 
 SCAN_OPTIONS = --deprecated-guards=GDK_DISABLE_DEPRECATED \
                --ignore-decorators=G_GNUC_WARN_UNUSED_RESULT
 
-DOC_SOURCE_DIR = $(top_srcdir)/gsk
+DOC_SOURCE_DIR = $(top_srcdir)/gsk $(top_builddir)/gsk
 
 HFILE_GLOB = $(top_srcdir)/gsk/*.h
 CFILE_GLOB = $(top_srcdir)/gsk/*.c
@@ -20,11 +20,12 @@ IGNORE_HFILES =				\
 	gskprofilerprivate.h		\
 	gskrendererprivate.h		\
 	gskrendernodeprivate.h		\
-	gskshaderbiulderprivate.h
+	gskshaderbuilderprivate.h	\
+	$()
 
 EXTRA_HFILES =
 
-AM_CPPFLAGS = 			\
+AM_CPPFLAGS = \
 	-I$(top_srcdir)		\
 	-I$(top_builddir)	\
 	-I$(top_builddir)/gsk	\
@@ -35,14 +36,14 @@ GTKDOC_LIBS = $(top_builddir)/gtk/libgtk-4.la $(GDK_DEP_LIBS)
 
 MKDB_OPTIONS=--output-format=xml --name-space=gsk
 
-content_files = 		\
+content_files = \
 	version.xml
 
 HTML_IMAGES =
 
 if ENABLE_DOC_CROSS_REFERENCES
 # Extra options to supply to gtkdoc-fixref
-FIXXREF_OPTIONS= \
+FIXXREF_OPTIONS = \
 	--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gobject \
 	--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib \
 	--extra-dir=$(CAIRO_PREFIX)/share/gtk-doc/html/cairo
diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
index 9ec9fb1cf3..f54cf0172c 100644
--- a/docs/reference/gtk/Makefile.am
+++ b/docs/reference/gtk/Makefile.am
@@ -1,20 +1,11 @@
-## Process this file with automake to produce Makefile.in
+DOC_MODULE = gtk4
 
-AUTOMAKE_OPTIONS = 1.6
+DOC_MAIN_SGML_FILE = gtk4-docs.xml
 
-# The name of the module.
-DOC_MODULE=gtk4
+SCAN_OPTIONS = --deprecated-guards="GTK_ENABLE_BROKEN|GTK_DISABLE_DEPRECATED"
 
-# The top-level SGML file.
-DOC_MAIN_SGML_FILE=gtk4-docs.xml
+DOC_SOURCE_DIR = $(top_srcdir)/gtk $(top_builddir)/gtk
 
-# Extra options to supply to gtkdoc-scan
-SCAN_OPTIONS=--deprecated-guards="GTK_ENABLE_BROKEN|GTK_DISABLE_DEPRECATED"
-
-# The directory containing the source code. Relative to $(srcdir)
-DOC_SOURCE_DIR=$(top_srcdir)/gtk
-
-# Used for dependencies
 HFILE_GLOB=$(top_srcdir)/gtk/*.h
 CFILE_GLOB=$(top_srcdir)/gtk/*.c
 
@@ -281,10 +272,9 @@ IGNORE_HFILES = \
 	gtkwin32drawprivate.h		\
 	gtkwin32themeprivate.h		\
 	xdgmime				\
-	xembed.h
+	xembed.h			\
+	$()
 
-# CFLAGS and LDFLAGS for compiling scan program. Only needed
-# if $(DOC_MODULE).types is non-empty.
 AM_CPPFLAGS = \
 	-I$(top_srcdir) 	\
 	-I$(top_builddir) 	\
@@ -303,12 +293,12 @@ GTKDOC_LIBS = \
 
 
 # Extra options to supply to gtkdoc-mkdb
-MKDB_OPTIONS=--output-format=xml --name-space=gtk
+MKDB_OPTIONS = --output-format=xml --name-space=gtk
 
-MKHTML_OPTIONS="--path=\"$(abs_srcdir):$(top_srcdir)/examples\""
+MKHTML_OPTIONS = "--path=\"$(abs_srcdir):$(top_srcdir)/examples\""
 
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE)
-content_files =					\
+content_files = \
 	broadway.xml				\
 	building.sgml				\
 	compiling.sgml				\
@@ -343,9 +333,10 @@ content_files =					\
 	visual_index.xml			\
 	wayland.xml				\
 	windows.sgml				\
-	x11.sgml
+	x11.sgml				\
+	$()
 
-expand_content_files = 				\
+expand_content_files = \
 	compiling.sgml				\
 	drawing-model.xml			\
 	getting_started.xml			\
@@ -355,7 +346,8 @@ expand_content_files = 				\
 	migrating-3to4.xml			\
 	question_index.sgml			\
 	text_widget.sgml			\
-	tree_widget.sgml
+	tree_widget.sgml			\
+	$()
 
 # Images to copy into HTML directory
 HTML_IMAGES = \