pdb, libgimp: make the "pdb" PDB group private

and don't install its header. Temporarily add its only two remaining
needed functions to gimppdb.[ch].

Also some Makefile cleanup.

libgimp/Makefile.am

@@ -107,6 +107,11 @@ libgimp_built_sources = \
 	gimpenums.c
 
 libgimp_private_sources = \
+	gimp-debug.c		\
+	gimp-debug.h		\
+	gimp-private.h		\
+	gimp-shm.c		\
+	gimp-shm.h		\
 	gimpgpcompat.c		\
 	gimpgpcompat.h		\
 	gimpgpparams.c		\
@@ -121,16 +126,13 @@ libgimp_private_sources = \
 	gimppixbuf.h		\
 	gimpplugin-private.c	\
 	gimpplugin-private.h	\
-	gimp-debug.c		\
-	gimp-debug.h		\
-	gimp-private.h		\
-	gimp-shm.c		\
-	gimp-shm.h		\
 	gimpprocedure-private.c	\
 	gimpprocedure-private.h	\
 	\
 	gimpunit_pdb.c		\
 	gimpunit_pdb.h		\
+	gimppdb_pdb.c		\
+	gimppdb_pdb.h		\
 	gimpplugin_pdb.c	\
 	gimpplugin_pdb.h
 
@@ -285,8 +287,6 @@ gimpuimarshal.c: gimpuimarshal.h
 ### GObject introspection
 
 -include $(INTROSPECTION_MAKEFILE)
-AUTOMAKE_OPTIONS = subdir-objects
-include ../libgimp/Makefile.gi
 include ../libgimpbase/Makefile.gi
 include ../libgimpcolor/Makefile.gi
 include ../libgimpconfig/Makefile.gi

libgimp/Makefile.gi

@@ -44,7 +44,6 @@ PDB_WRAPPERS_C = \
 	../libgimp/gimppattern_pdb.c		\
 	../libgimp/gimppatterns_pdb.c		\
 	../libgimp/gimppatternselect_pdb.c	\
-	../libgimp/gimppdb_pdb.c			\
 	../libgimp/gimpprogress_pdb.c		\
 	../libgimp/gimpselection_pdb.c		\
 	../libgimp/gimptextlayer_pdb.c		\
@@ -96,7 +95,6 @@ PDB_WRAPPERS_H = \
 	../libgimp/gimppattern_pdb.h		\
 	../libgimp/gimppatterns_pdb.h		\
 	../libgimp/gimppatternselect_pdb.h	\
-	../libgimp/gimppdb_pdb.h			\
 	../libgimp/gimpprogress_pdb.h		\
 	../libgimp/gimpselection_pdb.h		\
 	../libgimp/gimptextlayer_pdb.h		\

libgimp/gimp_pdb_headers.h

@@ -70,7 +70,6 @@
 #include <libgimp/gimppattern_pdb.h>
 #include <libgimp/gimppatterns_pdb.h>
 #include <libgimp/gimppatternselect_pdb.h>
-#include <libgimp/gimppdb_pdb.h>
 #include <libgimp/gimpprogress_pdb.h>
 #include <libgimp/gimpselection_pdb.h>
 #include <libgimp/gimptextlayer_pdb.h>

libgimp/gimplegacy.c

@@ -31,6 +31,7 @@
 #include "gimp-private.h"
 #include "gimpgpcompat.h"
 #include "gimpgpparams.h"
+#include "gimppdb_pdb.h"
 #include "gimpplugin_pdb.h"
 #include "gimplegacy-private.h"
 

libgimp/gimppdb.c

@@ -28,6 +28,7 @@
 #include "gimp-private.h"
 #include "gimpgpparams.h"
 #include "gimppdb-private.h"
+#include "gimppdb_pdb.h"
 #include "gimppdbprocedure.h"
 #include "gimpplugin-private.h"
 
@@ -431,6 +432,22 @@ _gimp_pdb_error_quark (void)
 }
 
 
+/*  Temporary API, to go away before 3.0  */
+
+GParamSpec *
+gimp_pdb_proc_argument (const gchar *procedure_name,
+                        gint         arg_num)
+{
+  return _gimp_pdb_proc_argument (procedure_name, arg_num);
+}
+
+GParamSpec *
+gimp_pdb_proc_return_value (const gchar *procedure_name,
+                            gint         val_num)
+{
+  return _gimp_pdb_proc_return_value (procedure_name, val_num);
+}
+
 /*  Cruft API  */
 
 /**

libgimp/gimppdb.h

@@ -100,6 +100,12 @@ gchar         ** gimp_pdb_query_procedures     (GimpPDB              *pdb,
                                                 const gchar          *proc_type,
                                                 gint                 *num_matches);
 
+/*  Temporary API, to go away before 3.0  */
+
+GParamSpec * gimp_pdb_proc_argument     (const gchar *procedure_name,
+                                         gint         arg_num);
+GParamSpec * gimp_pdb_proc_return_value (const gchar *procedure_name,
+                                         gint         val_num);
 
 /*  Cruft API  */
 

libgimp/gimppdb_pdb.c

@@ -23,6 +23,7 @@
 #include "config.h"
 
 #include "gimp.h"
+#include "gimppdb_pdb.h"
 
 /**
  * _gimp_pdb_temp_name:
@@ -429,7 +430,7 @@ _gimp_pdb_proc_val (const gchar     *procedure_name,
 }
 
 /**
- * gimp_pdb_proc_argument:
+ * _gimp_pdb_proc_argument:
  * @procedure_name: The procedure name.
  * @arg_num: The argument number.
  *
@@ -444,7 +445,7 @@ _gimp_pdb_proc_val (const gchar     *procedure_name,
  * Since: 3.0
  **/
 GParamSpec *
-gimp_pdb_proc_argument (const gchar *procedure_name,
+_gimp_pdb_proc_argument (const gchar *procedure_name,
                          gint         arg_num)
 {
   GimpPDB        *pdb = gimp_get_pdb ();
@@ -475,7 +476,7 @@ gimp_pdb_proc_argument (const gchar *procedure_name,
 }
 
 /**
- * gimp_pdb_proc_return_value:
+ * _gimp_pdb_proc_return_value:
  * @procedure_name: The procedure name.
  * @val_num: The return value number.
  *
@@ -491,7 +492,7 @@ gimp_pdb_proc_argument (const gchar *procedure_name,
  * Since: 3.0
  **/
 GParamSpec *
-gimp_pdb_proc_return_value (const gchar *procedure_name,
+_gimp_pdb_proc_return_value (const gchar *procedure_name,
                              gint         val_num)
 {
   GimpPDB        *pdb = gimp_get_pdb ();

libgimp/gimppdb_pdb.h

@@ -63,9 +63,9 @@ G_GNUC_INTERNAL gboolean _gimp_pdb_proc_val         (const gchar       *procedur
                                                          GimpPDBArgType    *val_type,
                                                          gchar            **val_name,
                                                          gchar            **val_desc);
-GParamSpec*              gimp_pdb_proc_argument     (const gchar       *procedure_name,
+G_GNUC_INTERNAL GParamSpec* _gimp_pdb_proc_argument     (const gchar       *procedure_name,
                                                          gint               arg_num);
-GParamSpec*              gimp_pdb_proc_return_value (const gchar       *procedure_name,
+G_GNUC_INTERNAL GParamSpec* _gimp_pdb_proc_return_value (const gchar       *procedure_name,
                                                          gint               val_num);
 G_GNUC_INTERNAL gboolean    _gimp_pdb_get_data          (const gchar       *identifier,
                                                          gint              *bytes,

libgimp/gimppdbprocedure.c

@@ -22,6 +22,7 @@
 
 #include "gimp.h"
 #include "gimppdb-private.h"
+#include "gimppdb_pdb.h"
 #include "gimppdbprocedure.h"
 
 

pdb/groups/pdb.pdb

@@ -268,6 +268,8 @@ HELP
     $date = '2019';
     $since = '3.0';
 
+    $lib_private = 1;
+
     @inargs = (
 	{ name => 'procedure_name', type  => 'string', non_empty => 1,
 	  desc => 'The procedure name' },
@@ -327,6 +329,8 @@ HELP
     $date = '2019';
     $since = '3.0';
 
+    $lib_private = 1;
+
     @inargs = (
 	{ name => 'procedure_name', type  => 'string', non_empty => 1,
 	  desc => 'The procedure name' },
@@ -657,4 +661,6 @@ CODE
 
 $desc = 'Procedural database';
 
+$lib_private = 1;
+
 1;