~lttng/lttng-ust/lttng-ust

« back to all changes in this revision

Viewing changes to libust/Makefile.am

  • Committer: Pierre-Marc Fournier
  • Date: 2009-10-27 22:58:15 UTC
  • mfrom: (232.1.5)
  • Revision ID: git-v1:aa08b4413291fabcbd1b1144377d37034ad361de
Merge branch 'for-pierre-marc' of git://git.infradead.org/users/jblunck/ust

Fixed conflicts:
        include/ust/marker.h

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
INCLUDES = -I$(top_builddir)/share -I$(top_builddir)/libustcomm
 
1
AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_builddir)/libustcomm
2
2
 
3
3
lib_LTLIBRARIES = libust.la
4
 
libust_la_SOURCES = marker.c marker.h tracepoint.c tracepoint.h immediate.h channels.c channels.h marker-control.c marker-control.h relay.c relay.h tracer.c tracer.h tracercore.c tracercore.h serialize.c tracectl.c $(top_builddir)/libustcomm/ustcomm.c $(top_builddir)/share/usterr.h
 
4
libust_la_SOURCES = buffer.h marker.c tracepoint.c channels.c channels.h marker-control.c marker-control.h relay.c relay.h tracer.c tracer.h tracercore.c tracercore.h serialize.c tracectl.c $(top_builddir)/libustcomm/ustcomm.c
5
5
libust_la_LDFLAGS = -no-undefined -version-info 0:0:0
6
6
libust_la_LIBADD = -lpthread
7
7
libust_la_CFLAGS = -DUST_COMPONENT="libust"