Renamed kordepert to k_order_perturbation
git-svn-id: https://www.dynare.org/svn/dynare/trunk@3070 ac1d8469-bf42-47a9-8791-bf33cf982152time-shift
parent
3a673134fe
commit
9ab04f3323
|
@ -170,7 +170,7 @@ end
|
||||||
disp([ message 'Bytecode evaluation.' ])
|
disp([ message 'Bytecode evaluation.' ])
|
||||||
|
|
||||||
% Test if k-order perturbation DLL is present
|
% Test if k-order perturbation DLL is present
|
||||||
if exist('korderpert') == 3
|
if exist('k_order_perturbation') == 3
|
||||||
remove_path_to_mex = 0;
|
remove_path_to_mex = 0;
|
||||||
message = '[mex] ';
|
message = '[mex] ';
|
||||||
else
|
else
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
vpath %.cpp $(top_srcdir)/../../sources/korderpert $(top_srcdir)/../../../dynare++/sylv/cc $(top_srcdir)/../../../dynare++/tl/cc $(top_srcdir)/../../../dynare++/kord $(top_srcdir)/../../../dynare++/integ/cc $(top_srcdir)/../../../dynare++/src
|
vpath %.cpp $(top_srcdir)/../../sources/k_order_perturbation $(top_srcdir)/../../../dynare++/sylv/cc $(top_srcdir)/../../../dynare++/tl/cc $(top_srcdir)/../../../dynare++/kord $(top_srcdir)/../../../dynare++/integ/cc $(top_srcdir)/../../../dynare++/src
|
||||||
|
|
||||||
noinst_PROGRAMS = korderpert
|
noinst_PROGRAMS = k_order_perturbation
|
||||||
|
|
||||||
# Can't use korderpert_CPPFLAGS, because it interacts badly with VPATH
|
# Can't use k_order_perturbation_CPPFLAGS, because it interacts badly with VPATH
|
||||||
CPPFLAGS += -I$(top_srcdir)/../../../dynare++/src -I$(top_srcdir)/../../../dynare++/kord -I$(top_srcdir)/../../../dynare++/tl/cc -I$(top_srcdir)/../../../dynare++/utils/cc -I$(top_srcdir)/../../../dynare++/sylv/cc -I$(top_srcdir)/../../../dynare++/integ/cc -I$(top_srcdir)/../../sources
|
CPPFLAGS += -I$(top_srcdir)/../../../dynare++/src -I$(top_srcdir)/../../../dynare++/kord -I$(top_srcdir)/../../../dynare++/tl/cc -I$(top_srcdir)/../../../dynare++/utils/cc -I$(top_srcdir)/../../../dynare++/sylv/cc -I$(top_srcdir)/../../../dynare++/integ/cc -I$(top_srcdir)/../../sources
|
||||||
|
|
||||||
CXXFLAGS += $(PTHREAD_CFLAGS)
|
CXXFLAGS += $(PTHREAD_CFLAGS)
|
||||||
|
@ -72,7 +72,7 @@ INTEG_SRCS = \
|
||||||
smolyak.cpp \
|
smolyak.cpp \
|
||||||
vector_function.cpp
|
vector_function.cpp
|
||||||
|
|
||||||
nodist_korderpert_SOURCES = \
|
nodist_k_order_perturbation_SOURCES = \
|
||||||
k_order_perturbation.cpp \
|
k_order_perturbation.cpp \
|
||||||
k_ord_dynare.cpp \
|
k_ord_dynare.cpp \
|
||||||
k_ord_dynare.h \
|
k_ord_dynare.h \
|
|
@ -1,7 +1,7 @@
|
||||||
ACLOCAL_AMFLAGS = -I ../../../m4
|
ACLOCAL_AMFLAGS = -I ../../../m4
|
||||||
|
|
||||||
if DO_SOMETHING
|
if DO_SOMETHING
|
||||||
SUBDIRS = mjdgges gensylv kronecker bytecode korderpert
|
SUBDIRS = mjdgges gensylv kronecker bytecode k_order_perturbation
|
||||||
endif
|
endif
|
||||||
|
|
||||||
EXTRA_DIST = mex.def mexFunction-MacOSX.map
|
EXTRA_DIST = mex.def mexFunction-MacOSX.map
|
||||||
|
|
|
@ -49,7 +49,7 @@ AC_PROG_CC
|
||||||
AC_PROG_CXX
|
AC_PROG_CXX
|
||||||
AX_PROG_LN_S
|
AX_PROG_LN_S
|
||||||
AX_PTHREAD
|
AX_PTHREAD
|
||||||
# Check for dlopen(), needed by korderpert DLL
|
# Check for dlopen(), needed by k_order_perturbation DLL
|
||||||
AC_CHECK_LIB([dl], [dlopen], [LIBADD_DLOPEN="-ldl"], [])
|
AC_CHECK_LIB([dl], [dlopen], [LIBADD_DLOPEN="-ldl"], [])
|
||||||
AC_SUBST([LIBADD_DLOPEN])
|
AC_SUBST([LIBADD_DLOPEN])
|
||||||
|
|
||||||
|
@ -60,7 +60,7 @@ AC_CONFIG_FILES([Makefile
|
||||||
kronecker/Makefile
|
kronecker/Makefile
|
||||||
gensylv/Makefile
|
gensylv/Makefile
|
||||||
bytecode/Makefile
|
bytecode/Makefile
|
||||||
korderpert/Makefile])
|
k_order_perturbation/Makefile])
|
||||||
|
|
||||||
if test "x$ax_enable_matlab" = "xyes" -a "x$ax_matlab_version_ok" = "xyes" -a "x$ax_mexopts_ok" = "xyes"; then
|
if test "x$ax_enable_matlab" = "xyes" -a "x$ax_matlab_version_ok" = "xyes" -a "x$ax_mexopts_ok" = "xyes"; then
|
||||||
if test x"$ax_pthread_ok" = "xyes"; then
|
if test x"$ax_pthread_ok" = "xyes"; then
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
include ../mex.am
|
include ../mex.am
|
||||||
include ../../korderpert.am
|
include ../../k_order_perturbation.am
|
||||||
|
|
||||||
CPPFLAGS += -DMEXEXT=\"$(MEXEXT)\"
|
CPPFLAGS += -DMEXEXT=\"$(MEXEXT)\"
|
|
@ -1,5 +1,5 @@
|
||||||
ACLOCAL_AMFLAGS = -I ../../../m4
|
ACLOCAL_AMFLAGS = -I ../../../m4
|
||||||
|
|
||||||
if DO_SOMETHING
|
if DO_SOMETHING
|
||||||
SUBDIRS = mjdgges gensylv kronecker bytecode korderpert
|
SUBDIRS = mjdgges gensylv kronecker bytecode k_order_perturbation
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -35,7 +35,7 @@ AC_PROG_CC
|
||||||
AC_PROG_CXX
|
AC_PROG_CXX
|
||||||
AX_PROG_LN_S
|
AX_PROG_LN_S
|
||||||
AX_PTHREAD
|
AX_PTHREAD
|
||||||
# Check for dlopen(), needed by korderpert DLL
|
# Check for dlopen(), needed by k_order_perturbation DLL
|
||||||
AC_CHECK_LIB([dl], [dlopen], [LIBADD_DLOPEN="-ldl"], [])
|
AC_CHECK_LIB([dl], [dlopen], [LIBADD_DLOPEN="-ldl"], [])
|
||||||
AC_SUBST([LIBADD_DLOPEN])
|
AC_SUBST([LIBADD_DLOPEN])
|
||||||
|
|
||||||
|
@ -65,6 +65,6 @@ AC_CONFIG_FILES([Makefile
|
||||||
kronecker/Makefile
|
kronecker/Makefile
|
||||||
gensylv/Makefile
|
gensylv/Makefile
|
||||||
bytecode/Makefile
|
bytecode/Makefile
|
||||||
korderpert/Makefile])
|
k_order_perturbation/Makefile])
|
||||||
|
|
||||||
AC_OUTPUT
|
AC_OUTPUT
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
include ../mex.am
|
include ../mex.am
|
||||||
include ../../korderpert.am
|
include ../../k_order_perturbation.am
|
||||||
|
|
||||||
CPPFLAGS += -DMEXEXT=\"mex\"
|
CPPFLAGS += -DMEXEXT=\"mex\"
|
Loading…
Reference in New Issue