~lttng/lttng-ust/lttng-ust

« back to all changes in this revision

Viewing changes to ustctl/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
AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_builddir)/libustcomm \
 
2
        -I$(top_builddir)/libustcmd $(KCOMPAT_CFLAGS)
 
3
 
1
4
bin_PROGRAMS = ustctl
2
 
ustctl_SOURCES = ustctl.c $(top_builddir)/libustcomm/ustcomm.c $(top_builddir)/libustcomm/ustcomm.h $(top_builddir)/libustcmd/ustcmd.c $(top_builddir)/libustcmd/ustcmd.h $(top_builddir)/share/usterr.h
 
5
ustctl_SOURCES = ustctl.c $(top_builddir)/libustcomm/ustcomm.c $(top_builddir)/libustcomm/ustcomm.h $(top_builddir)/libustcmd/ustcmd.c $(top_builddir)/libustcmd/ustcmd.h
3
6
ustctl_CFLAGS = -DUST_COMPONENT=ustctl
4
7
 
5
 
INCLUDES = $(KCOMPAT_CFLAGS)
6
 
INCLUDES += -I$(top_builddir)/libustcomm
7
 
INCLUDES += -I$(top_builddir)/libustcmd
8
 
INCLUDES += -I$(top_builddir)/share