Branch: refs/heads/master Author: Colomban Wendling ban@herbesfolles.org Committer: Colomban Wendling ban@herbesfolles.org Date: Wed, 15 Oct 2014 20:30:05 UTC Commit: c2d4a39f10dedc9be852719341331e8bc72317dd https://github.com/geany/geany-plugins/commit/c2d4a39f10dedc9be852719341331e...

Log Message: ----------- Revert "autotools: Enable subdir-objects as many plugins use sub-directory objects"

This reverts commit 8873b9082c1c98b4f3e97062f0c6f26c9d980e95.

Unfortunately Automake has a bug when using `subdir-objects` and a object is in a sub-directory that contains rules for creating other objects. See http://debbugs.gnu.org/cgi/bugreport.cgi?bug=17354

We use it in GeanyPrj's and GeanyVC's unit tests.

There are other possible fixes while still using `subdir-objects`: * include the C file directly from the unit test main source file, like #include "../src/utils.c"; * switch these plugins to non-recursive Automake setup, so all rules are in the same Makefile.am.

Modified Paths: -------------- configure.ac

Modified: configure.ac 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,7 +1,7 @@ AC_PREREQ([2.61]) dnl Don't forget when updating version number to do GP_CHECK_GEANY also AC_INIT([geany-plugins], [1.25]) -AM_INIT_AUTOMAKE([1.8 foreign dist-bzip2 tar-ustar subdir-objects]) +AM_INIT_AUTOMAKE([1.8 foreign dist-bzip2 tar-ustar])

m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])

-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).