diff --git a/ChangeLog b/ChangeLog index d23bfa458..1348193ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2002-06-17 Lutz Müller + + Marcus Meissner explained me how what + --enable-maintainer-mode is for: + + * Makefile.am: Uncomment the automake and aclocal flags. + 2002-06-17 Lutz Müller Patch by Arnaud Launay , which corrects the diff --git a/Makefile.am b/Makefile.am index b6daf5208..e908bec0a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,18 +24,13 @@ doc_DATA = AUTHORS COPYING README ######################################################################## # The following default options for aclocal and automake # are required in the top level Makefile.am for the automatic -# re-building of the build system files. +# re-building of the build system files (only if configured with +# --enable-maintainer-mode). # # It is not sufficient to have these options somewhere in autogen.sh! -# Lutz thinks these flags are no longer -# necessary. If you have a different opinion, speak up on -# gphoto-devel@gphoto.org. - -# default options for aclocal -# ACLOCAL_AMFLAGS = -I $(top_srcdir)/libgphoto2_port/m4 -# default options for automake - only required in the top Makefile.am -# AUTOMAKE_OPTIONS = gnu +ACLOCAL_AMFLAGS = -I libgphoto2_port/m4 +AUTOMAKE_OPTIONS = gnu ######################################################################## # The following rules are only interesting if you want to create