summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick McDermott <pj@pehjota.net>2017-11-01 13:19:58 (EDT)
committer Patrick McDermott <pj@pehjota.net>2017-11-01 13:19:58 (EDT)
commit239138b44e39cd401f2754ac7d19963d32237342 (patch)
tree485d160940b5ad680b7c0f5dd7acf93c737b4100
parent7ee941825739135fd5c6571e2706784f1ba70168 (diff)
downloadmarquee-239138b44e39cd401f2754ac7d19963d32237342.zip
marquee-239138b44e39cd401f2754ac7d19963d32237342.tar.gz
marquee-239138b44e39cd401f2754ac7d19963d32237342.tar.bz2
Revert "Makefile.am: Add version.c to marquee_SOURCES"
This reverts commit 7ee941825739135fd5c6571e2706784f1ba70168. The commit introduced a dependency cycle that causes trouble.
-rw-r--r--Makefile.am9
1 files changed, 6 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index 0533a5e..6ce855c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,7 +40,7 @@ PACKAGE_STRING = $(PACKAGE_NAME) $(PACKAGE_VERSION_GIT)
bin_PROGRAMS = marquee
-marquee_SOURCES = version.c
+marquee_SOURCES =
marquee_CPPFLAGS = \
-DABS_TOP_BUILDDIR=\"$(abs_top_builddir)\" \
-DPKGDATADIR=\"$(pkgdatadir)\" \
@@ -51,10 +51,13 @@ marquee_LDADD = \
$(WEBKIT2GTK_LIBS)
CLEANFILES = version.c
-version.c: $(marquee_OBJECTS) $(marquee_DEPENDENCIES) \
+marquee$(EXEEXT): $(marquee_OBJECTS) $(marquee_DEPENDENCIES) \
$(EXTRA_marquee_DEPENDENCIES)
- $(AM_V_GEN)printf 'const char *PACKAGE_VERSION_GIT = "%s";\n' \
+ @rm -f marquee$(EXEEXT)
+ @printf 'const char *PACKAGE_VERSION_GIT = "%s";\n' \
"$(PACKAGE_VERSION_GIT)" >version.c
+ $(AM_V_CCLD)$(LINK) version.c $(marquee_OBJECTS) $(marquee_LDADD) \
+ $(LIBS)
include $(top_srcdir)/src/local.mk