Skip to content
Browse files

build: fix more example extraction issues.

	* Makefile.am (dist_TESTS): New.
	(TESTS, EXTRA_DIST): Run and ship them.
	* examples/calc++/local.mk: examples/calc++/calc++.stamp no longer
        exists, don't try to ship it.
	(.yy.stamp): New recipe.
	Use it.
	* examples/calc++/local.mk, examples/mfcalc/local.mk,
	* examples/rpcalc/local.mk:
	Don't ship the sources.
	Adjust the CPPFLAGS: there is nothing left in srcdir.
	(MAINTAINERCLEANFILES): Remove, now we are in builddir.
	(TESTS): Rename as...
	(dist_TESTS): this.
  • Loading branch information...
1 parent 2191bb7 commit 59fba180a5b8c7135445bfbada5e96266a3286e8 @akimd akimd committed Feb 24, 2012
Showing with 18 additions and 33 deletions.
  1. +3 −1 Makefile.am
  2. +9 −22 examples/calc++/local.mk
  3. +3 −5 examples/mfcalc/local.mk
  4. +3 −5 examples/rpcalc/local.mk
View
4 Makefile.am
@@ -41,11 +41,13 @@ AM_CFLAGS = $(WARN_CFLAGS)
AM_CPPFLAGS = -I. -Ilib -I$(top_srcdir) -I$(top_srcdir)/lib
BUILT_SOURCES =
DISTCLEANFILES =
+EXTRA_DIST += $(dist_TESTS)
MOSTLYCLEANDIRS =
MOSTLYCLEANFILES =
SUFFIXES =
-TESTS =
+TESTS = $(dist_TESTS)
check_PROGRAMS =
+dist_TESTS =
noinst_LIBRARIES =
include build-aux/local.mk
View
31 examples/calc++/local.mk
@@ -19,23 +19,16 @@
## Parser generation. ##
## ------------------- ##
-CLEANFILES += $(top_srcdir)/examples/calc++/*.output *.tmp
-MAINTAINERCLEANFILES += examples/calc++/*.stamp $(calc_sources)
+CLEANFILES += examples/calc++/calc++-parser.output *.tmp
-# Compile the parser and save cycles.
-# This code comes from "Handling Tools that Produce Many Outputs",
-# from the Automake documentation.
-EXTRA_DIST += \
- examples/calc++/calc++-parser.stamp \
- examples/calc++/calc++-parser.yy \
- examples/calc++/calc++.stamp
# Don't depend on $(BISON) otherwise we would rebuild these files
# in srcdir, including during distcheck, which is forbidden.
-examples/calc++/calc++-parser.stamp: examples/calc++/calc++-parser.yy $(BISON_IN)
+examples/calc++/calc++-parser.stamp: $(BISON_IN)
+SUFFIXES += .yy .stamp
+.yy.stamp:
$(AM_V_YACC)rm -f $@
$(AM_V_at)touch $@.tmp
- $(AM_V_at)$(YACCCOMPILE) -o examples/calc++/calc++-parser.cc \
- examples/calc++/calc++-parser.yy
+ $(AM_V_at)$(YACCCOMPILE) -o $*.cc $<
$(AM_V_at)mv -f $@.tmp $@
$(calc_sources_generated): examples/calc++/calc++-parser.stamp
@@ -49,8 +42,6 @@ $(calc_sources_generated): examples/calc++/calc++-parser.stamp
# Avoid using BUILT_SOURCES which is too global.
$(examples_calc___calc___OBJECTS): $(calc_sources_generated)
-CLEANFILES += *.tmp
-MAINTAINERCLEANFILES += $(calc_sources)
calc_sources_extracted = \
examples/calc++/calc++-driver.cc \
@@ -70,16 +61,12 @@ calc_sources_generated = \
calc_sources = \
$(calc_sources_extracted) \
$(calc_sources_generated)
+
if BISON_CXX_WORKS
check_PROGRAMS += examples/calc++/calc++
-examples_calc___calc___SOURCES = \
+nodist_examples_calc___calc___SOURCES = \
$(calc_sources)
-examples_calc___calc___CPPFLAGS = \
- -I$(top_builddir)/examples/calc++ \
- -I$(top_srcdir)/examples/calc++
-TESTS += examples/calc++/calc++.test
+examples_calc___calc___CPPFLAGS = -I$(top_builddir)/examples/calc++
+dist_TESTS += examples/calc++/calc++.test
endif
-EXTRA_DIST += \
- examples/calc++/calc++-parser.yy \
- examples/calc++/calc++.test
View
8 examples/mfcalc/local.mk
@@ -20,7 +20,6 @@
## -------------------- ##
BUILT_SOURCES += $(mfcalc_sources)
-MAINTAINERCLEANFILES += $(mfcalc_sources)
mfcalc_extracted = \
examples/mfcalc/calc.h \
@@ -31,9 +30,8 @@ extracted += $(mfcalc_extracted)
check_PROGRAMS += examples/mfcalc/mfcalc
examples_mfcalc_mfcalc_LDADD = -lm
-examples_mfcalc_mfcalc_SOURCES = \
+nodist_examples_mfcalc_mfcalc_SOURCES = \
$(mfcalc_sources)
-examples_mfcalc_mfcalc_CPPFLAGS = -I$(top_srcdir)/examples/mfcalc
-TESTS += examples/mfcalc/mfcalc.test
-EXTRA_DIST += examples/mfcalc/mfcalc.test
+examples_mfcalc_mfcalc_CPPFLAGS = -I$(top_builddir)/examples/mfcalc
+dist_TESTS += examples/mfcalc/mfcalc.test
View
8 examples/rpcalc/local.mk
@@ -20,7 +20,6 @@
## -------------------- ##
BUILT_SOURCES += $(rpcalc_sources)
-MAINTAINERCLEANFILES += $(rpcalc_sources)
rpcalc_extracted = \
examples/rpcalc/rpcalc.y
@@ -30,9 +29,8 @@ extracted += $(rpcalc_extracted)
check_PROGRAMS += examples/rpcalc/rpcalc
examples_rpcalc_rpcalc_LDADD = -lm
-examples_rpcalc_rpcalc_SOURCES = \
+nodist_examples_rpcalc_rpcalc_SOURCES = \
$(rpcalc_sources)
-examples_rpcalc_rpcalc_CPPFLAGS = -I$(top_srcdir)/examples/rpcalc
-TESTS += examples/rpcalc/rpcalc.test
-EXTRA_DIST += examples/rpcalc/rpcalc.test
+examples_rpcalc_rpcalc_CPPFLAGS = -I$(top_builddir)/examples/rpcalc
+dist_TESTS += examples/rpcalc/rpcalc.test

0 comments on commit 59fba18

Please sign in to comment.
Something went wrong with that request. Please try again.