[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: automatically calculate pkvmacro_files [libtool--gary--1.0--patch-2]
From: |
Ralf Wildenhues |
Subject: |
Re: automatically calculate pkvmacro_files [libtool--gary--1.0--patch-2] |
Date: |
Sat, 12 Mar 2005 20:57:15 +0100 |
User-agent: |
Mutt/1.5.6+20040907i |
Hi Gary,
Nits below. Looks ok otherwise (lightly tested only).
Cheers,
Ralf
* Gary V. Vaughan wrote on Fri, Mar 11, 2005 at 06:01:19PM CET:
> from Gary V. Vaughan <address@hidden>
> * libtoolize.m4sh (func_massage_pkgvmacro_DATA): New function
> to calculate the macro filenames to be copied by libtoolize.
> * Makefile.am (edit): Substitute pkgvmacro_DATA.
>
> --- orig/Makefile.am
> +++ mod/Makefile.am
> @@ -1,6 +1,6 @@
> ## Makefile.am -- Process this file with automake to produce Makefile.in
> ##
> -## Copyright (C) 2003, 2004 Free Software Foundation
> +## Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
> ##
> ## This program is free software; you can redistribute it and/or modify
> ## it under the terms of the GNU General Public License as published by
> @@ -43,6 +43,7 @@
> -e 's,@host_triplet\@,$(host_triplet),g' \
> -e 's,@pkgvdatadir\@,$(pkgvdatadir),g' \
> -e 's,@pkgvmacrodir\@,$(pkgvmacrodir),g' \
> + -e 's,@pkgvmacro_DATA\@,$(pkgvmacro_DATA),g' \
> -e 's,@prefix\@,$(prefix),g' \
> -e "s,@configure_input\@,Generated from $$input; do not edit by hand,g"
>
> @@ -88,8 +89,6 @@
>
> # Everything that gets picked up by aclocal is automatically distributed,
> # this is the list of macro files we install on the user's system.
> -# NOTE: Ensure that PKGVMACRO_FILES in libtoolize.in is updated if you
> -# change the contents of aclocal_DATA:
> pkgvmacro_DATA = m4/argz.m4 m4/libtool.m4 m4/ltdl.m4 \
> m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4
>
>
>
> --- orig/libtoolize.m4sh
> +++ mod/libtoolize.m4sh
> @@ -821,6 +821,31 @@
> }
>
>
> +# func_massage_pkgvmacro_DATA [glob_exclude]
> +# @pkgvmacro_DATA@ is substituted as per its value in Makefile.am; this
This ^^ will appear substituted in `libtoolize', which is ugly. Please
insert a space or backslash or so.
> +# function massages it into a suitable format for func_copy_some_files.
> +func_massage_pkgvmacro_DATA ()
> +{
> + pkgvmacro_files= # GLOBAL VAR
> +
> + my_glob_exclude="$1"
No quotes necessary (just thinking loud).
> +
> + # Massage a value for pkgvmacro_files from the value used in Makefile.am.
> + for my_filename in @pkgvmacro_DATA@; do
> + my_filename=`$ECHO "X$my_filename" | $Xsed -e "$basename"`
> +
> + # ignore excluded filenames
> + if test -n "$my_glob_exclude"; then
> + eval 'case $my_filename in '$my_glob_exclude') continue ;; esac'
> + fi
> +
> + pkgvmacro_files="$pkgvmacro_files:$my_filename"
> + done
> +
> + # strip spurious leading `:'
> + pkgvmacro_files=`$ECHO "X$pkgvmacro_files" | $Xsed -e 's,^:*,,'`
> +}
> +
>
> ## ----------- ##
> ## Main. ##
> @@ -829,10 +854,10 @@
> {
> rerun_aclocal=false
>
> - # NOTE: PKGVMACRO_FILES must be kept in synch with pkgvmacro_DATA in the
> - # libtool top_srcdir/Makefile.am (libtool.m4 and ltdl.m4 are handled
> - # specially below though, so don't add them here):
> - pkgvmacro_files='argz.m4:ltoptions.m4:ltsugar.m4:ltversion.m4'
> + # libtool.m4 and ltdl.m4 are handled specially below
> + func_massage_pkgvmacro_DATA 'libtool.m4|ltdl.m4'
> + echo "$pkgvmacro_files"
> + exit 1
Well, you certainly don't want these two lines in there. :)
>
> glob_exclude_pkgaux_files='config.guess|config.sub|install-sh|ltmain.sh'
>
>
>
>