RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-18 09:25:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

tracing: merge tracepoint provider makefiles into main makefile

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

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
This commit is contained in:
Jason Dillaman 2015-09-30 18:49:32 -04:00
parent b3d02cc21b
commit e11d8d68da
4 changed files with 44 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -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

5
src/Makefile-env.am
View File

@ -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

5
src/Makefile.am
View File

@ -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

75
src/tracing/Makefile.am
View File

@ -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)