libsysprof: add inside guards to prevent stray includes

This requires that things use #include <sysprof.h> now instead
of individual includes. A few cases are still allowed in the
libsysprof-capture library to make copy/paste embedding easier.

src/libsysprof-ui/sysprof-callgraph-view.h

@@ -21,10 +21,7 @@
 #pragma once
 
 #include <gtk/gtk.h>
-
+#include <sysprof.h>
-#include "sysprof-callgraph-profile.h"
-
-#include "sysprof-version-macros.h"
 
 G_BEGIN_DECLS
 

src/libsysprof-ui/sysprof-cpu-visualizer-row.c

@@ -22,8 +22,8 @@
 
 #include "config.h"
 
-#include "sysprof-capture-condition.h"
+#include <sysprof.h>
-#include "sysprof-capture-cursor.h"
+
 #include "sysprof-color-cycle.h"
 #include "sysprof-cpu-visualizer-row.h"
 

src/libsysprof-ui/sysprof-failed-state-view.h

@@ -21,9 +21,7 @@
 #pragma once
 
 #include <gtk/gtk.h>
-
+#include <sysprof.h>
-#include "sysprof-profiler.h"
-#include "sysprof-version-macros.h"
 
 G_BEGIN_DECLS
 

src/libsysprof-ui/sysprof-line-visualizer-row.c

@@ -24,10 +24,9 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <sysprof.h>
 
 #include "pointcache.h"
-#include "sysprof-capture-condition.h"
-#include "sysprof-capture-cursor.h"
 #include "sysprof-line-visualizer-row.h"
 
 typedef struct

src/libsysprof-ui/sysprof-process-model-row.c

@@ -18,6 +18,8 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
+#define G_LOG_DOMAIN "sysprof-process-model-row"
+
 #include "config.h"
 
 #include "sysprof-process-model-row.h"

src/libsysprof-ui/sysprof-process-model-row.h

@@ -21,9 +21,7 @@
 #pragma once
 
 #include <gtk/gtk.h>
-
+#include <sysprof.h>
-#include "sysprof-process-model-item.h"
-#include "sysprof-version-macros.h"
 
 G_BEGIN_DECLS
 

src/libsysprof-ui/sysprof-profiler-menu-button.c

@@ -22,10 +22,9 @@
 
 #include <glib/gi18n.h>
 #include <string.h>
+#include <sysprof.h>
 
 #include "sysprof-model-filter.h"
-#include "sysprof-process-model.h"
-#include "sysprof-process-model-item.h"
 #include "sysprof-process-model-row.h"
 #include "sysprof-profiler-menu-button.h"
 

src/libsysprof-ui/sysprof-recording-state-view.h

@@ -21,9 +21,7 @@
 #pragma once
 
 #include <gtk/gtk.h>
-
+#include <sysprof.h>
-#include "sysprof-profiler.h"
-#include "sysprof-version-macros.h"
 
 G_BEGIN_DECLS
 

src/libsysprof-ui/sysprof-ui.h

@@ -35,8 +35,6 @@ G_BEGIN_DECLS
 # include "sysprof-model-filter.h"
 # include "sysprof-multi-paned.h"
 # include "sysprof-recording-state-view.h"
-# include "sysprof-process-model.h"
-# include "sysprof-process-model-item.h"
 # include "sysprof-process-model-row.h"
 # include "sysprof-profiler-menu-button.h"
 # include "sysprof-visualizer-row.h"

src/libsysprof-ui/sysprof-visualizer-view.c

@@ -28,7 +28,6 @@
 #include "sysprof-visualizer-list.h"
 #include "sysprof-visualizer-row.h"
 #include "sysprof-visualizer-row-private.h"
-#include "sysprof-selection.h"
 #include "sysprof-visualizer-ticks.h"
 #include "sysprof-visualizer-view.h"
 

src/libsysprof/sysprof-callgraph-profile.h

@@ -20,6 +20,10 @@
 
 #pragma once
 
+#if !defined (SYSPROF_INSIDE) && !defined (SYSPROF_COMPILATION)
+# error "Only <sysprof.h> can be included directly."
+#endif
+
 #include "sysprof-version-macros.h"
 
 #include "sysprof-profile.h"

src/libsysprof/sysprof-capture-gobject.h

@@ -20,6 +20,10 @@
 
 #pragma once
 
+#if !defined (SYSPROF_INSIDE) && !defined (SYSPROF_COMPILATION)
+# error "Only <sysprof.h> can be included directly."
+#endif
+
 #include <glib-object.h>
 
 #include "sysprof-version-macros.h"

src/libsysprof/sysprof-elf-symbol-resolver.h

@@ -20,6 +20,10 @@
 
 #pragma once
 
+#if !defined (SYSPROF_INSIDE) && !defined (SYSPROF_COMPILATION)
+# error "Only <sysprof.h> can be included directly."
+#endif
+
 #include "sysprof-version-macros.h"
 
 #include "sysprof-symbol-resolver.h"

src/libsysprof/sysprof-gjs-source.h

@@ -20,6 +20,10 @@
 
 #pragma once
 
+#if !defined (SYSPROF_INSIDE) && !defined (SYSPROF_COMPILATION)
+# error "Only <sysprof.h> can be included directly."
+#endif
+
 #include "sysprof-source.h"
 
 G_BEGIN_DECLS

src/libsysprof/sysprof-hostinfo-source.h

@@ -20,6 +20,10 @@
 
 #pragma once
 
+#if !defined (SYSPROF_INSIDE) && !defined (SYSPROF_COMPILATION)
+# error "Only <sysprof.h> can be included directly."
+#endif
+
 #include "sysprof-version-macros.h"
 
 #include "sysprof-source.h"

src/libsysprof/sysprof-jitmap-symbol-resolver.h

@@ -20,6 +20,10 @@
 
 #pragma once
 
+#if !defined (SYSPROF_INSIDE) && !defined (SYSPROF_COMPILATION)
+# error "Only <sysprof.h> can be included directly."
+#endif
+
 #include "sysprof-symbol-resolver.h"
 
 G_BEGIN_DECLS

src/libsysprof/sysprof-kallsyms.h

@@ -20,6 +20,10 @@
 
 #pragma once
 
+#if !defined (SYSPROF_INSIDE) && !defined (SYSPROF_COMPILATION)
+# error "Only <sysprof.h> can be included directly."
+#endif
+
 #include "sysprof-version-macros.h"
 
 G_BEGIN_DECLS

src/libsysprof/sysprof-kernel-symbol-resolver.h

@@ -20,6 +20,10 @@
 
 #pragma once
 
+#if !defined (SYSPROF_INSIDE) && !defined (SYSPROF_COMPILATION)
+# error "Only <sysprof.h> can be included directly."
+#endif
+
 #include "sysprof-symbol-resolver.h"
 
 G_BEGIN_DECLS

src/libsysprof/sysprof-kernel-symbol.h

@@ -20,6 +20,10 @@
 
 #pragma once
 
+#if !defined (SYSPROF_INSIDE) && !defined (SYSPROF_COMPILATION)
+# error "Only <sysprof.h> can be included directly."
+#endif
+
 #include "sysprof-capture-types.h"
 
 G_BEGIN_DECLS

src/libsysprof/sysprof-local-profiler.h

@@ -20,6 +20,10 @@
 
 #pragma once
 
+#if !defined (SYSPROF_INSIDE) && !defined (SYSPROF_COMPILATION)
+# error "Only <sysprof.h> can be included directly."
+#endif
+
 #include "sysprof-profiler.h"
 
 #include "sysprof-version-macros.h"

src/libsysprof/sysprof-map-lookaside.h

@@ -20,6 +20,10 @@
 
 #pragma once
 
+#if !defined (SYSPROF_INSIDE) && !defined (SYSPROF_COMPILATION)
+# error "Only <sysprof.h> can be included directly."
+#endif
+
 #include <glib.h>
 
 #include "sysprof-capture-types.h"

src/libsysprof/sysprof-memory-source.h

@@ -20,6 +20,10 @@
 
 #pragma once
 
+#if !defined (SYSPROF_INSIDE) && !defined (SYSPROF_COMPILATION)
+# error "Only <sysprof.h> can be included directly."
+#endif
+
 #include "sysprof-version-macros.h"
 
 #include "sysprof-source.h"

src/libsysprof/sysprof-perf-counter.h

@@ -20,6 +20,10 @@
 
 #pragma once
 
+#if !defined (SYSPROF_INSIDE) && !defined (SYSPROF_COMPILATION)
+# error "Only <sysprof.h> can be included directly."
+#endif
+
 #include <gio/gio.h>
 #include <linux/perf_event.h>
 

src/libsysprof/sysprof-perf-source.h

@@ -20,6 +20,10 @@
 
 #pragma once
 
+#if !defined (SYSPROF_INSIDE) && !defined (SYSPROF_COMPILATION)
+# error "Only <sysprof.h> can be included directly."
+#endif
+
 #include "sysprof-version-macros.h"
 
 #include "sysprof-source.h"

src/libsysprof/sysprof-proc-source.h

@@ -20,6 +20,10 @@
 
 #pragma once
 
+#if !defined (SYSPROF_INSIDE) && !defined (SYSPROF_COMPILATION)
+# error "Only <sysprof.h> can be included directly."
+#endif
+
 #include "sysprof-version-macros.h"
 
 #include "sysprof-source.h"

src/libsysprof/sysprof-process-model-item.c

@@ -18,11 +18,14 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
+#define G_LOG_DOMAIN "sp-process-model-item"
+
 #include "config.h"
 
 #include <string.h>
 
 #include "sysprof-process-model-item.h"
+
 #ifdef __linux__
 # include "sysprof-proc-source.h"
 #endif

src/libsysprof/sysprof-process-model-item.h

@@ -20,6 +20,10 @@
 
 #pragma once
 
+#if !defined (SYSPROF_INSIDE) && !defined (SYSPROF_COMPILATION)
+# error "Only <sysprof.h> can be included directly."
+#endif
+
 #include "sysprof-version-macros.h"
 
 #include <gio/gio.h>

src/libsysprof/sysprof-process-model.h

@@ -20,6 +20,10 @@
 
 #pragma once
 
+#if !defined (SYSPROF_INSIDE) && !defined (SYSPROF_COMPILATION)
+# error "Only <sysprof.h> can be included directly."
+#endif
+
 #include <gio/gio.h>
 
 #include "sysprof-version-macros.h"

src/libsysprof/sysprof-profile.h

@@ -20,6 +20,10 @@
 
 #pragma once
 
+#if !defined (SYSPROF_INSIDE) && !defined (SYSPROF_COMPILATION)
+# error "Only <sysprof.h> can be included directly."
+#endif
+
 #include <gio/gio.h>
 
 #include "sysprof-version-macros.h"

src/libsysprof/sysprof-profiler.h

@@ -20,6 +20,10 @@
 
 #pragma once
 
+#if !defined (SYSPROF_INSIDE) && !defined (SYSPROF_COMPILATION)
+# error "Only <sysprof.h> can be included directly."
+#endif
+
 #include "sysprof-version-macros.h"
 
 #include "sysprof-capture-writer.h"

src/libsysprof/sysprof-selection.h

@@ -20,6 +20,10 @@
 
 #pragma once
 
+#if !defined (SYSPROF_INSIDE) && !defined (SYSPROF_COMPILATION)
+# error "Only <sysprof.h> can be included directly."
+#endif
+
 #include <glib-object.h>
 
 #include "sysprof-version-macros.h"

src/libsysprof/sysprof-source.h

@@ -20,6 +20,10 @@
 
 #pragma once
 
+#if !defined (SYSPROF_INSIDE) && !defined (SYSPROF_COMPILATION)
+# error "Only <sysprof.h> can be included directly."
+#endif
+
 #include <glib-object.h>
 
 #include "sysprof-capture-writer.h"

src/libsysprof/sysprof-symbol-dirs.h

@@ -20,6 +20,10 @@
 
 #pragma once
 
+#if !defined (SYSPROF_INSIDE) && !defined (SYSPROF_COMPILATION)
+# error "Only <sysprof.h> can be included directly."
+#endif
+
 #include "sysprof-version-macros.h"
 
 #include <glib.h>

src/libsysprof/sysprof-symbol-resolver.h

@@ -20,6 +20,10 @@
 
 #pragma once
 
+#if !defined (SYSPROF_INSIDE) && !defined (SYSPROF_COMPILATION)
+# error "Only <sysprof.h> can be included directly."
+#endif
+
 #include <glib-object.h>
 
 #include "sysprof-address.h"

src/libsysprof/sysprof.h

@@ -31,6 +31,8 @@ G_BEGIN_DECLS
 # include "sysprof-profile.h"
 # include "sysprof-profiler.h"
 # include "sysprof-map-lookaside.h"
+# include "sysprof-process-model.h"
+# include "sysprof-process-model-item.h"
 # include "sysprof-source.h"
 # include "sysprof-elf-symbol-resolver.h"
 # include "sysprof-jitmap-symbol-resolver.h"