From 5d1fdab1f0ee7c77e15ad627d7eec4eda2e71b11 Mon Sep 17 00:00:00 2001 From: george <george@ac1d8469-bf42-47a9-8791-bf33cf982152> Date: Mon, 24 Aug 2009 16:06:39 +0000 Subject: [PATCH] separating dynamic_dll handling into new dynamic_dll.cpp from k_order_perturbation.cpp containing now only mex_function for k_order_perturbationDLL and renaming k_order_perturbation.h to dynamic_dll.h git-svn-id: https://www.dynare.org/svn/dynare/trunk@2865 ac1d8469-bf42-47a9-8791-bf33cf982152 --- mex/sources/korderpert/src/Makefile | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/mex/sources/korderpert/src/Makefile b/mex/sources/korderpert/src/Makefile index cf302ab2c5..f477e1469e 100644 --- a/mex/sources/korderpert/src/Makefile +++ b/mex/sources/korderpert/src/Makefile @@ -5,10 +5,13 @@ all: k_orddbgtest k_order_test_main.o: k_order_test_main.cpp gcc -DMATLAB_MEX_FILE -g -DDEBUG -DPOSIX_THREADS -I$(MATLAB_PATH)/extern/include -I $(DYNAREPPDIR)/src -I $(DYNAREPPDIR)/kord -I $(DYNAREPPDIR)/tl/cc -I $(DYNAREPPDIR)/utils/cc/ -I $(DYNAREPPDIR)/sylv/cc/ -c k_order_test_main.cpp -k_ord_dynare.o: k_ord_dynare.cpp k_ord_dynare.h +k_ord_dynare.o: k_ord_dynare.cpp k_ord_dynare.h dynamic_dll.h gcc -DMATLAB_MEX_FILE -g -DDEBUG -DPOSIX_THREADS -I$(MATLAB_PATH)/extern/include -I $(DYNAREPPDIR)/src -I $(DYNAREPPDIR)/kord -I $(DYNAREPPDIR)/tl/cc -I $(DYNAREPPDIR)/utils/cc/ -I $(DYNAREPPDIR)/sylv/cc/ -fPIC -c k_ord_dynare.cpp -k_order_perturbation.o: k_order_perturbation.cpp k_order_perturbation.h +k_order_perturbation.o: k_order_perturbation.cpp dynamic_dll.h + gcc -DMATLAB_MEX_FILE -g -DDEBUG -DPOSIX_THREADS -I$(MATLAB_PATH)/extern/include -I $(DYNAREPPDIR)/src -I $(DYNAREPPDIR)/kord -I $(DYNAREPPDIR)/tl/cc -I $(DYNAREPPDIR)/utils/cc/ -I $(DYNAREPPDIR)/sylv/cc/ -fPIC -c k_order_perturbation.cpp + +dynamic_dll.o: dynamic_dll.cpp dynamic_dll.h gcc -DMATLAB_MEX_FILE -g -DDEBUG -DPOSIX_THREADS -I$(MATLAB_PATH)/extern/include -I $(DYNAREPPDIR)/src -I $(DYNAREPPDIR)/kord -I $(DYNAREPPDIR)/tl/cc -I $(DYNAREPPDIR)/utils/cc/ -I $(DYNAREPPDIR)/sylv/cc/ -fPIC -c k_order_perturbation.cpp nlsolve.o: $(DYNAREPPDIR)/src/nlsolve.cpp @@ -39,11 +42,11 @@ ramst1_dynamic.mexa64: ramst1_dynamic.o mexversion.o dynamic.map gcc -O -pthread -shared -Wl,--no-undefined -o "ramst1_dynamic.mexa64" ramst1_dynamic.o mexversion.o -Wl,-rpath-link,$(MATLAB_PATH)/bin/glnxa64 -L$(MATLAB_PATH)/bin/glnxa64 -lmx -lmex -lmat -lm -lstdc++ -k_orddbgtest: k_order_test_main.o k_ord_dynare.o k_order_perturbation.o nlsolve.o dynarelib.a +k_orddbgtest: k_order_test_main.o k_ord_dynare.o dynamic_dll.o k_order_perturbation.o nlsolve.o dynarelib.a gcc -DMATLAB_MEX_FILE -g -DDEBUG -DPOSIX_THREADS -o k_orddbgtest k_order_test_main.o k_ord_dynare.o k_order_perturbation.o nlsolve.o dynarelib.a -Wl,-rpath,$(MATLAB_PATH)/bin/glnxa64 -Wl,-rpath,$(MATLAB_PATH)/sys/os/glnxa64 -Wl,-rpath,. -L$(MATLAB_PATH)/bin/glnxa64 -lmex -lmx -lmwlapack -lmwblas -lmat -lm -lstdc++ -k_orddbgtest_ramst1: k_order_test_main_ramst1.o k_ord_dynare.o k_order_perturbation.o nlsolve.o dynarelib.a +k_orddbgtest_ramst1: k_order_test_main_ramst1.o k_ord_dynare.o dynamic_dll.o k_order_perturbation.o nlsolve.o dynarelib.a gcc -DMATLAB_MEX_FILE -g -DDEBUG -DPOSIX_THREADS -o k_orddbgtest_ramst1 k_order_test_main_ramst1.o k_ord_dynare.o k_order_perturbation.o nlsolve.o dynarelib.a -Wl,-rpath,$(MATLAB_PATH)/bin/glnxa64 -Wl,-rpath,$(MATLAB_PATH)/sys/os/glnxa64 -Wl,-rpath,. -L$(MATLAB_PATH)/bin/glnxa64 -lmex -lmx -lmwlapack -lmwblas -lmat -lm -lstdc++ -k_order_perturbation.mexa64: k_order_perturbation.o k_ord_dynare.o nlsolve.o dynarelib.a +k_order_perturbation.mexa64: k_order_perturbation.o k_ord_dynare.o dynamic_dll.o nlsolve.o dynarelib.a $(MEX) -v -DMATLAB_MEX_FILE -g -DDEBUG -DPOSIX_THREADS -I$(MATLAB_PATH)/extern/include -I$(DYNAREPPDIR)/src -I$(DYNAREPPDIR)/kord -I$(DYNAREPPDIR)/tl/cc -I$(DYNAREPPDIR)/utils/cc/ -I$(DYNAREPPDIR)/sylv/cc/ k_order_perturbation.cpp k_ord_dynare.o nlsolve.o dynarelib.a -lmwlapack -lmwblas -ldl -lstdc++ LDFLAGS='-pthread -shared -Wl,--version-script,$(MATLAB_PATH)/extern/lib/glnxa64/mexFunction.map -Wl,--no-undefined -Wl,-rpath,.' \ No newline at end of file -- GitLab