diff options
| author | irungentoo <irungentoo@gmail.com> | 2014-02-16 19:13:34 -0500 |
|---|---|---|
| committer | irungentoo <irungentoo@gmail.com> | 2014-02-16 19:13:34 -0500 |
| commit | 9d1eb27717472f5655242fac7b8123a44f1ff33c (patch) | |
| tree | fd205f1ea53749717d9930d93ddb153fc8a16929 /build/Makefile.am | |
| parent | fd3dc22ef3bd77beb78faf24cd43e9d2b9706f5d (diff) | |
| parent | f79b327fd639b2dcca9d4d2c137f93c1dce622fc (diff) | |
Merge branch 'av-fix' into av-good
Diffstat (limited to 'build/Makefile.am')
| -rw-r--r-- | build/Makefile.am | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/build/Makefile.am b/build/Makefile.am index 9530e1a7..5514a4d5 100644 --- a/build/Makefile.am +++ b/build/Makefile.am | |||
| @@ -5,8 +5,7 @@ noinst_bindir = $(top_builddir)/build | |||
| 5 | EXTRA_DIST= | 5 | EXTRA_DIST= |
| 6 | 6 | ||
| 7 | include ../toxcore/Makefile.inc | 7 | include ../toxcore/Makefile.inc |
| 8 | include ../toxrtp/Makefile.inc | 8 | include ../toxav/Makefile.inc |
| 9 | include ../toxmsi/Makefile.inc | ||
| 10 | include ../other/Makefile.inc | 9 | include ../other/Makefile.inc |
| 11 | include ../testing/Makefile.inc | 10 | include ../testing/Makefile.inc |
| 12 | include ../other/bootstrap_serverdaemon/Makefile.inc | 11 | include ../other/bootstrap_serverdaemon/Makefile.inc |