From f2983ed2afd05e8f341a1ac34efa834b3dd655b3 Mon Sep 17 00:00:00 2001
From: ketmar <ketmar@ketmar.no-ip.org>
Date: Thu, 14 Apr 2011 17:54:41 +0000
Subject: [PATCH] fixes in build script and cosmetics is '-9'

FossilOrigin-Name: bd815ac43f53de1bfdca45a12fc6aaf864259f3d45a73aabf6b7d481b9b234a8
---
 Jamrules          | 27 ++++++++++++---------------
 src/Jamfile       |  6 +++---
 src/syren/Jamfile |  4 ++++
 src/syren/syren.c |  5 ++++-
 4 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/Jamrules b/Jamrules
index 1f970f1..e0676f7 100644
--- a/Jamrules
+++ b/Jamrules
@@ -2,34 +2,31 @@ if ! $(THIS_IS_K8JAM) {
   Exit "K8Jam NOT detected; you need K8Jam (http://gitorious.org/projects/kjam) to build Syren" ;
 }
 
-SY_NOSCRIPT = tan ;
+set-profile ;
+set-default-target-locations ;
+
 
+SY_NOSCRIPT = tan ;
 
 
 HDRS += $(TOP)/src/polarssl ;
 HDRS += $(TOP)/src/sylib ;
 
 
-ALL_LOCATE_TARGET = $(TOP)/_build/obj ;
-ALL_LOCATE_LIB = $(TOP)/_build ;
-ALL_LOCATE_LIBSO = $(TOP)/_build/so ;
-ALL_LOCATE_BIN = $(TOP) ;
-
-
 if $(LITE) {
-  SY_OPT_FOR_SIZE = tan ;
+  #SY_OPT_FOR_SIZE = tan ;
   SY_NOSCRIPT = tan ;
   NO_HTTPS = tan ;
 }
 
 
-if $(VALGRIND) {
-  profile "debug" ;
-} else if $(SY_OPT_FOR_SPEED) {
-  profile "speed" ;
-} else {
-  profile "size" ;
-}
+#if $(VALGRIND) {
+#  profile "debug" ;
+#} else if $(SY_OPT_FOR_SPEED) {
+#  profile "speed" ;
+#} else {
+#  profile "size" ;
+#}
 
 OPTIM += -Wall ;
 
diff --git a/src/Jamfile b/src/Jamfile
index 7b004c5..2975997 100644
--- a/src/Jamfile
+++ b/src/Jamfile
@@ -1,6 +1,6 @@
 SubDir TOP src ;
 
 
-SubIncludeOnce INC_SYREN_POLARSSL : TOP src polarssl ;
-SubIncludeOnce INC_SYREN_SYLIB : TOP src sylib ;
-SubIncludeOnce INC_SYREN_MAIN : TOP src syren ;
+SubInclude TOP src polarssl ;
+SubInclude TOP src sylib ;
+SubInclude TOP src syren ;
diff --git a/src/syren/Jamfile b/src/syren/Jamfile
index 8bb57c9..7a5253a 100644
--- a/src/syren/Jamfile
+++ b/src/syren/Jamfile
@@ -12,3 +12,7 @@ LINKLIBS on syren += -lm ;
 
 if ! $(VALGRIND) { LINKFLAGS on syren += -s ; }
 else { LINKFLAGS on syren += -g ; }
+
+
+SubInclude TOP src polarssl ;
+SubInclude TOP src sylib ;
diff --git a/src/syren/syren.c b/src/syren/syren.c
index 51c349d..b213e26 100644
--- a/src/syren/syren.c
+++ b/src/syren/syren.c
@@ -1131,6 +1131,7 @@ int main (int argc, char *argv[]) {
   state->postData = oPostData; oPostData = NULL;
 
 do {
+  static int wosDo = 0;
   res = SY_ERROR;
   userBreak = 0;
 
@@ -1143,7 +1144,6 @@ do {
       goto done;
     }
     /*if (!oURL) { SyMessage(&prs, SY_MSG_ERROR, "URL?"); goto done; }*/
-    if (optWOS > 0) { SyMessage(&prs, SY_MSG_MSG, "WOS waiting: %d", optWOS); sleep(optWOS); }
   } else {
     SyKVListClear(oURLList);
     SyMessage(&prs, SY_MSG_MSG, "restoring state from file %s", oStateFileName);
@@ -1162,6 +1162,9 @@ do {
 
   if (replyOnly == SY_FALSE && oResume == SY_TRUE && CheckResume(state) != SY_OK) goto done;
 
+  if (wosDo && optWOS > 0) { SyMessage(&prs, SY_MSG_MSG, "WOS waiting: %d", optWOS); sleep(optWOS); }
+  wosDo = 1;
+
 #ifdef SYREN_USE_SCRIPT
 /*
   if (!(state->url = SyURLNew())) {
-- 
2.11.4.GIT