Minor fixes to build system and license notices

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

Makefile.am

@@ -31,5 +31,6 @@ clean-local:
 dist-hook: clean-local
 	rm -rf `find $(distdir) -name .svn`
 	rm -rf `find $(distdir)/mex/sources -name *.o`
-	rm -f $(distdir)/matlab/dynare_m$(EXEEXT)
+	rm -rf `find $(distdir)/matlab -name *~`
+	rm -f $(distdir)/matlab/dynare_m$(EXEEXT) $(distdir)/matlab/dynare_version.m
 	$(MKDIR_P) $(distdir)/mex/matlab $(distdir)/mex/octave

license.txt

@@ -248,10 +248,8 @@ License: GPL-2+ with special Autoconf exception
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  GNU General Public License for more details.
  .
- You should have received a copy of the GNU General Public License
- along with this program; see the file COPYING.  If not, write to
- the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- Boston, MA 02111-1307, USA.
+ You should have received a copy of the GNU General Public License along
+ with this program. If not, see <http://www.gnu.org/licenses/>.
  .
  As a special exception to the GNU General Public License, if
  you distribute this file as part of a program that contains a

m4/ax_matlab.m4

@@ -13,10 +13,8 @@ dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
 dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 dnl GNU General Public License for more details.
 dnl
-dnl You should have received a copy of the GNU General Public License
-dnl along with this program; see the file COPYING.  If not, write to
-dnl the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-dnl Boston, MA 02111-1307, USA.
+dnl You should have received a copy of the GNU General Public License along
+dnl with this program. If not, see <http://www.gnu.org/licenses/>.
 dnl
 dnl As a special exception to the GNU General Public License, if
 dnl you distribute this file as part of a program that contains a

m4/ax_matlab_arch.m4

@@ -13,10 +13,8 @@ dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
 dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 dnl GNU General Public License for more details.
 dnl
-dnl You should have received a copy of the GNU General Public License
-dnl along with this program; see the file COPYING.  If not, write to
-dnl the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-dnl Boston, MA 02111-1307, USA.
+dnl You should have received a copy of the GNU General Public License along
+dnl with this program. If not, see <http://www.gnu.org/licenses/>.
 dnl
 dnl As a special exception to the GNU General Public License, if
 dnl you distribute this file as part of a program that contains a

m4/ax_mexext.m4

@@ -13,10 +13,8 @@ dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
 dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 dnl GNU General Public License for more details.
 dnl
-dnl You should have received a copy of the GNU General Public License
-dnl along with this program; see the file COPYING.  If not, write to
-dnl the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-dnl Boston, MA 02111-1307, USA.
+dnl You should have received a copy of the GNU General Public License along
+dnl with this program. If not, see <http://www.gnu.org/licenses/>.
 dnl
 dnl As a special exception to the GNU General Public License, if
 dnl you distribute this file as part of a program that contains a

tests/Makefile.am

@@ -96,6 +96,7 @@ clean-local:
 		$(patsubst %.mod, %_mean.mat, $(MODS)) \
 		$(patsubst %.mod, %_pindx.mat, $(MODS)) \
 		$(patsubst %.mod, %_params.mat, $(MODS)) \
+		$(patsubst %.mod, %_simul, $(MODS)) \
 		$(patsubst %.mod, %.log, $(MODS))
 
 	rm -rf $(patsubst %.mod, %, $(MODS))
@@ -110,9 +111,8 @@ clean-local:
 		$(shell find -name H.dat)
 
 	rm -f arima/data1.m arima/data2.m \
-		k_order_perturbation/*_simul \
 		k_order_perturbation/*.jnl \
-    k_order_perturbation/*.mat \
+		k_order_perturbation/*.mat \
 		block_bytecode/fs2000_simk.swp
 
 	rm -rf ramsey_objective