Build system: fixes for creation of the tarball

git-svn-id: https://www.dynare.org/svn/dynare/trunk@2968 ac1d8469-bf42-47a9-8791-bf33cf982152

dynare++/integ/cc/Makefile.am

@@ -35,10 +35,12 @@ EXTRA_DIST = main.web
 dummy.ch:
 	touch dummy.ch
 
-%.cpp: %.cweb dummy.ch
+# Don't depend on dummy.ch in the following rules, otherwise make will want to rebuild from CWEB even in a tarball, since dummy.ch has a recent timestamp
+
+%.cpp: %.cweb
 	$(CTANGLE) -bhp $< dummy.ch $@
 
-%.h: %.hweb dummy.ch
+%.h: %.hweb
 	$(CTANGLE) -bhp $< dummy.ch $@
 
 if HAVE_CWEAVE

dynare++/kord/Makefile.am

@@ -76,10 +76,12 @@ check-local:
 dummy.ch:
 	touch dummy.ch
 
-%.cpp: %.cweb dummy.ch
+# Don't depend on dummy.ch in the following rules, otherwise make will want to rebuild from CWEB even in a tarball, since dummy.ch has a recent timestamp
+
+%.cpp: %.cweb
 	$(CTANGLE) -bhp $< dummy.ch $@
 
-%.h: %.hweb dummy.ch
+%.h: %.hweb
 	$(CTANGLE) -bhp $< dummy.ch $@
 
 if HAVE_CWEAVE

dynare++/tl/cc/Makefile.am

@@ -104,10 +104,12 @@ EXTRA_DIST = main.web
 dummy.ch:
 	touch dummy.ch
 
-%.cpp: %.cweb dummy.ch
+# Don't depend on dummy.ch in the following rules, otherwise make will want to rebuild from CWEB even in a tarball, since dummy.ch has a recent timestamp
+
+%.cpp: %.cweb
 	$(CTANGLE) -bhp $< dummy.ch $@
 
-%.h: %.hweb dummy.ch
+%.h: %.hweb
 	$(CTANGLE) -bhp $< dummy.ch $@
 
 if HAVE_CWEAVE

preprocessor/Makefile.am

@@ -6,6 +6,7 @@ matlabdir = $(libdir)/matlab
 
 matlab_PROGRAMS = dynare_m
 
+# We don't put BUILT_SOURCES in dynare_m_SOURCES, otherwise DynareBison.o and DynareFlex.o will be linked two times (Automake translates DynareFlex.ll and DynareBison.yy into their respective .o); so BUILT_SOURCES is in EXTRA_DIST
 dynare_m_SOURCES = \
 	DynareFlex.ll \
 	DynareBison.yy \
@@ -75,4 +76,4 @@ clean-local:
 	cd ../matlab && rm -f $(PROGRAMS)
 	rm -rf doc/html/
 
-EXTRA_DIST = Doxyfile
+EXTRA_DIST = $(BUILT_SOURCES) Doxyfile

preprocessor/macro/Makefile.am

@@ -2,6 +2,7 @@ noinst_LIBRARIES = libmacro.a
 
 BUILT_SOURCES = MacroBison.hh stack.hh position.hh location.hh MacroBison.cc MacroFlex.cc
 
+# We don't put BUILT_SOURCES in libmacro_a_SOURCES, otherwise MacroBison.o and MacroFlex.o will be linked two times (Automake translates MacroFlex.ll and MacroBison.yy into their respective .o); so BUILT_SOURCES is in EXTRA_DIST
 libmacro_a_SOURCES = \
 	MacroFlex.ll \
 	MacroBison.yy \
@@ -10,6 +11,8 @@ libmacro_a_SOURCES = \
 	MacroValue.cc \
 	MacroValue.hh
 
+EXTRA_DIST = $(BUILT_SOURCES)
+
 # The -I.. is for <FlexLexer.h>
 libmacro_a_CPPFLAGS = -I..