From 043b929b0e761154024bfa94d451f6716828e848 Mon Sep 17 00:00:00 2001 From: Erick Tryzelaar Date: Thu, 26 Jun 2014 08:00:06 -0700 Subject: [PATCH] Make sure libraries depend on "lib" --- configure_ovr.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configure_ovr.py b/configure_ovr.py index 5e742b2..4625780 100644 --- a/configure_ovr.py +++ b/configure_ovr.py @@ -182,7 +182,7 @@ class LibXcodebuild(Module): self.dep_modules = [] def make_rule(self, mods): - out = "%s: %s\n" % (self.get_ename(), + out = "%s: lib %s\n" % (self.get_ename(), " ".join(mods[m].get_ename() for m in self.dep_modules)) out += "\txcodebuild -project %s build\n\tcp %s lib\n" % ( self.get_path_to_xcode_project(), self.get_path_to_output_dir() @@ -221,7 +221,7 @@ class LibMakefile(Module): self.dep_modules = [] def make_rule(self, mods): - out = "%s: %s %s\n" % (self.get_ename(), + out = "%s: lib %s %s\n" % (self.get_ename(), self.get_path_to_makefile_dir() + "Makefile", " ".join(mods[m].get_ename() for m in self.dep_modules)) out += "\tmake -j 16 -C %s\n\tcp %s lib\n" % ( @@ -238,7 +238,7 @@ class LibConfigureMakefile(LibMakefile): out += "\tcd %s && ./configure\n\n" % ( os.path.join(self.get_path_to_makefile_dir()) ) - out += "%s: %s\n" % (self.get_ename(), os.path.join(self.get_path_to_makefile_dir(), "Makefile")) + out += "%s: lib %s\n" % (self.get_ename(), os.path.join(self.get_path_to_makefile_dir(), "Makefile")) out += "\tmake -j 16 -C %s\n\tcp %s lib\n" % ( self.get_path_to_makefile_dir(), self.get_path_to_output_dir() ) @@ -276,7 +276,7 @@ class LibCMake(Module): def make_rule(self, mods): out = "%s:\n" % (self.get_path_to_makefile_dir() + "Makefile") out += "\tcd %s && cmake %s .\n\n" % (self.get_path_to_makefile_dir(), self.cmake_flags) - out += "%s: %s %s\n" % (self.get_ename(), + out += "%s: lib %s %s\n" % (self.get_ename(), self.get_path_to_makefile_dir() + "Makefile", " ".join(mods[m].get_ename() for m in self.dep_modules)) out += "\tmake -j 16 -C %s && cp %s lib\n" % (