Re: [evolution-patches] automake-1.6 happiness for camel

[Not Zed <notzed ximian com>]

How do you get it to build with automake 1.6 anyway, i thought the gnome
2 crap forced 1.4, or is this a gnome 2.2 thing ...

anyway the fix looks as good as any.

its still linking with a load of shit it never used to though and
shouldn't.  it only needs to link with glib and gettext.


On Wed, 2003-04-30 at 02:55, Dan Winship wrote:
> Another patch I've had lying around for a while. automake-1.6 doesn't
> like camel/Makefile.am:
> 
> [danw twelve-monkeys evolution]$ automake camel/Makefile && echo ok
> automake: camel/Makefile.am: object `camel-lock.$(OBJEXT)' created both
> with libtool and without
> [danw twelve-monkeys evolution]$
> 
> It does create the Makefile.in, but it exits with non-0 status, which
> will mess up things like the rule that automatically regenerates
> Makefile.in when Makefile.am changes.
> 
> This patch seems like a kludge to me, so suggestions on a better fix are
> welcome.
> 
> 
> ______________________________________________________________________
> Index: camel/ChangeLog
> ===================================================================
> RCS file: /cvs/gnome/evolution/camel/ChangeLog,v
> retrieving revision 1.1805
> diff -u -r1.1805 ChangeLog
> --- camel/ChangeLog	24 Apr 2003 17:41:26 -0000	1.1805
> +++ camel/ChangeLog	29 Apr 2003 17:17:58 -0000
> @@ -1,3 +1,9 @@
> +2003-04-29  Dan Winship  <danw ximian com>
> +
> +	* Makefile.am (camel_lock_helper_SOURCES): Remove camel-lock.c
> +	from here because it upsets automake 1.6 for some reason
> +	(camel_lock_helper_LDADD): Add camel-lock.o here
> +
>  2003-04-22  Jeffrey Stedfast  <fejj ximian com>
>  
>  	* providers/imap/camel-imap-utils.c: Disable debugging printfs.
> Index: camel/Makefile.am
> ===================================================================
> RCS file: /cvs/gnome/evolution/camel/Makefile.am,v
> retrieving revision 1.181
> diff -u -r1.181 Makefile.am
> --- camel/Makefile.am	20 Mar 2003 19:37:38 -0000	1.181
> +++ camel/Makefile.am	29 Apr 2003 17:17:58 -0000
> @@ -233,13 +233,12 @@
>  
>  camel_lock_helper_SOURCES = 			\
>  	camel-lock-helper.c 			\
> -	camel-lock-helper.h			\
> -	camel-lock.c				\
> -	camel-lock.h
> +	camel-lock-helper.h
>  
>  # NOTE: This needs to be cleaned up, it shouldn't link with all this crap,
>  # because it might be setuid.
>  camel_lock_helper_LDADD =			\
> +	camel-lock.o				\
>  	$(libcamel_la_LIBADD)
>  
>  camel_index_control_SOURCES =			\