From 2d89eeaa35d6884b23c6bb16aa4510420bea64ea Mon Sep 17 00:00:00 2001 From: Matt Birkholz Date: Sun, 2 Dec 2018 10:49:08 -0700 Subject: [PATCH] x11/Makefile.am: Fix merge: Add C sources to the link(!) and TAGS. --- src/x11/Makefile.am | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/x11/Makefile.am b/src/x11/Makefile.am index 20c4c62da..f856b7ee2 100644 --- a/src/x11/Makefile.am +++ b/src/x11/Makefile.am @@ -49,11 +49,12 @@ AM_CPPFLAGS = -I@MIT_SCHEME_INCLUDEDIR@ AM_CFLAGS = @MIT_CFLAGS@ x11_shim_la_LIBADD = @MIT_LIBS@ -c_sources = x11-shim.h x11.h x11base.c x11color.c x11graph.c x11term.c +c_sources = x11base.c x11color.c x11graph.c x11term.c x11-shim.h x11.h +x11_shim_la_SOURCES = $(c_sources) x11-shim.c x11_shim_la_LDFLAGS = -module -avoid-version -shared noinst_PROGRAMS = x11-const -x11_const_SOURCES = x11-const.c x11-shim.h +x11_const_SOURCES = x11-const.c x11-shim.h x11.h x11-shim.c: stamp-shim x11-const.c: stamp-shim @@ -89,11 +90,10 @@ TESTS = x11-check.sh tags: tags-am ./tags-fix.sh x11 -all_sources = $(sources) $(c_sources) -ETAGS_ARGS = $(all_sources) -r '/^([^iI].*/' $(cdecls) -TAGS_DEPENDENCIES = $(all_sources) $(cdecls) +ETAGS_ARGS = $(sources) $(c_sources) -r '/^([^iI].*/' $(cdecls) +TAGS_DEPENDENCIES = $(sources) $(c_sources) $(cdecls) -EXTRA_DIST += $(all_sources) $(cdecls) compile.sh compile.scm x11.pkg +EXTRA_DIST += $(sources) $(cdecls) compile.sh compile.scm x11.pkg EXTRA_DIST += x11-check.sh x11-test.scm EXTRA_DIST += make.scm optiondb.scm tags-fix.sh debian -- 2.25.1