[Lunar-commits] <lunar> Revert "Start of the split BUILD code."

[Auke Kok]

commit dd0d3b6c5eb0008b9237aa2ada881fad7d606f5d
Author: Auke Kok <sofar at foo-projects.org>
Date:   Sat Jun 23 17:25:52 2012 -0700

    Revert "Start of the split BUILD code."
    
    This reverts commit cef5e5efa9d29d6e39da7c1c16f33db8712d2e46.
---
 libs/build.lunar |   33 +++------------------------------
 1 file changed, 3 insertions(+), 30 deletions(-)

diff --git a/libs/build.lunar b/libs/build.lunar
index 7dfcdd6..c3573bb 100644
--- a/libs/build.lunar
+++ b/libs/build.lunar
@@ -236,9 +236,9 @@ default_cmake_config() {
 default_make() {
   debug_msg "default_make ($@)"
   verbose_msg "running \"default_make\""
-  default_compile                    &&
+  make ${MAKES:+-j${MAKES}}          &&
   prepare_install                    &&
-  default_install
+  make install
 }
 
 
@@ -266,21 +266,6 @@ default_build() {
 }
 
 
-default_compile() {
-  debug_msg "default_compile ($@)"
-  verbose_msg "running \"default_compile\""
-  default_config  &&
-  make ${MAKES:+-j${MAKES}}
-}
-
-
-default_install() {
-  debug_msg "default_install ($@)"
-  verbose_msg "running \"default_install\""
-  make install
-}
-
-
 default_cvs_build() {
   debug_msg "default_cvs_build ($@)"
   default_cvs_config  &&
@@ -429,21 +414,9 @@ run_build()  {
     # fix errors, don't avoid them. This makes all errors fatal
     shopt -s execfail
     if has_module_file $MODULE BUILD ; then
-      # this MUST call `prepare_install` !!!
       run_module_file $MODULE BUILD
     else
-      # split build code hooks in here:
-      if has_module_file $MODULE COMPILE ; then
-        run_module_file $MODULE COMPILE
-      else
-        default_compile
-      fi
-      prepare_install &&
-      if has_module_file $MODULE INSTALL ; then
-        run_module_file $MODULE INSTALL
-      else
-        default_install
-      fi
+      default_build
     fi
   ) > $C_FIFO 2>&1
 }