Re: [g-a-devel]Bug in gnopernicus/braille/libbrl/Makefile.am

[Adi Dascal <ad baum ro>]

Hi Mario,

Indeed this was a bug, thanks for the patch. Fixes are available in
today's CVS.

Thanks && Best regards,
Adi

On Tue, 2003-08-19 at 18:18, Mario Lang wrote:
> This change:
> 
> 2003-08-13 Adi Dascal <ad baum ro>
> 
> 	* braille/libbrl/Makefile.am,
> 	* braille/libbrl/braille.c,
> 	* magnifier/libmag/Makefile.am:
> 	Fixed distribution in case of conditional building/compiling.
> 	(Automake needs to know the list of files that are intended to be 
> 	compiled statically. In adition the EXTRA_* variable supports dist_ and 
> 	nodist_ prefix; dist_ is redundant) 
> 
> Seems to have gone wrong a bit.
> 
> The conditional resulted in a Makefile.in which set
> EXTRA_libbrl_la_SOURCES only when BUILD_BRLTTY_SUPPORT was
> NOT set.  That is, of course, bogus, and resulted in a undefined
> symbol brltty_open_device when linking libbrl and BUILD_BRLTTY_SUPPORT was true.
> 
> Below patch fixes this:
> 
> Index: braille/libbrl/Makefile.am
> ===================================================================
> RCS file: /cvs/gnome/gnopernicus/braille/libbrl/Makefile.am,v
> retrieving revision 1.12
> diff -u -r1.12 Makefile.am
> --- braille/libbrl/Makefile.am	13 Aug 2003 14:54:09 -0000	1.12
> +++ braille/libbrl/Makefile.am	19 Aug 2003 15:17:44 -0000
> @@ -26,7 +26,6 @@
>  
>  libbrlinclude_HEADERS = brlxmlapi.h  
>  
> -if BUILD_BRLTTY_SUPPORT
>  libbrl_la_SOURCES = baumbrl.h	 \
>  		    alvabrl.h	 \
>  		    braille.h    \
> @@ -39,18 +38,8 @@
>  		    braille.c    \
>  		    brlxml.c     \
>  		    $(EXTRA_libbrl_la_SOURCES)
> -else
> -libbrl_la_SOURCES = baumbrl.h    \
> -		    alvabrl.h	 \
> -		    braille.h    \
> -		    brlxmlapi.h  \
> -		    brlxml.h     \
> -		    sercomm.h    \
> -		    sercomm.c    \
> -		    baumbrl.c    \
> -		    alvabrl.c	 \
> -		    braille.c    \
> -		    brlxml.c      
> +
> +if BUILD_BRLTTY_SUPPORT
>  EXTRA_libbrl_la_SOURCES = ttybrl.c 	 \
>  			 ttybrl.h
> -endif
> \ No newline at end of file
> +endif
> 
> -- 
> CYa,
>   Mario | Debian Developer <URL:http://debian.org/>
>         | Get my public key via finger mlang db debian org
>         | 1024D/7FC1A0854909BCCDBE6C102DDFFC022A6B113E44
> _______________________________________________
> Gnome-accessibility-devel mailing list
> Gnome-accessibility-devel gnome org
> http://mail.gnome.org/mailman/listinfo/gnome-accessibility-devel