Move pkgconfig file to 'src/lib/'

Change-Id: I9e57ae0ddcf97466ea2ad5b335c0c9318c156daf
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/.gitignore b/.gitignore
index 326795a713efae29afffce7d54ce6420d96c1311..b36ae4721ef313e6647127ef622c838256815987 100644 (file)
--- 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 032adea94597b029acfa092b5a414193be5d7951..bcf3b2bb1623beff898e7f5950b87068de676a05 100644 (file)
--- 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 b59b1f5f97d5038a62d2f596bfd8d64e3d9782ca..92ae455806e385bd8c4b5a7105b3881d4ecd0b41 100644 (file)
--- 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 fbd123585ad1655c2916d1aeae00a5e4dbc8f0c6..bcf2a9b2ab3e97bea6f8664b6dfef59419c211c0 100644 (file)
--- 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/lib/lttng-ust-ctl.pc.in b/src/lib/lttng-ust-ctl.pc.in
new file mode 100644 (file)
index 0000000..a82a668
--- /dev/null
+++ b/src/lib/lttng-ust-ctl.pc.in
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: LTTng Userspace Tracer control
+Description: The LTTng Userspace Tracer (UST) is a library accompanied by a set of tools to trace userspace code.
+Version: @PACKAGE_VERSION@
+Requires:
+Libs: -L${libdir} -llttng-ust-ctl -llttng-ust-common
+Cflags: -I${includedir}
+

diff --git a/src/lib/lttng-ust.pc.in b/src/lib/lttng-ust.pc.in
new file mode 100644 (file)
index 0000000..6aee46e
--- /dev/null
+++ b/src/lib/lttng-ust.pc.in
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: LTTng Userspace Tracer
+Description: The LTTng Userspace Tracer (UST) is a library accompanied by a set of tools to trace userspace code. 
+Version: @PACKAGE_VERSION@
+Requires:
+Libs: -L${libdir} -llttng-ust -llttng-ust-common -ldl
+Cflags: -I${includedir} 
+

diff --git a/src/lttng-ust-ctl.pc.in b/src/lttng-ust-ctl.pc.in
deleted file mode 100644 (file)
index a82a668..0000000
--- a/src/lttng-ust-ctl.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: LTTng Userspace Tracer control
-Description: The LTTng Userspace Tracer (UST) is a library accompanied by a set of tools to trace userspace code.
-Version: @PACKAGE_VERSION@
-Requires:
-Libs: -L${libdir} -llttng-ust-ctl -llttng-ust-common
-Cflags: -I${includedir}
-

diff --git a/src/lttng-ust.pc.in b/src/lttng-ust.pc.in
deleted file mode 100644 (file)
index 6aee46e..0000000
--- a/src/lttng-ust.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: LTTng Userspace Tracer
-Description: The LTTng Userspace Tracer (UST) is a library accompanied by a set of tools to trace userspace code. 
-Version: @PACKAGE_VERSION@
-Requires:
-Libs: -L${libdir} -llttng-ust -llttng-ust-common -ldl
-Cflags: -I${includedir} 
-