X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=include%2FMakefile.am;h=957a01d25d171ed1000a099f6ec1dbb7a3002d02;hp=85ffa11da55af922abb9c07f98c2c70428be3c60;hb=683d081a7f3734fcb5c8dd4424b0aa102117d1a0;hpb=2ebe596e3e57e57220afae2b4499aff6348ce3a7 diff --git a/include/Makefile.am b/include/Makefile.am index 85ffa11da..957a01d25 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,3 +1,4 @@ +## SPDX-License-Identifier: GPL-2.0-only ## ## This target generates an include file that contains the git version ## string of the current branch, it must be continuously updated when @@ -31,6 +32,15 @@ ## with "-" and join all lines by replacing "\n" with litteral string c-style "\n\t" and ## output it to "version.i.tmp". ## +## Repeat the same logic for the "version/extra_patches" directory. +## Data fetched from "version/extra_patches" must be sanitized and +## formatted. +## The data is fetched using "ls" with an ignore pattern for the README file. +## The sanitize step uses sed with a script to replace all +## non-alpha-numeric values, except " " (space), to "-". +## The formatting step uses sed with a script to join all lines +## by replacing "\n" with litteral string c-style "\n\t". +## ## If we don't have a "version.i" or we have both files (version.i, version.i.tmp) ## and they are different, copy "version.i.tmp" over "version.i". ## This way the dependent targets are only rebuilt when the git version @@ -42,6 +52,9 @@ version_verbose_0 = @echo " GEN " $@; version.i: $(version_verbose)rm -f version.i.tmp; \ + if (test ! -f version.i && test -f "$(top_srcdir)/include/version.i"); then \ + cp "$(top_srcdir)/include/version.i" version.i; \ + fi; \ if (test -r "$(top_srcdir)/bootstrap" && test -r "$(top_srcdir)/.git") && \ test -x "`which git 2>&1;true`"; then \ GIT_VERSION_STR="`cd "$(top_srcdir)" && git describe --tags --dirty`"; \ @@ -61,6 +74,7 @@ version.i: fi; \ echo "#define EXTRA_VERSION_NAME \"`$(SED) -n '1p' "$(top_srcdir)/version/extra_version_name" 2> /dev/null`\"" >> version.i.tmp; \ echo "#define EXTRA_VERSION_DESCRIPTION \"`$(SED) -E ':a ; N ; $$!ba ; s/[^a-zA-Z0-9 \n\t\.,]/-/g ; s/\r{0,1}\n/\\\n\\\t/g' "$(top_srcdir)/version/extra_version_description" 2> /dev/null`\"" >> version.i.tmp; \ + echo "#define EXTRA_VERSION_PATCHES \"`ls -1 "$(top_srcdir)/version/extra_patches" | $(GREP) -v '^README' | $(SED) -E ':a ; N ; $$!ba ; s/[^a-zA-Z0-9 \n\t\.]/-/g ; s/\r{0,1}\n/\\\n\\\t/g' 2> /dev/null`\"" >> version.i.tmp; \ if test ! -f version.i || \ test x"`cat version.i.tmp`" != x"`cat version.i`"; then \ mv version.i.tmp version.i; \ @@ -100,15 +114,25 @@ lttnginclude_HEADERS = \ lttng/location.h \ lttng/userspace-probe.h \ lttng/session-descriptor.h \ - lttng/destruction-handle.h + lttng/destruction-handle.h \ + lttng/clear.h \ + lttng/clear-handle.h \ + lttng/tracker.h \ + lttng/kernel-probe.h lttngactioninclude_HEADERS= \ lttng/action/action.h \ - lttng/action/notify.h + lttng/action/group.h \ + lttng/action/notify.h \ + lttng/action/rotate-session.h \ + lttng/action/snapshot-session.h \ + lttng/action/start-session.h \ + lttng/action/stop-session.h lttngconditioninclude_HEADERS= \ lttng/condition/condition.h \ lttng/condition/buffer-usage.h \ + lttng/condition/event-rule.h \ lttng/condition/session-consumed-size.h \ lttng/condition/session-rotation.h \ lttng/condition/evaluation.h @@ -120,15 +144,28 @@ lttngnotificationinclude_HEADERS= \ lttngtriggerinclude_HEADERS= \ lttng/trigger/trigger.h +lttngeventruleinclude_HEADERS= \ + lttng/event-rule/event-rule.h \ + lttng/event-rule/kprobe.h \ + lttng/event-rule/syscall.h \ + lttng/event-rule/uprobe.h \ + lttng/event-rule/tracepoint.h + noinst_HEADERS = \ lttng/snapshot-internal.h \ lttng/health-internal.h \ lttng/save-internal.h \ lttng/load-internal.h \ lttng/action/action-internal.h \ + lttng/action/group-internal.h \ lttng/action/notify-internal.h \ + lttng/action/rotate-session-internal.h \ + lttng/action/snapshot-session-internal.h \ + lttng/action/start-session-internal.h \ + lttng/action/stop-session-internal.h \ lttng/condition/condition-internal.h \ lttng/condition/buffer-usage-internal.h \ + lttng/condition/event-rule-internal.h \ lttng/condition/session-consumed-size-internal.h \ lttng/condition/evaluation-internal.h \ lttng/condition/session-rotation-internal.h \ @@ -137,6 +174,7 @@ noinst_HEADERS = \ lttng/endpoint-internal.h \ lttng/notification/channel-internal.h \ lttng/channel-internal.h \ + lttng/domain-internal.h \ lttng/event-internal.h \ lttng/rotate-internal.h \ lttng/ref-internal.h \ @@ -144,5 +182,11 @@ noinst_HEADERS = \ lttng/userspace-probe-internal.h \ lttng/session-internal.h \ lttng/session-descriptor-internal.h \ + lttng/kernel-probe-internal.h \ + lttng/event-rule/event-rule-internal.h \ + lttng/event-rule/kprobe-internal.h \ + lttng/event-rule/syscall-internal.h \ + lttng/event-rule/uprobe-internal.h \ + lttng/event-rule/tracepoint-internal.h \ version.h \ version.i