summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAlexandre Duret-Lutz <adl@gnu.org>2001-11-16 10:25:58 +0000
committerAlexandre Duret-Lutz <adl@gnu.org>2001-11-16 10:25:58 +0000
commitf391cff9c01d5226f2cdaace319a08d56228049a (patch)
treeff41ad2cf656f618719fdb79aa82a25df8b4a64d /lib
parent401f009a7f15fba879e36908271c4cad9b965114 (diff)
downloadautomake-f391cff9c01d5226f2cdaace319a08d56228049a.tar.gz
At every place where an "$extension" is used, include the leading
dot in the extension, don't hardcode it when building the filename. That will make any support for a dot-less extension easier to add. * automake.in (SUFFIX_RULE_PATTERN): Include extension dots in backref groups. ("main"): Prepend a '.' to the supported extensions of all languages (e.g. 'c' becomes '.c'). (handle_languages, handle_single_transform_list, handle_lib_objects_cond, handle_headers, derive_suffix, rule_define): Do not add a dot before extensions, and include dots in matching groups. * lib/am/depend2.am (.%EXT%.o, .%EXT%.obj, .%EXT%.lo): Rename as ... (%EXT%.o, %EXT%.obj, %EXT%.lo): ... these. * lib/am/lex.am (.%EXT%.%DERIVED-EXT%): Rename as ... (%EXT%%DERIVED-EXT%): ... this. * lib/am/yacc.am: Likewise.
Diffstat (limited to 'lib')
-rw-r--r--lib/am/depend2.am6
-rw-r--r--lib/am/lex.am2
-rw-r--r--lib/am/yacc.am2
3 files changed, 5 insertions, 5 deletions
diff --git a/lib/am/depend2.am b/lib/am/depend2.am
index 466f165ea..0540e9d09 100644
--- a/lib/am/depend2.am
+++ b/lib/am/depend2.am
@@ -30,7 +30,7 @@
## the `if AMDEP' chunk is prefix with @AMDEP_TRUE@ just like for any
## other configure-time conditional.
-?GENERIC?.%EXT%.o:
+?GENERIC?%EXT%.o:
?!GENERIC?%OBJ%: %SOURCE%
if %AMDEP%
source='%SOURCE%' object='%OBJ%' libtool=no @AMDEPBACKSLASH@
@@ -40,7 +40,7 @@ endif %AMDEP%
?-o? %COMPILE% %-c% %-o% %OBJ% `test -f %SOURCE% || echo '$(srcdir)/'`%SOURCE%
?!-o? %COMPILE% %-c% `test -f %SOURCE% || echo '$(srcdir)/'`%SOURCE%
-?GENERIC?.%EXT%.obj:
+?GENERIC?%EXT%.obj:
?!GENERIC?%OBJOBJ%: %SOURCE%
if %AMDEP%
source='%SOURCE%' object='%OBJOBJ%' libtool=no @AMDEPBACKSLASH@
@@ -51,7 +51,7 @@ endif %AMDEP%
?!-o? %COMPILE% %-c% `cygpath -w %SOURCE%`
if %?LIBTOOL%
-?GENERIC?.%EXT%.lo:
+?GENERIC?%EXT%.lo:
?!GENERIC?%LTOBJ%: %SOURCE%
if %AMDEP%
source='%SOURCE%' object='%LTOBJ%' libtool=yes @AMDEPBACKSLASH@
diff --git a/lib/am/lex.am b/lib/am/lex.am
index 8d0f996cb..a61663f56 100644
--- a/lib/am/lex.am
+++ b/lib/am/lex.am
@@ -21,7 +21,7 @@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LEXLIB = @LEXLIB@
-?GENERIC?.%EXT%.%DERIVED-EXT%:
+?GENERIC?%EXT%%DERIVED-EXT%:
?!GENERIC?%OBJ%: %SOURCE%
if %?MORE-THAN-ONE%
$(SHELL) $(YLWRAP) %SOURCE% $(LEX_OUTPUT_ROOT).c %OBJ% -- %COMPILE%
diff --git a/lib/am/yacc.am b/lib/am/yacc.am
index 2032f0c12..8fda29dfc 100644
--- a/lib/am/yacc.am
+++ b/lib/am/yacc.am
@@ -16,7 +16,7 @@
## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
## 02111-1307, USA.
-?GENERIC?.%EXT%.%DERIVED-EXT%:
+?GENERIC?%EXT%%DERIVED-EXT%:
?!GENERIC?%OBJ%: %SOURCE%
if %?MORE-THAN-ONE%
$(SHELL) $(YLWRAP) %SOURCE% y.tab.c %OBJ% y.tab.h %BASE%.h -- %COMPILE%