AUDIT: r21570 - gnucash/trunk - Fix clean targets and DIST_SOURCES

[Derek Atkins]

John Ralls <jralls at code.gnucash.org> writes:

> 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.

Have you verified that this works right and includes ALL subdirs in
"make dist", even ones that are disabled during configure?  The reason
to have DIST_SUBDIRS is to make sure that all code is included in the
tarball, even if you don't include that code in your configure.

For example, if you --disable-gui, or --disable-python and then run
"make dist" it should still include the GUI and Python subdirs.

> Modified: gnucash/trunk/src/Makefile.am
> ===================================================================
> --- gnucash/trunk/src/Makefile.am	2011-11-14 21:28:32 UTC (rev 21569)
> +++ gnucash/trunk/src/Makefile.am	2011-11-17 21:27:40 UTC (rev 21570)
> @@ -1,4 +1,8 @@
>  # These directories do not contain any gtk dependencies
> +if WITH_PYTHON
> +   PYTHON_DIR = python
> +endif
> +

Where is PYTHON_DIR referenced?

> Modified: gnucash/trunk/src/backend/Makefile.am
> ===================================================================
> --- gnucash/trunk/src/backend/Makefile.am	2011-11-14 21:28:32 UTC (rev 21569)
> +++ gnucash/trunk/src/backend/Makefile.am	2011-11-17 21:27:40 UTC (rev 21570)
> @@ -1,3 +1,5 @@
> +if WITH_DBI
> +    DBI_DIR=dbi
> +endif
> +SUBDIRS = xml sql ${DBI_DIR}
>  
> -SUBDIRS = xml sql ${DBI_DIR}
> -DIST_SUBDIRS = xml sql dbi

Have you tested the 'dbi' is included in the results of "make dist" even
if you do not --enable-dbi, or if you explicitly --disable-dbi?

[snip]

-derek

-- 
       Derek Atkins, SB '93 MIT EE, SM '95 MIT Media Laboratory
       Member, MIT Student Information Processing Board  (SIPB)
       URL: http://web.mit.edu/warlord/    PP-ASEL-IA     N1NWH
       warlord at MIT.EDU                        PGP key available