diff options
| author | Keith Packard <keithp@keithp.com> | 2010-11-24 21:00:52 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2010-11-24 21:00:52 -0800 |
| commit | 51c7741040d95c5deece939dae5e4136cc04afc4 (patch) | |
| tree | 96631ee5aa9fd0c8c45f019ff154cc4fc8ca85d0 /configure.ac | |
| parent | d1dbe3b69e6f95ef8ecd4cf959863b922ab47c66 (diff) | |
| parent | 4e47c44d335276cf0dc5ed3a0756e50c98c1b9b9 (diff) | |
Merge branch 'buttonbox'
Conflicts:
doc/telemetrum-doc.xsl
Pull the buttbox version of the docs in as it had been updated.
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 903c5765..22af00ab 100644 --- a/configure.ac +++ b/configure.ac @@ -133,6 +133,8 @@ PKG_CHECK_MODULES([SNDFILE], [sndfile]) AC_OUTPUT([ Makefile +altosui/Makefile +altosui/libaltos/Makefile ao-tools/Makefile ao-tools/lib/Makefile ao-tools/ao-rawload/Makefile @@ -144,8 +146,6 @@ ao-tools/ao-list/Makefile ao-tools/ao-load/Makefile ao-tools/ao-postflight/Makefile ao-tools/ao-view/Makefile -ao-tools/libaltos/Makefile -ao-tools/altosui/Makefile ao-utils/Makefile src/Version ]) |