stepan
/
dynare
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SWZ: remove from swz from mex build system

time-shift
Houtan Bastani 2011-02-02 18:06:09 +01:00
parent e19026d130
commit 6674b5ffcf
7 changed files with 6 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mex/build/matlab/Makefile.am
View File

@ -4,10 +4,6 @@ ACLOCAL_AMFLAGS = -I ../../../m4
if DO_SOMETHING
SUBDIRS = mjdgges kronecker bytecode libdynare++ gensylv k_order_perturbation dynare_simul_ estimation
if HAVE_GSL
SUBDIRS += swz
endif
# libslicot must come before kalman_steady_state
if HAVE_FORT
SUBDIRS += libslicot kalman_steady_state

14
mex/build/matlab/configure.ac
View File

@ -86,12 +86,6 @@ else
BUILD_MEX_MATLAB="no (missing MATLAB, or unknown version, or unknown architecture)"
fi
if test "x$ax_enable_matlab" = "xyes" -a "x$ax_matlab_version_ok" = "xyes" -a "x$ax_mexopts_ok" = "xyes" -a "x$has_gsl" = "xyes"; then
BUILD_SWZ_MEX_MATLAB="yes"
else
BUILD_SWZ_MEX_MATLAB="no (missing GSL)"
fi
if test "x$ax_enable_matlab" = "xyes" -a "x$ax_matlab_version_ok" = "xyes" -a "x$ax_mexopts_ok" = "xyes" -a "x$F77" != "x"; then
BUILD_KALMAN_STEADY_STATE_MATLAB="yes"
else
@ -121,10 +115,9 @@ AC_MSG_NOTICE([
Dynare is now configured for building the following components...
Binaries (with "make"):
MEX files for MATLAB (except SWZ and Kalman Steady State): $BUILD_MEX_MATLAB
SWZ MEX files for MATLAB: $BUILD_SWZ_MEX_MATLAB
Kalman Steady State MEX file for MATLAB: $BUILD_KALMAN_STEADY_STATE_MATLAB
M2HTML documentation: $BUILD_M2HTML
MEX files for MATLAB (except Kalman Steady State): $BUILD_MEX_MATLAB
Kalman Steady State MEX file for MATLAB: $BUILD_KALMAN_STEADY_STATE_MATLAB
M2HTML documentation: $BUILD_M2HTML
])
@ -136,7 +129,6 @@ AC_CONFIG_FILES([Makefile
gensylv/Makefile
k_order_perturbation/Makefile
dynare_simul_/Makefile
swz/Makefile
estimation/Makefile
libslicot/Makefile
kalman_steady_state/Makefile])

2
mex/build/matlab/swz/Makefile.am
View File

@ -1,2 +0,0 @@
include ../mex.am
include ../../swz.am

4
mex/build/octave/Makefile.am
View File

@ -4,10 +4,6 @@ ACLOCAL_AMFLAGS = -I ../../../m4
if DO_SOMETHING
SUBDIRS = mjdgges kronecker bytecode libdynare++ gensylv k_order_perturbation dynare_simul_ qzcomplex ordschur
if HAVE_GSL
SUBDIRS += swz
endif
# libslicot must come before kalman_steady_state
if HAVE_FORT
SUBDIRS += libslicot kalman_steady_state

14
mex/build/octave/configure.ac
View File

@ -75,12 +75,6 @@ else
BUILD_MEX_OCTAVE="no (missing mkoctfile)"
fi
if test "x$MKOCTFILE" != "x" -a "x$has_gsl" = "xyes"; then
BUILD_SWZ_MEX_OCTAVE="yes"
else
BUILD_SWZ_MEX_OCTAVE="no (missing GSL)"
fi
if test "x$MKOCTFILE" != "x" -a "x$ac_cv_header_matio_h" = "xyes" -a "x$ac_cv_lib_matio_Mat_Open" = "xyes"; then
BUILD_ESTIMATION_MEX_OCTAVE="yes"
else
@ -106,10 +100,9 @@ AC_MSG_NOTICE([
Dynare is now configured for building the following components...
Binaries (with "make"):
MEX files for Octave (except SWZ and Kalman Steady State): $BUILD_MEX_OCTAVE
SWZ MEX files for Octave: $BUILD_SWZ_MEX_OCTAVE
Kalman Steady State MEX file for Octave: $BUILD_KALMAN_STEADY_STATE_OCTAVE
Estimation MEX for Octave: $BUILD_ESTIMATION_MEX_OCTAVE
MEX files for Octave (except Kalman Steady State): $BUILD_MEX_OCTAVE
Kalman Steady State MEX file for Octave: $BUILD_KALMAN_STEADY_STATE_OCTAVE
Estimation MEX for Octave: $BUILD_ESTIMATION_MEX_OCTAVE
])
@ -121,7 +114,6 @@ AC_CONFIG_FILES([Makefile
gensylv/Makefile
k_order_perturbation/Makefile
dynare_simul_/Makefile
swz/Makefile
estimation/Makefile
qzcomplex/Makefile
ordschur/Makefile

3
mex/build/octave/swz/Makefile.am
View File

@ -1,3 +0,0 @@
EXEEXT = .mex
include ../mex.am
include ../../swz.am

69
mex/build/swz.am
View File

@ -1,69 +0,0 @@
TOPDIR = ../../../../matlab/swz/c-code
CPPFLAGS += -DINTELCMATHLIBRARY $(GSL_CPPFLAGS) -I$(TOPDIR)/utilities/TZCcode -I$(TOPDIR)/utilities/DWCcode/matrix -I$(TOPDIR)/utilities/DWCcode/error -I$(TOPDIR)/utilities/DWCcode/arrays -I$(TOPDIR)/utilities/DWCcode/ascii -I$(TOPDIR)/utilities/DWCcode/histogram -I$(TOPDIR)/utilities/DWCcode/stat -I$(TOPDIR)/utilities/DWCcode/spherical -I$(TOPDIR)/utilities/DWCcode/sort -I$(TOPDIR)/sbvar/switching -I$(TOPDIR)/sbvar/var -I$(TOPDIR)/mex
LIBS += $(GSL_LIBS)
LDFLAGS += $(GSL_LDFLAGS)
noinst_PROGRAMS = mex_sbvar_init_file mex_sbvar_estimation mex_sbvar_mhm_1 mex_sbvar_mhm_2 mex_sbvar_probabilities mex_sbvar_draws mex_sbvar_forecast
SWZ_COMMON = \
$(TOPDIR)/utilities/DWCcode/matrix/bmatrix.c \
$(TOPDIR)/utilities/DWCcode/matrix/swzmatrix.c \
$(TOPDIR)/utilities/DWCcode/error/dw_error.c \
$(TOPDIR)/utilities/DWCcode/stat/dw_rand.c \
$(TOPDIR)/utilities/DWCcode/stat/dw_matrix_rand.c \
$(TOPDIR)/utilities/DWCcode/arrays/dw_array.c \
$(TOPDIR)/utilities/DWCcode/arrays/dw_matrix_array.c \
$(TOPDIR)/utilities/DWCcode/sort/dw_matrix_sort.c \
$(TOPDIR)/utilities/DWCcode/ascii/dw_ascii.c \
$(TOPDIR)/utilities/DWCcode/ascii/dw_parse_cmd.c \
$(TOPDIR)/utilities/DWCcode/histogram/dw_histogram.c \
$(TOPDIR)/sbvar/switching/switch.c \
$(TOPDIR)/sbvar/switching/switchio.c \
$(TOPDIR)/sbvar/var/VARbase.c \
$(TOPDIR)/sbvar/var/VARio.c \
$(TOPDIR)/mex/mex_top_level.cc \
$(TOPDIR)/mex/modify_for_mex.cc
nodist_mex_sbvar_init_file_SOURCES = \
$(SWZ_COMMON) \
$(TOPDIR)/sbvar/var/create_init_file.c \
$(TOPDIR)/sbvar/var/VARio_matlab.c
nodist_mex_sbvar_estimation_SOURCES = \
$(SWZ_COMMON) \
$(TOPDIR)/utilities/TZCcode/tzmatlab.c \
$(TOPDIR)/utilities/TZCcode/mathlib.c \
$(TOPDIR)/utilities/TZCcode/cstz_dw.c \
$(TOPDIR)/sbvar/var/estimate.c \
$(TOPDIR)/sbvar/var/command_line_VAR.c \
$(TOPDIR)/sbvar/switching/switch_opt.c \
$(TOPDIR)/utilities/TZCcode/csminwel.c
nodist_mex_sbvar_mhm_1_SOURCES = \
$(SWZ_COMMON) \
$(TOPDIR)/sbvar/var/mhm_VAR_main_1.c \
$(TOPDIR)/sbvar/var/mhm_VAR.c \
$(TOPDIR)/sbvar/var/command_line_VAR.c
nodist_mex_sbvar_mhm_2_SOURCES = \
$(SWZ_COMMON) \
$(TOPDIR)/sbvar/var/mhm_VAR_main_2.c \
$(TOPDIR)/utilities/DWCcode/spherical/spherical.c \
$(TOPDIR)/sbvar/var/mhm_VAR.c
nodist_mex_sbvar_probabilities_SOURCES = \
$(SWZ_COMMON) \
$(TOPDIR)/sbvar/var/probabilities.c \
$(TOPDIR)/sbvar/var/command_line_VAR.c
nodist_mex_sbvar_draws_SOURCES = \
$(SWZ_COMMON) \
$(TOPDIR)/sbvar/var/PrintDraws.c \
$(TOPDIR)/sbvar/var/command_line_VAR.c
nodist_mex_sbvar_forecast_SOURCES = \
$(SWZ_COMMON) \
$(TOPDIR)/sbvar/var/forecast.c \
$(TOPDIR)/sbvar/var/command_line_VAR.c