~lttng/lttng-ust/lttng-ust

« back to all changes in this revision

Viewing changes to ustd/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)/libust \
2
 
         -I$(top_builddir)/libustcomm
 
1
AM_CPPFLAGS = -I$(top_builddir)/libust -I$(top_builddir)/libustcomm \
 
2
        -I$(top_builddir)/include
3
3
 
4
4
bin_PROGRAMS = ustd
5
 
ustd_SOURCES = lowlevel.c ustd.c ustd.h $(top_builddir)/libustcomm/ustcomm.c $(top_builddir)/libustcomm/ustcomm.h $(top_builddir)/share/usterr.h
 
5
ustd_SOURCES = lowlevel.c ustd.c ustd.h $(top_builddir)/libustcomm/ustcomm.c $(top_builddir)/libustcomm/ustcomm.h
6
6
ustd_LDFLAGS = -lpthread
7
7
ustd_CFLAGS = -DUST_COMPONENT=ustd