From 0fcbc89e92a1137f6829a4a59138fc20c43d194d Mon Sep 17 00:00:00 2001 From: Morgan Deters Date: Tue, 8 Dec 2009 23:18:52 +0000 Subject: [PATCH] final (?) fixes to parser/generated build directory modifications --- src/parser/cvc/Makefile.am | 6 +++--- src/parser/cvc/Makefile.in | 15 ++++++++------- src/parser/smt/Makefile.am | 4 ++-- src/parser/smt/Makefile.in | 24 +++++++++++++----------- 4 files changed, 26 insertions(+), 23 deletions(-) diff --git a/src/parser/cvc/Makefile.am b/src/parser/cvc/Makefile.am index 979af52b2..eb0adc39c 100644 --- a/src/parser/cvc/Makefile.am +++ b/src/parser/cvc/Makefile.am @@ -28,7 +28,7 @@ libparsercvc_la_SOURCES = \ BUILT_SOURCES = $(ANTLR_STUFF) dist-hook: $(ANTLR_STUFF) MAINTAINERCLEANFILES = $(ANTLR_STUFF) -maintainerclean-local: +maintainer-clean-local: -rmdir @srcdir@/generated -rm -f @srcdir@/stamp-generated @@ -36,13 +36,13 @@ maintainerclean-local: mkdir -p @srcdir@/generated touch @srcdir@/stamp-generated # antlr doesn't overwrite output files, it just leaves them. So we have to delete them first. -$(ANTLR_LEXER_STUFF): CvcLexer.g @srcdir@/generated +$(ANTLR_LEXER_STUFF): CvcLexer.g @srcdir@/stamp-generated -rm -f $(ANTLR_LEXER_STUFF) $(ANTLR) -o "@srcdir@/generated" "@srcdir@/CvcLexer.g" # doesn't actually depend on the lexer, but if we're doing parallel # make and the lexer needs to be rebuilt, we have to keep the rules # from running in parallel (since the token files will be deleted & # recreated) -$(ANTLR_PARSER_STUFF): CvcParser.g CvcLexer.g $(ANTLR_TOKEN_STUFF) @srcdir@/generated +$(ANTLR_PARSER_STUFF): CvcParser.g CvcLexer.g $(ANTLR_TOKEN_STUFF) @srcdir@/stamp-generated -rm -f $(ANTLR_PARSER_STUFF) $(ANTLR) -o "@srcdir@/generated" "@srcdir@/CvcParser.g" diff --git a/src/parser/cvc/Makefile.in b/src/parser/cvc/Makefile.in index 64911107e..f7358bfcc 100644 --- a/src/parser/cvc/Makefile.in +++ b/src/parser/cvc/Makefile.in @@ -518,7 +518,8 @@ installcheck-am: maintainer-clean: maintainer-clean-am -rm -rf ./$(DEPDIR) -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic +maintainer-clean-am: distclean-am maintainer-clean-generic \ + maintainer-clean-local mostlyclean: mostlyclean-am @@ -547,12 +548,12 @@ uninstall-am: install-info-am install-man install-pdf install-pdf-am \ install-ps install-ps-am install-strip installcheck \ installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + maintainer-clean-generic maintainer-clean-local mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags uninstall uninstall-am dist-hook: $(ANTLR_STUFF) -maintainerclean-local: +maintainer-clean-local: -rmdir @srcdir@/generated -rm -f @srcdir@/stamp-generated @@ -560,14 +561,14 @@ maintainerclean-local: mkdir -p @srcdir@/generated touch @srcdir@/stamp-generated # antlr doesn't overwrite output files, it just leaves them. So we have to delete them first. -$(ANTLR_LEXER_STUFF): CvcLexer.g @srcdir@/generated +$(ANTLR_LEXER_STUFF): CvcLexer.g @srcdir@/stamp-generated -rm -f $(ANTLR_LEXER_STUFF) $(ANTLR) -o "@srcdir@/generated" "@srcdir@/CvcLexer.g" # doesn't actually depend on the lexer, but if we're doing parallel # make and the lexer needs to be rebuilt, we have to keep the rules # from running in parallel (since the token files will be deleted & # recreated) -$(ANTLR_PARSER_STUFF): CvcParser.g CvcLexer.g $(ANTLR_TOKEN_STUFF) @srcdir@/generated +$(ANTLR_PARSER_STUFF): CvcParser.g CvcLexer.g $(ANTLR_TOKEN_STUFF) @srcdir@/stamp-generated -rm -f $(ANTLR_PARSER_STUFF) $(ANTLR) -o "@srcdir@/generated" "@srcdir@/CvcParser.g" diff --git a/src/parser/smt/Makefile.am b/src/parser/smt/Makefile.am index 8e2aa77b1..a6d234bd0 100644 --- a/src/parser/smt/Makefile.am +++ b/src/parser/smt/Makefile.am @@ -11,7 +11,7 @@ ANTLR_TOKEN_STUFF = \ @srcdir@/generated/AntlrSmtParserTokenTypes.txt ANTLR_LEXER_STUFF = \ @srcdir@/generated/AntlrSmtLexer.hpp \ - @srcdir@/generated/AntlrSmtLexer.cpp + @srcdir@/generated/AntlrSmtLexer.cpp \ $(ANTLR_TOKEN_STUFF) ANTLR_PARSER_STUFF = \ @srcdir@/generated/AntlrSmtParser.hpp \ @@ -28,7 +28,7 @@ libparsersmt_la_SOURCES = \ BUILT_SOURCES = $(ANTLR_STUFF) dist-hook: $(ANTLR_STUFF) MAINTAINERCLEANFILES = $(ANTLR_STUFF) -maintainerclean-local: +maintainer-clean-local: -rmdir @srcdir@/generated -rm -f @srcdir@/stamp-generated diff --git a/src/parser/smt/Makefile.in b/src/parser/smt/Makefile.in index 1bd03d582..20c91c28a 100644 --- a/src/parser/smt/Makefile.in +++ b/src/parser/smt/Makefile.in @@ -52,10 +52,11 @@ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = LTLIBRARIES = $(noinst_LTLIBRARIES) libparsersmt_la_LIBADD = -am__objects_1 = AntlrSmtLexer.lo -am__objects_2 = AntlrSmtParser.lo -am__objects_3 = $(am__objects_1) $(am__objects_2) -am_libparsersmt_la_OBJECTS = $(am__objects_3) +am__objects_1 = +am__objects_2 = AntlrSmtLexer.lo $(am__objects_1) +am__objects_3 = AntlrSmtParser.lo +am__objects_4 = $(am__objects_2) $(am__objects_3) +am_libparsersmt_la_OBJECTS = $(am__objects_4) libparsersmt_la_OBJECTS = $(am_libparsersmt_la_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/config/depcomp @@ -230,7 +231,8 @@ ANTLR_TOKEN_STUFF = \ ANTLR_LEXER_STUFF = \ @srcdir@/generated/AntlrSmtLexer.hpp \ - @srcdir@/generated/AntlrSmtLexer.cpp + @srcdir@/generated/AntlrSmtLexer.cpp \ + $(ANTLR_TOKEN_STUFF) ANTLR_PARSER_STUFF = \ @srcdir@/generated/AntlrSmtParser.hpp \ @@ -516,7 +518,8 @@ installcheck-am: maintainer-clean: maintainer-clean-am -rm -rf ./$(DEPDIR) -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic +maintainer-clean-am: distclean-am maintainer-clean-generic \ + maintainer-clean-local mostlyclean: mostlyclean-am @@ -545,13 +548,12 @@ uninstall-am: install-info-am install-man install-pdf install-pdf-am \ install-ps install-ps-am install-strip installcheck \ installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + maintainer-clean-generic maintainer-clean-local mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags uninstall uninstall-am - $(ANTLR_TOKEN_STUFF) dist-hook: $(ANTLR_STUFF) -maintainerclean-local: +maintainer-clean-local: -rmdir @srcdir@/generated -rm -f @srcdir@/stamp-generated -- 2.30.2