From 8202a40f4d95c7d81286ee9690300d80cae886c7 Mon Sep 17 00:00:00 2001
From: Christian Hergert <chergert@redhat.com>
Date: Tue, 6 Jun 2023 16:32:21 -0700
Subject: [PATCH] preload: hoist preloads into src/ directory

They will get used from libsysprof-profile, but it's nice to have them
a directory up going forward.
---
 src/libsysprof/meson.build                                  | 2 --
 src/meson.build                                             | 1 +
 src/{libsysprof => }/preload/backtrace-helper.h             | 0
 src/{libsysprof => }/preload/gconstructor.h                 | 0
 src/{libsysprof => }/preload/meson.build                    | 0
 src/{libsysprof => }/preload/sysprof-memory-collector.c     | 0
 src/{libsysprof => }/preload/sysprof-speedtrack-collector.c | 0
 src/{libsysprof => }/preload/sysprof-tracer.c               | 0
 8 files changed, 1 insertion(+), 2 deletions(-)
 rename src/{libsysprof => }/preload/backtrace-helper.h (100%)
 rename src/{libsysprof => }/preload/gconstructor.h (100%)
 rename src/{libsysprof => }/preload/meson.build (100%)
 rename src/{libsysprof => }/preload/sysprof-memory-collector.c (100%)
 rename src/{libsysprof => }/preload/sysprof-speedtrack-collector.c (100%)
 rename src/{libsysprof => }/preload/sysprof-tracer.c (100%)

diff --git a/src/libsysprof/meson.build b/src/libsysprof/meson.build
index fa0f5263..2e3af830 100644
--- a/src/libsysprof/meson.build
+++ b/src/libsysprof/meson.build
@@ -196,5 +196,3 @@ pkgconfig.generate(
 
 install_headers(libsysprof_public_headers, subdir: sysprof_header_subdir)
 endif
-
-subdir('preload')
diff --git a/src/meson.build b/src/meson.build
index c735b46c..616fcbf8 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -64,6 +64,7 @@ endif
 
 if need_libsysprof_profile
   subdir('libsysprof-profile')
+  subdir('preload')
 endif
 
 if get_option('sysprofd') == 'bundled'
diff --git a/src/libsysprof/preload/backtrace-helper.h b/src/preload/backtrace-helper.h
similarity index 100%
rename from src/libsysprof/preload/backtrace-helper.h
rename to src/preload/backtrace-helper.h
diff --git a/src/libsysprof/preload/gconstructor.h b/src/preload/gconstructor.h
similarity index 100%
rename from src/libsysprof/preload/gconstructor.h
rename to src/preload/gconstructor.h
diff --git a/src/libsysprof/preload/meson.build b/src/preload/meson.build
similarity index 100%
rename from src/libsysprof/preload/meson.build
rename to src/preload/meson.build
diff --git a/src/libsysprof/preload/sysprof-memory-collector.c b/src/preload/sysprof-memory-collector.c
similarity index 100%
rename from src/libsysprof/preload/sysprof-memory-collector.c
rename to src/preload/sysprof-memory-collector.c
diff --git a/src/libsysprof/preload/sysprof-speedtrack-collector.c b/src/preload/sysprof-speedtrack-collector.c
similarity index 100%
rename from src/libsysprof/preload/sysprof-speedtrack-collector.c
rename to src/preload/sysprof-speedtrack-collector.c
diff --git a/src/libsysprof/preload/sysprof-tracer.c b/src/preload/sysprof-tracer.c
similarity index 100%
rename from src/libsysprof/preload/sysprof-tracer.c
rename to src/preload/sysprof-tracer.c