[vte] build: Don't dist generated sources
- From: Christian Persch <chpe src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vte] build: Don't dist generated sources
- Date: Mon, 20 Mar 2017 20:58:48 +0000 (UTC)
commit 3e556b57b75e33e0249d94aaf881ea201312b3c0
Author: Christian Persch <chpe src gnome org>
Date: Mon Mar 20 21:56:32 2017 +0100
build: Don't dist generated sources
Instead of distributing vteseq-list.h and vteseq-n.cc, just generate
them at build time.
https://bugzilla.gnome.org/show_bug.cgi?id=780163
configure.ac | 8 ++++++++
src/Makefile.am | 19 +++++++++++++------
2 files changed, 21 insertions(+), 6 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index c646c8b..fb5b869 100644
--- a/configure.ac
+++ b/configure.ac
@@ -423,6 +423,14 @@ if test -z "$GLIB_COMPILE_RESOURCES"; then
fi
fi
+AC_ARG_VAR([GPERF],[the gperf programme])
+if test -z "$GPERF"; then
+ AC_PATH_PROG([GPERF],[gperf],[])
+ if test -z "$GPERF"; then
+ AC_MSG_ERROR([gperf not found])
+ fi
+fi
+
AC_ARG_VAR([XMLLINT],[the xmllint programme])
if test -z "$XMLLINT"; then
AC_PATH_PROG([XMLLINT],[xmllint],[])
diff --git a/src/Makefile.am b/src/Makefile.am
index d5c8e70..9295678 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -134,11 +134,18 @@ libvte_@VTE_API_MAJOR_VERSION@_@VTE_API_MINOR_VERSION@_la_LIBADD = \
# Generated sources
-VTESEQ_BUILTSOURCES = vteseq-list.h vteseq-n.cc
-BUILT_SOURCES = box_drawing.h marshal.cc marshal.h vtetypebuiltins.cc vte/vtetypebuiltins.h vteresources.cc
$(VTESEQ_BUILTSOURCES)
-MAINTAINERCLEANFILES += $(VTESEQ_BUILTSOURCES)
-EXTRA_DIST += $(VTESEQ_BUILTSOURCES) box_drawing.txt box_drawing_generate.sh iso2022.txt
-CLEANFILES += box_drawing.h marshal.cc marshal.h vtetypebuiltins.cc vte/vtetypebuiltins.h
stamp-vtetypebuiltins.h vteresources.cc
+BUILT_SOURCES = \
+ box_drawing.h \
+ marshal.cc \
+ marshal.h \
+ vtetypebuiltins.cc \
+ vte/vtetypebuiltins.h \
+ vteresources.cc \
+ vteseq-list.h \
+ vteseq-n.cc \
+ $(NULL)
+EXTRA_DIST += box_drawing.txt box_drawing_generate.sh iso2022.txt
+CLEANFILES += $(BUILT_SOURCES) stamp-vtetypebuiltins.h
box_drawing.h: box_drawing.txt box_drawing_generate.sh
$(AM_V_GEN) $(srcdir)/box_drawing_generate.sh < $< > $@
@@ -163,7 +170,7 @@ vtetypebuiltins.cc: vtetypebuiltins.cc.template vte/vteenums.h vte/vtedeprecated
&& rm -f xgen-vtbc
vteseq-n.cc: vteseq-n.gperf
- $(AM_V_GEN) $(top_srcdir)/missing --run gperf -m 100 $< > $@.tmp && \
+ $(AM_V_GEN) $(top_srcdir)/missing --run $(GPERF) -m 100 $< > $@.tmp && \
mv -f $@.tmp $@
vteseq-list.h: vteseq-n.gperf
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]