From 190faa818df0bdfb4fef9ff9e20d909db884456a Mon Sep 17 00:00:00 2001 From: Christian Hergert Date: Thu, 28 Sep 2017 16:57:00 -0700 Subject: [PATCH] build: use subdir meson.build files This keeps the build file closer to the sources it effects. --- lib/callgraph/meson.build | 17 +++++ lib/capture/meson.build | 14 +++++ lib/meson.build | 122 ++++-------------------------------- lib/profiler/meson.build | 11 ++++ lib/sources/meson.build | 17 +++++ lib/symbols/meson.build | 17 +++++ lib/util/meson.build | 43 +++++++++++++ lib/visualizers/meson.build | 18 ++++++ lib/widgets/meson.build | 19 ++++++ 9 files changed, 168 insertions(+), 110 deletions(-) create mode 100644 lib/callgraph/meson.build create mode 100644 lib/capture/meson.build create mode 100644 lib/profiler/meson.build create mode 100644 lib/sources/meson.build create mode 100644 lib/symbols/meson.build create mode 100644 lib/util/meson.build create mode 100644 lib/visualizers/meson.build create mode 100644 lib/widgets/meson.build diff --git a/lib/callgraph/meson.build b/lib/callgraph/meson.build new file mode 100644 index 00000000..03023270 --- /dev/null +++ b/lib/callgraph/meson.build @@ -0,0 +1,17 @@ +libsysprof_headers += files([ + 'sp-callgraph-profile.h', +]) + +libsysprof_sources += files([ + 'sp-callgraph-profile-private.h', + 'sp-callgraph-profile.c', +]) + + +libsysprof_ui_headers += files([ + 'sp-callgraph-view.h', +]) + +libsysprof_ui_sources += files([ + 'sp-callgraph-view.c', +]) diff --git a/lib/capture/meson.build b/lib/capture/meson.build new file mode 100644 index 00000000..e23e4922 --- /dev/null +++ b/lib/capture/meson.build @@ -0,0 +1,14 @@ +libsysprof_headers += files([ + 'sp-capture-condition.h', + 'sp-capture-cursor.h', + 'sp-capture-reader.h', + 'sp-capture-types.h', + 'sp-capture-writer.h', +]) + +libsysprof_sources += files([ + 'sp-capture-condition.c', + 'sp-capture-cursor.c', + 'sp-capture-reader.c', + 'sp-capture-writer.c', +]) diff --git a/lib/meson.build b/lib/meson.build index 63ca02d4..5e33b120 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -26,72 +26,26 @@ libsysprof_headers = [ 'sp-address.h', 'sp-clock.h', 'sp-error.h', - 'callgraph/sp-callgraph-profile.h', - 'capture/sp-capture-condition.h', - 'capture/sp-capture-cursor.h', - 'capture/sp-capture-reader.h', - 'capture/sp-capture-types.h', - 'capture/sp-capture-writer.h', - 'profiler/sp-local-profiler.h', - 'profiler/sp-profile.h', - 'profiler/sp-profiler.h', - 'sources/sp-gjs-source.h', - 'sources/sp-hostinfo-source.h', - 'sources/sp-perf-source.h', - 'sources/sp-proc-source.h', - 'sources/sp-source.h', - 'symbols/sp-elf-symbol-resolver.h', - 'symbols/sp-jitmap-symbol-resolver.h', - 'symbols/sp-kernel-symbol-resolver.h', - 'symbols/sp-kernel-symbol.h', - 'symbols/sp-symbol-dirs.h', - 'symbols/sp-symbol-resolver.h', - 'util/sp-map-lookaside.h', - 'util/sp-selection.h', ] libsysprof_sources = [ 'sp-address.c', 'sp-clock.c', 'sp-error.c', - 'callgraph/sp-callgraph-profile-private.h', - 'callgraph/sp-callgraph-profile.c', - 'capture/sp-capture-condition.c', - 'capture/sp-capture-cursor.c', - 'capture/sp-capture-reader.c', - 'capture/sp-capture-writer.c', - 'profiler/sp-local-profiler.c', - 'profiler/sp-profile.c', - 'profiler/sp-profiler.c', - 'sources/sp-gjs-source.c', - 'sources/sp-hostinfo-source.c', - 'sources/sp-perf-counter.c', - 'sources/sp-perf-counter.h', - 'sources/sp-perf-source.c', - 'sources/sp-proc-source.c', - 'sources/sp-source.c', - 'symbols/sp-elf-symbol-resolver.c', - 'symbols/sp-jitmap-symbol-resolver.c', - 'symbols/sp-kernel-symbol-resolver.c', - 'symbols/sp-kernel-symbol.c', - 'symbols/sp-symbol-dirs.c', - 'symbols/sp-symbol-resolver.c', - 'util/binfile.c', - 'util/binfile.h', - 'util/demangle.cpp', - 'util/demangle.h', - 'util/elfparser.c', - 'util/elfparser.h', - 'util/sp-line-reader.c', - 'util/sp-line-reader.h', - 'util/sp-map-lookaside.c', - 'util/sp-platform.c', - 'util/sp-platform.h', - 'util/sp-selection.c', - 'util/stackstash.c', - 'util/stackstash.h', ] +libsysprof_ui_headers = ['sysprof-ui.h'] +libsysprof_ui_sources = [] + +subdir('callgraph') +subdir('capture') +subdir('profiler') +subdir('sources') +subdir('symbols') +subdir('util') +subdir('visualizers') +subdir('widgets') + cxx = meson.get_compiler('cpp') libsysprof_deps = [ @@ -131,58 +85,6 @@ if get_option('enable_gtk') # and manipulating the various profiler API in libsysprof. This is # meant to be used by IDEs and the sysprof gui. - libsysprof_ui_headers = [ - 'callgraph/sp-callgraph-view.h', - 'util/sp-model-filter.h', - 'util/sp-process-model-item.h', - 'util/sp-process-model.h', - 'util/sp-zoom-manager.h', - 'visualizers/sp-cpu-visualizer-row.h', - 'visualizers/sp-line-visualizer-row.h', - 'visualizers/sp-visualizer-row.h', - 'visualizers/sp-visualizer-view.h', - 'widgets/sp-cell-renderer-percent.h', - 'widgets/sp-empty-state-view.h', - 'widgets/sp-failed-state-view.h', - 'widgets/sp-multi-paned.h', - 'widgets/sp-process-model-row.h', - 'widgets/sp-profiler-menu-button.h', - 'widgets/sp-recording-state-view.h', - 'sysprof-ui.h', - ] - - libsysprof_ui_sources = [ - 'callgraph/sp-callgraph-view.c', - 'util/pointcache.c', - 'util/pointcache.h', - 'util/sp-color-cycle.c', - 'util/sp-color-cycle.h', - 'util/sp-model-filter.c', - 'util/sp-process-model-item.c', - 'util/sp-process-model.c', - 'util/sp-theme-manager.c', - 'util/sp-theme-manager.h', - 'util/sp-zoom-manager.c', - 'util/stackstash.c', - 'util/stackstash.h', - 'visualizers/sp-cpu-visualizer-row.c', - 'visualizers/sp-line-visualizer-row.c', - 'visualizers/sp-visualizer-list.c', - 'visualizers/sp-visualizer-list.h', - 'visualizers/sp-visualizer-row-private.h', - 'visualizers/sp-visualizer-row.c', - 'visualizers/sp-visualizer-ticks.c', - 'visualizers/sp-visualizer-ticks.h', - 'visualizers/sp-visualizer-view.c', - 'widgets/sp-cell-renderer-percent.c', - 'widgets/sp-empty-state-view.c', - 'widgets/sp-failed-state-view.c', - 'widgets/sp-multi-paned.c', - 'widgets/sp-process-model-row.c', - 'widgets/sp-profiler-menu-button.c', - 'widgets/sp-recording-state-view.c', - ] - libsysprof_ui_resources = gnome.compile_resources( 'sp-ui-resources', 'resources/libsysprof.gresource.xml', source_dir: 'resources', diff --git a/lib/profiler/meson.build b/lib/profiler/meson.build new file mode 100644 index 00000000..b9384a15 --- /dev/null +++ b/lib/profiler/meson.build @@ -0,0 +1,11 @@ +libsysprof_headers += files([ + 'sp-local-profiler.h', + 'sp-profile.h', + 'sp-profiler.h', +]) + +libsysprof_sources += files([ + 'sp-local-profiler.c', + 'sp-profile.c', + 'sp-profiler.c', +]) diff --git a/lib/sources/meson.build b/lib/sources/meson.build new file mode 100644 index 00000000..f9df088c --- /dev/null +++ b/lib/sources/meson.build @@ -0,0 +1,17 @@ +libsysprof_headers += files([ + 'sp-gjs-source.h', + 'sp-hostinfo-source.h', + 'sp-perf-source.h', + 'sp-proc-source.h', + 'sp-source.h', +]) + +libsysprof_sources += files([ + 'sp-gjs-source.c', + 'sp-hostinfo-source.c', + 'sp-perf-counter.c', + 'sp-perf-counter.h', + 'sp-perf-source.c', + 'sp-proc-source.c', + 'sp-source.c', +]) diff --git a/lib/symbols/meson.build b/lib/symbols/meson.build new file mode 100644 index 00000000..35c7486d --- /dev/null +++ b/lib/symbols/meson.build @@ -0,0 +1,17 @@ +libsysprof_headers += files([ + '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([ + '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', +]) diff --git a/lib/util/meson.build b/lib/util/meson.build new file mode 100644 index 00000000..350e6191 --- /dev/null +++ b/lib/util/meson.build @@ -0,0 +1,43 @@ +libsysprof_headers += files([ + 'sp-map-lookaside.h', + 'sp-selection.h', +]) + +libsysprof_sources += files([ + 'binfile.c', + 'binfile.h', + 'demangle.cpp', + 'demangle.h', + 'elfparser.c', + 'elfparser.h', + 'sp-line-reader.c', + 'sp-line-reader.h', + 'sp-map-lookaside.c', + 'sp-platform.c', + 'sp-platform.h', + 'sp-selection.c', + 'stackstash.c', + 'stackstash.h', +]) + +libsysprof_ui_headers += files([ + 'sp-model-filter.h', + 'sp-process-model-item.h', + 'sp-process-model.h', + 'sp-zoom-manager.h', +]) + +libsysprof_ui_sources += files([ + 'pointcache.c', + 'pointcache.h', + 'sp-color-cycle.c', + 'sp-color-cycle.h', + 'sp-model-filter.c', + 'sp-process-model-item.c', + 'sp-process-model.c', + 'sp-theme-manager.c', + 'sp-theme-manager.h', + 'sp-zoom-manager.c', + 'stackstash.c', + 'stackstash.h', +]) diff --git a/lib/visualizers/meson.build b/lib/visualizers/meson.build new file mode 100644 index 00000000..3ff02f51 --- /dev/null +++ b/lib/visualizers/meson.build @@ -0,0 +1,18 @@ +libsysprof_ui_headers += files([ + 'sp-cpu-visualizer-row.h', + 'sp-line-visualizer-row.h', + 'sp-visualizer-row.h', + 'sp-visualizer-view.h', +]) + +libsysprof_ui_sources += files([ + 'sp-cpu-visualizer-row.c', + 'sp-line-visualizer-row.c', + 'sp-visualizer-list.c', + 'sp-visualizer-list.h', + 'sp-visualizer-row-private.h', + 'sp-visualizer-row.c', + 'sp-visualizer-ticks.c', + 'sp-visualizer-ticks.h', + 'sp-visualizer-view.c', +]) diff --git a/lib/widgets/meson.build b/lib/widgets/meson.build new file mode 100644 index 00000000..decb67e4 --- /dev/null +++ b/lib/widgets/meson.build @@ -0,0 +1,19 @@ +libsysprof_ui_headers += files([ + 'sp-cell-renderer-percent.h', + 'sp-empty-state-view.h', + 'sp-failed-state-view.h', + 'sp-multi-paned.h', + 'sp-process-model-row.h', + 'sp-profiler-menu-button.h', + 'sp-recording-state-view.h', +]) + +libsysprof_ui_sources += files([ + 'sp-cell-renderer-percent.c', + 'sp-empty-state-view.c', + 'sp-failed-state-view.c', + 'sp-multi-paned.c', + 'sp-process-model-row.c', + 'sp-profiler-menu-button.c', + 'sp-recording-state-view.c', +])