From 538ff49837c95e2ba6514356c863112569128532 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Tue, 18 Aug 2015 13:17:53 +0200 Subject: Revert "configure.ac: Add subdir-objects" This reverts commit 7c942ba1475a366cc7c8a129fbdd335166ce21c6. With automake 1.14 and using the above option the distclean will fail with: Making distclean in tests gmake[2]: Entering directory '/home/builder/source/workspace/libosmocore/label/FreeBSD_amd64/libosmocore-0.8.0.47-7c94/_build/tests' Makefile:848: ../src/gsm/.deps/a5.Po: No such file or directory Makefile:849: ../src/gsm/.deps/kasumi.Po: No such file or directory gmake[2]: *** No rule to make target '../src/gsm/.deps/kasumi.Po'. Stop. gmake[2]: Leaving directory '/home/builder/source/workspace/libosmocore/label/FreeBSD_amd64/libosmocore-0.8.0.47-7c94/_build/tests' Makefile:506: recipe for target 'distclean-recursive' failed gmake[1]: *** [distclean-recursive] Error 1 gmake[1]: Leaving directory '/home/builder/source/workspace/libosmocore/label/FreeBSD_amd64/libosmocore-0.8.0.47-7c94/_build' Makefile:714: recipe for target 'distcheck' failed As we are not required to use the option, let's fix the build --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index c4922772..acd153d1 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ AC_INIT([libosmocore], m4_esyscmd([./git-version-gen .tarball-version]), [openbsc@lists.osmocom.org]) -AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip 1.6 subdir-objects]) +AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip 1.6]) AC_CONFIG_TESTDIR(tests) dnl kernel style compile messages -- cgit v1.2.3