From f7a390264ca07738319ccb179c5d1f6984dc3a54 Mon Sep 17 00:00:00 2001 From: sebastien Date: Wed, 23 Sep 2009 13:26:04 +0000 Subject: [PATCH] k-order DLL: added files omitted in commit r2959 git-svn-id: https://www.dynare.org/svn/dynare/trunk@2961 ac1d8469-bf42-47a9-8791-bf33cf982152 --- mex/build/korderpert.am | 30 +++++++++++++++++++++++++ mex/build/korderpert/matlab/Makefile.am | 4 ++++ mex/build/korderpert/octave/Makefile.am | 4 ++++ mex/build/korderpert/tests/Makefile.am | 24 ++++++++++++++++++++ 4 files changed, 62 insertions(+) create mode 100644 mex/build/korderpert.am create mode 100644 mex/build/korderpert/matlab/Makefile.am create mode 100644 mex/build/korderpert/octave/Makefile.am create mode 100644 mex/build/korderpert/tests/Makefile.am diff --git a/mex/build/korderpert.am b/mex/build/korderpert.am new file mode 100644 index 000000000..892b97c6a --- /dev/null +++ b/mex/build/korderpert.am @@ -0,0 +1,30 @@ +VPATH = $(top_srcdir)/mex/sources/korderpert + +noinst_PROGRAMS = korderpert + +#check_PROGRAMS = ramst1_dynamic fs2000k_dynamic + +# Can't use korderpert_CPPFLAGS, because it interacts badly with VPATH +CPPFLAGS += -DMATLAB_MEX_FILE -DPOSIX_THREADS -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 + +CXXFLAGS += $(PTHREAD_CFLAGS) + +LIBS += $(LIBADD_DLOPEN) $(PTHREAD_LIBS) $(top_srcdir)/dynare++/kord/libkord.a $(top_srcdir)/dynare++/tl/cc/libtl.a $(top_srcdir)/dynare++/sylv/cc/libsylv.a $(top_srcdir)/dynare++/src/libnsolve.a + +nodist_korderpert_SOURCES = \ + k_order_perturbation.cpp \ + k_ord_dynare.cpp \ + k_ord_dynare.h \ + dynamic_dll.cpp \ + dynamic_dll.h + +#BUILT_SOURCES = ramst1_dynamic.c fs2000k_dynamic.c + +#nodist_ramst1_dynamic_SOURCES = ramst1_dynamic.c +#nodist_fs2000k_dynamic_SOURCES = fs2000k_dynamic.c + +#ramst1_dynamic.c: tests/ramst1.mod +# $(top_srcdir)/preprocessor/dynare_m $(top_srcdir)/mex/sources/korderpert/tests/ramst1.mod + +#fs2000k_dynamic.c: tests/fs2000k.mod +# $(top_srcdir)/preprocessor/dynare_m $(top_srcdir)/mex/sources/korderpert/tests/fs2000k.mod diff --git a/mex/build/korderpert/matlab/Makefile.am b/mex/build/korderpert/matlab/Makefile.am new file mode 100644 index 000000000..65a4639eb --- /dev/null +++ b/mex/build/korderpert/matlab/Makefile.am @@ -0,0 +1,4 @@ +include ../../matlabmex.am +include ../../korderpert.am + +CPPFLAGS += -DMEXEXT=\"$(MEXEXT)\" diff --git a/mex/build/korderpert/octave/Makefile.am b/mex/build/korderpert/octave/Makefile.am new file mode 100644 index 000000000..61409032c --- /dev/null +++ b/mex/build/korderpert/octave/Makefile.am @@ -0,0 +1,4 @@ +include ../../mkoctfile.am +include ../../korderpert.am + +CPPFLAGS += -DMEXEXT=\"mex\" diff --git a/mex/build/korderpert/tests/Makefile.am b/mex/build/korderpert/tests/Makefile.am new file mode 100644 index 000000000..4aa0f7a40 --- /dev/null +++ b/mex/build/korderpert/tests/Makefile.am @@ -0,0 +1,24 @@ +VPATH = $(top_srcdir)/mex/sources/korderpert:$(top_srcdir)/mex/sources/korderpert/tests + +check_PROGRAMS = k_order_test_main + +CPPFLAGS += -DPOSIX_THREADS -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$(MATLAB)/extern/include -I$(top_srcdir)/mex/sources/korderpert + +CPPFLAGS += -DMEXEXT=\"$(MEXEXT)\" + +CXXFLAGS += $(PTHREAD_CFLAGS) + +LIBS += $(LIBADD_DLOPEN) $(top_srcdir)/dynare++/kord/libkord.a $(top_srcdir)/dynare++/tl/cc/libtl.a $(top_srcdir)/dynare++/sylv/cc/libsylv.a $(top_srcdir)/dynare++/src/libnsolve.a $(MATLAB_LIBS) + +LDFLAGS += $(subst -shared,,$(MATLAB_LDFLAGS)) + +LDFLAGS += -Wl,-rpath,$(MATLAB)/bin/$(MATLAB_ARCH) + +nodist_k_order_test_main_SOURCES = \ + k_order_test_main.cpp \ + k_order_perturbation.cpp \ + k_ord_dynare.cpp \ + k_ord_dynare.h \ + dynamic_dll.cpp \ + dynamic_dll.h +