diff --git a/examples/c++/glr/local.mk b/examples/c++/glr/local.mk index c3faa7b7..3ac0b14b 100644 --- a/examples/c++/glr/local.mk +++ b/examples/c++/glr/local.mk @@ -23,8 +23,11 @@ glrxxdir = $(docdir)/%D% $(nodist_%C%_c___types_SOURCES): %D%/c++-types.stamp @test -f $@ || rm -f %D%/c++-types.stamp @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) %D%/c++-types.stamp -CLEANFILES += \ - $(nodist_%C%_c___types_SOURCES) %D%/c++-types.stamp +CLEANFILES += \ + $(nodist_%C%_c___types_SOURCES) \ + %D%/c++-types.stamp \ + %D%/c++-types.output \ + %D%/location.hh CLEANDIRS += %D%/*.dSYM ## -------------------- ## diff --git a/examples/c/glr/local.mk b/examples/c/glr/local.mk index c6822343..f5032a63 100644 --- a/examples/c/glr/local.mk +++ b/examples/c/glr/local.mk @@ -30,5 +30,5 @@ nodist_%C%_c___types_SOURCES = %D%/c++-types.y %C%_c___types_CFLAGS = $(TEST_CFLAGS) dist_glr_DATA = %D%/c++-types.y %D%/Makefile %D%/README.md -CLEANFILES += %D%/c++-types.c %D%/c++-types.output +CLEANFILES += %D%/c++-types.[ch] %D%/c++-types.output CLEANDIRS += %D%/*.dSYM diff --git a/src/output.c b/src/output.c index ced4553d..6c82e2b1 100644 --- a/src/output.c +++ b/src/output.c @@ -554,7 +554,7 @@ merger_output (FILE *out) int n; merger_list* p; for (n = 1, p = merge_functions; p != NULL; n += 1, p = p->next) - fprintf (out, "]b4_call_merger([%d], [%s], [%d])[\n", + fprintf (out, "]b4_call_merger""([%d], [%s], [%d])[\n", n, p->name, p->sym->content->number); fputs ("]])\n\n", out); }