From b3bdf00d5feee54e53ec81cffd38cb6d5d53e262 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Thu, 22 Apr 2021 21:01:41 -0400 Subject: [PATCH] Move pkgconfig file to 'src/lib/' Change-Id: I9e57ae0ddcf97466ea2ad5b335c0c9318c156daf Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers --- .gitignore | 4 ++-- configure.ac | 4 ++-- src/Makefile.am | 3 --- src/lib/Makefile.am | 3 +++ src/{ => lib}/lttng-ust-ctl.pc.in | 0 src/{ => lib}/lttng-ust.pc.in | 0 6 files changed, 7 insertions(+), 7 deletions(-) rename src/{ => lib}/lttng-ust-ctl.pc.in (100%) rename src/{ => lib}/lttng-ust.pc.in (100%) diff --git a/.gitignore b/.gitignore index 326795a7..b36ae472 100644 --- a/.gitignore +++ b/.gitignore @@ -50,8 +50,8 @@ cscope.* /src/common/config.h /src/common/config.h.in /src/common/stamp-h1 -/src/lttng-ust-ctl.pc -/src/lttng-ust.pc +/src/lib/lttng-ust-ctl.pc +/src/lib/lttng-ust.pc /doc/examples/demo/demo /doc/examples/easy-ust/sample diff --git a/configure.ac b/configure.ac index 032adea9..bcf3b2bb 100644 --- a/configure.ac +++ b/configure.ac @@ -600,8 +600,8 @@ AC_CONFIG_FILES([ src/lib/lttng-ust/Makefile src/lib/lttng-ust-python-agent/Makefile src/lib/Makefile - src/lttng-ust-ctl.pc - src/lttng-ust.pc + src/lib/lttng-ust-ctl.pc + src/lib/lttng-ust.pc src/Makefile src/python-lttngust/lttngust/version.py src/python-lttngust/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index b59b1f5f..92ae4558 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -7,6 +7,3 @@ SUBDIRS = \ if ENABLE_PYTHON_AGENT SUBDIRS += python-lttngust endif - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = lttng-ust.pc lttng-ust-ctl.pc diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index fbd12358..bcf2a9b2 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -26,3 +26,6 @@ endif if ENABLE_PYTHON_AGENT SUBDIRS += lttng-ust-python-agent endif + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = lttng-ust.pc lttng-ust-ctl.pc diff --git a/src/lttng-ust-ctl.pc.in b/src/lib/lttng-ust-ctl.pc.in similarity index 100% rename from src/lttng-ust-ctl.pc.in rename to src/lib/lttng-ust-ctl.pc.in diff --git a/src/lttng-ust.pc.in b/src/lib/lttng-ust.pc.in similarity index 100% rename from src/lttng-ust.pc.in rename to src/lib/lttng-ust.pc.in -- 2.34.1