diff --git a/Makefile b/Makefile index c683626..0cd5bd2 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,8 @@ -include $(BTREE)/Make.inc #définir dans Make.inc une variable sophia, et prévoir F95FLAGS ad hoc pour compil et modules +include $(BTREE)/Make.inc -ifdef SOPHIA -objects = fvnlib_sophia.o -else objects = fvnlib.o -endif modobjects = $(objects) library = libfvn$(libext) @@ -18,28 +14,10 @@ sub: ( cd fvn_linear && make && make install ) ( cd fvn_integ && make && make install ) ( cd fvn_interpol && make && make install ) -ifndef SOPHIA ( cd fvn_sparse && make && make install ) -endif ( cd fvn_fnlib && make && make install ) ( cd fvn_misc && make && make install ) -submodules: -#builds only modules local to fvn: go to sub-project, build sub-project modules, transfer them back here -#if sub-project depend on another, it is built after, and its proper make searches modules here, not in the install tree - ( cd fvn_common && make modules && mv *.mod .. ) - ( cd fvn_linear && make modules F95FLAGS="$(F95FLAGS) -M.." && mv *.mod .. ) - ( cd fvn_integ && make modules F95FLAGS="$(F95FLAGS) -M.." && mv *.mod .. ) - ( cd fvn_interpol && make modules F95FLAGS="$(F95FLAGS) -M.." && mv *.mod .. ) -ifndef SOPHIA - ( cd fvn_sparse && make modules F95FLAGS="$(F95FLAGS) -M.." && mv *.mod .. ) -endif - ( cd fvn_fnlib && make modules F95FLAGS="$(F95FLAGS) -M.." && mv *.mod .. ) - ( cd fvn_misc && make modules F95FLAGS="$(F95FLAGS) -M.." && mv *.mod .. ) - -modules: submodules $(modobjects) - rm -f $(modobjects) - clean: rm -f {*.o,*.oo,*.ipo,*.a,*.mod} ( cd fvn_common && make clean ) diff --git a/fvn_common/Makefile b/fvn_common/Makefile index 0917568..33f5025 100644 --- a/fvn_common/Makefile +++ b/fvn_common/Makefile @@ -5,13 +5,8 @@ library = libfvn_common$(libext) objects = fvn_common.o d1mach.o r1mach.o -modobjects = fvn_common.o - lib:$(objects) -modules: $(modobjects) - rm -f $(modobjects) - install: cp fvn_common.mod $(BTREE)/modules diff --git a/fvn_fnlib/Makefile b/fvn_fnlib/Makefile index d126e5d..6228e71 100644 --- a/fvn_fnlib/Makefile +++ b/fvn_fnlib/Makefile @@ -63,13 +63,8 @@ zsinh.o ztanh.o ztan.o besyn.o \ besjn.o dbesyn.o dbesjn.o beskn.o \ besin.o dbeskn.o dbesin.o -modobjects = fvn_fnlib.o - lib:$(objects) -modules: $(modobjects) - rm -f $(modobjects) - install: cp fvn_fnlib.mod $(BTREE)/modules diff --git a/fvn_integ/Makefile b/fvn_integ/Makefile index 5e079b1..eb1c9c8 100644 --- a/fvn_integ/Makefile +++ b/fvn_integ/Makefile @@ -2,13 +2,9 @@ include $(BTREE)/Make.inc objects = fvn_integ.o -modobjects = fvn_integ.o all: $(objects) -modules: $(modobjects) - rm -f $(modobjects) - clean: rm -f {*.o,*.oo,*.ipo,*.a,*.mod} diff --git a/fvn_interpol/Makefile b/fvn_interpol/Makefile index dd79c3e..96946a1 100644 --- a/fvn_interpol/Makefile +++ b/fvn_interpol/Makefile @@ -2,13 +2,9 @@ include $(BTREE)/Make.inc objects = fvn_interpol.o -modobjects = fvn_interpol.o lib:$(objects) -modules: $(modobjects) - rm -f $(modobjects) - install: cp fvn_interpol.mod $(BTREE)/modules diff --git a/fvn_linear/Makefile b/fvn_linear/Makefile index bbf5d5a..1307bb9 100644 --- a/fvn_linear/Makefile +++ b/fvn_linear/Makefile @@ -2,13 +2,9 @@ include $(BTREE)/Make.inc objects = fvn_linear.o -modobjects = fvn_linear.o lib:$(objects) -modules: $(modobjects) - rm -f $(modobjects) - install: cp fvn_linear.mod $(BTREE)/modules diff --git a/fvn_misc/Makefile b/fvn_misc/Makefile index 5d572e3..d262d00 100644 --- a/fvn_misc/Makefile +++ b/fvn_misc/Makefile @@ -2,13 +2,9 @@ include $(BTREE)/Make.inc objects = fvn_misc.o -modobjects = fvn_misc.o lib:$(objects) -modules: $(modobjects) - rm -f $(modobjects) - install: cp fvn_misc.mod $(BTREE)/modules diff --git a/fvn_sparse/Makefile b/fvn_sparse/Makefile index f7e7e38..a6f0294 100644 --- a/fvn_sparse/Makefile +++ b/fvn_sparse/Makefile @@ -2,16 +2,12 @@ include $(BTREE)/Make.inc objects = fvn_sparse.o umfpack_wrapper.o -modobjects = fvn_sparse.o all: suitesparse $(objects) suitesparse: ( cd UMFPACK && make ) -modules: $(modobjects) - rm -f $(modobjects) - clean: ( cd AMD && make clean ) ( cd UMFPACK && make clean ) diff --git a/fvnlib_sophia.f90 b/fvnlib_sophia.f90 deleted file mode 100644 index 5f4cef9..0000000 --- a/fvnlib_sophia.f90 +++ /dev/null @@ -1,20 +0,0 @@ - -module fvn -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -! -! fvn : a f95 module replacement for some imsl routines -! it uses lapack for linear algebra -! it uses modified quadpack for integration -! -! William Daniau 2007->today -! william.daniau@femto-st.fr -! -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -use fvn_common -use fvn_linear -use fvn_integ -use fvn_interpol -!use fvn_sparse !ChW : not used in Sophia for the moment -use fvn_fnlib -use fvn_misc -end module fvn \ No newline at end of file