[amtk] Replace _AMTK_EXTERN by G_MODULE_EXPORT - remove amtk-macros.h

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

commit c1c9ae78d55ed3e54d63432d656f700f16ab4657
Author: Sébastien Wilmet <sebastien wilmet gmail com>
Date:   Thu Sep 9 17:50:05 2021 +0200

    Replace _AMTK_EXTERN by G_MODULE_EXPORT - remove amtk-macros.h
    
    This is the continuation of the previous commit. To simplify the code.
    
    gmodule.h needs to be #included explicitly in a few places, when that
    header is not already #included implicitly (e.g., by gio/gio.h or
    gtk/gtk.h).

 amtk/amtk-action-info-central-store.h |  1 -
 amtk/amtk-action-info-store.h         |  1 -
 amtk/amtk-action-info.h               |  2 +-
 amtk/amtk-action-map.h                |  1 -
 amtk/amtk-application-window.h        |  1 -
 amtk/amtk-factory.h                   |  1 -
 amtk/amtk-gmenu.h                     |  1 -
 amtk/amtk-init.h                      |  3 +--
 amtk/amtk-macros.h                    | 29 -----------------------------
 amtk/amtk-menu-item.h                 |  1 -
 amtk/amtk-menu-shell.h                |  1 -
 amtk/amtk-shortcuts.h                 |  1 -
 amtk/amtk-utils.h                     |  1 -
 amtk/amtk.h                           |  1 -
 amtk/meson.build                      |  1 -
 15 files changed, 2 insertions(+), 44 deletions(-)
---
diff --git a/amtk/amtk-action-info-central-store.h b/amtk/amtk-action-info-central-store.h
index 1a7505e..d9eb7e6 100644
--- a/amtk/amtk-action-info-central-store.h
+++ b/amtk/amtk-action-info-central-store.h
@@ -26,7 +26,6 @@
 
 #include <glib-object.h>
 #include <amtk/amtk-action-info.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 10691b8..f4e55ff 100644
--- a/amtk/amtk-action-info-store.h
+++ b/amtk/amtk-action-info-store.h
@@ -26,7 +26,6 @@
 
 #include <gtk/gtk.h>
 #include <amtk/amtk-action-info.h>
-#include <amtk/amtk-macros.h>
 
 G_BEGIN_DECLS
 
diff --git a/amtk/amtk-action-info.h b/amtk/amtk-action-info.h
index d535e4a..b061186 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-macros.h>
+#include <gmodule.h>
 
 G_BEGIN_DECLS
 
diff --git a/amtk/amtk-action-map.h b/amtk/amtk-action-map.h
index fab94bb..7bfd9ad 100644
--- a/amtk/amtk-action-map.h
+++ b/amtk/amtk-action-map.h
@@ -25,7 +25,6 @@
 #endif
 
 #include <gio/gio.h>
-#include <amtk/amtk-macros.h>
 
 G_BEGIN_DECLS
 
diff --git a/amtk/amtk-application-window.h b/amtk/amtk-application-window.h
index 47b4075..990bdba 100644
--- a/amtk/amtk-application-window.h
+++ b/amtk/amtk-application-window.h
@@ -25,7 +25,6 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <amtk/amtk-macros.h>
 
 G_BEGIN_DECLS
 
diff --git a/amtk/amtk-factory.h b/amtk/amtk-factory.h
index 3577cc7..4b26b14 100644
--- a/amtk/amtk-factory.h
+++ b/amtk/amtk-factory.h
@@ -26,7 +26,6 @@
 
 #include <gtk/gtk.h>
 #include <amtk/amtk-action-info.h>
-#include <amtk/amtk-macros.h>
 
 G_BEGIN_DECLS
 
diff --git a/amtk/amtk-gmenu.h b/amtk/amtk-gmenu.h
index 18aec25..d820eea 100644
--- a/amtk/amtk-gmenu.h
+++ b/amtk/amtk-gmenu.h
@@ -25,7 +25,6 @@
 #endif
 
 #include <gio/gio.h>
-#include <amtk/amtk-macros.h>
 
 G_BEGIN_DECLS
 
diff --git a/amtk/amtk-init.h b/amtk/amtk-init.h
index a43e950..0928477 100644
--- a/amtk/amtk-init.h
+++ b/amtk/amtk-init.h
@@ -24,8 +24,7 @@
 #error "Only <amtk/amtk.h> can be included directly."
 #endif
 
-#include <glib.h>
-#include <amtk/amtk-macros.h>
+#include <gmodule.h>
 
 G_BEGIN_DECLS
 
diff --git a/amtk/amtk-menu-item.h b/amtk/amtk-menu-item.h
index 91ba702..74d4324 100644
--- a/amtk/amtk-menu-item.h
+++ b/amtk/amtk-menu-item.h
@@ -25,7 +25,6 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <amtk/amtk-macros.h>
 
 G_BEGIN_DECLS
 
diff --git a/amtk/amtk-menu-shell.h b/amtk/amtk-menu-shell.h
index 5ee0111..83d438e 100644
--- a/amtk/amtk-menu-shell.h
+++ b/amtk/amtk-menu-shell.h
@@ -25,7 +25,6 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <amtk/amtk-macros.h>
 
 G_BEGIN_DECLS
 
diff --git a/amtk/amtk-shortcuts.h b/amtk/amtk-shortcuts.h
index be303a1..32b640a 100644
--- a/amtk/amtk-shortcuts.h
+++ b/amtk/amtk-shortcuts.h
@@ -25,7 +25,6 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <amtk/amtk-macros.h>
 
 G_BEGIN_DECLS
 
diff --git a/amtk/amtk-utils.h b/amtk/amtk-utils.h
index 838f16b..a727ea0 100644
--- a/amtk/amtk-utils.h
+++ b/amtk/amtk-utils.h
@@ -25,7 +25,6 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <amtk/amtk-macros.h>
 
 G_BEGIN_DECLS
 
diff --git a/amtk/amtk.h b/amtk/amtk.h
index 6121fd1..d3ac154 100644
--- a/amtk/amtk.h
+++ b/amtk/amtk.h
@@ -22,7 +22,6 @@
 
 #define AMTK_H_INSIDE
 
-#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 0711a09..0e8a118 100644
--- a/amtk/meson.build
+++ b/amtk/meson.build
@@ -8,7 +8,6 @@ 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',