summaryrefslogtreecommitdiff
path: root/cesar/bsu/aclf
diff options
context:
space:
mode:
authorlaranjeiro2010-05-17 09:57:05 +0000
committerlaranjeiro2010-05-17 09:57:05 +0000
commitb53c50940132dd6e6d6118d477cd5e7727a5689e (patch)
tree62572fa3f13325b9e2a4d4c19f9e3923e5460b5f /cesar/bsu/aclf
parent09fc2cd6f053fca8774f62d87b8d60f628abc059 (diff)
cesar/bsu/aclf: change makefile
make only launch scilab only on script change git-svn-id: svn+ssh://pessac/svn/cesar/trunk@7059 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'cesar/bsu/aclf')
-rw-r--r--cesar/bsu/aclf/test/utest/Makefile43
-rw-r--r--cesar/bsu/aclf/test/utest/acl_period.sce2
-rw-r--r--cesar/bsu/aclf/test/utest/estimate_acl_freq_decrease.sce4
-rw-r--r--cesar/bsu/aclf/test/utest/estimate_acl_freq_increase.sce4
-rw-r--r--cesar/bsu/aclf/test/utest/estimate_acl_freq_stable.sce (renamed from cesar/bsu/aclf/test/utest/estimate_acl_stable.sce)4
-rw-r--r--cesar/bsu/aclf/test/utest/src/bpsd.c14
-rw-r--r--cesar/bsu/aclf/test/utest/src/common.c5
7 files changed, 44 insertions, 32 deletions
diff --git a/cesar/bsu/aclf/test/utest/Makefile b/cesar/bsu/aclf/test/utest/Makefile
index a343b40a55..1121f2b3e4 100644
--- a/cesar/bsu/aclf/test/utest/Makefile
+++ b/cesar/bsu/aclf/test/utest/Makefile
@@ -1,22 +1,33 @@
-PAGES= estimate_acl_freq_decrease estimate_acl_freq_increase\
- estimate_acl_stable acl_period
-all: $(PAGES)
-
-%: %.sce
- scilab -nw -f $<
-
-SCILAB_FILE= $(OBJ_DIR)/result_increase.csv $(OBJ_DIR)/table_increase.h \
- $(OBJ_DIR)/result_increase.h $(OBJ_DIR)/result_stable.csv \
- $(OBJ_DIR)/table.h $(OBJ_DIR)/result_stable.h \
- $(OBJ_DIR)/table_decrease.h $(OBJ_DIR)/result_decrease.h \
- $(OBJ_DIR)/result_decrease.csv $(OBJ_DIR)/zc_cross.h
-
-CLEAN_FILES+=$(SCILAB_FILE)
-
BASE = ../../../..
HOST_PROGRAMS = aclf
aclf_SOURCES = aclf.c common.c bpsd.c freq.c misc.c
-aclf_MODULES = lib bsu/aclf
+aclf_MODULES = lib bsu/aclf hal/timer/stub
include $(BASE)/common/make/top.mk
+
+increase_files = $(OBJ_DIR)/inc/table_increase.h \
+ $(OBJ_DIR)/inc/result_increase.h \
+ $(OBJ_DIR)/result_increase.csv
+decrease_files = $(OBJ_DIR)/inc/table_decrease.h \
+ $(OBJ_DIR)/inc/result_decrease.h \
+ $(OBJ_DIR)/result_decrease.csv
+stable_files = $(OBJ_DIR)/inc/table_stable.h \
+ $(OBJ_DIR)/inc/result_stable.h \
+ $(OBJ_DIR)/result_stable.csv
+acl_files = $(OBJ_DIR)/inc/zc_cross.h
+SCILAB_FILE = $(increase_files) $(decrease_files) $(stable_files) $(acl_files)
+CLEAN_FILES += $(SCILAB_FILE)
+
+$(call src2obj,src/bpsd.c,host): $(increase_files) $(decrease_files) \
+ $(stable_files)
+$(call src2obj,src/common.c,host): $(acl_files)
+
+$(increase_files): estimate_acl_freq_increase.sce
+ scilab -nw -f $<
+$(decrease_files): estimate_acl_freq_decrease.sce
+ scilab -nw -f $<
+$(stable_files): estimate_acl_freq_stable.sce
+ scilab -nw -f $<
+$(acl_files): acl_period.sce
+ scilab -nw -f $<
diff --git a/cesar/bsu/aclf/test/utest/acl_period.sce b/cesar/bsu/aclf/test/utest/acl_period.sce
index 7eb2a4c080..be612419ad 100644
--- a/cesar/bsu/aclf/test/utest/acl_period.sce
+++ b/cesar/bsu/aclf/test/utest/acl_period.sce
@@ -7,6 +7,6 @@ bp_period_tck = 2 .* acl_period ./ 40e-9;
zc_tck = bp_period_tck ./ 4
// Write the result.
-convertc_array ('obj/zc_cross.h', 'zero_cross', zc_tck);
+convertc_array ('obj/inc/zc_cross.h', 'zero_cross', zc_tck);
exit;
diff --git a/cesar/bsu/aclf/test/utest/estimate_acl_freq_decrease.sce b/cesar/bsu/aclf/test/utest/estimate_acl_freq_decrease.sce
index a57a07394b..773a386af2 100644
--- a/cesar/bsu/aclf/test/utest/estimate_acl_freq_decrease.sce
+++ b/cesar/bsu/aclf/test/utest/estimate_acl_freq_decrease.sce
@@ -43,10 +43,10 @@ file('close', result_file);
// Write the array.
res = result(:,1);
-convertc_array ('obj/table_decrease.h', 'ac_decrease', res);
+convertc_array ('obj/inc/table_decrease.h', 'ac_decrease', res);
// Write the result of the simulation.
res = result (:,5);
-convertc_array ('obj/result_decrease.h', 'result_ac_decrease', res);
+convertc_array ('obj/inc/result_decrease.h', 'result_ac_decrease', res);
exit;
diff --git a/cesar/bsu/aclf/test/utest/estimate_acl_freq_increase.sce b/cesar/bsu/aclf/test/utest/estimate_acl_freq_increase.sce
index be357657bf..8d8553568e 100644
--- a/cesar/bsu/aclf/test/utest/estimate_acl_freq_increase.sce
+++ b/cesar/bsu/aclf/test/utest/estimate_acl_freq_increase.sce
@@ -47,10 +47,10 @@ file('close', result_file);
// Write the array.
res = result(:,1);
-convertc_array ('obj/table_increase.h', 'ac_increase', res);
+convertc_array ('obj/inc/table_increase.h', 'ac_increase', res);
// Write the result of the simulation.
res = result (:,5);
-convertc_array ('obj/result_increase.h', 'result_ac_increase', res);
+convertc_array ('obj/inc/result_increase.h', 'result_ac_increase', res);
exit;
diff --git a/cesar/bsu/aclf/test/utest/estimate_acl_stable.sce b/cesar/bsu/aclf/test/utest/estimate_acl_freq_stable.sce
index 69b2967d98..ea18bce4ab 100644
--- a/cesar/bsu/aclf/test/utest/estimate_acl_stable.sce
+++ b/cesar/bsu/aclf/test/utest/estimate_acl_freq_stable.sce
@@ -45,10 +45,10 @@ file('close', result_file);
// Write the array.
res = result(:,1);
-convertc_array ('obj/table.h', 'ac_stable', res);
+convertc_array ('obj/inc/table_stable.h', 'ac_stable', res);
// Write the result of the simulation.
res = result (:,5);
-convertc_array ('obj/result_stable.h', 'result_ac_stable', res);
+convertc_array ('obj/inc/result_stable.h', 'result_ac_stable', res);
exit;
diff --git a/cesar/bsu/aclf/test/utest/src/bpsd.c b/cesar/bsu/aclf/test/utest/src/bpsd.c
index 299a7d835d..1ec9212f97 100644
--- a/cesar/bsu/aclf/test/utest/src/bpsd.c
+++ b/cesar/bsu/aclf/test/utest/src/bpsd.c
@@ -12,13 +12,13 @@
*/
#include "common/std.h"
#include "lib/test.h"
-#include "bsu/aclf/test/utest/common.h"
-#include "bsu/aclf/test/utest/obj/table.h"
-#include "bsu/aclf/test/utest/obj/table_increase.h"
-#include "bsu/aclf/test/utest/obj/table_decrease.h"
-#include "bsu/aclf/test/utest/obj/result_stable.h"
-#include "bsu/aclf/test/utest/obj/result_increase.h"
-#include "bsu/aclf/test/utest/obj/result_decrease.h"
+#include "common.h"
+#include "table_stable.h"
+#include "table_increase.h"
+#include "table_decrease.h"
+#include "result_stable.h"
+#include "result_increase.h"
+#include "result_decrease.h"
static u32 zc_test [] = {0, 740000, 1480000};
static u32 zc_test_len = 3;
diff --git a/cesar/bsu/aclf/test/utest/src/common.c b/cesar/bsu/aclf/test/utest/src/common.c
index 5e2a8dab62..66622f9557 100644
--- a/cesar/bsu/aclf/test/utest/src/common.c
+++ b/cesar/bsu/aclf/test/utest/src/common.c
@@ -11,8 +11,9 @@
* \ingroup bsu_aclf
*/
#include "common/std.h"
-#include "bsu/aclf/test/utest/obj/zc_cross.h"
-#include "bsu/aclf/test/utest/common.h"
+#include "hal/timer/timer.h"
+#include "zc_cross.h"
+#include "common.h"
#include <string.h>
static struct bsu_aclf_test_phy_t phy_test_global;