Merge branch 'master' into ecb-master
commit
7843c206e5
|
@ -27,3 +27,6 @@
|
|||
[submodule "matlab/modules/reporting"]
|
||||
path = matlab/modules/reporting
|
||||
url = git@github.com:DynareTeam/reporting.git
|
||||
[submodule "contrib/jsonlab"]
|
||||
path = contrib/jsonlab
|
||||
url = https://github.com/fangq/jsonlab.git
|
||||
|
|
|
@ -44,6 +44,8 @@ dist-hook:
|
|||
install-exec-local:
|
||||
$(MKDIR_P) $(DESTDIR)$(pkglibdir)/contrib/ms-sbvar/TZcode
|
||||
cp -r contrib/ms-sbvar/TZcode/MatlabFiles $(DESTDIR)$(pkglibdir)/contrib/ms-sbvar/TZcode
|
||||
$(MKDIR_P) $(DESTDIR)$(pkglibdir)/contrib/jsonlab
|
||||
cp -r contrib/jsonlab $(DESTDIR)$(pkglibdir)/contrib/jsonlab
|
||||
cp -r examples $(DESTDIR)$(pkglibdir)
|
||||
cp -r matlab $(DESTDIR)$(pkglibdir)
|
||||
rm -rf $(DESTDIR)$(pkglibdir)/matlab/preprocessor*
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
Subproject commit 31b5bdc283f54733dca6352c760cd363878886e1
|
|
@ -263,6 +263,10 @@ Copyright: 2009 John Burkardt
|
|||
2010-2011 Dynare Team
|
||||
License: LGPL-3+
|
||||
|
||||
Files: contrib/jsonlab
|
||||
Copyright: 2011-2017 Qianqian Fang <q.fang at neu.edu>
|
||||
License: BSD or GPL-3+
|
||||
|
||||
Files: contrib/ms-sbvar/utilities_dw/*
|
||||
Copyright: 1996-2011 Daniel Waggoner
|
||||
License: GPL-3+
|
||||
|
|
|
@ -54,6 +54,7 @@ p = {'/distributions/' ; ...
|
|||
'/ms-sbvar/' ; ...
|
||||
'/ms-sbvar/identification/' ; ...
|
||||
'/../contrib/ms-sbvar/TZcode/MatlabFiles/' ; ...
|
||||
'/../contrib/jsonlab/' ; ...
|
||||
'/parallel/' ; ...
|
||||
'/particles/src' ; ...
|
||||
'/gsa/' ; ...
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit bc59736f5b50454cea925c99b98a757a0494f3e8
|
||||
Subproject commit eb996550e0aafe5c43a0eb96a017680d77d1b5ee
|
Loading…
Reference in New Issue