~lttng/lttng-ust/lttng-ust

« back to all changes in this revision

Viewing changes to configure.ac

  • 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:
65
65
 
66
66
AC_CONFIG_FILES([
67
67
        Makefile
 
68
        include/Makefile
68
69
        libust/Makefile
69
70
        tests/Makefile
70
71
        tests/hello/Makefile
76
77
        libinterfork/Makefile
77
78
        ustd/Makefile
78
79
        ustctl/Makefile
79
 
        java/Makefile
80
80
])
81
81
AC_OUTPUT