On Hën , 2004-02-23 at 14:53, JP Rosevear wrote:
> Makes EDS pass distcheck.
>
> -JP
> Index: Makefile.am
> ===================================================================
> RCS file: /cvs/gnome/evolution-data-server/Makefile.am,v
> retrieving revision 1.7
> diff -u -r1.7 Makefile.am
> --- Makefile.am 6 Feb 2004 15:46:57 -0000 1.7
> +++ Makefile.am 23 Feb 2004 19:56:17 -0000
> @@ -1,3 +1,4 @@
> +AUTOMAKE_OPTIONS = 1.6
> DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
>
> SUBDIRS = libdb libedataserver servers addressbook calendar src docs
> po
> @@ -24,6 +25,10 @@
> $(pkgconfig_DATA:.pc=.pc.in) \
> $(LIBDB_FILES)
>
> +CLEANFILES = intltool-extract intltool-merge intltool-update
> +distclean-local:
> + (cd libdb && $(MAKE) $(AM_MAKEFLAGS) distclean)
> +
> LIBDB_FILES= \
> $(srcdir)/libdb/Makefile.am \
> $(srcdir)/libdb/Makefile.in \
The intltool-{extract,merge,update} scripts should be in DISTCLEANFILES,
rather than CLEANFILES, since we don't want to have to re-run configure
after doing a make clean. But, after a distclean, we do need to re-run
configure, since this gets us back to the state of what should be in
the tarball (generally, anyway). As a general rule CLEANFILES should
contain the files that are generated by "make", which aren't already
removed by "make clean", like object files generally are. DISTCLEANFILES
should include files that are generated by running ./configure. And,
then MAINTAINERCLEANFILES should include anything else that is left
behind from "make distclean" that is not included in CVS.
-- dobey
Attachment:
signature.asc
Description: This is a digitally signed message part