Makefile.am: reduced redundant variables.

diff --git a/re2c/Makefile.am b/re2c/Makefile.am
index 562ed8de911c3e287cfd903a3f4d01fea291a6a4..34673f715d972c5c943d0d587071f57228a7a617 100644 (file)
--- a/re2c/Makefile.am
+++ b/re2c/Makefile.am
@@ -152,55 +152,45 @@ re2c_SOURCES = \
 
 # autogenerated sources
 AUTOGEN_LEX = src/ast/lex.cc
-AUTOGEN_LEX_CONF = src/ast/lex_conf.cc
-AUTOGEN_PARSEOPT = src/conf/parse_opts.cc
 AUTOGEN_VERTOVERNUM = src/conf/ver_to_vernum.cc
 AUTOGEN_PARSER = src/ast/parser.cc
 AUTOGEN_PARSER_HDR = src/ast/y.tab.h
 AUTOGEN_HELP = src/conf/help.cc
 AUTOGEN = \
        $(AUTOGEN_LEX) \
-       $(AUTOGEN_LEX_CONF) \
        $(AUTOGEN_PARSER) \
        $(AUTOGEN_PARSER_HDR) \
-       $(AUTOGEN_PARSEOPT)\
-       $(AUTOGEN_VERTOVERNUM)\
-       $(AUTOGEN_HELP)
+       $(AUTOGEN_VERTOVERNUM) \
+       $(AUTOGEN_HELP) \
+       src/ast/lex_conf.cc \
+       src/conf/parse_opts.cc
 nodist_re2c_SOURCES = $(AUTOGEN)
 
 # bootstrap sources
-BOOTSTRAP_LEX = bootstrap/src/ast/lex.cc
-BOOTSTRAP_LEX_CONF = bootstrap/src/ast/lex_conf.cc
-BOOTSTRAP_PARSEOPT = bootstrap/src/conf/parse_opts.cc
-BOOTSTRAP_VERTOVERNUM = bootstrap/src/conf/ver_to_vernum.cc
 BOOTSTRAP_PARSER = bootstrap/src/ast/parser.cc
 BOOTSTRAP_PARSER_HDR = bootstrap/src/ast/y.tab.h
 BOOTSTRAP_DOC = bootstrap/doc/re2c.1
 BOOTSTRAP_HELP = bootstrap/src/conf/help.cc
 BOOTSTRAP = \
-       $(BOOTSTRAP_LEX) \
-       $(BOOTSTRAP_LEX_CONF) \
        $(BOOTSTRAP_DOC) \
        $(BOOTSTRAP_HELP) \
        $(BOOTSTRAP_PARSER) \
        $(BOOTSTRAP_PARSER_HDR) \
-       $(BOOTSTRAP_PARSEOPT) \
-       $(BOOTSTRAP_VERTOVERNUM)
+       bootstrap/src/ast/lex.cc \
+       bootstrap/src/ast/lex_conf.cc \
+       bootstrap/src/conf/parse_opts.cc \
+       bootstrap/src/conf/ver_to_vernum.cc
 
 # custom sources
-CUSTOM_LEX = src/ast/lex.re
-CUSTOM_LEX_CONF = src/ast/lex_conf.re
-CUSTOM_PARSEOPT = src/conf/parse_opts.re
-CUSTOM_VERTOVERNUM = src/conf/ver_to_vernum.re
 CUSTOM_PARSER = src/ast/parser.ypp
 CUSTOM_HELP = doc/help.rst
 CUSTOM = \
-       $(CUSTOM_LEX) \
-       $(CUSTOM_LEX_CONF) \
        $(CUSTOM_PARSER) \
-       $(CUSTOM_PARSEOPT) \
-       $(CUSTOM_VERTOVERNUM) \
-       $(CUSTOM_HELP)
+       $(CUSTOM_HELP) \
+       src/ast/lex.re \
+       src/ast/lex_conf.re \
+       src/conf/parse_opts.re \
+       src/conf/ver_to_vernum.re
 
 # docs
 SRC_DOC = doc/manpage.rst