From 5d7562fd0a9689af37840ee05ee1e5e8ad3d9268 Mon Sep 17 00:00:00 2001
From: Anthony Scemama <scemama@irsamc.ups-tlse.fr>
Date: Wed, 10 Jun 2015 12:10:14 +0200
Subject: [PATCH] build.ninja is back into IRPF90_temp

---
 src/ninja.py   | 16 ++++++++--------
 src/version.py |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/ninja.py b/src/ninja.py
index a12a645..f8c44e0 100644
--- a/src/ninja.py
+++ b/src/ninja.py
@@ -33,7 +33,7 @@ irpdir = irpf90_t.irpdir
 mandir = irpf90_t.mandir
 irp_id = irpf90_t.irp_id
 
-FILENAME = "build.ninja"
+FILENAME = os.path.join(irpdir,"build.ninja")
 
 cwd = os.getcwd()
 
@@ -130,8 +130,6 @@ def create_build_target(t,list_of_other_o):
           "   short_in  = {short_target_module_F90}",
           "   short_out = {short_target_module_o}",
           "",
-          "build {short_target}: phony {target}",
-          "",
         ] )
 
     result = result.format(
@@ -239,7 +237,9 @@ def create_build_remaining(f):
 
 def create_irpf90_make(targets):
     targets = ' '.join(targets)
-    result = """TARGETS={1}
+    result = """NINJA += -C {0}
+
+TARGETS={1}
 
 .PHONY: all clean veryclean
 
@@ -247,7 +247,7 @@ all:
 	$(NINJA)
 
 $(TARGETS): 
-	$(NINJA) $@
+	$(NINJA) $(PWD)/$@
 
 clean:
 	$(NINJA) -t clean
@@ -280,7 +280,7 @@ def run():
     try: CXX = os.environ["CXX"]
     except KeyError: CXX="g++"
 
-    includes = [ "-I %s "%(os.path.join(irpdir,i)) for i in command_line.include_dir ]
+    includes = [ "-I %s"%(i) for i in command_line.include_dir ]
 
     FC  += " "+' '.join(includes)
     CC  += " "+' '.join(includes)
@@ -312,11 +312,11 @@ def run():
     # Rules
 
     t = [ "rule compile_fortran_{id}", 
-          "  command = cd $builddir ; {FC} {FCFLAGS} -c $in -o $out", 
+          "  command = {FC} {FCFLAGS} -c $in -o $out", 
           "  description = F   : $short_in -> $short_out", 
           "",
           "rule compile_touches_{id}", 
-          "  command = cd $builddir ; {FC} -c $in -o $out",
+          "  command = {FC} -c $in -o $out",
           "  description = F   : $short_in -> $short_out", 
           "",
           "",
diff --git a/src/version.py b/src/version.py
index 267d327..26a0a01 100644
--- a/src/version.py
+++ b/src/version.py
@@ -1 +1 @@
-version = "1.6.6"
+version = "1.6.7"