[tepl] amtk: make amtk-utils public

[Sébastien Wilmet <swilmet src gnome org>]

commit 31d4382dcd3b65c14b09a5ba7250674769710949
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Thu Jul 13 20:24:35 2017 +0200

    amtk: make amtk-utils public

 amtk/Makefile.am            |   12 +++---------
 amtk/amtk-utils.h           |    4 ++++
 amtk/amtk.h                 |    1 +
 docs/reference/Makefile.am  |    1 -
 testsuite/amtk/test-utils.c |    2 +-
 5 files changed, 9 insertions(+), 11 deletions(-)
---
diff --git a/amtk/Makefile.am b/amtk/Makefile.am
index 2378db4..b61d0a9 100644
--- a/amtk/Makefile.am
+++ b/amtk/Makefile.am
@@ -18,7 +18,8 @@ amtk_public_headers =                         \
        amtk-application-window.h               \
        amtk-menu-item.h                        \
        amtk-menu-shell.h                       \
-       amtk-types.h
+       amtk-types.h                            \
+       amtk-utils.h
 
 amtk_public_c_files =                          \
        amtk-action-info.c                      \
@@ -27,19 +28,12 @@ amtk_public_c_files =                               \
        amtk-action-map.c                       \
        amtk-application-window.c               \
        amtk-menu-item.c                        \
-       amtk-menu-shell.c
-
-amtk_private_headers = \
-       amtk-utils.h
-
-amtk_private_c_files = \
+       amtk-menu-shell.c                       \
        amtk-utils.c
 
 noinst_LTLIBRARIES = libamtk.la
 
 libamtk_la_SOURCES =           \
-       $(amtk_private_c_files) \
-       $(amtk_private_headers) \
        $(amtk_public_c_files)  \
        $(amtk_public_headers)
 
diff --git a/amtk/amtk-utils.h b/amtk/amtk-utils.h
index 8929849..393bdb2 100644
--- a/amtk/amtk-utils.h
+++ b/amtk/amtk-utils.h
@@ -20,6 +20,10 @@
 #ifndef AMTK_UTILS_H
 #define AMTK_UTILS_H
 
+#if !defined (AMTK_H_INSIDE) && !defined (AMTK_COMPILATION)
+#error "Only <amtk/amtk.h> can be included directly."
+#endif
+
 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS
diff --git a/amtk/amtk.h b/amtk/amtk.h
index 699fbeb..856fc46 100644
--- a/amtk/amtk.h
+++ b/amtk/amtk.h
@@ -31,6 +31,7 @@
 #include <amtk/amtk-application-window.h>
 #include <amtk/amtk-menu-item.h>
 #include <amtk/amtk-menu-shell.h>
+#include <amtk/amtk-utils.h>
 
 #undef AMTK_H_INSIDE
 
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 660aecf..92799de 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -25,7 +25,6 @@ CFILE_GLOB = $(top_srcdir)/tepl/*.c $(top_srcdir)/amtk/*.c
 # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h private_code
 IGNORE_HFILES =                                        \
        amtk.h                                  \
-       amtk-utils.h                            \
        tepl.h                                  \
        tepl-application-window-actions.h       \
        tepl-buffer-input-stream.h              \
diff --git a/testsuite/amtk/test-utils.c b/testsuite/amtk/test-utils.c
index f590ef9..b74f395 100644
--- a/testsuite/amtk/test-utils.c
+++ b/testsuite/amtk/test-utils.c
@@ -17,7 +17,7 @@
  * along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "amtk/amtk-utils.h"
+#include <amtk/amtk.h>
 
 static void
 check_strv_equal (const gchar * const *strv1,