[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
build: fix distcheck
From: |
Akim Demaille |
Subject: |
build: fix distcheck |
Date: |
Sun, 7 Oct 2018 10:42:44 +0200 |
commit c164fc0822e8dcbbde156deb9fe3c7ae5f4b5a87
Author: Akim Demaille <address@hidden>
Date: Sun Oct 7 10:11:05 2018 +0200
build: fix distcheck
Now that distcheck no longer fails (see previous commit), let's
address the shortcomings.
* Makefile.am (CLEANDIRS, clean-local): New.
* doc/local.mk, examples/calc++/local.mk, examples/local.mk,
* examples/mfcalc/local.mk, examples/rpcalc/local.mk,
* src/local.mk
(CLEANDIRS): Get rid of Apple's *.dSYM directories.
(CLEANFILES): Get rid of *.output files.
* examples/variant-11.yy, examples/variant.yy: Don't generate
any of the auxiliary files (location.hh and the like).
diff --git a/Makefile.am b/Makefile.am
index d03a65b0..ffd06423 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,6 +43,7 @@ AM_CFLAGS = $(WARN_CFLAGS)
# instead of "-Ilib" avoids infinite recursions on #include_next.
AM_CPPFLAGS = -I. -I./lib -I$(top_srcdir) -I$(top_srcdir)/lib
BUILT_SOURCES =
+CLEANDIRS =
CLEANFILES =
DISTCLEANFILES =
EXTRA_DIST += $(dist_TESTS)
@@ -64,6 +65,9 @@ include lib/local.mk
include src/local.mk
include tests/local.mk
+clean-local:
+ rm -rf $(CLEANDIRS)
+
# See comments in build-aux/git-version-gen. However, we make .version depend
# on configure so that .version and VERSION/PACKAGE_VERSION stay in sync in the
# working copy (for example, when you run autoreconf && make). Allowing these
diff --git a/doc/local.mk b/doc/local.mk
index 5fa08cee..29955a53 100644
--- a/doc/local.mk
+++ b/doc/local.mk
@@ -30,9 +30,7 @@ $(doc_bison).pdf: $(FIGS_GV:.gv=.pdf)
$(doc_bison).html: $(FIGS_GV:.gv=.png)
TEXI2DVI = texi2dvi --build-dir=doc/bison.t2d -I doc
-CLEANDIRS = doc/bison.t2d
-clean-local:
- rm -rf $(CLEANDIRS)
+CLEANDIRS += doc/bison.t2d
MOSTLYCLEANFILES += $(top_srcdir)/doc/*.t
diff --git a/examples/calc++/local.mk b/examples/calc++/local.mk
index 28f9f908..add46ac1 100644
--- a/examples/calc++/local.mk
+++ b/examples/calc++/local.mk
@@ -36,7 +36,7 @@ CLEANFILES += \
%D%/parser.output \
%D%/parser.stamp \
%D%/scanner.cc
-
+CLEANDIRS += %D%/*.dSYM
## -------------------- ##
## Building & testing. ##
diff --git a/examples/local.mk b/examples/local.mk
index 9effb9d6..cd35e838 100644
--- a/examples/local.mk
+++ b/examples/local.mk
@@ -65,6 +65,9 @@ if ENABLE_CXX11
%D%/variant-11.cc: $(BISON_IN) $(dist_pkgdata_DATA)
endif
+CLEANFILES += %D%/variant.output %D%/variant-11.output
+CLEANDIRS += %D%/*.dSYM
+
include %D%/calc++/local.mk
include %D%/mfcalc/local.mk
include %D%/rpcalc/local.mk
diff --git a/examples/mfcalc/local.mk b/examples/mfcalc/local.mk
index 1bb8b82c..1a0989a8 100644
--- a/examples/mfcalc/local.mk
+++ b/examples/mfcalc/local.mk
@@ -20,6 +20,7 @@
BUILT_SOURCES += $(mfcalc_sources)
CLEANFILES += %D%/mfcalc.[ch] %D%/mfcalc.output
+CLEANDIRS += %D%/*.dSYM
mfcalc_extracted = %D%/calc.h %D%/mfcalc.y
mfcalc_sources = $(mfcalc_extracted)
diff --git a/examples/rpcalc/local.mk b/examples/rpcalc/local.mk
index 622cda4c..4fac1aeb 100644
--- a/examples/rpcalc/local.mk
+++ b/examples/rpcalc/local.mk
@@ -20,6 +20,7 @@
BUILT_SOURCES += $(rpcalc_sources)
CLEANFILES += %D%/rpcalc.[ch] %D%/rpcalc.output
+CLEANDIRS += %D%/*.dSYM
rpcalc_extracted = %D%/rpcalc.y
rpcalc_sources = $(rpcalc_extracted)
diff --git a/examples/variant-11.yy b/examples/variant-11.yy
index 81b0b1b9..a9454a1e 100644
--- a/examples/variant-11.yy
+++ b/examples/variant-11.yy
@@ -17,10 +17,10 @@
%debug
%language "c++"
-%defines
%define api.token.constructor
%define api.value.type variant
%define api.value.automove
+%define api.location.file none
%define parse.assert
%locations
diff --git a/examples/variant.yy b/examples/variant.yy
index 0a2ec687..8c7c8edd 100644
--- a/examples/variant.yy
+++ b/examples/variant.yy
@@ -17,9 +17,9 @@
%debug
%language "c++"
-%defines
%define api.token.constructor
%define api.value.type variant
+%define api.location.file none
%define parse.assert
%locations
diff --git a/src/local.mk b/src/local.mk
index ff864158..45888f95 100644
--- a/src/local.mk
+++ b/src/local.mk
@@ -116,6 +116,7 @@ bin_SCRIPTS = src/yacc
endif
EXTRA_SCRIPTS = src/yacc
MOSTLYCLEANFILES += src/yacc
+CLEANDIRS += %D%/*.dSYM
src/yacc:
$(AM_V_GEN)rm -f $@ address@hidden
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- build: fix distcheck,
Akim Demaille <=