diff --git a/ocaml/.gitignore b/ocaml/.gitignore index 3770af1a..20613b5f 100644 --- a/ocaml/.gitignore +++ b/ocaml/.gitignore @@ -1,4 +1,4 @@ -cd .gitignore +.gitignore ezfio.ml Qptypes.ml qptypes_generator.byte @@ -10,6 +10,7 @@ qp_print.native qp_run.native qp_set_ddci.native qp_set_mo_class.native +qp_edit.native test_atom.byte test_basis.byte test_bitlist.byte @@ -37,15 +38,13 @@ qp_print qp_run qp_set_ddci qp_set_mo_class -qp_edit.ml Input_pseudo.ml Input_integrals_bielec.ml Input_hartree_fock.ml Input_perturbation.ml Input_determinants.ml Input_properties.ml -Input_cas_sd.ml -Input_cisd_sc2_selected.ml -Input_full_ci.ml -Input_mrcc.ml +qp_edit.ml +qp_edit +qp_edit.native Input_auto_generated.ml diff --git a/ocaml/Makefile b/ocaml/Makefile index b796e10d..7e514d1a 100644 --- a/ocaml/Makefile +++ b/ocaml/Makefile @@ -13,10 +13,10 @@ LIBS= PKGS= OCAMLCFLAGS="-g -warn-error A" OCAMLBUILD=ocamlbuild -j 0 -syntax camlp4o -cflags $(OCAMLCFLAGS) -lflags $(OCAMLCFLAGS) -MLFILES=$(wildcard *.ml) ezfio.ml Qptypes.ml Input_auto_generated.ml +MLFILES=$(wildcard *.ml) ezfio.ml Qptypes.ml Input_auto_generated.ml qp_edit.ml MLIFILES=$(wildcard *.mli) ALL_TESTS=$(patsubst %.ml,%.byte,$(wildcard test_*.ml)) -ALL_EXE=$(patsubst %.ml,%.native,$(wildcard qp_*.ml)) +ALL_EXE=$(patsubst %.ml,%.native,$(wildcard qp_*.ml)) qp_edit.native .PHONY: executables default @@ -27,7 +27,7 @@ default: $(ALL_TESTS) $(ALL_EXE) .gitignore @for i in .gitignore ezfio.ml Qptypes.ml qptypes_generator.byte _build $(ALL_EXE) $(ALL_TESTS) \ $(patsubst %.ml,%,$(wildcard test_*.ml)) $(patsubst %.ml,%,$(wildcard qp_*.ml)) \ $(shell grep Input Input_auto_generated.ml | awk '{print $$2 ".ml"}') \ - Input_auto_generated.ml;\ + qp_edit.ml qp_edit qp_edit.native Input_auto_generated.ml;\ do \ echo $$i ; \ done > .gitignore @@ -74,7 +74,7 @@ Qptypes.ml: qptypes_generator.byte ${QPACKAGE_ROOT}/EZFIO/Ocaml/ezfio.ml: $(MAKE) -C ${QPACKAGE_ROOT}/src ezfio -Input_auto_generated.ml: +Input_auto_generated.ml qp_edit.ml: ei_handler.py ocaml_global clean: