diff --git a/Makefile b/Makefile index 66d3d59..e290321 100644 --- a/Makefile +++ b/Makefile @@ -28,17 +28,14 @@ include make.config .PHONY: default clean distclean archive configure default: make.config - - bash -c "[[ -e lib/libezfio.a ]] && rm $$PWD/lib/*" - @echo Compiling library && make -C $$PWD/src static - @echo Building Python module && make -C $$PWD/src python + $(MAKE) -C $$PWD/src clean: - bash -c "[[ -e lib/libezfio.a ]] && rm $$PWD/lib/*" - bash -c "[[ -e Python/ezfio.py ]] && rm $$PWD/Python/*" - - make -C $$PWD/src veryclean - -distclean: clean - - rm -rf autom4te.cache config.status config.log make.config + - bash -c "[[ -e Ocaml/ezfio.ml ]] && rm $$PWD/Ocaml/*" + - bash -c "[[ -e Bash/ezfio.sh ]] && rm $$PWD/Bash/*" + - $(MAKE) -C $$PWD/src veryclean archive: distclean git archive --format=tar HEAD > EZFIO.$(VERSION).tar @@ -47,9 +44,6 @@ archive: distclean tar -zcvf EZFIO.$(VERSION).tar.gz EZFIO rm -rf EZFIO -configure: make.config.in configure.ac - autoconf - make.config: - ./configure --host=dummy + python configure.py diff --git a/make.config.example b/make.config.example deleted file mode 100644 index b185904..0000000 --- a/make.config.example +++ /dev/null @@ -1,6 +0,0 @@ -IRPF90 = irpf90 -FC = gfortran -ffree-line-length-none -fPIC -FCFLAGS= -O2 -RANLIB = ranlib -AR = ar -NINJA = ninja diff --git a/src/Makefile b/src/Makefile index 7ee4841..30f30f2 100644 --- a/src/Makefile +++ b/src/Makefile @@ -29,7 +29,7 @@ export include irpf90.make -irpf90.make: $(wildcard *.irp.f) ../config/* +irpf90.make: $(wildcard *.irp.f) ../config/* $(IRPF90) include ../version