From 4a3709da0961aeda2fa16b8f8c23817a0245f284 Mon Sep 17 00:00:00 2001 From: sebastien <sebastien@ac1d8469-bf42-47a9-8791-bf33cf982152> Date: Wed, 13 Jan 2010 17:39:59 +0000 Subject: [PATCH] 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 | 3 ++- license.txt | 6 ++---- m4/ax_matlab.m4 | 6 ++---- m4/ax_matlab_arch.m4 | 6 ++---- m4/ax_mexext.m4 | 6 ++---- tests/Makefile.am | 4 ++-- 6 files changed, 12 insertions(+), 19 deletions(-) diff --git a/Makefile.am b/Makefile.am index ff8fa738b..be4207e93 100644 --- a/Makefile.am +++ b/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 diff --git a/license.txt b/license.txt index 516ac76d3..10f10415c 100644 --- a/license.txt +++ b/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 diff --git a/m4/ax_matlab.m4 b/m4/ax_matlab.m4 index 22249b1d8..f6b06763f 100644 --- a/m4/ax_matlab.m4 +++ b/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 diff --git a/m4/ax_matlab_arch.m4 b/m4/ax_matlab_arch.m4 index 1b0622464..fca6b96ed 100644 --- a/m4/ax_matlab_arch.m4 +++ b/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 diff --git a/m4/ax_mexext.m4 b/m4/ax_mexext.m4 index 208a0b184..17a5c58ed 100644 --- a/m4/ax_mexext.m4 +++ b/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 diff --git a/tests/Makefile.am b/tests/Makefile.am index 55bcd42f4..ecf041ea4 100644 --- a/tests/Makefile.am +++ b/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 -- GitLab