Skip to content
Snippets Groups Projects
Commit 858468ee authored by Ralph Giles's avatar Ralph Giles
Browse files

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.
parent d099f132
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
......@@ -208,7 +208,7 @@ fi
AM_CONDITIONAL([FIXED_POINT], [test x$ac_enable_fixed = xyes])
AM_CONDITIONAL([CUSTOM_MODES], [test x$ac_enable_custom_modes = xyes])
AC_OUTPUT([Makefile libcelt/Makefile
AC_OUTPUT([Makefile libcelt/tests/Makefile
opus.pc opus-uninstalled.pc])
AC_MSG_RESULT([
......
......@@ -5,11 +5,11 @@ TESTS = type-test ectest cwrs32-test dft-test laplace-test mdct-test mathops-tes
noinst_PROGRAMS = type-test ectest cwrs32-test dft-test laplace-test mdct-test mathops-test rotation-test
type_test_SOURCES = tests/type-test.c
ectest_SOURCES = tests/ectest.c
cwrs32_test_SOURCES = tests/cwrs32-test.c
dft_test_SOURCES = tests/dft-test.c
laplace_test_SOURCES = tests/laplace-test.c
mdct_test_SOURCES = tests/mdct-test.c
mathops_test_SOURCES = tests/mathops-test.c
rotation_test_SOURCES = tests/rotation-test.c
type_test_SOURCES = type-test.c
ectest_SOURCES = ectest.c
cwrs32_test_SOURCES = cwrs32-test.c
dft_test_SOURCES = dft-test.c
laplace_test_SOURCES = laplace-test.c
mdct_test_SOURCES = mdct-test.c
mathops_test_SOURCES = mathops-test.c
rotation_test_SOURCES = rotation-test.c
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment