build: fix header installation paths

lib/callgraph/meson.build

@@ -1,17 +1,33 @@
-libsysprof_headers += files([
+callgraph_headers = [
   'sp-callgraph-profile.h',
-])
+]
 
-libsysprof_sources += files([
+callgraph_sources = [
   'sp-callgraph-profile-private.h',
   'sp-callgraph-profile.c',
-])
+]
+
+libsysprof_headers += files(callgraph_headers)
+libsysprof_sources += files(callgraph_sources)
+
+install_headers(callgraph_headers,
+  subdir: join_paths(libsysprof_header_subdir, 'callgraph'))
 
 
-libsysprof_ui_headers += files([
-    'sp-callgraph-view.h',
-])
+if get_option('enable_gtk')
 
-libsysprof_ui_sources += files([
-    'sp-callgraph-view.c',
-])
+callgraph_ui_headers = [
+  'sp-callgraph-view.h',
+]
+
+callgraph_ui_sources = [
+  'sp-callgraph-view.c',
+]
+
+libsysprof_ui_headers += files(callgraph_ui_headers)
+libsysprof_ui_sources += files(callgraph_ui_sources)
+
+install_headers(callgraph_ui_headers,
+  subdir: join_paths(libsysprof_header_subdir, 'callgraph'))
+
+endif

lib/capture/meson.build

@@ -1,14 +1,20 @@
-libsysprof_headers += files([
+capture_headers = [
   'sp-capture-condition.h',
   'sp-capture-cursor.h',
   'sp-capture-reader.h',
   'sp-capture-types.h',
   'sp-capture-writer.h',
-])
+]
 
-libsysprof_sources += files([
+capture_sources = [
   'sp-capture-condition.c',
   'sp-capture-cursor.c',
   'sp-capture-reader.c',
   'sp-capture-writer.c',
-])
+]
+
+libsysprof_headers += files(capture_headers)
+libsysprof_sources += files(capture_sources)
+
+install_headers(capture_headers,
+  subdir: join_paths(libsysprof_header_subdir, 'capture'))

lib/meson.build

@@ -5,6 +5,7 @@
 # components (for IDE integration).
 
 libsysprof_api_version = '2'
+libsysprof_header_subdir = 'sysprof-' + libsysprof_api_version
 
 libsysprof_version_conf = configuration_data()
 libsysprof_version = meson.project_version().split('.')
@@ -21,20 +22,22 @@ configure_file(
     install_dir: join_paths(get_option('includedir'), 'sysprof-' + libsysprof_api_version)
 )
 
-libsysprof_headers = [
+libsysprof_base_headers = [
   'sysprof.h',
   'sp-address.h',
   'sp-clock.h',
   'sp-error.h',
 ]
 
+libsysprof_headers = libsysprof_base_headers
 libsysprof_sources = [
   'sp-address.c',
   'sp-clock.c',
   'sp-error.c',
 ]
 
-libsysprof_ui_headers = ['sysprof-ui.h']
+libsysprof_ui_base_headers = ['sysprof-ui.h']
+libsysprof_ui_headers = libsysprof_ui_base_headers
 libsysprof_ui_sources = []
 
 subdir('callgraph')
@@ -70,16 +73,14 @@ libsysprof = shared_library('sysprof-' + libsysprof_api_version,
        install: true,
 )
 
-install_headers(libsysprof_headers,
-  subdir: 'sysprof-' + libsysprof_api_version,
-)
-
 libsysprof_dep = declare_dependency(
   include_directories: include_directories('.'),
      link_with: libsysprof,
   dependencies: libsysprof_deps,
 )
 
+install_headers(libsysprof_base_headers, subdir: libsysprof_header_subdir)
+
 if get_option('enable_gtk')
   # This is our GTK library containing the widgets suitable for viewing
   # and manipulating the various profiler API in libsysprof.  This is
@@ -104,14 +105,12 @@ if get_option('enable_gtk')
          install: true,
   )
 
-  install_headers(libsysprof_ui_headers,
-    subdir: 'sysprof-' + libsysprof_api_version,
-  )
-
   libsysprof_ui_dep = declare_dependency(
            dependencies: libsysprof_ui_deps,
               link_with: libsysprof_ui,
     include_directories: include_directories('.'),
   )
 
+  install_headers(libsysprof_ui_base_headers, subdir: libsysprof_header_subdir)
+
 endif

lib/profiler/meson.build

@@ -1,11 +1,17 @@
-libsysprof_headers += files([
+profiler_headers = [
   'sp-local-profiler.h',
   'sp-profile.h',
   'sp-profiler.h',
-])
+]
 
-libsysprof_sources += files([
+profiler_sources = [
   'sp-local-profiler.c',
   'sp-profile.c',
   'sp-profiler.c',
-])
+]
+
+libsysprof_headers += files(profiler_headers)
+libsysprof_sources += files(profiler_sources)
+
+install_headers(profiler_headers,
+  subdir: join_paths(libsysprof_header_subdir, 'profiler'))

lib/sources/meson.build

@@ -1,12 +1,12 @@
-libsysprof_headers += files([
+sources_headers = [
   'sp-gjs-source.h',
   'sp-hostinfo-source.h',
   'sp-perf-source.h',
   'sp-proc-source.h',
   'sp-source.h',
-])
+]
 
-libsysprof_sources += files([
+sources_sources = [
   'sp-gjs-source.c',
   'sp-hostinfo-source.c',
   'sp-perf-counter.c',
@@ -14,4 +14,10 @@ libsysprof_sources += files([
   'sp-perf-source.c',
   'sp-proc-source.c',
   'sp-source.c',
-])
+]
+
+libsysprof_headers += files(sources_headers)
+libsysprof_sources += files(sources_sources)
+
+install_headers(sources_headers,
+  subdir: join_paths(libsysprof_header_subdir, 'sources'))

lib/symbols/meson.build

@@ -1,17 +1,23 @@
-libsysprof_headers += files([
+symbols_headers = [
   'sp-elf-symbol-resolver.h',
   'sp-jitmap-symbol-resolver.h',
   'sp-kernel-symbol-resolver.h',
   'sp-kernel-symbol.h',
   'sp-symbol-dirs.h',
   'sp-symbol-resolver.h',
-])
+]
 
-libsysprof_sources += files([
+symbols_sources = [
   'sp-elf-symbol-resolver.c',
   'sp-jitmap-symbol-resolver.c',
   'sp-kernel-symbol-resolver.c',
   'sp-kernel-symbol.c',
   'sp-symbol-dirs.c',
   'sp-symbol-resolver.c',
-])
+]
+
+libsysprof_headers += files(symbols_headers)
+libsysprof_sources += files(symbols_sources)
+
+install_headers(symbols_headers,
+  subdir: join_paths(libsysprof_header_subdir, 'symbols'))

lib/util/meson.build

@@ -1,9 +1,9 @@
-libsysprof_headers += files([
+util_headers = [
   'sp-map-lookaside.h',
   'sp-selection.h',
-])
+]
 
-libsysprof_sources += files([
+util_sources = [
   'binfile.c',
   'binfile.h',
   'demangle.cpp',
@@ -18,16 +18,25 @@ libsysprof_sources += files([
   'sp-selection.c',
   'stackstash.c',
   'stackstash.h',
-])
+]
 
-libsysprof_ui_headers += files([
+libsysprof_headers += files(util_headers)
+libsysprof_sources += files(util_sources)
+
+install_headers(util_headers,
+  subdir: join_paths(libsysprof_header_subdir, 'util'))
+
+
+if get_option('enable_gtk')
+
+util_ui_headers = [
   'sp-model-filter.h',
   'sp-process-model-item.h',
   'sp-process-model.h',
   'sp-zoom-manager.h',
-])
+]
 
-libsysprof_ui_sources += files([
+util_ui_sources = [
   'pointcache.c',
   'pointcache.h',
   'sp-color-cycle.c',
@@ -40,4 +49,12 @@ libsysprof_ui_sources += files([
   'sp-zoom-manager.c',
   'stackstash.c',
   'stackstash.h',
-])
+]
+
+libsysprof_ui_headers += files(util_ui_headers)
+libsysprof_ui_sources += files(util_ui_sources)
+
+install_headers(util_ui_headers,
+  subdir: join_paths(libsysprof_header_subdir, 'util'))
+
+endif

lib/visualizers/meson.build

@@ -1,11 +1,13 @@
-libsysprof_ui_headers += files([
+if get_option('enable_gtk')
+
+visualizer_ui_headers = [
   'sp-cpu-visualizer-row.h',
   'sp-line-visualizer-row.h',
   'sp-visualizer-row.h',
   'sp-visualizer-view.h',
-])
+]
 
-libsysprof_ui_sources += files([
+visualizer_ui_sources = [
   'sp-cpu-visualizer-row.c',
   'sp-line-visualizer-row.c',
   'sp-visualizer-list.c',
@@ -15,4 +17,12 @@ libsysprof_ui_sources += files([
   'sp-visualizer-ticks.c',
   'sp-visualizer-ticks.h',
   'sp-visualizer-view.c',
-])
+]
+
+libsysprof_ui_headers += files(visualizer_ui_headers)
+libsysprof_ui_sources += files(visualizer_ui_sources)
+
+install_headers(visualizer_ui_headers,
+  subdir: join_paths(libsysprof_header_subdir, 'visualizers'))
+
+endif

lib/widgets/meson.build

@@ -1,4 +1,6 @@
-libsysprof_ui_headers += files([
+if get_option('enable_gtk')
+
+widgets_ui_headers = [
   'sp-cell-renderer-percent.h',
   'sp-empty-state-view.h',
   'sp-failed-state-view.h',
@@ -6,9 +8,9 @@ libsysprof_ui_headers += files([
   'sp-process-model-row.h',
   'sp-profiler-menu-button.h',
   'sp-recording-state-view.h',
-])
+]
 
-libsysprof_ui_sources += files([
+widgets_ui_sources = [
   'sp-cell-renderer-percent.c',
   'sp-empty-state-view.c',
   'sp-failed-state-view.c',
@@ -16,4 +18,12 @@ libsysprof_ui_sources += files([
   'sp-process-model-row.c',
   'sp-profiler-menu-button.c',
   'sp-recording-state-view.c',
-])
+]
+
+libsysprof_ui_headers += files(widgets_ui_headers)
+libsysprof_ui_sources += files(widgets_ui_sources)
+
+install_headers(widgets_ui_headers,
+  subdir: join_paths(libsysprof_header_subdir, 'widgets'))
+
+endif