r21576 - gnucash/branches/2.4 - [r21570]Fix clean targets and DIST_SOURCES
John Ralls
jralls at code.gnucash.org
Thu Nov 17 17:29:57 EST 2011
Author: jralls
Date: 2011-11-17 17:29:57 -0500 (Thu, 17 Nov 2011)
New Revision: 21576
Trac: http://svn.gnucash.org/trac/changeset/21576
Modified:
gnucash/branches/2.4/configure.ac
gnucash/branches/2.4/lib/Makefile.am
gnucash/branches/2.4/src/Makefile.am
gnucash/branches/2.4/src/app-utils/Makefile.am
gnucash/branches/2.4/src/backend/Makefile.am
gnucash/branches/2.4/src/business/business-core/Makefile.am
gnucash/branches/2.4/src/business/business-gnome/Makefile.am
gnucash/branches/2.4/src/business/dialog-tax-table/Makefile.am
gnucash/branches/2.4/src/core-utils/Makefile.am
gnucash/branches/2.4/src/engine/Makefile.am
gnucash/branches/2.4/src/gnc-module/Makefile.am
gnucash/branches/2.4/src/gnome-utils/Makefile.am
gnucash/branches/2.4/src/import-export/Makefile.am
gnucash/branches/2.4/src/optional/Makefile.am
gnucash/branches/2.4/src/optional/python-bindings/tests/Makefile.am
gnucash/branches/2.4/src/report/Makefile.am
gnucash/branches/2.4/src/report/report-gnome/Makefile.am
gnucash/branches/2.4/src/report/report-system/Makefile.am
Log:
[r21570]Fix clean targets and DIST_SOURCES
Several subdirectories have a subdirectory "gnucash", which clean tried to remove by including in the CLEANFILES variable in Makefile.am. This doesn't work, because directories can't be removed with rm, they require rm -r. Add a clean-local: target which calls rm -r on the gnucash subdirectory.
Some Makefile.ams used an AC_SUBSTed variable to define an optionally-compiled subdirectory, then included the variable in SUBDIRS and the actual directory name in DIST_SUBDIRS. This breaks the distclean and maintainer-clean targets when the optional directory is built, because it is then processed twice, and there is no Makefile the second time so make halts. Replaced the AC_SUBSTed variables with ones local to the Makefile.am, switched with an AM_CONDITIONAL. That way automake can figure out the dist_subdirs on its own.
More information about the gnucash-patches
mailing list