diff options
author | Ralph Giles <giles@mozilla.com> | 2011-09-04 03:34:51 +0400 |
---|---|---|
committer | Ralph Giles <giles@mozilla.com> | 2011-09-04 03:34:51 +0400 |
commit | 858468ee4219ac29d4443b81387bb609fd6247c6 (patch) | |
tree | 48cfe5caf6cd483a2940130dd97d4ee571959d64 /Makefile.am | |
parent | d099f132fc916d16c1097e7521a069a7bf6838c1 (diff) |
Fix the 'distclean' target.
With subdir-objects, both the top-level makefile, and
libcelt/Makefile, which runs celt-specific unit tests,
were sharing libcelt/.deps for generated dependencies.
Each thought it owned the directory, and so would remove
the files it created in that directory, followed by the
directory itself. The second makefile would then fail to
because the files it created weren't there to remove,
blocking a successful 'make distcheck' with in runs
'make distclean' as part of its verification tests.
We can work around the problem by generating the makefile
for the tests in the actual test directory, so it doesn't
share autotools scratch space with the top level makefile.
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 7a285958..74f06880 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = subdir-objects lib_LTLIBRARIES = libopus.la -SUBDIRS = . libcelt +SUBDIRS = . libcelt/tests INCLUDES = -I$(top_srcdir)/libcelt -I$(top_srcdir)/silk -I$(top_srcdir)/silk/float -I$(top_srcdir)/silk/fixed |