diff --git a/dynare++/Makefile.am b/dynare++/Makefile.am index b695ec8d9..1145fb694 100644 --- a/dynare++/Makefile.am +++ b/dynare++/Makefile.am @@ -1,3 +1,3 @@ SUBDIRS = sylv parser/cc tl doc utils/cc integ kord src -EXTRA_DIST = change_log.html c++lib.w +EXTRA_DIST = change_log.html c++lib.w tests diff --git a/dynare++/sylv/Makefile.am b/dynare++/sylv/Makefile.am index ffebab6fe..d98a940da 100644 --- a/dynare++/sylv/Makefile.am +++ b/dynare++/sylv/Makefile.am @@ -1 +1,12 @@ SUBDIRS = cc testing + +EXTRA_DIST = sylvester.tex change_log.html matlab + +if HAVE_PDFTEX +pdf-local: sylvester.pdf + +sylvester.pdf: sylvester.tex + $(PDFTEX) sylvester +endif + +CLEANFILES = *.pdf *.log diff --git a/dynare++/sylv/matlab/Makefile b/dynare++/sylv/matlab/Makefile deleted file mode 100755 index 0cad09308..000000000 --- a/dynare++/sylv/matlab/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -# $Header: /var/lib/cvs/dynare_cpp/sylv/matlab/Makefile,v 1.1.1.1 2004/06/04 13:01:13 kamenik Exp $ - -# Tag $Name: $ - -# set directory to sylvester code -sylv=../cc - -LD_LIBS := -llapack -lcblas -lblas -latlas -CC_FLAGS := -Wall -I../cc -CC_DEFS := -I/usr/local/matlab73/extern/include -DMATLAB #-DUSE_MEMORY_POOL -MEX := mex.bat - -objects := $(patsubst %.cpp,%.o,$(wildcard ../cc/*.cpp)) -headers := $(wildcard ../cc/*.h) - -# set mex file suffix -mex_suffix=dll -ifeq ($(OSTYPE),linux-gnu) - mex_suffix=mexglx -endif - -aa_gensylv.$(mex_suffix): gensylv.cpp ../cc/sylvester.a - $(MEX) -I../cc -DMATLAB gensylv.cpp ../cc/sylvester.a c:/matlab6p5/extern/lib/win32/microsoft/msvc60/libmwlapack.lib - mv gensylv.$(mex_suffix) aa_gensylv.$(mex_suffix) - -../cc/sylvester.a : $(objects) - make -C ../cc sylvester.a - -../cc/%.o: ../cc/%.cpp $(headers) - make EXTERN_DEFS="$(CC_DEFS)" -C ../cc $*.o - -clear: - make -C ../cc clear - rm -f *.dll - rm -f *.mexglx diff --git a/dynare++/sylv/matlab/dummy.h b/dynare++/sylv/matlab/dummy.h deleted file mode 100755 index 9ce95e82b..000000000 --- a/dynare++/sylv/matlab/dummy.h +++ /dev/null @@ -1,3 +0,0 @@ -/* this is only dummy header file to be able to loadlibrary to MATLAB */ -void mexFunction(int nhls, mxArray* plhs[], - int nhrs, const mxArray* prhs[]); diff --git a/dynare++/sylv/matlab/gensylv.cpp b/dynare++/sylv/matlab/gensylv.cpp old mode 100755 new mode 100644 diff --git a/dynare++/sylv/matlab/gensylv.m b/dynare++/sylv/matlab/gensylv.m old mode 100755 new mode 100644 diff --git a/dynare++/sylv/matlab/mexopts.bat b/dynare++/sylv/matlab/mexopts.bat deleted file mode 100755 index fe71cb2a0..000000000 --- a/dynare++/sylv/matlab/mexopts.bat +++ /dev/null @@ -1,59 +0,0 @@ -@echo off -rem $Header: /var/lib/cvs/dynare_cpp/sylv/matlab/mexopts.bat,v 1.1.1.1 2004/06/04 13:01:13 kamenik Exp $ -rem Tag $Name: $ -rem c:\ondra\wk\sylv\matlab\mexopts.bat -rem Generated by gnumex.m script in c:\fs\gnumex -rem gnumex version: 1.08 -rem Compile and link options used for building MEX etc files with -rem the Mingw/Cygwin tools. Options here are: -rem Cygwin (cygwin*.dll) linking -rem Mex file creation -rem Standard (safe) linking to temporary libraries -rem Language C / C++ -rem Matlab version 6.5 -rem -set MATLAB=C:\MATLAB~2 -set GM_PERLPATH=C:\MATLAB~2\sys\perl\win32\bin\perl.exe -set GM_UTIL_PATH=c:\fs\gnumex -set PATH=C:\fs\cygwin\bin;%PATH% -rem -rem Added libraries for linking -set GM_ADD_LIBS= -rem -rem Type of file to compile (mex or engine) -set GM_MEXTYPE=mex -rem -rem Language for compilation -set GM_MEXLANG=c -rem -rem def files to be converted to libs -set GM_DEFS2LINK=libmx.def;libmex.def;libmat.def;_libmatlbmx.def; -rem -rem dlltool command line -set GM_DLLTOOL=c:\fs\gnumex\mexdlltool -E --as C:\fs\cygwin\bin\as.exe -rem -rem compiler options; add compiler flags to compflags as desired -set NAME_OBJECT=-o -set COMPILER=gcc -set COMPFLAGS=-c -DMATLAB_MEX_FILE -set OPTIMFLAGS=-O3 -mcpu=pentium -malign-double -set DEBUGFLAGS=-g -set CPPCOMPFLAGS=%COMPFLAGS% -x c++ -set CPPOPTIMFLAGS=%OPTIMFLAGS% -set CPPDEBUGFLAGS=%DEBUGFLAGS% -rem -rem NB Library creation commands occur in linker scripts -rem -rem Linker parameters -set LINKER=%GM_PERLPATH% %GM_UTIL_PATH%\linkmex.pl -set LINKFLAGS= -set CPPLINKFLAGS= --driver-name c++ -set LINKOPTIMFLAGS=-s -set LINKDEBUGFLAGS=-g -set LINK_FILE= -set LINK_LIB= -set NAME_OUTPUT=-o %OUTDIR%%MEX_NAME%.dll -rem -rem Resource compiler parameters -set RC_COMPILER=%GM_PERLPATH% %GM_UTIL_PATH%\rccompile.pl --unix -o %OUTDIR%mexversion.res -set RC_LINKER=