From 11729146547052b7a0ed704a918d7b08e07cf657 Mon Sep 17 00:00:00 2001 From: Thomas Applencourt Date: Thu, 26 Jan 2017 08:37:19 -0600 Subject: [PATCH] Fix configure --- configure.py | 7 +++---- src/Makefile | 6 ++---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/configure.py b/configure.py index 86e8773..0f86bb3 100755 --- a/configure.py +++ b/configure.py @@ -26,7 +26,7 @@ d_default = { "FCFLAGS" : '-O2', "RANLIB" : 'ranlib', "AR" : 'ar', - "NINJA" : 'ninja', + "BUILD_SYSTEM" : 'make' } CONFIG_FILES=' '.join([ os.path.join("config",x) for x in os.listdir('config') if x != '.empty']) @@ -112,7 +112,7 @@ rule build_libezfio_a description = Building libezfio.a rule build_libezfio_irp_a - command = cp lib/libezfio.a lib/libezfio_irp.a ; {AR} dv lib/libezfio_irp.a irp_stack.irp.o > /dev/null ; {RANLIB} lib/libezfio_irp.a + command = cp lib/libezfio.a lib/libezfio_irp.a ; {RANLIB} lib/libezfio_irp.a description = Building libezfio_irp.a rule build_python @@ -141,5 +141,4 @@ build Ocaml/ezfio.ml: build_ocaml | lib/libezfio.a if __name__ == '__main__': - - create_build_ninja() + create_build_ninja() diff --git a/src/Makefile b/src/Makefile index 75af455..66cdeb5 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,5 +1,3 @@ -BUILD_SYSTEM= make - .EXPORT_ALL_VARIABLES: include ../make.config @@ -53,10 +51,10 @@ static: ../lib/libezfio.a ../lib/libezfio_irp.a ../lib/libezfio_irp.a: ../lib/libezfio.a cp ../lib/libezfio.a ../lib/libezfio_irp.a -../Python/ezfio.py: +../Python/ezfio.py: ../lib/libezfio.a python create_python.py -../Ocaml/ezfio.ml: +../Ocaml/ezfio.ml: ../lib/libezfio.a python create_ocaml.py IRPF90_temp/irpf90.a: $(BUILD_FILE)