diff options
| author | Simon Martin <simon@nasilyan.com> | 2024-12-23 13:28:31 +0100 |
|---|---|---|
| committer | Simon Martin <simon@nasilyan.com> | 2024-12-23 16:59:18 +0100 |
| commit | 6c59463a6fc6cd3ed4d0aad492af40c7ddd12f2a (patch) | |
| tree | 8725dd8485aec31f9ebee946388dd6f34467893c | |
| parent | d21efb65d15273d50ca80aea14787efa6245174c (diff) | |
| download | gcc-6c59463a6fc6cd3ed4d0aad492af40c7ddd12f2a.zip gcc-6c59463a6fc6cd3ed4d0aad492af40c7ddd12f2a.tar.gz gcc-6c59463a6fc6cd3ed4d0aad492af40c7ddd12f2a.tar.bz2 | |
libcc1: Fix tags generation target
'make tags' currently fails for libcc1 with this:
*** No rule to make target `marshall-c.hh', needed by `tags-am'. Stop.
The problem is that while marshall-c.hh has been removed via
r12-454-g25d1a6ecdc443f, it's still part of the libcc1_la_SOURCES
variable, hence the 'tags' target has a dependency on it.
This patch simply removes the marshall_c_source variable, that should be
empty.
libcc1/ChangeLog:
* Makefile.am: Remove reference to deleted marshall-c.h.
* Makefile.in: Regenerate.
| -rw-r--r-- | libcc1/Makefile.am | 5 | ||||
| -rw-r--r-- | libcc1/Makefile.in | 9 |
2 files changed, 6 insertions, 8 deletions
diff --git a/libcc1/Makefile.am b/libcc1/Makefile.am index b592bc8..062f4a7 100644 --- a/libcc1/Makefile.am +++ b/libcc1/Makefile.am @@ -51,12 +51,11 @@ endif shared_source = callbacks.cc callbacks.hh connection.cc connection.hh \ marshall.cc marshall.hh rpc.hh status.hh -marshall_c_source = marshall-c.hh marshall_cxx_source = marshall-cp.hh libcc1plugin_la_LDFLAGS = -module -export-symbols $(srcdir)/libcc1plugin.sym libcc1plugin_la_SOURCES = libcc1plugin.cc context.cc context.hh \ - $(shared_source) $(marshall_c_source) + $(shared_source) libcc1plugin.lo_CPPFLAGS = $(CPPFLAGS_FOR_C) libcc1plugin_la_LIBADD = $(libiberty) libcc1plugin_la_DEPENDENCIES = $(libiberty_dep) @@ -78,7 +77,7 @@ LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) libcc1_la_LDFLAGS = -module -export-symbols $(srcdir)/libcc1.sym libcc1_la_SOURCES = findcomp.cc libcc1.cc libcp1.cc \ compiler.cc compiler.hh names.cc names.hh $(shared_source) \ - $(marshall_c_source) $(marshall_cxx_source) + $(marshall_cxx_source) libcc1_la_LIBADD = $(libiberty) libcc1_la_DEPENDENCIES = $(libiberty_dep) libcc1_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ diff --git a/libcc1/Makefile.in b/libcc1/Makefile.in index f8f590d..9d56a83 100644 --- a/libcc1/Makefile.in +++ b/libcc1/Makefile.in @@ -145,11 +145,11 @@ LTLIBRARIES = $(cc1lib_LTLIBRARIES) $(plugin_LTLIBRARIES) am__objects_1 = callbacks.lo connection.lo marshall.lo am__objects_2 = am_libcc1_la_OBJECTS = findcomp.lo libcc1.lo libcp1.lo compiler.lo \ - names.lo $(am__objects_1) $(am__objects_2) $(am__objects_2) + names.lo $(am__objects_1) $(am__objects_2) libcc1_la_OBJECTS = $(am_libcc1_la_OBJECTS) @ENABLE_PLUGIN_TRUE@am_libcc1_la_rpath = -rpath $(cc1libdir) am_libcc1plugin_la_OBJECTS = libcc1plugin.lo context.lo \ - $(am__objects_1) $(am__objects_2) + $(am__objects_1) libcc1plugin_la_OBJECTS = $(am_libcc1plugin_la_OBJECTS) @ENABLE_PLUGIN_TRUE@am_libcc1plugin_la_rpath = -rpath $(plugindir) am_libcp1plugin_la_OBJECTS = libcp1plugin.lo context.lo \ @@ -403,11 +403,10 @@ cc1libdir = $(libdir)/$(libsuffix) shared_source = callbacks.cc callbacks.hh connection.cc connection.hh \ marshall.cc marshall.hh rpc.hh status.hh -marshall_c_source = marshall-c.hh marshall_cxx_source = marshall-cp.hh libcc1plugin_la_LDFLAGS = -module -export-symbols $(srcdir)/libcc1plugin.sym libcc1plugin_la_SOURCES = libcc1plugin.cc context.cc context.hh \ - $(shared_source) $(marshall_c_source) + $(shared_source) libcc1plugin.lo_CPPFLAGS = $(CPPFLAGS_FOR_C) libcc1plugin_la_LIBADD = $(libiberty) @@ -431,7 +430,7 @@ LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) libcc1_la_LDFLAGS = -module -export-symbols $(srcdir)/libcc1.sym libcc1_la_SOURCES = findcomp.cc libcc1.cc libcp1.cc \ compiler.cc compiler.hh names.cc names.hh $(shared_source) \ - $(marshall_c_source) $(marshall_cxx_source) + $(marshall_cxx_source) libcc1_la_LIBADD = $(libiberty) libcc1_la_DEPENDENCIES = $(libiberty_dep) |