Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-22 02:33:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

gnulib: improve prefixing.

Browse Source 
* configure.ac (gl_PREFIXED_LIBOBJS): Don't rename it, rather,
	change the value of...
	(gl_LIBOBJS): this.
	Adjust more variables.
	* etc/prefix-gnulib-mk (prefix_assignment): Don't rename
	gl_LIBOBJS.
	(prefix): Also transform rules whose targets have slashes.
	Use $prefix liberally.
	Map @MKDIR_P@ to $(MKDIR_P).
	Prefix directories that are mkdir'd.
This commit is contained in:
Akim Demaille
2009-07-01 11:53:29 +02:00
parent 838205d547
commit d1b55e8115
3 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeLog
View File

@@ -1,3 +1,17 @@
2009-08-12 Akim Demaille <demaille@gostai.com>
gnulib: improve prefixing.
* configure.ac (gl_PREFIXED_LIBOBJS): Don't rename it, rather,
change the value of...
(gl_LIBOBJS): this.
Adjust more variables.
* etc/prefix-gnulib-mk (prefix_assignment): Don't rename
gl_LIBOBJS.
(prefix): Also transform rules whose targets have slashes.
Use $prefix liberally.
Map @MKDIR_P@ to $(MKDIR_P).
Prefix directories that are mkdir'd.
2009-08-12 Akim Demaille <demaille@gostai.com> 2009-08-12 Akim Demaille <demaille@gostai.com>
build: fix paths. build: fix paths.

10
configure.ac
View File

@@ -145,11 +145,13 @@ AC_SUBST([O0CXXFLAGS], [`echo $CXXFLAGS | sed 's/-O[[0-9]] *//'`])
gt_JAVACOMP([1.3], [1.4]) gt_JAVACOMP([1.3], [1.4])
gt_JAVAEXEC gt_JAVAEXEC
AC_SUBST([gl_PREFIXED_LIBOBJS], # We use gnulib, but from lib/local.mk instead of lib/Makefile.am.
[$(echo "$gl_LIBOBJS" | sed -e 's, , lib/,g')]) # So prefix paths with lib/. See also etc/prefix-gnulib-mk.
for ac_var in ERRNO_H GETOPT_H INTTYPES_H STDBOOL_H STDINT_H WCHAR_H WCTYPE_H gl_LIBOBJS=`echo "$gl_LIBOBJS" | sed -e 's, , lib/,g'`
for ac_var in ALLOCA_H ERRNO_H FCNTL_H GETOPT_H INTTYPES_H \
STDBOOL_H STDINT_H SYS_WAIT_H WCHAR_H WCTYPE_H
do do
eval "$ac_var=lib/\$$ac_var" eval "test 'x$ac_var' = x || $ac_var=lib/\$$ac_var"
done done
AC_CONFIG_FILES([Makefile AC_CONFIG_FILES([Makefile
po/Makefile.in po/Makefile.in

15
etc/prefix-gnulib-mk
View File

@@ -73,9 +73,6 @@ sub prefix_assignment ($$)
# lib_libbison_a_SOURCES. # lib_libbison_a_SOURCES.
$lhs_and_assign_op =~ s/(libbison)/lib_$1/g; $lhs_and_assign_op =~ s/(libbison)/lib_$1/g;
# Do not use gl_LIBOBJS, but its prefixed version.
$rhs =~ s/gl_LIBOBJS/gl_PREFIXED_LIBOBJS/g;
return $lhs_and_assign_op . $rhs; return $lhs_and_assign_op . $rhs;
} }
@@ -93,7 +90,7 @@ sub prefix ($)
# Prefix all the occurrence of files in rules. If there is nothing # Prefix all the occurrence of files in rules. If there is nothing
# after in the :, it's probably a phony target, or a suffix rule. # after in the :, it's probably a phony target, or a suffix rule.
# Don't touch it. # Don't touch it.
s{^([\w.]+ *: *\w.*)$} s{^([\w./]+ *: *\w.*)$}
{prefix_words($1)}gem; {prefix_words($1)}gem;
# Prefix files in variables. # Prefix files in variables.
@@ -103,7 +100,7 @@ sub prefix ($)
# These three guys escape all the other regular rules. # These three guys escape all the other regular rules.
s{(charset\.alias|ref-add\.sed|ref-del\.sed)}{$prefix$1}g; s{(charset\.alias|ref-add\.sed|ref-del\.sed)}{$prefix$1}g;
# Unfortunately, as a result we sometimes have lib/lib. # Unfortunately, as a result we sometimes have lib/lib.
s{lib/lib/}{lib/}g; s{($prefix){2}}{$1}g;
# $(srcdir) is actually $(top_srcdir)/lib. # $(srcdir) is actually $(top_srcdir)/lib.
s{\$\(srcdir\)}{\$(top_srcdir)/lib}g; s{\$\(srcdir\)}{\$(top_srcdir)/lib}g;
@@ -112,6 +109,12 @@ sub prefix ($)
# not work when we have a $@ with a directory in it. # not work when we have a $@ with a directory in it.
s{t-\$\@}{\$\@-t}g; s{t-\$\@}{\$\@-t}g;
# Some AC_SUBST patterns remain and would better be Make macros.
s{\@(MKDIR_P)\@}{\$($1)}g;
# Adjust paths in mkdir.
s{(\$\(MKDIR_P\))\s*(\w+)}{$1 $prefix$2}g;
return $_; return $_;
} }
@@ -128,7 +131,7 @@ sub process ($)
print $out $contents; print $out $contents;
} }
process ("lib/gnulib.mk") process ("${prefix}gnulib.mk")
### Setup "GNU" style for perl-mode and cperl-mode. ### Setup "GNU" style for perl-mode and cperl-mode.