libcc1: Clean compiler-name.h (PR70173)

Since the file is generated from a Makefile fragment, it needs to be
added to MOSTLYCLEANFILES.  The directory itself is still not deleted
(just like the gnattools and gotools directories).

2016-04-11  Segher Boessenkool  <segher@kernel.crashing.org>

libcc1/
	PR bootstrap/70173
	* Makefile.am (MOSTLYCLEANFILES): New, add compiler-name.h .
	(compiler-name.h): Shorten recipe so that it fits the line.
	* Makefile.in: Regenerate.

From-SVN: r234874

diff --git a/libcc1/ChangeLog b/libcc1/ChangeLog
index 1efcb68e04b03ced926e7029fd1b091f24610791..a65af09c6e666aecd20aa5d74ee9d7e7459aaa1e 100644 (file)
--- a/libcc1/ChangeLog
+++ b/libcc1/ChangeLog
@@ -1,3 +1,10 @@
+2016-04-11  Segher Boessenkool  <segher@kernel.crashing.org>
+
+       PR bootstrap/70173
+       * Makefile.am (MOSTLYCLEANFILES): New, add compiler-name.h .
+       (compiler-name.h): Shorten recipe so that it fits the line.
+       * Makefile.in: Regenerate.
+
 2016-03-14  Andreas Schwab  <schwab@suse.de>
 
        * configure.ac (CONFIG_STATUS_DEPENDENCIES): Substitute.

diff --git a/libcc1/Makefile.am b/libcc1/Makefile.am
index 7a274b3470cf4ee132e73f7ee2639e3a2d96cf5e..b40820b21897c32cfa14ad2cbab0e7aa387bccc2 100644 (file)
--- a/libcc1/Makefile.am
+++ b/libcc1/Makefile.am
@@ -44,11 +44,12 @@ cc1lib_LTLIBRARIES = libcc1.la
 endif
 
 BUILT_SOURCES = compiler-name.h
+MOSTLYCLEANFILES = compiler-name.h
 
 # Put this in a header so we don't run sed for each compilation.  This
 # is also simpler to debug as one can easily see the constant.
 compiler-name.h: Makefile
-       echo "#define COMPILER_NAME \"`echo gcc | sed '$(transform)'`\"" > compiler-name.h
+       echo "#define COMPILER_NAME \"`echo gcc | sed '$(transform)'`\"" > $@
 
 
 shared_source = callbacks.cc callbacks.hh connection.cc connection.hh \

diff --git a/libcc1/Makefile.in b/libcc1/Makefile.in
index 9e0036823639cb8164328883b9d5199c0536f17c..79d39d3f46a2ea54f78138165bb0b9f88fc6b4cc 100644 (file)
--- a/libcc1/Makefile.in
+++ b/libcc1/Makefile.in
@@ -296,6 +296,7 @@ cc1libdir = $(libdir)/$(libsuffix)
 @ENABLE_PLUGIN_TRUE@plugin_LTLIBRARIES = libcc1plugin.la
 @ENABLE_PLUGIN_TRUE@cc1lib_LTLIBRARIES = libcc1.la
 BUILT_SOURCES = compiler-name.h
+MOSTLYCLEANFILES = compiler-name.h
 shared_source = callbacks.cc callbacks.hh connection.cc connection.hh \
     marshall.cc marshall.hh rpc.hh status.hh
 
@@ -563,6 +564,7 @@ install-strip:
            "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
        fi
 mostlyclean-generic:
+       -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
 clean-generic:
 
@@ -672,7 +674,7 @@ override LDFLAGS := $(filter-out -fsanitize=address,$(LDFLAGS))
 # Put this in a header so we don't run sed for each compilation.  This
 # is also simpler to debug as one can easily see the constant.
 compiler-name.h: Makefile
-       echo "#define COMPILER_NAME \"`echo gcc | sed '$(transform)'`\"" > compiler-name.h
+       echo "#define COMPILER_NAME \"`echo gcc | sed '$(transform)'`\"" > $@
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.