~lttng/lttng-ust/lttng-ust

« back to all changes in this revision

Viewing changes to 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
1
ACLOCAL_AMFLAGS = -I m4
2
 
SUBDIRS = libust tests libmallocwrap ustd ustctl libinterfork
 
2
SUBDIRS = libust tests libmallocwrap ustd ustctl libinterfork include
3
3
 
4
 
EXTRA_DIST = share/kernelcompat.h doc
5
 
bin_SCRIPTS = usttrace
 
4
EXTRA_DIST = doc
 
5
dist_bin_SCRIPTS = usttrace