[amtk] macros: rename amtk-types.h -> amtk-macros.h

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

commit bfcb3b9046d17ed859a0e3fce7c0888386d783e1
Author: Sébastien Wilmet <sebastien wilmet gmail com>
Date:   Thu Sep 9 03:56:47 2021 +0200

    macros: rename amtk-types.h -> amtk-macros.h
    
    The types have been moved to their respective headers.
    amtk-macros.h is like tepl-macros.h.

 amtk/amtk-action-info-central-store.h | 2 +-
 amtk/amtk-action-info-store.h         | 2 +-
 amtk/amtk-action-info.h               | 2 +-
 amtk/amtk-action-map.h                | 2 +-
 amtk/amtk-application-window.h        | 2 +-
 amtk/amtk-factory.h                   | 2 +-
 amtk/amtk-gmenu.h                     | 2 +-
 amtk/amtk-init.h                      | 2 +-
 amtk/{amtk-types.h => amtk-macros.h}  | 6 +++---
 amtk/amtk-menu-item.h                 | 2 +-
 amtk/amtk-menu-shell.h                | 2 +-
 amtk/amtk-shortcuts.h                 | 2 +-
 amtk/amtk-utils.h                     | 2 +-
 amtk/amtk.h                           | 2 +-
 amtk/meson.build                      | 4 ++--
 15 files changed, 18 insertions(+), 18 deletions(-)
---
diff --git a/amtk/amtk-action-info-central-store.h b/amtk/amtk-action-info-central-store.h
index 6c0d1d1..bd5c025 100644
--- a/amtk/amtk-action-info-central-store.h
+++ b/amtk/amtk-action-info-central-store.h
@@ -26,7 +26,7 @@
 
 #include <glib-object.h>
 #include <amtk/amtk-action-info.h>
-#include <amtk/amtk-types.h>
+#include <amtk/amtk-macros.h>
 
 G_BEGIN_DECLS
 
diff --git a/amtk/amtk-action-info-store.h b/amtk/amtk-action-info-store.h
index 95b057c..7a727bc 100644
--- a/amtk/amtk-action-info-store.h
+++ b/amtk/amtk-action-info-store.h
@@ -26,7 +26,7 @@
 
 #include <gtk/gtk.h>
 #include <amtk/amtk-action-info.h>
-#include <amtk/amtk-types.h>
+#include <amtk/amtk-macros.h>
 
 G_BEGIN_DECLS
 
diff --git a/amtk/amtk-action-info.h b/amtk/amtk-action-info.h
index d974719..f038c7c 100644
--- a/amtk/amtk-action-info.h
+++ b/amtk/amtk-action-info.h
@@ -25,7 +25,7 @@
 #endif
 
 #include <glib-object.h>
-#include <amtk/amtk-types.h>
+#include <amtk/amtk-macros.h>
 
 G_BEGIN_DECLS
 
diff --git a/amtk/amtk-action-map.h b/amtk/amtk-action-map.h
index 9ee8150..8ee9967 100644
--- a/amtk/amtk-action-map.h
+++ b/amtk/amtk-action-map.h
@@ -25,7 +25,7 @@
 #endif
 
 #include <gio/gio.h>
-#include <amtk/amtk-types.h>
+#include <amtk/amtk-macros.h>
 
 G_BEGIN_DECLS
 
diff --git a/amtk/amtk-application-window.h b/amtk/amtk-application-window.h
index 4228766..180cf56 100644
--- a/amtk/amtk-application-window.h
+++ b/amtk/amtk-application-window.h
@@ -25,7 +25,7 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <amtk/amtk-types.h>
+#include <amtk/amtk-macros.h>
 
 G_BEGIN_DECLS
 
diff --git a/amtk/amtk-factory.h b/amtk/amtk-factory.h
index 7ad9207..afef326 100644
--- a/amtk/amtk-factory.h
+++ b/amtk/amtk-factory.h
@@ -26,7 +26,7 @@
 
 #include <gtk/gtk.h>
 #include <amtk/amtk-action-info.h>
-#include <amtk/amtk-types.h>
+#include <amtk/amtk-macros.h>
 
 G_BEGIN_DECLS
 
diff --git a/amtk/amtk-gmenu.h b/amtk/amtk-gmenu.h
index 689b4a1..05a0e7e 100644
--- a/amtk/amtk-gmenu.h
+++ b/amtk/amtk-gmenu.h
@@ -25,7 +25,7 @@
 #endif
 
 #include <gio/gio.h>
-#include <amtk/amtk-types.h>
+#include <amtk/amtk-macros.h>
 
 G_BEGIN_DECLS
 
diff --git a/amtk/amtk-init.h b/amtk/amtk-init.h
index d67bd0e..99d9cd5 100644
--- a/amtk/amtk-init.h
+++ b/amtk/amtk-init.h
@@ -25,7 +25,7 @@
 #endif
 
 #include <glib.h>
-#include <amtk/amtk-types.h>
+#include <amtk/amtk-macros.h>
 
 G_BEGIN_DECLS
 
diff --git a/amtk/amtk-types.h b/amtk/amtk-macros.h
similarity index 93%
rename from amtk/amtk-types.h
rename to amtk/amtk-macros.h
index a5d5583..3fc2bbb 100644
--- a/amtk/amtk-types.h
+++ b/amtk/amtk-macros.h
@@ -17,8 +17,8 @@
  * along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef AMTK_TYPES_H
-#define AMTK_TYPES_H
+#ifndef AMTK_MACROS_H
+#define AMTK_MACROS_H
 
 #if !defined (AMTK_H_INSIDE) && !defined (AMTK_COMPILATION)
 #error "Only <amtk/amtk.h> can be included directly."
@@ -34,4 +34,4 @@ G_BEGIN_DECLS
 
 G_END_DECLS
 
-#endif /* AMTK_TYPES_H */
+#endif /* AMTK_MACROS_H */
diff --git a/amtk/amtk-menu-item.h b/amtk/amtk-menu-item.h
index 28aa5b2..18fe64d 100644
--- a/amtk/amtk-menu-item.h
+++ b/amtk/amtk-menu-item.h
@@ -25,7 +25,7 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <amtk/amtk-types.h>
+#include <amtk/amtk-macros.h>
 
 G_BEGIN_DECLS
 
diff --git a/amtk/amtk-menu-shell.h b/amtk/amtk-menu-shell.h
index 8518078..75fa72e 100644
--- a/amtk/amtk-menu-shell.h
+++ b/amtk/amtk-menu-shell.h
@@ -25,7 +25,7 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <amtk/amtk-types.h>
+#include <amtk/amtk-macros.h>
 
 G_BEGIN_DECLS
 
diff --git a/amtk/amtk-shortcuts.h b/amtk/amtk-shortcuts.h
index 24045c8..487c5da 100644
--- a/amtk/amtk-shortcuts.h
+++ b/amtk/amtk-shortcuts.h
@@ -25,7 +25,7 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <amtk/amtk-types.h>
+#include <amtk/amtk-macros.h>
 
 G_BEGIN_DECLS
 
diff --git a/amtk/amtk-utils.h b/amtk/amtk-utils.h
index 42c966b..76a3074 100644
--- a/amtk/amtk-utils.h
+++ b/amtk/amtk-utils.h
@@ -25,7 +25,7 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <amtk/amtk-types.h>
+#include <amtk/amtk-macros.h>
 
 G_BEGIN_DECLS
 
diff --git a/amtk/amtk.h b/amtk/amtk.h
index bf7d5ea..6121fd1 100644
--- a/amtk/amtk.h
+++ b/amtk/amtk.h
@@ -22,7 +22,7 @@
 
 #define AMTK_H_INSIDE
 
-#include <amtk/amtk-types.h>
+#include <amtk/amtk-macros.h>
 #include <amtk/amtk-enum-types.h>
 
 #include <amtk/amtk-action-info.h>
diff --git a/amtk/meson.build b/amtk/meson.build
index 281b3ca..35c61e6 100644
--- a/amtk/meson.build
+++ b/amtk/meson.build
@@ -8,10 +8,10 @@ amtk_public_headers = [
   'amtk-factory.h',
   'amtk-gmenu.h',
   'amtk-init.h',
+  'amtk-macros.h',
   'amtk-menu-item.h',
   'amtk-menu-shell.h',
   'amtk-shortcuts.h',
-  'amtk-types.h',
   'amtk-utils.h',
 ]
 
@@ -39,7 +39,7 @@ install_headers(
 amtk_enum_types = GNOME.mkenums_simple(
   'amtk-enum-types',
   decorator: '_AMTK_EXTERN',
-  header_prefix: '#include <amtk/amtk-types.h>',
+  header_prefix: '#include <amtk/amtk-macros.h>',
   sources: amtk_public_headers,
   install_header: true,
   install_dir: headers_install_dir