tracing: merge tracepoint provider makefiles into main makefile

This results in the tracepoint provider shared libraries being
placed in the library path for unittests.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>

diff --git a/configure.ac b/configure.ac
index 9bef7677be287222e4f8422ac83011a41d2c2903..f6fe165cc99965a016d08705b14677c83b93422c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1336,7 +1336,6 @@ AC_CONFIG_FILES([Makefile
        src/ocf/ceph
        src/ocf/rbd
        src/java/Makefile
-       src/tracing/Makefile
        systemd/Makefile
        man/Makefile
        doc/Makefile

diff --git a/src/Makefile-env.am b/src/Makefile-env.am
index 2304193ce0bd0065ed78d7604ffe808b58a10d69..63ea49f0142f513907ea3bea87fa562805d9f2aa 100644 (file)
--- a/src/Makefile-env.am
+++ b/src/Makefile-env.am
@@ -5,6 +5,7 @@ DIST_SUBDIRS =
 BUILT_SOURCES =
 EXTRA_DIST =
 CLEANFILES =
+dist_noinst_DATA =
 
 noinst_HEADERS =
 bin_PROGRAMS =
@@ -188,10 +189,6 @@ LIBRBD_TYPES = librbd_types.la
 LIBKRBD = libkrbd.la
 LIBCEPHFS = libcephfs.la
 LIBERASURE_CODE = liberasure_code.la
-LIBOSD_TP = tracing/libosd_tp.la
-LIBRADOS_TP = tracing/librados_tp.la
-LIBRBD_TP = tracing/librbd_tp.la
-LIBOS_TP = tracing/libos_tp.la
 
 if WITH_LIBAIO
 LIBOS += -laio

diff --git a/src/Makefile.am b/src/Makefile.am
index 6ba07195a55eea5a13e0dbecf330025791fcc391..90ec3f1fceee329d43a4f320e00b6e48649cbb63 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
 include Makefile-env.am
 
-SUBDIRS += ocf java tracing
-DIST_SUBDIRS += gmock ocf java tracing
+SUBDIRS += ocf java
+DIST_SUBDIRS += gmock ocf java
 
 if NO_GIT_VERSION
 export NO_VERSION="yes"
@@ -40,6 +40,7 @@ include test/Makefile.am
 include tools/Makefile.am
 include Makefile-rocksdb.am
 include compressor/Makefile.am
+include tracing/Makefile.am
 
 
 # shell scripts

diff --git a/src/tracing/Makefile.am b/src/tracing/Makefile.am
index be99d9be6cf44205eb64832161f153515679c99b..5c6a4e243287b1c170df351efbc1fa94dbada52c 100644 (file)
--- a/src/tracing/Makefile.am
+++ b/src/tracing/Makefile.am
@@ -1,73 +1,78 @@
-EXTRA_DIST = tracing-common.h
+EXTRA_DIST += \
+       tracing/tracing-common.h
 
 if WITH_LTTNG
-%.h: %.tp
-       $(LTTNG_GEN_TP_PROG) $< -o $*.h
+tracing/%.h: tracing/%.tp
+       $(LTTNG_GEN_TP_PROG) $< -o tracing/$*.h
 endif
 
-dist_noinst_DATA = \
-       librados.tp \
-       librbd.tp \
-       oprequest.tp \
-       osd.tp \
-       pg.tp \
-       objectstore.tp
+dist_noinst_DATA += \
+       tracing/librados.tp \
+       tracing/librbd.tp \
+       tracing/oprequest.tp \
+       tracing/osd.tp \
+       tracing/pg.tp \
+       tracing/objectstore.tp
 
 if WITH_LTTNG
+libosd_tp_la_SOURCES = \
+       tracing/oprequest.c \
+       tracing/osd.c \
+       tracing/pg.c
 nodist_libosd_tp_la_SOURCES = \
-       oprequest.c \
-       oprequest.h \
-       osd.c \
-       osd.h \
-       pg.h \
-       pg.c
+       tracing/oprequest.h \
+       tracing/osd.h \
+       tracing/pg.h
 endif
 libosd_tp_la_LIBADD = -llttng-ust -ldl
-libosd_tp_la_CFLAGS = -I$(top_srcdir)/src $(AM_CFLAGS) -fpic
+libosd_tp_la_CFLAGS = -I$(top_srcdir)/src/tracing -I$(top_srcdir)/src $(AM_CFLAGS) -fpic
 libosd_tp_la_LDFLAGS = -version-info 1:0:0
 
 if WITH_LTTNG
+librados_tp_la_SOURCES = \
+       tracing/librados.c
 nodist_librados_tp_la_SOURCES = \
-       librados.c \
-       librados.h
+       tracing/librados.h
 endif
 librados_tp_la_LIBADD = -llttng-ust -ldl
-librados_tp_la_CFLAGS = -I$(top_srcdir)/src $(AM_CFLAGS) -fpic
+librados_tp_la_CFLAGS = -I$(top_srcdir)/src/tracing -I$(top_srcdir)/src $(AM_CFLAGS) -fpic
 librados_tp_la_LDFLAGS = -version-info 2:0:0
 
 if WITH_LTTNG
+librbd_tp_la_SOURCES = \
+       tracing/librbd.c
 nodist_librbd_tp_la_SOURCES = \
-       librbd.c \
-       librbd.h
+       tracing/librbd.h
 endif
 librbd_tp_la_LIBADD = -llttng-ust -ldl
-librbd_tp_la_CFLAGS = -I$(top_srcdir)/src $(AM_CFLAGS) -fpic
+librbd_tp_la_CFLAGS = -I$(top_srcdir)/src/tracing -I$(top_srcdir)/src $(AM_CFLAGS) -fpic
 librbd_tp_la_LDFLAGS = -version-info 1:0:0
 
 if WITH_LTTNG
+libos_tp_la_SOURCES = \
+       tracing/objectstore.c
 nodist_libos_tp_la_SOURCES = \
-       objectstore.c \
-       objectstore.h
+       tracing/objectstore.h
 endif
 libos_tp_la_LIBADD = -llttng-ust -ldl
-libos_tp_la_CFLAGS = -I$(top_srcdir)/src $(AM_CFLAGS) -fpic
+libos_tp_la_CFLAGS = -I$(top_srcdir)/src/tracing -I$(top_srcdir)/src $(AM_CFLAGS) -fpic
 libos_tp_la_LDFLAGS = -version-info 1:0:0
 
 if WITH_LTTNG
-lib_LTLIBRARIES = \
+lib_LTLIBRARIES += \
        libosd_tp.la \
        libos_tp.la \
        librados_tp.la \
        librbd_tp.la
 
-BUILT_SOURCES = \
-       librados.h \
-       librbd.h \
-       objectstore.h \
-       oprequest.h \
-       osd.h \
-       pg.h
+BUILT_SOURCES += \
+       tracing/librados.h \
+       tracing/librbd.h \
+       tracing/objectstore.h \
+       tracing/oprequest.h \
+       tracing/osd.h \
+       tracing/pg.h
 endif
 
-CLEANFILES = \
+CLEANFILES += \
        $(BUILT_SOURCES)