diff options
author | Akim Demaille <akim@epita.fr> | 2001-02-27 09:12:42 +0000 |
---|---|---|
committer | Akim Demaille <akim@epita.fr> | 2001-02-27 09:12:42 +0000 |
commit | e8133bcf9b3314171647e9f40157349c53ce08fe (patch) | |
tree | 4328a0430212037d2137656ab8731f2823e85552 | |
parent | 833912f601dd7be2df60393826207e556b7d46b8 (diff) | |
download | automake-e8133bcf9b3314171647e9f40157349c53ce08fe.tar.gz |
Distinguish automake substitutions from config.status
substitutions.
* automake.in (&add_depend2): Transform AMDEP.
(&handle_clean): Transform MCFILES and MFILES.
(&file_contents): Transform MAINTAINER_MODE.
(&transform, &am_install_var): Use `%', not `@'.
Adjust all the *.am files.
* clean.am: Use ?MFILES? instead of ad hoc MAINTAINERCLEAN.
* depend2.am: Display the double dependency on both ?AMDEP? and
@AMDEP@.
59 files changed, 503 insertions, 496 deletions
@@ -1,3 +1,17 @@ +2001-02-27 Akim Demaille <akim@epita.fr> + + Distinguish automake substitutions from config.status + substitutions. + + * automake.in (&add_depend2): Transform AMDEP. + (&handle_clean): Transform MCFILES and MFILES. + (&file_contents): Transform MAINTAINER_MODE. + (&transform, &am_install_var): Use `%', not `@'. + Adjust all the *.am files. + * clean.am: Use ?MFILES? instead of ad hoc MAINTAINERCLEAN. + * depend2.am: Display the double dependency on both ?AMDEP? and + @AMDEP@. + 2001-02-27 Tom Tromey <tromey@redhat.com> * distdir.am (distcheck): Fixed new code. diff --git a/automake.in b/automake.in index 6297318f0..8d3d8d5d4 100755 --- a/automake.in +++ b/automake.in @@ -2721,7 +2721,8 @@ sub add_depend2 my $xform = &transform ('PFX' => $pfx, 'FPFX' => $fpfx, 'OBJEXT' => $seen_objext, - 'LIBTOOL' => $seen_libtool); + 'LIBTOOL' => $seen_libtool, + 'AMDEP' => $use_dependencies); # This function can be called even when we don't want dependency # tracking. This happens when we need an explicit rule for some @@ -2747,11 +2748,6 @@ sub add_depend2 . "\n"); } } - else - { - # If dependency tracking is disabled, we just elide the code. - $xform .= 's/\@AMDEP\@.*$//;'; - } # Now include code for each specially handled object with this # language. @@ -3644,23 +3640,18 @@ sub handle_clean if &variable_defined ('BUILT_SOURCES'); push (@maintainer_clean_files, '\$(MAINTAINERCLEANFILES)') if &variable_defined ('MAINTAINERCLEANFILES'); - if (! @maintainer_clean_files) - { - $xform .= 's/^MAINTAINERCLEAN.*$//;'; - } - else - { - $xform .= ('s/^MAINTAINERCLEAN//;' - # Join with no space to avoid spurious `test -z' - # success at runtime. - . 's,\@MCFILES\@,' . join ('', @maintainer_clean_files) - . ',;' - # A space is required in the join here. - . 's,\@MFILES\@,' . join (' ', @maintainer_clean_files) - . ',;'); - } - $output_rules .= &file_contents ('clean', $xform); + $output_rules .= + &file_contents ('clean', + $xform + . &transform ('MCFILES' + # Join with no space to avoid + # spurious `test -z' success at + # runtime. + => join ('', @maintainer_clean_files), + 'MFILES' + # A space is required in the join here. + => join (' ', @maintainer_clean_files))); # We special-case config.status here. If we do it as part of the # normal clean processing for this directory, then it might be @@ -6577,7 +6568,8 @@ sub file_contents &prog_error ("file_contents: $command") if $command ne '' && substr ($command, -1) ne ';'; $command .= - &transform ('CYGNUS' => $cygnus_mode, + &transform ('CYGNUS' => $cygnus_mode, + 'MAINTAINER_MODE' => $seen_maint_mode, 'SHAR' => $options{'dist-shar'}, 'BZIP2' => $options{'dist-bzip2'}, @@ -6770,7 +6762,7 @@ sub transform (%) while (my ($token, $val) = each %pairs) { - $result .= "s/\Q\@$token\@\E/\Q$val\E/g;"; + $result .= "s/\Q%$token%\E/\Q$val\E/g;"; if ($val) { $result .= "s/\Q?$token?\E//g;s/^.*\Q?!$token?\E.*\$//g;"; @@ -6840,23 +6832,23 @@ sub am_install_var my $ltxform; if (defined $configure_vars{'LIBTOOL'}) { - # Transform '@LIBTOOL ...@' to '$(LIBTOOL) ...' - $ltxform = 's/\@LIBTOOL([^\@]*)\@/\$(LIBTOOL) $1/;'; + # Transform '%LIBTOOL ...%' to '$(LIBTOOL) ...' + $ltxform = 's/%LIBTOOL([^\%]*)%/\$(LIBTOOL) $1/;'; } else { - # Delete '@LIBTOOL ...@' - $ltxform = 's/\@LIBTOOL([^\@]*)\@//;'; + # Delete '%LIBTOOL ...%' + $ltxform = 's/%LIBTOOL([^%]*)%//;'; } my $cygxform; if (! $seen_exeext) { - $cygxform = 's/\@EXEEXT\@//g;'; + $cygxform = 's/%EXEEXT%//g;'; } else { - $cygxform = 's/\@EXEEXT\@/\$(EXEEXT)/g;'; + $cygxform = 's/%EXEEXT%/\$(EXEEXT)/g;'; } my $do_clean = 0; diff --git a/clean-hdr.am b/clean-hdr.am index 973ff8658..3e5d454ac 100644 --- a/clean-hdr.am +++ b/clean-hdr.am @@ -19,4 +19,4 @@ .PHONY: distclean-hdr distclean-am: distclean-hdr distclean-hdr: - -rm -f @FILES@ + -rm -f %FILES% @@ -40,7 +40,7 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -rm -f Makefile.in -MAINTAINERCLEAN -test -z "@MCFILES@" || rm -f @MFILES@ +?MFILES? -test -z "%MCFILES%" || rm -f %MFILES% .PHONY: clean mostlyclean distclean maintainer-clean \ clean-generic mostlyclean-generic distclean-generic maintainer-clean-generic diff --git a/comp-vars.am b/comp-vars.am index 5e94d6922..6d346340a 100644 --- a/comp-vars.am +++ b/comp-vars.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright 1994, 1995, 1996, 1998, 1999 Free Software Foundation, Inc. +## Copyright 1994, 1995, 1996, 1998, 1999, 2001 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 @@ -16,7 +16,7 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -DEFS = @DEFS@@DEFAULT_INCLUDES@ +DEFS = @DEFS@%DEFAULT_INCLUDES% CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ @@ -16,31 +16,31 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -_am_installdirs += $(DESTDIR)$(@NDIR@dir) -?EXEC?.PHONY install-exec-am: install-@DIR@DATA -?!EXEC?.PHONY install-data-am: install-@DIR@DATA -install-@DIR@DATA: $(@DIR@_DATA) +_am_installdirs += $(DESTDIR)$(%NDIR%dir) +?EXEC?.PHONY install-exec-am: install-%DIR%DATA +?!EXEC?.PHONY install-data-am: install-%DIR%DATA +install-%DIR%DATA: $(%DIR%_DATA) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(@NDIR@dir) + $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir) ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. - @list='$(@DIR@_DATA)'; for p in $$list; do \ + @list='$(%DIR%_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ## If the _DATA variable has an entry like foo/bar, install it as ## $(destdir)/bar, not $(destdir)/foo/bar. The user can always make a ## new dir variable for the latter case. ?BASE? f="`echo $$p | sed -e 's|^.*/||'`"; \ ?!BASE? f="$$p"; \ - echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@NDIR@dir)/$$f"; \ - $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@NDIR@dir)/$$f; \ + echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(%NDIR%dir)/$$f"; \ + $(INSTALL_DATA) $$d$$p $(DESTDIR)$(%NDIR%dir)/$$f; \ done -.PHONY uninstall-am: uninstall-@DIR@DATA -uninstall-@DIR@DATA: +.PHONY uninstall-am: uninstall-%DIR%DATA +uninstall-%DIR%DATA: @$(NORMAL_UNINSTALL) - @list='$(@DIR@_DATA)'; for p in $$list; do \ + @list='$(%DIR%_DATA)'; for p in $$list; do \ ?BASE? f="`echo $$p | sed -e 's|^.*/||'`"; \ ?!BASE? f="$$p"; \ - echo " rm -f $(DESTDIR)$(@NDIR@dir)/$$f"; \ - rm -f $(DESTDIR)$(@NDIR@dir)/$$f; \ + echo " rm -f $(DESTDIR)$(%NDIR%dir)/$$f"; \ + rm -f $(DESTDIR)$(%NDIR%dir)/$$f; \ done diff --git a/depend2.am b/depend2.am index 9a0580448..06b36ad12 100644 --- a/depend2.am +++ b/depend2.am @@ -20,27 +20,23 @@ ## This file is read several times: ## - once per language for generic compilation rules ## - once for each file which requires specific flags. -## -## It is worth noting that @AMDEPBACKSLASH@ is not transformed by automake, -## it is AC_SUBST'ed, and @AMDEP@ can be both deactivated by automake, -## or by AC_SUBST. - -@AMDEP@@FPFX@DEPMODE = @@FPFX@DEPMODE@ - -@EXT@.o: -@AMDEP@ source='@SOURCE@' object='@OBJ@' libtool=no @AMDEPBACKSLASH@ -@AMDEP@ depfile='$(DEPDIR)/@BASE@.Po' tmpdepfile='$(DEPDIR)/@BASE@.TPo' @AMDEPBACKSLASH@ -@AMDEP@ $(@FPFX@DEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @COMPILE@ -c -o @OBJ@ `test -f @SOURCE@ || echo '$(srcdir)/'`@SOURCE@ - -?LIBTOOL?@EXT@.lo: -?LIBTOOL?@AMDEP@ source='@SOURCE@' object='@LTOBJ@' libtool=yes @AMDEPBACKSLASH@ -?LIBTOOL?@AMDEP@ depfile='$(DEPDIR)/@BASE@.Plo' tmpdepfile='$(DEPDIR)/@BASE@.TPlo' @AMDEPBACKSLASH@ -?LIBTOOL?@AMDEP@ $(@FPFX@DEPMODE) $(depcomp) @AMDEPBACKSLASH@ -?LIBTOOL? @LTCOMPILE@ -c -o @LTOBJ@ `test -f @SOURCE@ || echo '$(srcdir)/'`@SOURCE@ - -?OBJEXT?@EXT@.obj: -?OBJEXT?@AMDEP@ source='@SOURCE@' object='@OBJOBJ@' libtool=no @AMDEPBACKSLASH@ -?OBJEXT?@AMDEP@ depfile='$(DEPDIR)/@BASE@.Po' tmpdepfile='$(DEPDIR)/@BASE@.TPo' @AMDEPBACKSLASH@ -?OBJEXT?@AMDEP@ $(@FPFX@DEPMODE) $(depcomp) @AMDEPBACKSLASH@ -?OBJEXT? @COMPILE@ -c -o @OBJOBJ@ `cygpath -w @SOURCE@` + +?AMDEP?@AMDEP@%FPFX%DEPMODE = @%FPFX%DEPMODE@ + +%EXT%.o: +?AMDEP?@AMDEP@ source='%SOURCE%' object='%OBJ%' libtool=no @AMDEPBACKSLASH@ +?AMDEP?@AMDEP@ depfile='$(DEPDIR)/%BASE%.Po' tmpdepfile='$(DEPDIR)/%BASE%.TPo' @AMDEPBACKSLASH@ +?AMDEP?@AMDEP@ $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@ + %COMPILE% -c -o %OBJ% `test -f %SOURCE% || echo '$(srcdir)/'`%SOURCE% + +?LIBTOOL?%EXT%.lo: +?LIBTOOL??AMDEP?@AMDEP@ source='%SOURCE%' object='%LTOBJ%' libtool=yes @AMDEPBACKSLASH@ +?LIBTOOL??AMDEP?@AMDEP@ depfile='$(DEPDIR)/%BASE%.Plo' tmpdepfile='$(DEPDIR)/%BASE%.TPlo' @AMDEPBACKSLASH@ +?LIBTOOL??AMDEP?@AMDEP@ $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@ +?LIBTOOL? %LTCOMPILE% -c -o %LTOBJ% `test -f %SOURCE% || echo '$(srcdir)/'`%SOURCE% + +?OBJEXT?%EXT%.obj: +?OBJEXT??AMDEP?@AMDEP@ source='%SOURCE%' object='%OBJOBJ%' libtool=no @AMDEPBACKSLASH@ +?OBJEXT??AMDEP?@AMDEP@ depfile='$(DEPDIR)/%BASE%.Po' tmpdepfile='$(DEPDIR)/%BASE%.TPo' @AMDEPBACKSLASH@ +?OBJEXT??AMDEP?@AMDEP@ $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@ +?OBJEXT? %COMPILE% -c -o %OBJOBJ% `cygpath -w %SOURCE%` diff --git a/distdir.am b/distdir.am index 9d8d6a5f0..767a3fd76 100644 --- a/distdir.am +++ b/distdir.am @@ -24,7 +24,7 @@ VERSION = @VERSION@ ## DIST_COMMON comes first so that README can be the very first file. DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -top_distdir = @TOP_DISTDIR@ +top_distdir = %TOP_DISTDIR% ?DISTDIR?distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @@ -43,7 +43,7 @@ distdir: $(DISTFILES) ?TOPDIR? mkdir $(distdir) ## ## -?DISTDIRS? $(mkinstalldirs) @DISTDIRS@ +?DISTDIRS? $(mkinstalldirs) %DISTDIRS% ## ## @for file in $(DISTFILES); do \ @@ -79,7 +79,7 @@ distdir: $(DISTFILES) ## directory, then we use `distdir' instead of `top_distdir'; this lets ## us work correctly with an enclosing package. ## -?SUBDIRS? for subdir in $(@DIST_SUBDIR_NAME@); do \ +?SUBDIRS? for subdir in $(%DIST_SUBDIR_NAME%); do \ ?SUBDIRS? if test "$$subdir" = .; then :; else \ ?SUBDIRS? test -d $(distdir)/$$subdir \ ?SUBDIRS? || mkdir $(distdir)/$$subdir \ @@ -99,7 +99,7 @@ distdir: $(DISTFILES) ## ?DIST-TARGETS? $(MAKE) $(AM_MAKEFLAGS) \ ?DIST-TARGETS? top_distdir="${top_distdir}" distdir="$(distdir)" \ -?DIST-TARGETS? @DIST-TARGETS@ +?DIST-TARGETS? %DIST-TARGETS% ## ## This complex find command will try to avoid changing the modes of ## links into the source tree, in case they're hard-linked. It will diff --git a/header-vars.am b/header-vars.am index 287de1d20..5b965c742 100644 --- a/header-vars.am +++ b/header-vars.am @@ -53,7 +53,7 @@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ ## Location of top build directory relative to this one. -top_builddir = @top_builddir@ +top_builddir = %top_builddir% ACLOCAL = @ACLOCAL@ AUTOCONF = @AUTOCONF@ @@ -16,29 +16,29 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -_am_installdirs += $(DESTDIR)$(@NDIR@dir) -?EXEC?.PHONY install-exec-am: install-@DIR@HEADERS -?!EXEC?.PHONY install-data-am: install-@DIR@HEADERS -install-@DIR@HEADERS: $(@DIR@_HEADERS) +_am_installdirs += $(DESTDIR)$(%NDIR%dir) +?EXEC?.PHONY install-exec-am: install-%DIR%HEADERS +?!EXEC?.PHONY install-data-am: install-%DIR%HEADERS +install-%DIR%HEADERS: $(%DIR%_HEADERS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(@NDIR@dir) + $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir) ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. - @list='$(@DIR@_HEADERS)'; for p in $$list; do \ + @list='$(%DIR%_HEADERS)'; for p in $$list; do \ ## A header file can be in the source directory or the build directory. if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ?BASE? f="`echo $$p | sed -e 's|^.*/||'`"; \ ?!BASE? f="$$p"; \ - echo " $(INSTALL_HEADER) $$d$$p $(DESTDIR)$(@NDIR@dir)/$$f"; \ - $(INSTALL_HEADER) $$d$$p $(DESTDIR)$(@NDIR@dir)/$$f; \ + echo " $(INSTALL_HEADER) $$d$$p $(DESTDIR)$(%NDIR%dir)/$$f"; \ + $(INSTALL_HEADER) $$d$$p $(DESTDIR)$(%NDIR%dir)/$$f; \ done -.PHONY uninstall-am: uninstall-@DIR@HEADERS -uninstall-@DIR@HEADERS: +.PHONY uninstall-am: uninstall-%DIR%HEADERS +uninstall-%DIR%HEADERS: @$(NORMAL_UNINSTALL) - @list='$(@DIR@_HEADERS)'; for p in $$list; do \ + @list='$(%DIR%_HEADERS)'; for p in $$list; do \ ?BASE? f="`echo $$p | sed -e 's|^.*/||'`"; \ ?!BASE? f="$$p"; \ - echo " rm -f $(DESTDIR)$(@NDIR@dir)/$$f"; \ - rm -f $(DESTDIR)$(@NDIR@dir)/$$f; \ + echo " rm -f $(DESTDIR)$(%NDIR%dir)/$$f"; \ + rm -f $(DESTDIR)$(%NDIR%dir)/$$f; \ done diff --git a/install.am b/install.am index 85418a6a7..c3e688347 100644 --- a/install.am +++ b/install.am @@ -22,11 +22,11 @@ ?SUBDIRS?.PHONY: installdirs installdirs-am installdirs-recursive ?SUBDIRS?installdirs: installdirs-recursive ?SUBDIRS?installdirs-am: -?SUBDIRS??_am_installdirs? $(mkinstalldirs) @_am_installdirs@ +?SUBDIRS??_am_installdirs? $(mkinstalldirs) %_am_installdirs% ?!SUBDIRS?.PHONY: installdirs ?!SUBDIRS?installdirs: -?!SUBDIRS??_am_installdirs? $(mkinstalldirs) @_am_installdirs@ +?!SUBDIRS??_am_installdirs? $(mkinstalldirs) %_am_installdirs% ## ----------------- ## diff --git a/java-clean.am b/java-clean.am index 6378895e9..b28848db9 100644 --- a/java-clean.am +++ b/java-clean.am @@ -16,6 +16,6 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -.PHONY clean-am: clean-@DIR@JAVA: -clean-@DIR@JAVA: - -rm *.class class@DIR@.stamp +.PHONY clean-am: clean-%DIR%JAVA: +clean-%DIR%JAVA: + -rm *.class class%DIR%.stamp @@ -16,23 +16,23 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -?EXEC?.PHONY install-exec-am: install-@DIR@JAVA -?!EXEC?.PHONY install-data-am: install-@DIR@JAVA -install-@DIR@JAVA: class@DIR@.stamp +?EXEC?.PHONY install-exec-am: install-%DIR%JAVA +?!EXEC?.PHONY install-data-am: install-%DIR%JAVA +install-%DIR%JAVA: class%DIR%.stamp @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(@NDIR@dir) + $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir) ## A single .java file can be compiled into multiple .class files. So ## we just install all the .class files that got built into this ## directory. This is not optimal, but will have to do for now. for p in *.class; do \ - echo " $(INSTALL_DATA) $$p $(DESTDIR)$(@NDIR@dir)/$$p"; \ - $(INSTALL_DATA) $$p $(DESTDIR)$(@NDIR@dir)/$$p; \ + echo " $(INSTALL_DATA) $$p $(DESTDIR)$(%NDIR%dir)/$$p"; \ + $(INSTALL_DATA) $$p $(DESTDIR)$(%NDIR%dir)/$$p; \ done -.PHONY uninstall-am: uninstall-@DIR@JAVA -uninstall-@DIR@JAVA: +.PHONY uninstall-am: uninstall-%DIR%JAVA +uninstall-%DIR%JAVA: @$(NORMAL_UNINSTALL) @for p in *.class; do \ - echo " rm -f $(DESTDIR)$(@NDIR@dir)/$$p"; \ - rm -f $(DESTDIR)$(@NDIR@dir)/$$p; \ + echo " rm -f $(DESTDIR)$(%NDIR%dir)/$$p"; \ + rm -f $(DESTDIR)$(%NDIR%dir)/$$p; \ done diff --git a/lib/am/clean-hdr.am b/lib/am/clean-hdr.am index 973ff8658..3e5d454ac 100644 --- a/lib/am/clean-hdr.am +++ b/lib/am/clean-hdr.am @@ -19,4 +19,4 @@ .PHONY: distclean-hdr distclean-am: distclean-hdr distclean-hdr: - -rm -f @FILES@ + -rm -f %FILES% diff --git a/lib/am/clean.am b/lib/am/clean.am index a699bc9b1..701d61e10 100644 --- a/lib/am/clean.am +++ b/lib/am/clean.am @@ -40,7 +40,7 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -rm -f Makefile.in -MAINTAINERCLEAN -test -z "@MCFILES@" || rm -f @MFILES@ +?MFILES? -test -z "%MCFILES%" || rm -f %MFILES% .PHONY: clean mostlyclean distclean maintainer-clean \ clean-generic mostlyclean-generic distclean-generic maintainer-clean-generic diff --git a/lib/am/comp-vars.am b/lib/am/comp-vars.am index 5e94d6922..6d346340a 100644 --- a/lib/am/comp-vars.am +++ b/lib/am/comp-vars.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright 1994, 1995, 1996, 1998, 1999 Free Software Foundation, Inc. +## Copyright 1994, 1995, 1996, 1998, 1999, 2001 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 @@ -16,7 +16,7 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -DEFS = @DEFS@@DEFAULT_INCLUDES@ +DEFS = @DEFS@%DEFAULT_INCLUDES% CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ diff --git a/lib/am/data.am b/lib/am/data.am index 2b11f09b6..0e92596d3 100644 --- a/lib/am/data.am +++ b/lib/am/data.am @@ -16,31 +16,31 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -_am_installdirs += $(DESTDIR)$(@NDIR@dir) -?EXEC?.PHONY install-exec-am: install-@DIR@DATA -?!EXEC?.PHONY install-data-am: install-@DIR@DATA -install-@DIR@DATA: $(@DIR@_DATA) +_am_installdirs += $(DESTDIR)$(%NDIR%dir) +?EXEC?.PHONY install-exec-am: install-%DIR%DATA +?!EXEC?.PHONY install-data-am: install-%DIR%DATA +install-%DIR%DATA: $(%DIR%_DATA) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(@NDIR@dir) + $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir) ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. - @list='$(@DIR@_DATA)'; for p in $$list; do \ + @list='$(%DIR%_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ## If the _DATA variable has an entry like foo/bar, install it as ## $(destdir)/bar, not $(destdir)/foo/bar. The user can always make a ## new dir variable for the latter case. ?BASE? f="`echo $$p | sed -e 's|^.*/||'`"; \ ?!BASE? f="$$p"; \ - echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@NDIR@dir)/$$f"; \ - $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@NDIR@dir)/$$f; \ + echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(%NDIR%dir)/$$f"; \ + $(INSTALL_DATA) $$d$$p $(DESTDIR)$(%NDIR%dir)/$$f; \ done -.PHONY uninstall-am: uninstall-@DIR@DATA -uninstall-@DIR@DATA: +.PHONY uninstall-am: uninstall-%DIR%DATA +uninstall-%DIR%DATA: @$(NORMAL_UNINSTALL) - @list='$(@DIR@_DATA)'; for p in $$list; do \ + @list='$(%DIR%_DATA)'; for p in $$list; do \ ?BASE? f="`echo $$p | sed -e 's|^.*/||'`"; \ ?!BASE? f="$$p"; \ - echo " rm -f $(DESTDIR)$(@NDIR@dir)/$$f"; \ - rm -f $(DESTDIR)$(@NDIR@dir)/$$f; \ + echo " rm -f $(DESTDIR)$(%NDIR%dir)/$$f"; \ + rm -f $(DESTDIR)$(%NDIR%dir)/$$f; \ done diff --git a/lib/am/depend2.am b/lib/am/depend2.am index 9a0580448..06b36ad12 100644 --- a/lib/am/depend2.am +++ b/lib/am/depend2.am @@ -20,27 +20,23 @@ ## This file is read several times: ## - once per language for generic compilation rules ## - once for each file which requires specific flags. -## -## It is worth noting that @AMDEPBACKSLASH@ is not transformed by automake, -## it is AC_SUBST'ed, and @AMDEP@ can be both deactivated by automake, -## or by AC_SUBST. - -@AMDEP@@FPFX@DEPMODE = @@FPFX@DEPMODE@ - -@EXT@.o: -@AMDEP@ source='@SOURCE@' object='@OBJ@' libtool=no @AMDEPBACKSLASH@ -@AMDEP@ depfile='$(DEPDIR)/@BASE@.Po' tmpdepfile='$(DEPDIR)/@BASE@.TPo' @AMDEPBACKSLASH@ -@AMDEP@ $(@FPFX@DEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @COMPILE@ -c -o @OBJ@ `test -f @SOURCE@ || echo '$(srcdir)/'`@SOURCE@ - -?LIBTOOL?@EXT@.lo: -?LIBTOOL?@AMDEP@ source='@SOURCE@' object='@LTOBJ@' libtool=yes @AMDEPBACKSLASH@ -?LIBTOOL?@AMDEP@ depfile='$(DEPDIR)/@BASE@.Plo' tmpdepfile='$(DEPDIR)/@BASE@.TPlo' @AMDEPBACKSLASH@ -?LIBTOOL?@AMDEP@ $(@FPFX@DEPMODE) $(depcomp) @AMDEPBACKSLASH@ -?LIBTOOL? @LTCOMPILE@ -c -o @LTOBJ@ `test -f @SOURCE@ || echo '$(srcdir)/'`@SOURCE@ - -?OBJEXT?@EXT@.obj: -?OBJEXT?@AMDEP@ source='@SOURCE@' object='@OBJOBJ@' libtool=no @AMDEPBACKSLASH@ -?OBJEXT?@AMDEP@ depfile='$(DEPDIR)/@BASE@.Po' tmpdepfile='$(DEPDIR)/@BASE@.TPo' @AMDEPBACKSLASH@ -?OBJEXT?@AMDEP@ $(@FPFX@DEPMODE) $(depcomp) @AMDEPBACKSLASH@ -?OBJEXT? @COMPILE@ -c -o @OBJOBJ@ `cygpath -w @SOURCE@` + +?AMDEP?@AMDEP@%FPFX%DEPMODE = @%FPFX%DEPMODE@ + +%EXT%.o: +?AMDEP?@AMDEP@ source='%SOURCE%' object='%OBJ%' libtool=no @AMDEPBACKSLASH@ +?AMDEP?@AMDEP@ depfile='$(DEPDIR)/%BASE%.Po' tmpdepfile='$(DEPDIR)/%BASE%.TPo' @AMDEPBACKSLASH@ +?AMDEP?@AMDEP@ $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@ + %COMPILE% -c -o %OBJ% `test -f %SOURCE% || echo '$(srcdir)/'`%SOURCE% + +?LIBTOOL?%EXT%.lo: +?LIBTOOL??AMDEP?@AMDEP@ source='%SOURCE%' object='%LTOBJ%' libtool=yes @AMDEPBACKSLASH@ +?LIBTOOL??AMDEP?@AMDEP@ depfile='$(DEPDIR)/%BASE%.Plo' tmpdepfile='$(DEPDIR)/%BASE%.TPlo' @AMDEPBACKSLASH@ +?LIBTOOL??AMDEP?@AMDEP@ $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@ +?LIBTOOL? %LTCOMPILE% -c -o %LTOBJ% `test -f %SOURCE% || echo '$(srcdir)/'`%SOURCE% + +?OBJEXT?%EXT%.obj: +?OBJEXT??AMDEP?@AMDEP@ source='%SOURCE%' object='%OBJOBJ%' libtool=no @AMDEPBACKSLASH@ +?OBJEXT??AMDEP?@AMDEP@ depfile='$(DEPDIR)/%BASE%.Po' tmpdepfile='$(DEPDIR)/%BASE%.TPo' @AMDEPBACKSLASH@ +?OBJEXT??AMDEP?@AMDEP@ $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@ +?OBJEXT? %COMPILE% -c -o %OBJOBJ% `cygpath -w %SOURCE%` diff --git a/lib/am/distdir.am b/lib/am/distdir.am index 9d8d6a5f0..767a3fd76 100644 --- a/lib/am/distdir.am +++ b/lib/am/distdir.am @@ -24,7 +24,7 @@ VERSION = @VERSION@ ## DIST_COMMON comes first so that README can be the very first file. DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -top_distdir = @TOP_DISTDIR@ +top_distdir = %TOP_DISTDIR% ?DISTDIR?distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @@ -43,7 +43,7 @@ distdir: $(DISTFILES) ?TOPDIR? mkdir $(distdir) ## ## -?DISTDIRS? $(mkinstalldirs) @DISTDIRS@ +?DISTDIRS? $(mkinstalldirs) %DISTDIRS% ## ## @for file in $(DISTFILES); do \ @@ -79,7 +79,7 @@ distdir: $(DISTFILES) ## directory, then we use `distdir' instead of `top_distdir'; this lets ## us work correctly with an enclosing package. ## -?SUBDIRS? for subdir in $(@DIST_SUBDIR_NAME@); do \ +?SUBDIRS? for subdir in $(%DIST_SUBDIR_NAME%); do \ ?SUBDIRS? if test "$$subdir" = .; then :; else \ ?SUBDIRS? test -d $(distdir)/$$subdir \ ?SUBDIRS? || mkdir $(distdir)/$$subdir \ @@ -99,7 +99,7 @@ distdir: $(DISTFILES) ## ?DIST-TARGETS? $(MAKE) $(AM_MAKEFLAGS) \ ?DIST-TARGETS? top_distdir="${top_distdir}" distdir="$(distdir)" \ -?DIST-TARGETS? @DIST-TARGETS@ +?DIST-TARGETS? %DIST-TARGETS% ## ## This complex find command will try to avoid changing the modes of ## links into the source tree, in case they're hard-linked. It will diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am index 287de1d20..5b965c742 100644 --- a/lib/am/header-vars.am +++ b/lib/am/header-vars.am @@ -53,7 +53,7 @@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ ## Location of top build directory relative to this one. -top_builddir = @top_builddir@ +top_builddir = %top_builddir% ACLOCAL = @ACLOCAL@ AUTOCONF = @AUTOCONF@ diff --git a/lib/am/header.am b/lib/am/header.am index 4f1766c2b..41fd59938 100644 --- a/lib/am/header.am +++ b/lib/am/header.am @@ -16,29 +16,29 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -_am_installdirs += $(DESTDIR)$(@NDIR@dir) -?EXEC?.PHONY install-exec-am: install-@DIR@HEADERS -?!EXEC?.PHONY install-data-am: install-@DIR@HEADERS -install-@DIR@HEADERS: $(@DIR@_HEADERS) +_am_installdirs += $(DESTDIR)$(%NDIR%dir) +?EXEC?.PHONY install-exec-am: install-%DIR%HEADERS +?!EXEC?.PHONY install-data-am: install-%DIR%HEADERS +install-%DIR%HEADERS: $(%DIR%_HEADERS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(@NDIR@dir) + $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir) ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. - @list='$(@DIR@_HEADERS)'; for p in $$list; do \ + @list='$(%DIR%_HEADERS)'; for p in $$list; do \ ## A header file can be in the source directory or the build directory. if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ?BASE? f="`echo $$p | sed -e 's|^.*/||'`"; \ ?!BASE? f="$$p"; \ - echo " $(INSTALL_HEADER) $$d$$p $(DESTDIR)$(@NDIR@dir)/$$f"; \ - $(INSTALL_HEADER) $$d$$p $(DESTDIR)$(@NDIR@dir)/$$f; \ + echo " $(INSTALL_HEADER) $$d$$p $(DESTDIR)$(%NDIR%dir)/$$f"; \ + $(INSTALL_HEADER) $$d$$p $(DESTDIR)$(%NDIR%dir)/$$f; \ done -.PHONY uninstall-am: uninstall-@DIR@HEADERS -uninstall-@DIR@HEADERS: +.PHONY uninstall-am: uninstall-%DIR%HEADERS +uninstall-%DIR%HEADERS: @$(NORMAL_UNINSTALL) - @list='$(@DIR@_HEADERS)'; for p in $$list; do \ + @list='$(%DIR%_HEADERS)'; for p in $$list; do \ ?BASE? f="`echo $$p | sed -e 's|^.*/||'`"; \ ?!BASE? f="$$p"; \ - echo " rm -f $(DESTDIR)$(@NDIR@dir)/$$f"; \ - rm -f $(DESTDIR)$(@NDIR@dir)/$$f; \ + echo " rm -f $(DESTDIR)$(%NDIR%dir)/$$f"; \ + rm -f $(DESTDIR)$(%NDIR%dir)/$$f; \ done diff --git a/lib/am/install.am b/lib/am/install.am index 85418a6a7..c3e688347 100644 --- a/lib/am/install.am +++ b/lib/am/install.am @@ -22,11 +22,11 @@ ?SUBDIRS?.PHONY: installdirs installdirs-am installdirs-recursive ?SUBDIRS?installdirs: installdirs-recursive ?SUBDIRS?installdirs-am: -?SUBDIRS??_am_installdirs? $(mkinstalldirs) @_am_installdirs@ +?SUBDIRS??_am_installdirs? $(mkinstalldirs) %_am_installdirs% ?!SUBDIRS?.PHONY: installdirs ?!SUBDIRS?installdirs: -?!SUBDIRS??_am_installdirs? $(mkinstalldirs) @_am_installdirs@ +?!SUBDIRS??_am_installdirs? $(mkinstalldirs) %_am_installdirs% ## ----------------- ## diff --git a/lib/am/java.am b/lib/am/java.am index b33f1c8f7..e7753b1df 100644 --- a/lib/am/java.am +++ b/lib/am/java.am @@ -16,23 +16,23 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -?EXEC?.PHONY install-exec-am: install-@DIR@JAVA -?!EXEC?.PHONY install-data-am: install-@DIR@JAVA -install-@DIR@JAVA: class@DIR@.stamp +?EXEC?.PHONY install-exec-am: install-%DIR%JAVA +?!EXEC?.PHONY install-data-am: install-%DIR%JAVA +install-%DIR%JAVA: class%DIR%.stamp @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(@NDIR@dir) + $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir) ## A single .java file can be compiled into multiple .class files. So ## we just install all the .class files that got built into this ## directory. This is not optimal, but will have to do for now. for p in *.class; do \ - echo " $(INSTALL_DATA) $$p $(DESTDIR)$(@NDIR@dir)/$$p"; \ - $(INSTALL_DATA) $$p $(DESTDIR)$(@NDIR@dir)/$$p; \ + echo " $(INSTALL_DATA) $$p $(DESTDIR)$(%NDIR%dir)/$$p"; \ + $(INSTALL_DATA) $$p $(DESTDIR)$(%NDIR%dir)/$$p; \ done -.PHONY uninstall-am: uninstall-@DIR@JAVA -uninstall-@DIR@JAVA: +.PHONY uninstall-am: uninstall-%DIR%JAVA +uninstall-%DIR%JAVA: @$(NORMAL_UNINSTALL) @for p in *.class; do \ - echo " rm -f $(DESTDIR)$(@NDIR@dir)/$$p"; \ - rm -f $(DESTDIR)$(@NDIR@dir)/$$p; \ + echo " rm -f $(DESTDIR)$(%NDIR%dir)/$$p"; \ + rm -f $(DESTDIR)$(%NDIR%dir)/$$p; \ done diff --git a/lib/am/library.am b/lib/am/library.am index 390c8e7a1..a9b825332 100644 --- a/lib/am/library.am +++ b/lib/am/library.am @@ -15,7 +15,7 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -@LIBRARY@: $(@XLIBRARY@_OBJECTS) $(@XLIBRARY@_DEPENDENCIES) - -rm -f @LIBRARY@ - $(@XLIBRARY@_AR) @LIBRARY@ $(@XLIBRARY@_OBJECTS) $(@XLIBRARY@_LIBADD) - $(RANLIB) @LIBRARY@ +%LIBRARY%: $(%XLIBRARY%_OBJECTS) $(%XLIBRARY%_DEPENDENCIES) + -rm -f %LIBRARY% + $(%XLIBRARY%_AR) %LIBRARY% $(%XLIBRARY%_OBJECTS) $(%XLIBRARY%_LIBADD) + $(RANLIB) %LIBRARY% diff --git a/lib/am/libs.am b/lib/am/libs.am index 8c682cd0d..ea5db3a1e 100644 --- a/lib/am/libs.am +++ b/lib/am/libs.am @@ -16,18 +16,18 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -_am_installdirs += $(DESTDIR)$(@NDIR@dir) -?EXEC?.PHONY install-exec-am: install-@DIR@LIBRARIES -?!EXEC?.PHONY install-data-am: install-@DIR@LIBRARIES -install-@DIR@LIBRARIES: $(@DIR@_LIBRARIES) +_am_installdirs += $(DESTDIR)$(%NDIR%dir) +?EXEC?.PHONY install-exec-am: install-%DIR%LIBRARIES +?!EXEC?.PHONY install-data-am: install-%DIR%LIBRARIES +install-%DIR%LIBRARIES: $(%DIR%_LIBRARIES) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(@NDIR@dir) + $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir) ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. - @list='$(@DIR@_LIBRARIES)'; for p in $$list; do \ + @list='$(%DIR%_LIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(INSTALL_DATA) $$p $(DESTDIR)$(@NDIR@dir)/$$p"; \ - $(INSTALL_DATA) $$p $(DESTDIR)$(@NDIR@dir)/$$p; \ + echo " $(INSTALL_DATA) $$p $(DESTDIR)$(%NDIR%dir)/$$p"; \ + $(INSTALL_DATA) $$p $(DESTDIR)$(%NDIR%dir)/$$p; \ else :; fi; \ done ## We do two loops here so that $(POST_INSTALL) can be empty. If we @@ -36,18 +36,18 @@ install-@DIR@LIBRARIES: $(@DIR@_LIBRARIES) ## useless; sh never actually executes this command. Read the GNU ## Standards for a little enlightenment on this. @$(POST_INSTALL) - @list='$(@DIR@_LIBRARIES)'; for p in $$list; do \ + @list='$(%DIR%_LIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ ## Must ranlib after installing because mod time changes. - echo " $(RANLIB) $(DESTDIR)$(@NDIR@dir)/$$p"; \ - $(RANLIB) $(DESTDIR)$(@NDIR@dir)/$$p; \ + echo " $(RANLIB) $(DESTDIR)$(%NDIR%dir)/$$p"; \ + $(RANLIB) $(DESTDIR)$(%NDIR%dir)/$$p; \ else :; fi; \ done -.PHONY uninstall-am: uninstall-@DIR@LIBRARIES -uninstall-@DIR@LIBRARIES: +.PHONY uninstall-am: uninstall-%DIR%LIBRARIES +uninstall-%DIR%LIBRARIES: @$(NORMAL_UNINSTALL) - @list='$(@DIR@_LIBRARIES)'; for p in $$list; do \ - echo " rm -f $(DESTDIR)$(@NDIR@dir)/$$p"; \ - rm -f $(DESTDIR)$(@NDIR@dir)/$$p; \ + @list='$(%DIR%_LIBRARIES)'; for p in $$list; do \ + echo " rm -f $(DESTDIR)$(%NDIR%dir)/$$p"; \ + rm -f $(DESTDIR)$(%NDIR%dir)/$$p; \ done diff --git a/lib/am/lisp.am b/lib/am/lisp.am index dbc2257cc..19aaf9f6c 100644 --- a/lib/am/lisp.am +++ b/lib/am/lisp.am @@ -16,34 +16,34 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -_am_installdirs += $(DESTDIR)$(@NDIR@dir) -?EXEC?.PHONY install-exec-am: install-@DIR@LISP -?!EXEC?.PHONY install-data-am: install-@DIR@LISP -install-@DIR@LISP: $(@DIR@_LISP) $(ELCFILES) +_am_installdirs += $(DESTDIR)$(%NDIR%dir) +?EXEC?.PHONY install-exec-am: install-%DIR%LISP +?!EXEC?.PHONY install-data-am: install-%DIR%LISP +install-%DIR%LISP: $(%DIR%_LISP) $(ELCFILES) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(@NDIR@dir) + $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir) ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. - @list='$(@DIR@_LISP)'; for p in $$list; do \ + @list='$(%DIR%_LISP)'; for p in $$list; do \ ## A lisp file can be in the source directory or the build directory. if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ?BASE? f="`echo $$p | sed -e 's|^.*/||'`"; \ ?!BASE? f="$$p"; \ - echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@NDIR@dir)/$$f"; \ - $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@NDIR@dir)/$$f; \ + echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(%NDIR%dir)/$$f"; \ + $(INSTALL_DATA) $$d$$p $(DESTDIR)$(%NDIR%dir)/$$f; \ ## Only install .elc file if it exists. if test -f $${p}c; then \ - echo " $(INSTALL_DATA) $${p}c $(DESTDIR)$(@NDIR@dir)/$${f}c"; \ - $(INSTALL_DATA) $${p}c $(DESTDIR)$(@NDIR@dir)/$${f}c; \ + echo " $(INSTALL_DATA) $${p}c $(DESTDIR)$(%NDIR%dir)/$${f}c"; \ + $(INSTALL_DATA) $${p}c $(DESTDIR)$(%NDIR%dir)/$${f}c; \ else : ; fi; \ done -.PHONY uninstall-am: uninstall-@DIR@LISP -uninstall-@DIR@LISP: +.PHONY uninstall-am: uninstall-%DIR%LISP +uninstall-%DIR%LISP: @$(NORMAL_UNINSTALL) - @list='$(@DIR@_LISP)'; for p in $$list; do \ + @list='$(%DIR%_LISP)'; for p in $$list; do \ ?BASE? f="`echo $$p | sed -e 's|^.*/||'`"; \ ?!BASE? f="$$p"; \ - echo " rm -f $(@NDIR@dir)/$$f $(DESTDIR)$(@NDIR@dir)/$${f}c"; \ - rm -f $(DESTDIR)$(@NDIR@dir)/$$f $(DESTDIR)$(@NDIR@dir)/$${f}c; \ + echo " rm -f $(%NDIR%dir)/$$f $(DESTDIR)$(%NDIR%dir)/$${f}c"; \ + rm -f $(DESTDIR)$(%NDIR%dir)/$$f $(DESTDIR)$(%NDIR%dir)/$${f}c; \ done diff --git a/lib/am/ltlib.am b/lib/am/ltlib.am index 2de94b7f2..9877e2e65 100644 --- a/lib/am/ltlib.am +++ b/lib/am/ltlib.am @@ -17,29 +17,29 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -_am_installdirs += $(DESTDIR)$(@NDIR@dir) -?EXEC?.PHONY install-exec-am: install-@DIR@LTLIBRARIES -?!EXEC?.PHONY install-data-am: install-@DIR@LTLIBRARIES -install-@DIR@LTLIBRARIES: $(@DIR@_LTLIBRARIES) +_am_installdirs += $(DESTDIR)$(%NDIR%dir) +?EXEC?.PHONY install-exec-am: install-%DIR%LTLIBRARIES +?!EXEC?.PHONY install-data-am: install-%DIR%LTLIBRARIES +install-%DIR%LTLIBRARIES: $(%DIR%_LTLIBRARIES) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(@NDIR@dir) + $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir) ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. - @list='$(@DIR@_LTLIBRARIES)'; for p in $$list; do \ + @list='$(%DIR%_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ ## Note that we explicitly set the libtool mode. This avoids any lossage ## if the program doesn't have a name that libtool expects. ## Use INSTALL and not INSTALL_DATA because libtool knows the right ## permissions to use. - echo " @LIBTOOL --mode=install@ $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(@NDIR@dir)/$$p"; \ - @LIBTOOL --mode=install@ $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(@NDIR@dir)/$$p; \ + echo " %LIBTOOL --mode=install% $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(%NDIR%dir)/$$p"; \ + %LIBTOOL --mode=install% $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(%NDIR%dir)/$$p; \ else :; fi; \ done -.PHONY uninstall-am: uninstall-@DIR@LTLIBRARIES -uninstall-@DIR@LTLIBRARIES: +.PHONY uninstall-am: uninstall-%DIR%LTLIBRARIES +uninstall-%DIR%LTLIBRARIES: @$(NORMAL_UNINSTALL) - @list='$(@DIR@_LTLIBRARIES)'; for p in $$list; do \ - echo " @LIBTOOL --mode=uninstall@ rm -f $(DESTDIR)$(@NDIR@dir)/$$p"; \ - @LIBTOOL --mode=uninstall@ rm -f $(DESTDIR)$(@NDIR@dir)/$$p; \ + @list='$(%DIR%_LTLIBRARIES)'; for p in $$list; do \ + echo " %LIBTOOL --mode=uninstall% rm -f $(DESTDIR)$(%NDIR%dir)/$$p"; \ + %LIBTOOL --mode=uninstall% rm -f $(DESTDIR)$(%NDIR%dir)/$$p; \ done diff --git a/lib/am/ltlibrary.am b/lib/am/ltlibrary.am index c87e55552..276c70a02 100644 --- a/lib/am/ltlibrary.am +++ b/lib/am/ltlibrary.am @@ -15,5 +15,5 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -@LTLIBRARY@: $(@XLTLIBRARY@_OBJECTS) $(@XLTLIBRARY@_DEPENDENCIES) - $(@XLINK@) @RPATH@ $(@XLTLIBRARY@_LDFLAGS) $(@XLTLIBRARY@_OBJECTS) $(@XLTLIBRARY@_LIBADD) $(LIBS) +%LTLIBRARY%: $(%XLTLIBRARY%_OBJECTS) $(%XLTLIBRARY%_DEPENDENCIES) + $(%XLINK%) %RPATH% $(%XLTLIBRARY%_LDFLAGS) $(%XLTLIBRARY%_OBJECTS) $(%XLTLIBRARY%_LIBADD) $(LIBS) diff --git a/lib/am/mans.am b/lib/am/mans.am index e67e03c57..4028a572a 100644 --- a/lib/am/mans.am +++ b/lib/am/mans.am @@ -16,18 +16,18 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -?INSTALL_MAN?_am_installdirs += $(DESTDIR)$(man@SECTION@dir) -.PHONY install-man: install-man@SECTION@ -install-man@SECTION@: $(man@SECTION@_MANS) $(man_MANS) +?INSTALL_MAN?_am_installdirs += $(DESTDIR)$(man%SECTION%dir) +.PHONY install-man: install-man%SECTION% +install-man%SECTION%: $(man%SECTION%_MANS) $(man_MANS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(man@SECTION@dir) - @list='$(man@SECTION@_MANS)'; \ + $(mkinstalldirs) $(DESTDIR)$(man%SECTION%dir) + @list='$(man%SECTION%_MANS)'; \ ## Extract all items from man_MANS that should go in this section. ## This must be done dynamically to support conditionals. l2='$(man_MANS)'; for i in $$l2; do \ case "$$i" in \ ## Have to accept files like `foo.1c'. - *.@SECTION@*) list="$$list $$i" ;; \ + *.%SECTION%*) list="$$list $$i" ;; \ esac; \ done; \ for i in $$list; do \ @@ -40,21 +40,21 @@ install-man@SECTION@: $(man@SECTION@_MANS) $(man_MANS) inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man@SECTION@dir)/$$inst"; \ - $(INSTALL_DATA) $$file $(DESTDIR)$(man@SECTION@dir)/$$inst; \ + echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man%SECTION%dir)/$$inst"; \ + $(INSTALL_DATA) $$file $(DESTDIR)$(man%SECTION%dir)/$$inst; \ done ## This is just completely gross. -.PHONY uninstall-man: uninstall-man@SECTION@ -uninstall-man@SECTION@: +.PHONY uninstall-man: uninstall-man%SECTION% +uninstall-man%SECTION%: @$(NORMAL_UNINSTALL) - @list='$(man@SECTION@_MANS)'; \ + @list='$(man%SECTION%_MANS)'; \ ## Extract all items from man_MANS that should go in this section. ## This must be done dynamically to support conditionals. l2='$(man_MANS)'; for i in $$l2; do \ case "$$i" in \ ## Have to accept files like `foo.1c'. - *.@SECTION@*) list="$$list $$i" ;; \ + *.%SECTION%*) list="$$list $$i" ;; \ esac; \ done; \ for i in $$list; do \ @@ -64,6 +64,6 @@ uninstall-man@SECTION@: inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " rm -f $(DESTDIR)$(man@SECTION@dir)/$$inst"; \ - rm -f $(DESTDIR)$(man@SECTION@dir)/$$inst; \ + echo " rm -f $(DESTDIR)$(man%SECTION%dir)/$$inst"; \ + rm -f $(DESTDIR)$(man%SECTION%dir)/$$inst; \ done diff --git a/lib/am/program.am b/lib/am/program.am index 07690b94e..7c47cf190 100644 --- a/lib/am/program.am +++ b/lib/am/program.am @@ -15,11 +15,11 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -@PROGRAM@@EXEEXT@: $(@XPROGRAM@_OBJECTS) $(@XPROGRAM@_DEPENDENCIES) +%PROGRAM%%EXEEXT%: $(%XPROGRAM%_OBJECTS) $(%XPROGRAM%_DEPENDENCIES) ## Remove program before linking. Otherwise the link will fail if the ## program is running somewhere. FIXME: this could be a loss if ## you're using an incremental linker. Maybe we should think twice? ## Or maybe not... sadly, incremental linkers are rarer than losing ## systems. - @rm -f @PROGRAM@@EXEEXT@ - $(@XLINK@) $(@XPROGRAM@_LDFLAGS) $(@XPROGRAM@_OBJECTS) $(@XPROGRAM@_LDADD) $(LIBS) + @rm -f %PROGRAM%%EXEEXT% + $(%XLINK%) $(%XPROGRAM%_LDFLAGS) $(%XPROGRAM%_OBJECTS) $(%XPROGRAM%_LDADD) $(LIBS) diff --git a/lib/am/progs.am b/lib/am/progs.am index 2c1cc281e..c4d03d6ec 100644 --- a/lib/am/progs.am +++ b/lib/am/progs.am @@ -16,30 +16,30 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -_am_installdirs += $(DESTDIR)$(@NDIR@dir) -?EXEC?.PHONY install-exec-am: install-@DIR@PROGRAMS -?!EXEC?.PHONY install-data-am: install-@DIR@PROGRAMS -install-@DIR@PROGRAMS: $(@DIR@_PROGRAMS) +_am_installdirs += $(DESTDIR)$(%NDIR%dir) +?EXEC?.PHONY install-exec-am: install-%DIR%PROGRAMS +?!EXEC?.PHONY install-data-am: install-%DIR%PROGRAMS +install-%DIR%PROGRAMS: $(%DIR%_PROGRAMS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(@NDIR@dir) + $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir) ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. - @list='$(@DIR@_PROGRAMS)'; for p in $$list; do \ + @list='$(%DIR%_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ ## Note that we explicitly set the libtool mode. This avoids any ## lossage if the install program doesn't have a name that libtool ## expects. f="`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`"; \ - echo " $(INSTALL_PROGRAM_ENV) @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(@NDIR@dir)/$$f"; \ - $(INSTALL_PROGRAM_ENV) @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(@NDIR@dir)/$$f; \ + echo " $(INSTALL_PROGRAM_ENV) %LIBTOOL --mode=install% $(INSTALL_PROGRAM) $$p $(DESTDIR)$(%NDIR%dir)/$$f"; \ + $(INSTALL_PROGRAM_ENV) %LIBTOOL --mode=install% $(INSTALL_PROGRAM) $$p $(DESTDIR)$(%NDIR%dir)/$$f; \ else :; fi; \ done -.PHONY uninstall-am: uninstall-@DIR@PROGRAMS -uninstall-@DIR@PROGRAMS: +.PHONY uninstall-am: uninstall-%DIR%PROGRAMS +uninstall-%DIR%PROGRAMS: @$(NORMAL_UNINSTALL) - @list='$(@DIR@_PROGRAMS)'; for p in $$list; do \ + @list='$(%DIR%_PROGRAMS)'; for p in $$list; do \ f="`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`"; \ - echo " rm -f $(DESTDIR)$(@NDIR@dir)/$$f"; \ - rm -f $(DESTDIR)$(@NDIR@dir)/$$f; \ + echo " rm -f $(DESTDIR)$(%NDIR%dir)/$$f"; \ + rm -f $(DESTDIR)$(%NDIR%dir)/$$f; \ done diff --git a/lib/am/python.am b/lib/am/python.am index b63e0a618..959e3e2a0 100644 --- a/lib/am/python.am +++ b/lib/am/python.am @@ -16,30 +16,30 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -_am_installdirs += $(DESTDIR)$(@DIR@dir) -?EXEC?.PHONY install-exec-am: install-@DIR@PYTHON -?!EXEC?.PHONY install-data-am: install-@DIR@PYTHON -install-@DIR@PYTHON: $(@DIR@_PYTHON) +_am_installdirs += $(DESTDIR)$(%DIR%dir) +?EXEC?.PHONY install-exec-am: install-%DIR%PYTHON +?!EXEC?.PHONY install-data-am: install-%DIR%PYTHON +install-%DIR%PYTHON: $(%DIR%_PYTHON) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(@DIR@dir) - @list='$(@DIR@_PYTHON)'; for p in $$list; do\ + $(mkinstalldirs) $(DESTDIR)$(%DIR%dir) + @list='$(%DIR%_PYTHON)'; for p in $$list; do\ if test -f $(srcdir)/$$p; then \ ## Don't perform translation, since script name is important. - echo " $(INSTALL_PROGRAM) $(srcdir)/$$p $(DESTDIR)$(@DIR@dir)/$$p"; \ - $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(@DIR@dir)/$$p; \ + echo " $(INSTALL_PROGRAM) $(srcdir)/$$p $(DESTDIR)$(%DIR%dir)/$$p"; \ + $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(%DIR%dir)/$$p; \ else :; fi; \ done ## Byte-compile must be done at install time, since file times are ## encoded in the actual files. - @PYTHON=$(PYTHON) $(py_compile) --basedir $(DESTDIR)$(@DIR@dir) $(@DIR@_PYTHON) + @PYTHON=$(PYTHON) $(py_compile) --basedir $(DESTDIR)$(%DIR%dir) $(%DIR%_PYTHON) -.PHONY uninstall-am: uninstall-@DIR@PYTHON -uninstall-@DIR@PYTHON: +.PHONY uninstall-am: uninstall-%DIR%PYTHON +uninstall-%DIR%PYTHON: @$(NORMAL_UNINSTALL) - list='$(@DIR@_PYTHON)'; for p in $$list; do \ - rm -f $(DESTDIR)$(@DIR@dir)/$$p; \ + list='$(%DIR%_PYTHON)'; for p in $$list; do \ + rm -f $(DESTDIR)$(%DIR%dir)/$$p; \ ## This is to remove the .pyc and .pyo byte compiled versions (a bit ## of a hack). - rm -f $(DESTDIR)$(@DIR@dir)/$${p}c; \ - rm -f $(DESTDIR)$(@DIR@dir)/$${p}o; \ + rm -f $(DESTDIR)$(%DIR%dir)/$${p}c; \ + rm -f $(DESTDIR)$(%DIR%dir)/$${p}o; \ done diff --git a/lib/am/remake-hdr.am b/lib/am/remake-hdr.am index 6252f9bb1..7945c22df 100644 --- a/lib/am/remake-hdr.am +++ b/lib/am/remake-hdr.am @@ -1,5 +1,6 @@ ## automake - create Makefile.in from Makefile.am -## Copyright 1994, 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +## Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2001 +## 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 @@ -15,40 +16,41 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -@CONFIG_HEADER@: @STAMP@ +%CONFIG_HEADER%: %STAMP% ## Recover from removal of CONFIG_HEADER @if test ! -f $@; then \ - rm -f @STAMP@; \ - $(MAKE) @STAMP@; \ + rm -f %STAMP%; \ + $(MAKE) %STAMP%; \ else :; fi ## Explicitly look in srcdir for benefit of non-GNU makes. -@STAMP@: $(srcdir)/@CONFIG_HEADER_IN@ $(top_builddir)/config.status - @rm -f @STAMP@ @STAMP@T +%STAMP%: $(srcdir)/%CONFIG_HEADER_IN% $(top_builddir)/config.status + @rm -f %STAMP% %STAMP%T ## We used to try to get a real timestamp here. But the fear is that ## that will cause unnecessary cvs conflicts - @echo timestamp > @STAMP@T 2> /dev/null + @echo timestamp > %STAMP%T 2> /dev/null cd $(top_builddir) \ - && CONFIG_FILES= CONFIG_HEADERS=@CONFIG_HEADER_FULL@ \ + && CONFIG_FILES= CONFIG_HEADERS=%CONFIG_HEADER_FULL% \ $(SHELL) ./config.status ## Creating the timestamp first, and moving it later, helps ensure that ## it will be older than the header file, avoiding needless triggering ## of the rebuild rule. - @mv @STAMP@T @STAMP@ + @mv %STAMP%T %STAMP% ## Explicitly look in srcdir for benefit of non-GNU makes. ## SRC_STAMP takes into account a possible subdir where CONFIG_HEADER_IN is -$(srcdir)/@CONFIG_HEADER_IN@: @MAINTAINER_MODE_TRUE@$(srcdir)/@SRC_STAMP@.in +?MAINTAINER_MODE?$(srcdir)/%CONFIG_HEADER_IN%: @MAINTAINER_MODE_TRUE@$(srcdir)/%SRC_STAMP%.in +?!MAINTAINER_MODE?$(srcdir)/%CONFIG_HEADER_IN%: $(srcdir)/%SRC_STAMP%.in ## Recover from removal of CONFIG_HEADER_IN @if test ! -f $@; then \ - rm -f $(srcdir)/@SRC_STAMP@.in; \ - $(MAKE) $(srcdir)/@SRC_STAMP@.in; \ + rm -f $(srcdir)/%SRC_STAMP%.in; \ + $(MAKE) $(srcdir)/%SRC_STAMP%.in; \ else :; fi -$(srcdir)/@SRC_STAMP@.in: $(top_srcdir)/@CONFIGURE_AC@ $(ACLOCAL_M4) @FILES@ - @rm -f $(srcdir)/@SRC_STAMP@.in $(srcdir)/@SRC_STAMP@.inT +$(srcdir)/%SRC_STAMP%.in: $(top_srcdir)/%CONFIGURE_AC% $(ACLOCAL_M4) %FILES% + @rm -f $(srcdir)/%SRC_STAMP%.in $(srcdir)/%SRC_STAMP%.inT ## We used to try to get a real timestamp here. But the fear is that ## that will cause unnecessary cvs conflicts - @echo timestamp > $(srcdir)/@SRC_STAMP@.inT 2> /dev/null + @echo timestamp > $(srcdir)/%SRC_STAMP%.inT 2> /dev/null cd $(top_srcdir) && $(AUTOHEADER) ## Creating the timestamp first, and moving it later, helps ensure that ## it will be older than the header file, avoiding needless triggering ## of the rebuild rule. - @mv $(srcdir)/@SRC_STAMP@.inT $(srcdir)/@SRC_STAMP@.in + @mv $(srcdir)/%SRC_STAMP%.inT $(srcdir)/%SRC_STAMP%.in diff --git a/lib/am/scripts.am b/lib/am/scripts.am index 21218e468..a01018c46 100644 --- a/lib/am/scripts.am +++ b/lib/am/scripts.am @@ -16,37 +16,37 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -_am_installdirs += $(DESTDIR)$(@NDIR@dir) -?EXEC?.PHONY install-exec-am: install-@DIR@SCRIPTS -?!EXEC?.PHONY install-data-am: install-@DIR@SCRIPTS -install-@DIR@SCRIPTS: $(@DIR@_SCRIPTS) +_am_installdirs += $(DESTDIR)$(%NDIR%dir) +?EXEC?.PHONY install-exec-am: install-%DIR%SCRIPTS +?!EXEC?.PHONY install-data-am: install-%DIR%SCRIPTS +install-%DIR%SCRIPTS: $(%DIR%_SCRIPTS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(@NDIR@dir) + $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir) ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. - @list='$(@DIR@_SCRIPTS)'; for p in $$list; do \ + @list='$(%DIR%_SCRIPTS)'; for p in $$list; do \ f="`echo $$p|sed '$(transform)'`"; \ if test -f $$p; then \ - echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(@NDIR@dir)/$$f"; \ - $(INSTALL_SCRIPT) $$p $(DESTDIR)$(@NDIR@dir)/$$f; \ + echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(%NDIR%dir)/$$f"; \ + $(INSTALL_SCRIPT) $$p $(DESTDIR)$(%NDIR%dir)/$$f; \ elif test -f $(srcdir)/$$p; then \ - echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(@NDIR@dir)/$$f"; \ - $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(@NDIR@dir)/$$f; \ + echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(%NDIR%dir)/$$f"; \ + $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(%NDIR%dir)/$$f; \ else :; fi; \ done -.PHONY uninstall-am: uninstall-@DIR@SCRIPTS -uninstall-@DIR@SCRIPTS: +.PHONY uninstall-am: uninstall-%DIR%SCRIPTS +uninstall-%DIR%SCRIPTS: @$(NORMAL_UNINSTALL) - @list='$(@DIR@_SCRIPTS)'; for p in $$list; do \ + @list='$(%DIR%_SCRIPTS)'; for p in $$list; do \ f="`echo $$p|sed '$(transform)'`"; \ - echo " rm -f $(DESTDIR)$(@NDIR@dir)/$$f"; \ - rm -f $(DESTDIR)$(@NDIR@dir)/$$f; \ + echo " rm -f $(DESTDIR)$(%NDIR%dir)/$$f"; \ + rm -f $(DESTDIR)$(%NDIR%dir)/$$f; \ done ## Uncomment line in handle_scripts when this is uncommented. -## check-@DIR@SCRIPTS: -## pid=$$$$; list="$(@DIR@_SCRIPTS)"; for p in $$list; do \ +## check-%DIR%SCRIPTS: +## pid=$$$$; list="$(%DIR%_SCRIPTS)"; for p in $$list; do \ ## for opt in --help --version; do \ ## if test -f $$p; then :; \ ## elif test -f $(srcdir)/$$p; then \ diff --git a/lib/am/subdirs.am b/lib/am/subdirs.am index d96609ce4..285c6a0f4 100644 --- a/lib/am/subdirs.am +++ b/lib/am/subdirs.am @@ -26,11 +26,11 @@ .PHONY: all-recursive install-data-recursive install-exec-recursive \ -installdirs-recursive install-recursive uninstall-recursive @INSTALLINFO@ \ +installdirs-recursive install-recursive uninstall-recursive %INSTALLINFO% \ check-recursive installcheck-recursive info-recursive dvi-recursive all-recursive install-data-recursive install-exec-recursive \ -installdirs-recursive install-recursive uninstall-recursive @INSTALLINFO@ \ +installdirs-recursive install-recursive uninstall-recursive %INSTALLINFO% \ check-recursive installcheck-recursive info-recursive dvi-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ dot_seen=no; \ diff --git a/lib/am/tags.am b/lib/am/tags.am index da02237ca..d96b3fafa 100644 --- a/lib/am/tags.am +++ b/lib/am/tags.am @@ -29,7 +29,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) END { for (i in files) print i; }'`; \ mkid -fID $$unique $(LISP) -TAGS: @DIRS@ $(HEADERS) $(SOURCES) @CONFIG@ $(TAGS_DEPENDENCIES) \ +TAGS: %DIRS% $(HEADERS) $(SOURCES) %CONFIG% $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ @@ -48,8 +48,8 @@ TAGS: @DIRS@ $(HEADERS) $(SOURCES) @CONFIG@ $(TAGS_DEPENDENCIES) \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ## Make sure we have something to run etags on. - test -z "$(ETAGS_ARGS)@CONFIG@$$unique$(LISP)$$tags" \ - || etags $(ETAGS_ARGS) $$tags @CONFIG@ $$unique $(LISP) + test -z "$(ETAGS_ARGS)%CONFIG%$$unique$(LISP)$$tags" \ + || etags $(ETAGS_ARGS) $$tags %CONFIG% $$unique $(LISP) ## Support `Global' tags. GTAGS: diff --git a/lib/am/texi-vers.am b/lib/am/texi-vers.am index 0d6f9664a..67d251ff4 100644 --- a/lib/am/texi-vers.am +++ b/lib/am/texi-vers.am @@ -16,32 +16,34 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -$(srcdir)/@VTEXI@: @MAINTAINER_MODE_TRUE@$(srcdir)/stamp-@VTI@ +?MAINTAINER_MODE?$(srcdir)/%VTEXI%: @MAINTAINER_MODE_TRUE@$(srcdir)/stamp-%VTI% +?!MAINTAINER_MODE?$(srcdir)/%VTEXI%: $(srcdir)/stamp-%VTI% @: -## Depend on @CONFIGURE_AC@ so that version number updates cause a +## Depend on %CONFIGURE_AC% so that version number updates cause a ## rebuild. -$(srcdir)/stamp-@VTI@: @TEXI@ $(top_srcdir)/@CONFIGURE_AC@ - @(set `$(SHELL) @MDDIR@mdate-sh $(srcdir)/@TEXI@`; \ +$(srcdir)/stamp-%VTI%: %TEXI% $(top_srcdir)/%CONFIGURE_AC% + @(set `$(SHELL) %MDDIR%mdate-sh $(srcdir)/%TEXI%`; \ echo "@set UPDATED $$1 $$2 $$3"; \ echo "@set UPDATED-MONTH $$2 $$3"; \ echo "@set EDITION $(VERSION)"; \ - echo "@set VERSION $(VERSION)") > @VTI@.tmp + echo "@set VERSION $(VERSION)") > %VTI%.tmp ## Use cp and rm here because some older "mv"s can't move across ## filesystems. Furthermore, GNU "mv" in the AmigaDOS environment ## can't handle this. - @cmp -s @VTI@.tmp $(srcdir)/@VTEXI@ \ - || (echo "Updating $(srcdir)/@VTEXI@"; \ - cp @VTI@.tmp $(srcdir)/@VTEXI@) - -@rm -f @VTI@.tmp - @cp $(srcdir)/@VTEXI@ $@ + @cmp -s %VTI%.tmp $(srcdir)/%VTEXI% \ + || (echo "Updating $(srcdir)/%VTEXI%"; \ + cp %VTI%.tmp $(srcdir)/%VTEXI%) + -@rm -f %VTI%.tmp + @cp $(srcdir)/%VTEXI% $@ -mostlyclean-am: mostlyclean-@VTI@ -mostlyclean-@VTI@: - -rm -f @VTI@.tmp +mostlyclean-am: mostlyclean-%VTI% +mostlyclean-%VTI%: + -rm -f %VTI%.tmp -maintainer-clean-am: maintainer-clean-@VTI@ -maintainer-clean-@VTI@: - -@MAINTAINER_MODE_TRUE@rm -f $(srcdir)/stamp-@VTI@ $(srcdir)/@VTEXI@ +maintainer-clean-am: maintainer-clean-%VTI% +maintainer-clean-%VTI%: +?MAINTAINER_MODE?@MAINTAINER_MODE_TRUE@ -rm -f $(srcdir)/stamp-%VTI% $(srcdir)/%VTEXI% +?!MAINTAINER_MODE? -rm -f $(srcdir)/stamp-%VTI% $(srcdir)/%VTEXI% -.PHONY: mostlyclean-@VTI@ maintainer-clean-@VTI@ +.PHONY: mostlyclean-%VTI% maintainer-clean-%VTI% diff --git a/lib/am/texibuild.am b/lib/am/texibuild.am index 0faf14ddb..747a3288c 100644 --- a/lib/am/texibuild.am +++ b/lib/am/texibuild.am @@ -17,7 +17,7 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -.@SUFFIX@.info: +.%SUFFIX%.info: ## We want to force the .info file to be built in srcdir. This is ## probably the simplest way. However, at Cygnus .info files are ## always put into the build directory. So at runtime we select which @@ -32,13 +32,13 @@ ?CYGNUS? @rm -f $@ $@-[0-9] $@-[0-9][0-9] ?CYGNUS? $(MAKEINFO) -I $(srcdir) $< -.@SUFFIX@.dvi: - TEXINPUTS=@TEXINFODIR@:$$TEXINPUTS \ +.%SUFFIX%.dvi: + TEXINPUTS=%TEXINFODIR%:$$TEXINPUTS \ ## Must set MAKEINFO like this so that version.texi will be found even ## if it is in srcdir. MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $< -.@SUFFIX@: +.%SUFFIX%: ## We want to force the .info file to be built in srcdir. This is ## probably the simplest way. However, at Cygnus .info files are ## always put into the build directory. So at runtime we select which diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am index bf886326c..63cd5c6a8 100644 --- a/lib/am/texinfos.am +++ b/lib/am/texinfos.am @@ -110,7 +110,7 @@ dist-info: $(INFO_DEPS) .PHONY: mostlyclean-aminfo mostlyclean-am: mostlyclean-aminfo mostlyclean-aminfo: -@TEXICLEAN@ +%TEXICLEAN% .PHONY: maintainer-clean-aminfo maintainer-clean-am: maintainer-clean-aminfo diff --git a/library.am b/library.am index 390c8e7a1..a9b825332 100644 --- a/library.am +++ b/library.am @@ -15,7 +15,7 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -@LIBRARY@: $(@XLIBRARY@_OBJECTS) $(@XLIBRARY@_DEPENDENCIES) - -rm -f @LIBRARY@ - $(@XLIBRARY@_AR) @LIBRARY@ $(@XLIBRARY@_OBJECTS) $(@XLIBRARY@_LIBADD) - $(RANLIB) @LIBRARY@ +%LIBRARY%: $(%XLIBRARY%_OBJECTS) $(%XLIBRARY%_DEPENDENCIES) + -rm -f %LIBRARY% + $(%XLIBRARY%_AR) %LIBRARY% $(%XLIBRARY%_OBJECTS) $(%XLIBRARY%_LIBADD) + $(RANLIB) %LIBRARY% diff --git a/libs-clean.am b/libs-clean.am index 5d489fc08..2a45031d3 100644 --- a/libs-clean.am +++ b/libs-clean.am @@ -16,6 +16,6 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -.PHONY clean-am: clean-@DIR@LIBRARIES -clean-@DIR@LIBRARIES: - -test -z "$(@DIR@_LIBRARIES)" || rm -f $(@DIR@_LIBRARIES) +.PHONY clean-am: clean-%DIR%LIBRARIES +clean-%DIR%LIBRARIES: + -test -z "$(%DIR%_LIBRARIES)" || rm -f $(%DIR%_LIBRARIES) @@ -16,18 +16,18 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -_am_installdirs += $(DESTDIR)$(@NDIR@dir) -?EXEC?.PHONY install-exec-am: install-@DIR@LIBRARIES -?!EXEC?.PHONY install-data-am: install-@DIR@LIBRARIES -install-@DIR@LIBRARIES: $(@DIR@_LIBRARIES) +_am_installdirs += $(DESTDIR)$(%NDIR%dir) +?EXEC?.PHONY install-exec-am: install-%DIR%LIBRARIES +?!EXEC?.PHONY install-data-am: install-%DIR%LIBRARIES +install-%DIR%LIBRARIES: $(%DIR%_LIBRARIES) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(@NDIR@dir) + $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir) ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. - @list='$(@DIR@_LIBRARIES)'; for p in $$list; do \ + @list='$(%DIR%_LIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(INSTALL_DATA) $$p $(DESTDIR)$(@NDIR@dir)/$$p"; \ - $(INSTALL_DATA) $$p $(DESTDIR)$(@NDIR@dir)/$$p; \ + echo " $(INSTALL_DATA) $$p $(DESTDIR)$(%NDIR%dir)/$$p"; \ + $(INSTALL_DATA) $$p $(DESTDIR)$(%NDIR%dir)/$$p; \ else :; fi; \ done ## We do two loops here so that $(POST_INSTALL) can be empty. If we @@ -36,18 +36,18 @@ install-@DIR@LIBRARIES: $(@DIR@_LIBRARIES) ## useless; sh never actually executes this command. Read the GNU ## Standards for a little enlightenment on this. @$(POST_INSTALL) - @list='$(@DIR@_LIBRARIES)'; for p in $$list; do \ + @list='$(%DIR%_LIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ ## Must ranlib after installing because mod time changes. - echo " $(RANLIB) $(DESTDIR)$(@NDIR@dir)/$$p"; \ - $(RANLIB) $(DESTDIR)$(@NDIR@dir)/$$p; \ + echo " $(RANLIB) $(DESTDIR)$(%NDIR%dir)/$$p"; \ + $(RANLIB) $(DESTDIR)$(%NDIR%dir)/$$p; \ else :; fi; \ done -.PHONY uninstall-am: uninstall-@DIR@LIBRARIES -uninstall-@DIR@LIBRARIES: +.PHONY uninstall-am: uninstall-%DIR%LIBRARIES +uninstall-%DIR%LIBRARIES: @$(NORMAL_UNINSTALL) - @list='$(@DIR@_LIBRARIES)'; for p in $$list; do \ - echo " rm -f $(DESTDIR)$(@NDIR@dir)/$$p"; \ - rm -f $(DESTDIR)$(@NDIR@dir)/$$p; \ + @list='$(%DIR%_LIBRARIES)'; for p in $$list; do \ + echo " rm -f $(DESTDIR)$(%NDIR%dir)/$$p"; \ + rm -f $(DESTDIR)$(%NDIR%dir)/$$p; \ done @@ -16,34 +16,34 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -_am_installdirs += $(DESTDIR)$(@NDIR@dir) -?EXEC?.PHONY install-exec-am: install-@DIR@LISP -?!EXEC?.PHONY install-data-am: install-@DIR@LISP -install-@DIR@LISP: $(@DIR@_LISP) $(ELCFILES) +_am_installdirs += $(DESTDIR)$(%NDIR%dir) +?EXEC?.PHONY install-exec-am: install-%DIR%LISP +?!EXEC?.PHONY install-data-am: install-%DIR%LISP +install-%DIR%LISP: $(%DIR%_LISP) $(ELCFILES) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(@NDIR@dir) + $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir) ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. - @list='$(@DIR@_LISP)'; for p in $$list; do \ + @list='$(%DIR%_LISP)'; for p in $$list; do \ ## A lisp file can be in the source directory or the build directory. if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ?BASE? f="`echo $$p | sed -e 's|^.*/||'`"; \ ?!BASE? f="$$p"; \ - echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@NDIR@dir)/$$f"; \ - $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@NDIR@dir)/$$f; \ + echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(%NDIR%dir)/$$f"; \ + $(INSTALL_DATA) $$d$$p $(DESTDIR)$(%NDIR%dir)/$$f; \ ## Only install .elc file if it exists. if test -f $${p}c; then \ - echo " $(INSTALL_DATA) $${p}c $(DESTDIR)$(@NDIR@dir)/$${f}c"; \ - $(INSTALL_DATA) $${p}c $(DESTDIR)$(@NDIR@dir)/$${f}c; \ + echo " $(INSTALL_DATA) $${p}c $(DESTDIR)$(%NDIR%dir)/$${f}c"; \ + $(INSTALL_DATA) $${p}c $(DESTDIR)$(%NDIR%dir)/$${f}c; \ else : ; fi; \ done -.PHONY uninstall-am: uninstall-@DIR@LISP -uninstall-@DIR@LISP: +.PHONY uninstall-am: uninstall-%DIR%LISP +uninstall-%DIR%LISP: @$(NORMAL_UNINSTALL) - @list='$(@DIR@_LISP)'; for p in $$list; do \ + @list='$(%DIR%_LISP)'; for p in $$list; do \ ?BASE? f="`echo $$p | sed -e 's|^.*/||'`"; \ ?!BASE? f="$$p"; \ - echo " rm -f $(@NDIR@dir)/$$f $(DESTDIR)$(@NDIR@dir)/$${f}c"; \ - rm -f $(DESTDIR)$(@NDIR@dir)/$$f $(DESTDIR)$(@NDIR@dir)/$${f}c; \ + echo " rm -f $(%NDIR%dir)/$$f $(DESTDIR)$(%NDIR%dir)/$${f}c"; \ + rm -f $(DESTDIR)$(%NDIR%dir)/$$f $(DESTDIR)$(%NDIR%dir)/$${f}c; \ done diff --git a/ltlib-clean.am b/ltlib-clean.am index 86b873666..1f7a01486 100644 --- a/ltlib-clean.am +++ b/ltlib-clean.am @@ -16,6 +16,6 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -.PHONY clean-am: clean-@DIR@LTLIBRARIES -clean-@DIR@LTLIBRARIES: - -test -z "$(@DIR@_LTLIBRARIES)" || rm -f $(@DIR@_LTLIBRARIES) +.PHONY clean-am: clean-%DIR%LTLIBRARIES +clean-%DIR%LTLIBRARIES: + -test -z "$(%DIR%_LTLIBRARIES)" || rm -f $(%DIR%_LTLIBRARIES) @@ -17,29 +17,29 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -_am_installdirs += $(DESTDIR)$(@NDIR@dir) -?EXEC?.PHONY install-exec-am: install-@DIR@LTLIBRARIES -?!EXEC?.PHONY install-data-am: install-@DIR@LTLIBRARIES -install-@DIR@LTLIBRARIES: $(@DIR@_LTLIBRARIES) +_am_installdirs += $(DESTDIR)$(%NDIR%dir) +?EXEC?.PHONY install-exec-am: install-%DIR%LTLIBRARIES +?!EXEC?.PHONY install-data-am: install-%DIR%LTLIBRARIES +install-%DIR%LTLIBRARIES: $(%DIR%_LTLIBRARIES) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(@NDIR@dir) + $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir) ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. - @list='$(@DIR@_LTLIBRARIES)'; for p in $$list; do \ + @list='$(%DIR%_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ ## Note that we explicitly set the libtool mode. This avoids any lossage ## if the program doesn't have a name that libtool expects. ## Use INSTALL and not INSTALL_DATA because libtool knows the right ## permissions to use. - echo " @LIBTOOL --mode=install@ $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(@NDIR@dir)/$$p"; \ - @LIBTOOL --mode=install@ $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(@NDIR@dir)/$$p; \ + echo " %LIBTOOL --mode=install% $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(%NDIR%dir)/$$p"; \ + %LIBTOOL --mode=install% $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(%NDIR%dir)/$$p; \ else :; fi; \ done -.PHONY uninstall-am: uninstall-@DIR@LTLIBRARIES -uninstall-@DIR@LTLIBRARIES: +.PHONY uninstall-am: uninstall-%DIR%LTLIBRARIES +uninstall-%DIR%LTLIBRARIES: @$(NORMAL_UNINSTALL) - @list='$(@DIR@_LTLIBRARIES)'; for p in $$list; do \ - echo " @LIBTOOL --mode=uninstall@ rm -f $(DESTDIR)$(@NDIR@dir)/$$p"; \ - @LIBTOOL --mode=uninstall@ rm -f $(DESTDIR)$(@NDIR@dir)/$$p; \ + @list='$(%DIR%_LTLIBRARIES)'; for p in $$list; do \ + echo " %LIBTOOL --mode=uninstall% rm -f $(DESTDIR)$(%NDIR%dir)/$$p"; \ + %LIBTOOL --mode=uninstall% rm -f $(DESTDIR)$(%NDIR%dir)/$$p; \ done diff --git a/ltlibrary.am b/ltlibrary.am index c87e55552..276c70a02 100644 --- a/ltlibrary.am +++ b/ltlibrary.am @@ -15,5 +15,5 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -@LTLIBRARY@: $(@XLTLIBRARY@_OBJECTS) $(@XLTLIBRARY@_DEPENDENCIES) - $(@XLINK@) @RPATH@ $(@XLTLIBRARY@_LDFLAGS) $(@XLTLIBRARY@_OBJECTS) $(@XLTLIBRARY@_LIBADD) $(LIBS) +%LTLIBRARY%: $(%XLTLIBRARY%_OBJECTS) $(%XLTLIBRARY%_DEPENDENCIES) + $(%XLINK%) %RPATH% $(%XLTLIBRARY%_LDFLAGS) $(%XLTLIBRARY%_OBJECTS) $(%XLTLIBRARY%_LIBADD) $(LIBS) @@ -16,18 +16,18 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -?INSTALL_MAN?_am_installdirs += $(DESTDIR)$(man@SECTION@dir) -.PHONY install-man: install-man@SECTION@ -install-man@SECTION@: $(man@SECTION@_MANS) $(man_MANS) +?INSTALL_MAN?_am_installdirs += $(DESTDIR)$(man%SECTION%dir) +.PHONY install-man: install-man%SECTION% +install-man%SECTION%: $(man%SECTION%_MANS) $(man_MANS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(man@SECTION@dir) - @list='$(man@SECTION@_MANS)'; \ + $(mkinstalldirs) $(DESTDIR)$(man%SECTION%dir) + @list='$(man%SECTION%_MANS)'; \ ## Extract all items from man_MANS that should go in this section. ## This must be done dynamically to support conditionals. l2='$(man_MANS)'; for i in $$l2; do \ case "$$i" in \ ## Have to accept files like `foo.1c'. - *.@SECTION@*) list="$$list $$i" ;; \ + *.%SECTION%*) list="$$list $$i" ;; \ esac; \ done; \ for i in $$list; do \ @@ -40,21 +40,21 @@ install-man@SECTION@: $(man@SECTION@_MANS) $(man_MANS) inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man@SECTION@dir)/$$inst"; \ - $(INSTALL_DATA) $$file $(DESTDIR)$(man@SECTION@dir)/$$inst; \ + echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man%SECTION%dir)/$$inst"; \ + $(INSTALL_DATA) $$file $(DESTDIR)$(man%SECTION%dir)/$$inst; \ done ## This is just completely gross. -.PHONY uninstall-man: uninstall-man@SECTION@ -uninstall-man@SECTION@: +.PHONY uninstall-man: uninstall-man%SECTION% +uninstall-man%SECTION%: @$(NORMAL_UNINSTALL) - @list='$(man@SECTION@_MANS)'; \ + @list='$(man%SECTION%_MANS)'; \ ## Extract all items from man_MANS that should go in this section. ## This must be done dynamically to support conditionals. l2='$(man_MANS)'; for i in $$l2; do \ case "$$i" in \ ## Have to accept files like `foo.1c'. - *.@SECTION@*) list="$$list $$i" ;; \ + *.%SECTION%*) list="$$list $$i" ;; \ esac; \ done; \ for i in $$list; do \ @@ -64,6 +64,6 @@ uninstall-man@SECTION@: inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " rm -f $(DESTDIR)$(man@SECTION@dir)/$$inst"; \ - rm -f $(DESTDIR)$(man@SECTION@dir)/$$inst; \ + echo " rm -f $(DESTDIR)$(man%SECTION%dir)/$$inst"; \ + rm -f $(DESTDIR)$(man%SECTION%dir)/$$inst; \ done diff --git a/program.am b/program.am index 07690b94e..7c47cf190 100644 --- a/program.am +++ b/program.am @@ -15,11 +15,11 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -@PROGRAM@@EXEEXT@: $(@XPROGRAM@_OBJECTS) $(@XPROGRAM@_DEPENDENCIES) +%PROGRAM%%EXEEXT%: $(%XPROGRAM%_OBJECTS) $(%XPROGRAM%_DEPENDENCIES) ## Remove program before linking. Otherwise the link will fail if the ## program is running somewhere. FIXME: this could be a loss if ## you're using an incremental linker. Maybe we should think twice? ## Or maybe not... sadly, incremental linkers are rarer than losing ## systems. - @rm -f @PROGRAM@@EXEEXT@ - $(@XLINK@) $(@XPROGRAM@_LDFLAGS) $(@XPROGRAM@_OBJECTS) $(@XPROGRAM@_LDADD) $(LIBS) + @rm -f %PROGRAM%%EXEEXT% + $(%XLINK%) $(%XPROGRAM%_LDFLAGS) $(%XPROGRAM%_OBJECTS) $(%XPROGRAM%_LDADD) $(LIBS) diff --git a/progs-clean.am b/progs-clean.am index 95a099a76..8a678f440 100644 --- a/progs-clean.am +++ b/progs-clean.am @@ -16,6 +16,6 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -.PHONY clean-am: clean-@DIR@PROGRAMS -clean-@DIR@PROGRAMS: - -test -z "$(@DIR@_PROGRAMS)" || rm -f $(@DIR@_PROGRAMS) +.PHONY clean-am: clean-%DIR%PROGRAMS +clean-%DIR%PROGRAMS: + -test -z "$(%DIR%_PROGRAMS)" || rm -f $(%DIR%_PROGRAMS) @@ -16,30 +16,30 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -_am_installdirs += $(DESTDIR)$(@NDIR@dir) -?EXEC?.PHONY install-exec-am: install-@DIR@PROGRAMS -?!EXEC?.PHONY install-data-am: install-@DIR@PROGRAMS -install-@DIR@PROGRAMS: $(@DIR@_PROGRAMS) +_am_installdirs += $(DESTDIR)$(%NDIR%dir) +?EXEC?.PHONY install-exec-am: install-%DIR%PROGRAMS +?!EXEC?.PHONY install-data-am: install-%DIR%PROGRAMS +install-%DIR%PROGRAMS: $(%DIR%_PROGRAMS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(@NDIR@dir) + $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir) ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. - @list='$(@DIR@_PROGRAMS)'; for p in $$list; do \ + @list='$(%DIR%_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ ## Note that we explicitly set the libtool mode. This avoids any ## lossage if the install program doesn't have a name that libtool ## expects. f="`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`"; \ - echo " $(INSTALL_PROGRAM_ENV) @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(@NDIR@dir)/$$f"; \ - $(INSTALL_PROGRAM_ENV) @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(@NDIR@dir)/$$f; \ + echo " $(INSTALL_PROGRAM_ENV) %LIBTOOL --mode=install% $(INSTALL_PROGRAM) $$p $(DESTDIR)$(%NDIR%dir)/$$f"; \ + $(INSTALL_PROGRAM_ENV) %LIBTOOL --mode=install% $(INSTALL_PROGRAM) $$p $(DESTDIR)$(%NDIR%dir)/$$f; \ else :; fi; \ done -.PHONY uninstall-am: uninstall-@DIR@PROGRAMS -uninstall-@DIR@PROGRAMS: +.PHONY uninstall-am: uninstall-%DIR%PROGRAMS +uninstall-%DIR%PROGRAMS: @$(NORMAL_UNINSTALL) - @list='$(@DIR@_PROGRAMS)'; for p in $$list; do \ + @list='$(%DIR%_PROGRAMS)'; for p in $$list; do \ f="`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`"; \ - echo " rm -f $(DESTDIR)$(@NDIR@dir)/$$f"; \ - rm -f $(DESTDIR)$(@NDIR@dir)/$$f; \ + echo " rm -f $(DESTDIR)$(%NDIR%dir)/$$f"; \ + rm -f $(DESTDIR)$(%NDIR%dir)/$$f; \ done @@ -16,30 +16,30 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -_am_installdirs += $(DESTDIR)$(@DIR@dir) -?EXEC?.PHONY install-exec-am: install-@DIR@PYTHON -?!EXEC?.PHONY install-data-am: install-@DIR@PYTHON -install-@DIR@PYTHON: $(@DIR@_PYTHON) +_am_installdirs += $(DESTDIR)$(%DIR%dir) +?EXEC?.PHONY install-exec-am: install-%DIR%PYTHON +?!EXEC?.PHONY install-data-am: install-%DIR%PYTHON +install-%DIR%PYTHON: $(%DIR%_PYTHON) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(@DIR@dir) - @list='$(@DIR@_PYTHON)'; for p in $$list; do\ + $(mkinstalldirs) $(DESTDIR)$(%DIR%dir) + @list='$(%DIR%_PYTHON)'; for p in $$list; do\ if test -f $(srcdir)/$$p; then \ ## Don't perform translation, since script name is important. - echo " $(INSTALL_PROGRAM) $(srcdir)/$$p $(DESTDIR)$(@DIR@dir)/$$p"; \ - $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(@DIR@dir)/$$p; \ + echo " $(INSTALL_PROGRAM) $(srcdir)/$$p $(DESTDIR)$(%DIR%dir)/$$p"; \ + $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(%DIR%dir)/$$p; \ else :; fi; \ done ## Byte-compile must be done at install time, since file times are ## encoded in the actual files. - @PYTHON=$(PYTHON) $(py_compile) --basedir $(DESTDIR)$(@DIR@dir) $(@DIR@_PYTHON) + @PYTHON=$(PYTHON) $(py_compile) --basedir $(DESTDIR)$(%DIR%dir) $(%DIR%_PYTHON) -.PHONY uninstall-am: uninstall-@DIR@PYTHON -uninstall-@DIR@PYTHON: +.PHONY uninstall-am: uninstall-%DIR%PYTHON +uninstall-%DIR%PYTHON: @$(NORMAL_UNINSTALL) - list='$(@DIR@_PYTHON)'; for p in $$list; do \ - rm -f $(DESTDIR)$(@DIR@dir)/$$p; \ + list='$(%DIR%_PYTHON)'; for p in $$list; do \ + rm -f $(DESTDIR)$(%DIR%dir)/$$p; \ ## This is to remove the .pyc and .pyo byte compiled versions (a bit ## of a hack). - rm -f $(DESTDIR)$(@DIR@dir)/$${p}c; \ - rm -f $(DESTDIR)$(@DIR@dir)/$${p}o; \ + rm -f $(DESTDIR)$(%DIR%dir)/$${p}c; \ + rm -f $(DESTDIR)$(%DIR%dir)/$${p}o; \ done diff --git a/remake-hdr.am b/remake-hdr.am index 6252f9bb1..7945c22df 100644 --- a/remake-hdr.am +++ b/remake-hdr.am @@ -1,5 +1,6 @@ ## automake - create Makefile.in from Makefile.am -## Copyright 1994, 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +## Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2001 +## 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 @@ -15,40 +16,41 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -@CONFIG_HEADER@: @STAMP@ +%CONFIG_HEADER%: %STAMP% ## Recover from removal of CONFIG_HEADER @if test ! -f $@; then \ - rm -f @STAMP@; \ - $(MAKE) @STAMP@; \ + rm -f %STAMP%; \ + $(MAKE) %STAMP%; \ else :; fi ## Explicitly look in srcdir for benefit of non-GNU makes. -@STAMP@: $(srcdir)/@CONFIG_HEADER_IN@ $(top_builddir)/config.status - @rm -f @STAMP@ @STAMP@T +%STAMP%: $(srcdir)/%CONFIG_HEADER_IN% $(top_builddir)/config.status + @rm -f %STAMP% %STAMP%T ## We used to try to get a real timestamp here. But the fear is that ## that will cause unnecessary cvs conflicts - @echo timestamp > @STAMP@T 2> /dev/null + @echo timestamp > %STAMP%T 2> /dev/null cd $(top_builddir) \ - && CONFIG_FILES= CONFIG_HEADERS=@CONFIG_HEADER_FULL@ \ + && CONFIG_FILES= CONFIG_HEADERS=%CONFIG_HEADER_FULL% \ $(SHELL) ./config.status ## Creating the timestamp first, and moving it later, helps ensure that ## it will be older than the header file, avoiding needless triggering ## of the rebuild rule. - @mv @STAMP@T @STAMP@ + @mv %STAMP%T %STAMP% ## Explicitly look in srcdir for benefit of non-GNU makes. ## SRC_STAMP takes into account a possible subdir where CONFIG_HEADER_IN is -$(srcdir)/@CONFIG_HEADER_IN@: @MAINTAINER_MODE_TRUE@$(srcdir)/@SRC_STAMP@.in +?MAINTAINER_MODE?$(srcdir)/%CONFIG_HEADER_IN%: @MAINTAINER_MODE_TRUE@$(srcdir)/%SRC_STAMP%.in +?!MAINTAINER_MODE?$(srcdir)/%CONFIG_HEADER_IN%: $(srcdir)/%SRC_STAMP%.in ## Recover from removal of CONFIG_HEADER_IN @if test ! -f $@; then \ - rm -f $(srcdir)/@SRC_STAMP@.in; \ - $(MAKE) $(srcdir)/@SRC_STAMP@.in; \ + rm -f $(srcdir)/%SRC_STAMP%.in; \ + $(MAKE) $(srcdir)/%SRC_STAMP%.in; \ else :; fi -$(srcdir)/@SRC_STAMP@.in: $(top_srcdir)/@CONFIGURE_AC@ $(ACLOCAL_M4) @FILES@ - @rm -f $(srcdir)/@SRC_STAMP@.in $(srcdir)/@SRC_STAMP@.inT +$(srcdir)/%SRC_STAMP%.in: $(top_srcdir)/%CONFIGURE_AC% $(ACLOCAL_M4) %FILES% + @rm -f $(srcdir)/%SRC_STAMP%.in $(srcdir)/%SRC_STAMP%.inT ## We used to try to get a real timestamp here. But the fear is that ## that will cause unnecessary cvs conflicts - @echo timestamp > $(srcdir)/@SRC_STAMP@.inT 2> /dev/null + @echo timestamp > $(srcdir)/%SRC_STAMP%.inT 2> /dev/null cd $(top_srcdir) && $(AUTOHEADER) ## Creating the timestamp first, and moving it later, helps ensure that ## it will be older than the header file, avoiding needless triggering ## of the rebuild rule. - @mv $(srcdir)/@SRC_STAMP@.inT $(srcdir)/@SRC_STAMP@.in + @mv $(srcdir)/%SRC_STAMP%.inT $(srcdir)/%SRC_STAMP%.in @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +## Copyright 1994, 1995, 1996, 1997, 1998, 2001 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 @@ -20,5 +20,6 @@ config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck ## Explicitly look in srcdir for benefit of non-GNU makes. -$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/@CONFIGURE_AC@ $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) +?MAINTAINER_MODE?$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/%CONFIGURE_AC% $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) +?!MAINTAINER_MODE?$(srcdir)/configure: $(srcdir)/%CONFIGURE_AC% $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) diff --git a/scripts.am b/scripts.am index 21218e468..a01018c46 100644 --- a/scripts.am +++ b/scripts.am @@ -16,37 +16,37 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -_am_installdirs += $(DESTDIR)$(@NDIR@dir) -?EXEC?.PHONY install-exec-am: install-@DIR@SCRIPTS -?!EXEC?.PHONY install-data-am: install-@DIR@SCRIPTS -install-@DIR@SCRIPTS: $(@DIR@_SCRIPTS) +_am_installdirs += $(DESTDIR)$(%NDIR%dir) +?EXEC?.PHONY install-exec-am: install-%DIR%SCRIPTS +?!EXEC?.PHONY install-data-am: install-%DIR%SCRIPTS +install-%DIR%SCRIPTS: $(%DIR%_SCRIPTS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(@NDIR@dir) + $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir) ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. - @list='$(@DIR@_SCRIPTS)'; for p in $$list; do \ + @list='$(%DIR%_SCRIPTS)'; for p in $$list; do \ f="`echo $$p|sed '$(transform)'`"; \ if test -f $$p; then \ - echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(@NDIR@dir)/$$f"; \ - $(INSTALL_SCRIPT) $$p $(DESTDIR)$(@NDIR@dir)/$$f; \ + echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(%NDIR%dir)/$$f"; \ + $(INSTALL_SCRIPT) $$p $(DESTDIR)$(%NDIR%dir)/$$f; \ elif test -f $(srcdir)/$$p; then \ - echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(@NDIR@dir)/$$f"; \ - $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(@NDIR@dir)/$$f; \ + echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(%NDIR%dir)/$$f"; \ + $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(%NDIR%dir)/$$f; \ else :; fi; \ done -.PHONY uninstall-am: uninstall-@DIR@SCRIPTS -uninstall-@DIR@SCRIPTS: +.PHONY uninstall-am: uninstall-%DIR%SCRIPTS +uninstall-%DIR%SCRIPTS: @$(NORMAL_UNINSTALL) - @list='$(@DIR@_SCRIPTS)'; for p in $$list; do \ + @list='$(%DIR%_SCRIPTS)'; for p in $$list; do \ f="`echo $$p|sed '$(transform)'`"; \ - echo " rm -f $(DESTDIR)$(@NDIR@dir)/$$f"; \ - rm -f $(DESTDIR)$(@NDIR@dir)/$$f; \ + echo " rm -f $(DESTDIR)$(%NDIR%dir)/$$f"; \ + rm -f $(DESTDIR)$(%NDIR%dir)/$$f; \ done ## Uncomment line in handle_scripts when this is uncommented. -## check-@DIR@SCRIPTS: -## pid=$$$$; list="$(@DIR@_SCRIPTS)"; for p in $$list; do \ +## check-%DIR%SCRIPTS: +## pid=$$$$; list="$(%DIR%_SCRIPTS)"; for p in $$list; do \ ## for opt in --help --version; do \ ## if test -f $$p; then :; \ ## elif test -f $(srcdir)/$$p; then \ diff --git a/subdirs.am b/subdirs.am index d96609ce4..285c6a0f4 100644 --- a/subdirs.am +++ b/subdirs.am @@ -26,11 +26,11 @@ .PHONY: all-recursive install-data-recursive install-exec-recursive \ -installdirs-recursive install-recursive uninstall-recursive @INSTALLINFO@ \ +installdirs-recursive install-recursive uninstall-recursive %INSTALLINFO% \ check-recursive installcheck-recursive info-recursive dvi-recursive all-recursive install-data-recursive install-exec-recursive \ -installdirs-recursive install-recursive uninstall-recursive @INSTALLINFO@ \ +installdirs-recursive install-recursive uninstall-recursive %INSTALLINFO% \ check-recursive installcheck-recursive info-recursive dvi-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ dot_seen=no; \ @@ -29,7 +29,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) END { for (i in files) print i; }'`; \ mkid -fID $$unique $(LISP) -TAGS: @DIRS@ $(HEADERS) $(SOURCES) @CONFIG@ $(TAGS_DEPENDENCIES) \ +TAGS: %DIRS% $(HEADERS) $(SOURCES) %CONFIG% $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ @@ -48,8 +48,8 @@ TAGS: @DIRS@ $(HEADERS) $(SOURCES) @CONFIG@ $(TAGS_DEPENDENCIES) \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ## Make sure we have something to run etags on. - test -z "$(ETAGS_ARGS)@CONFIG@$$unique$(LISP)$$tags" \ - || etags $(ETAGS_ARGS) $$tags @CONFIG@ $$unique $(LISP) + test -z "$(ETAGS_ARGS)%CONFIG%$$unique$(LISP)$$tags" \ + || etags $(ETAGS_ARGS) $$tags %CONFIG% $$unique $(LISP) ## Support `Global' tags. GTAGS: diff --git a/texi-vers.am b/texi-vers.am index 0d6f9664a..67d251ff4 100644 --- a/texi-vers.am +++ b/texi-vers.am @@ -16,32 +16,34 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -$(srcdir)/@VTEXI@: @MAINTAINER_MODE_TRUE@$(srcdir)/stamp-@VTI@ +?MAINTAINER_MODE?$(srcdir)/%VTEXI%: @MAINTAINER_MODE_TRUE@$(srcdir)/stamp-%VTI% +?!MAINTAINER_MODE?$(srcdir)/%VTEXI%: $(srcdir)/stamp-%VTI% @: -## Depend on @CONFIGURE_AC@ so that version number updates cause a +## Depend on %CONFIGURE_AC% so that version number updates cause a ## rebuild. -$(srcdir)/stamp-@VTI@: @TEXI@ $(top_srcdir)/@CONFIGURE_AC@ - @(set `$(SHELL) @MDDIR@mdate-sh $(srcdir)/@TEXI@`; \ +$(srcdir)/stamp-%VTI%: %TEXI% $(top_srcdir)/%CONFIGURE_AC% + @(set `$(SHELL) %MDDIR%mdate-sh $(srcdir)/%TEXI%`; \ echo "@set UPDATED $$1 $$2 $$3"; \ echo "@set UPDATED-MONTH $$2 $$3"; \ echo "@set EDITION $(VERSION)"; \ - echo "@set VERSION $(VERSION)") > @VTI@.tmp + echo "@set VERSION $(VERSION)") > %VTI%.tmp ## Use cp and rm here because some older "mv"s can't move across ## filesystems. Furthermore, GNU "mv" in the AmigaDOS environment ## can't handle this. - @cmp -s @VTI@.tmp $(srcdir)/@VTEXI@ \ - || (echo "Updating $(srcdir)/@VTEXI@"; \ - cp @VTI@.tmp $(srcdir)/@VTEXI@) - -@rm -f @VTI@.tmp - @cp $(srcdir)/@VTEXI@ $@ + @cmp -s %VTI%.tmp $(srcdir)/%VTEXI% \ + || (echo "Updating $(srcdir)/%VTEXI%"; \ + cp %VTI%.tmp $(srcdir)/%VTEXI%) + -@rm -f %VTI%.tmp + @cp $(srcdir)/%VTEXI% $@ -mostlyclean-am: mostlyclean-@VTI@ -mostlyclean-@VTI@: - -rm -f @VTI@.tmp +mostlyclean-am: mostlyclean-%VTI% +mostlyclean-%VTI%: + -rm -f %VTI%.tmp -maintainer-clean-am: maintainer-clean-@VTI@ -maintainer-clean-@VTI@: - -@MAINTAINER_MODE_TRUE@rm -f $(srcdir)/stamp-@VTI@ $(srcdir)/@VTEXI@ +maintainer-clean-am: maintainer-clean-%VTI% +maintainer-clean-%VTI%: +?MAINTAINER_MODE?@MAINTAINER_MODE_TRUE@ -rm -f $(srcdir)/stamp-%VTI% $(srcdir)/%VTEXI% +?!MAINTAINER_MODE? -rm -f $(srcdir)/stamp-%VTI% $(srcdir)/%VTEXI% -.PHONY: mostlyclean-@VTI@ maintainer-clean-@VTI@ +.PHONY: mostlyclean-%VTI% maintainer-clean-%VTI% diff --git a/texibuild.am b/texibuild.am index 0faf14ddb..747a3288c 100644 --- a/texibuild.am +++ b/texibuild.am @@ -17,7 +17,7 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -.@SUFFIX@.info: +.%SUFFIX%.info: ## We want to force the .info file to be built in srcdir. This is ## probably the simplest way. However, at Cygnus .info files are ## always put into the build directory. So at runtime we select which @@ -32,13 +32,13 @@ ?CYGNUS? @rm -f $@ $@-[0-9] $@-[0-9][0-9] ?CYGNUS? $(MAKEINFO) -I $(srcdir) $< -.@SUFFIX@.dvi: - TEXINPUTS=@TEXINFODIR@:$$TEXINPUTS \ +.%SUFFIX%.dvi: + TEXINPUTS=%TEXINFODIR%:$$TEXINPUTS \ ## Must set MAKEINFO like this so that version.texi will be found even ## if it is in srcdir. MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $< -.@SUFFIX@: +.%SUFFIX%: ## We want to force the .info file to be built in srcdir. This is ## probably the simplest way. However, at Cygnus .info files are ## always put into the build directory. So at runtime we select which diff --git a/texinfos.am b/texinfos.am index bf886326c..63cd5c6a8 100644 --- a/texinfos.am +++ b/texinfos.am @@ -110,7 +110,7 @@ dist-info: $(INFO_DEPS) .PHONY: mostlyclean-aminfo mostlyclean-am: mostlyclean-aminfo mostlyclean-aminfo: -@TEXICLEAN@ +%TEXICLEAN% .PHONY: maintainer-clean-aminfo maintainer-clean-am: maintainer-clean-aminfo |