[gtkmm/gtkmm-3-22] tools/gen_scripts/: Update for gdk-pixbuf built with meson, and for gtk+-3

[Kjell Ahlstedt <kjellahl src gnome org>]

commit 21fb1d8287ce0f4968cc19fa8446250b7d4d80a5
Author: Kjell Ahlstedt <kjellahlstedt gmail com>
Date:   Wed Sep 13 16:15:54 2017 +0200

    tools/gen_scripts/: Update for gdk-pixbuf built with meson, and for gtk+-3
    
    When gdk-pixbuf is built with meson instead of autotools, generated .h
    and .c files are stored in gdk-pixbuf/build/gdk-pixbuf. Files in that
    directory shall be read when the docs.xml and the .defs files are generated.
    
    Read .h and .c files from the gtk+-3 directory.

 tools/gen_scripts/gdk_generate_docs.sh    |    7 +++++--
 tools/gen_scripts/gdk_generate_enums.sh   |    7 ++++---
 tools/gen_scripts/gdk_generate_methods.sh |    7 ++++---
 tools/gen_scripts/gtk_generate_docs.sh    |    2 +-
 tools/gen_scripts/gtk_generate_enums.sh   |    2 +-
 tools/gen_scripts/gtk_generate_methods.sh |    2 +-
 6 files changed, 16 insertions(+), 11 deletions(-)
---
diff --git a/tools/gen_scripts/gdk_generate_docs.sh b/tools/gen_scripts/gdk_generate_docs.sh
index 37d55d4..47483ea 100755
--- a/tools/gen_scripts/gdk_generate_docs.sh
+++ b/tools/gen_scripts/gdk_generate_docs.sh
@@ -14,8 +14,11 @@ ROOT_DIR="$(dirname "$0")/../.."
 OUT_DIR="$ROOT_DIR/gdk/src"
 
 PARAMS="--with-properties --no-recursion"
-for dir in "$PREFIX"/gtk+/{gdk,gdk/deprecated} "$PREFIX"/gdk-pixbuf/gdk-pixbuf; do
-  PARAMS="$PARAMS -s $dir"
+for dir in "$PREFIX"/gtk+-3/{gdk,gdk/deprecated} \
+           "$PREFIX"/gdk-pixbuf/gdk-pixbuf "$PREFIX"/gdk-pixbuf/build/gdk-pixbuf; do
+  if [ -d "$dir" ]; then
+    PARAMS="$PARAMS -s $dir"
+  fi
 done
 
 DOCEXTRACT_TO_XML_PY="$JHBUILD_SOURCES/glibmm/tools/defs_gen/docextract_to_xml.py"
diff --git a/tools/gen_scripts/gdk_generate_enums.sh b/tools/gen_scripts/gdk_generate_enums.sh
index 99e4fd6..f61bf38 100755
--- a/tools/gen_scripts/gdk_generate_enums.sh
+++ b/tools/gen_scripts/gdk_generate_enums.sh
@@ -16,6 +16,7 @@ OUT_DIR="$ROOT_DIR/gdk/src"
 shopt -s extglob # Enable extended pattern matching
 ENUM_PL="$JHBUILD_SOURCES/glibmm/tools/enum.pl"
 # Process files whose names end with .h, but not with private.h.
-# Exclude gtk+/gdk/gdkinternals.h.
-$ENUM_PL "$PREFIX"/gtk+/gdk/!(*private|gdkinternals).h "$PREFIX"/gtk+/gdk/deprecated/!(*private).h > 
"$OUT_DIR"/gdk_enums.defs
-$ENUM_PL "$PREFIX"/gdk-pixbuf/gdk-pixbuf/gdk!(*private).h > "$OUT_DIR"/gdk_pixbuf_enums.defs
+# Exclude gtk+-3/gdk/gdkinternals.h.
+$ENUM_PL "$PREFIX"/gtk+-3/gdk/!(*private|gdkinternals).h "$PREFIX"/gtk+-3/gdk/deprecated/!(*private).h > 
"$OUT_DIR"/gdk_enums.defs
+$ENUM_PL "$PREFIX"/gdk-pixbuf/gdk-pixbuf/gdk!(*private).h \
+         "$PREFIX"/gdk-pixbuf/build/gdk-pixbuf/*.h > "$OUT_DIR"/gdk_pixbuf_enums.defs
diff --git a/tools/gen_scripts/gdk_generate_methods.sh b/tools/gen_scripts/gdk_generate_methods.sh
index 8d7500c..4a4af11 100755
--- a/tools/gen_scripts/gdk_generate_methods.sh
+++ b/tools/gen_scripts/gdk_generate_methods.sh
@@ -16,6 +16,7 @@ OUT_DIR="$ROOT_DIR/gdk/src"
 shopt -s extglob # Enable extended pattern matching
 H2DEF_PY="$JHBUILD_SOURCES/glibmm/tools/defs_gen/h2def.py"
 # Process files whose names end with .h, but not with private.h.
-# Exclude gtk+/gdk/gdkinternals.h.
-$H2DEF_PY "$PREFIX"/gtk+/gdk/!(*private|gdkinternals).h "$PREFIX"/gtk+/gdk/deprecated/!(*private).h > 
"$OUT_DIR"/gdk_methods.defs
-$H2DEF_PY "$PREFIX"/gdk-pixbuf/gdk-pixbuf/gdk!(*private).h > "$OUT_DIR"/gdk_pixbuf_methods.defs
+# Exclude gtk+-3/gdk/gdkinternals.h.
+$H2DEF_PY "$PREFIX"/gtk+-3/gdk/!(*private|gdkinternals).h "$PREFIX"/gtk+-3/gdk/deprecated/!(*private).h > 
"$OUT_DIR"/gdk_methods.defs
+$H2DEF_PY "$PREFIX"/gdk-pixbuf/gdk-pixbuf/gdk!(*private).h \
+          "$PREFIX"/gdk-pixbuf/build/gdk-pixbuf/*.h > "$OUT_DIR"/gdk_pixbuf_methods.defs
diff --git a/tools/gen_scripts/gtk_generate_docs.sh b/tools/gen_scripts/gtk_generate_docs.sh
index 712a71c..5b8cf28 100755
--- a/tools/gen_scripts/gtk_generate_docs.sh
+++ b/tools/gen_scripts/gtk_generate_docs.sh
@@ -14,7 +14,7 @@ ROOT_DIR="$(dirname "$0")/../.."
 OUT_DIR="$ROOT_DIR/gtk/src"
 
 PARAMS="--with-properties --no-recursion"
-for dir in "$PREFIX"/gtk+/{gtk,gtk/deprecated}; do
+for dir in "$PREFIX"/gtk+-3/{gtk,gtk/deprecated}; do
   PARAMS="$PARAMS -s $dir"
 done
 
diff --git a/tools/gen_scripts/gtk_generate_enums.sh b/tools/gen_scripts/gtk_generate_enums.sh
index 8e31aa8..f4c9edf 100755
--- a/tools/gen_scripts/gtk_generate_enums.sh
+++ b/tools/gen_scripts/gtk_generate_enums.sh
@@ -9,7 +9,7 @@ if [ -z "$JHBUILD_SOURCES" ]; then
   exit 1;
 fi
 
-PREFIX="$JHBUILD_SOURCES/gtk+"
+PREFIX="$JHBUILD_SOURCES/gtk+-3"
 ROOT_DIR="$(dirname "$0")/../.."
 OUT_DIR="$ROOT_DIR/gtk/src"
 
diff --git a/tools/gen_scripts/gtk_generate_methods.sh b/tools/gen_scripts/gtk_generate_methods.sh
index 7a41587..fbb34aa 100755
--- a/tools/gen_scripts/gtk_generate_methods.sh
+++ b/tools/gen_scripts/gtk_generate_methods.sh
@@ -9,7 +9,7 @@ if [ -z "$JHBUILD_SOURCES" ]; then
   exit 1;
 fi
 
-PREFIX="$JHBUILD_SOURCES/gtk+"
+PREFIX="$JHBUILD_SOURCES/gtk+-3"
 ROOT_DIR="$(dirname "$0")/../.."
 OUT_DIR="$ROOT_DIR/gtk/src"