From edef7b8cf3d811ce8630591dbed1257ba16164ff Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sat, 4 Jun 2016 10:21:01 -0600 Subject: [PATCH] Fix rust-exp handling in makefile I noticed that the rust-exp handling in the Makefile differed from that of other .y files. I believe I noticed this by seeing a stray "rm" in the build log. This patch changes the Makefile to bring the rust-exp handling in line with that of other .y files. 2016-06-10 Tom Tromey * Makefile.in (COMMON_OBS): Remove rust-exp.o. (YYFILES): Add rust-exp.c. (YYOBJ): Add rust-exp.o. (local-maintainer-clean): Remove rust-exp.c. --- gdb/ChangeLog | 7 +++++++ gdb/Makefile.in | 8 ++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 2cb21b40a3d..c7c74fb9e63 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2016-06-10 Tom Tromey + + * Makefile.in (COMMON_OBS): Remove rust-exp.o. + (YYFILES): Add rust-exp.c. + (YYOBJ): Add rust-exp.o. + (local-maintainer-clean): Remove rust-exp.c. + 2016-06-09 Toshihito Kikuchi * NEWS: Mention that GDB now supports a negative repeat count in diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 60cfc9760e7..02eb57f0899 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -1075,7 +1075,7 @@ COMMON_OBS = $(DEPFILES) $(CONFIG_OBS) $(YYOBJ) \ gnu-v2-abi.o gnu-v3-abi.o cp-abi.o cp-support.o \ cp-namespace.o d-namespace.o \ reggroups.o \ - rust-exp.o rust-lang.o \ + rust-lang.o \ trad-frame.o \ tramp-frame.o \ solib.o solib-target.o \ @@ -1108,12 +1108,12 @@ YYFILES = c-exp.c \ ada-lex.c \ ada-exp.c \ jv-exp.c \ - d-exp.c f-exp.c go-exp.c m2-exp.c p-exp.c + d-exp.c f-exp.c go-exp.c m2-exp.c p-exp.c rust-exp.c YYOBJ = c-exp.o \ cp-name-parser.o \ ada-exp.o \ jv-exp.o \ - d-exp.o f-exp.o go-exp.o m2-exp.o p-exp.o + d-exp.o f-exp.o go-exp.o m2-exp.o p-exp.o rust-exp.o # Things which need to be built when making a distribution. @@ -1485,7 +1485,7 @@ local-maintainer-clean: cp-name-parser.c \ ada-lex.c ada-exp.c \ jv-exp.tab \ - d-exp.c f-exp.c go-exp.c m2-exp.c p-exp.c + d-exp.c f-exp.c go-exp.c m2-exp.c p-exp.c rust-exp.c rm -f TAGS $(INFOFILES) rm -f $(YYFILES) rm -f nm.h config.status -- 2.30.2