blob: c5daa69db04896d66ee141983d35789305db1580 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
|
From fd826140db0f2a867ef588cccf2e5322cc77126a Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Mon, 19 Jan 2015 16:56:29 -0200
Subject: [PATCH] Fix build in OpenEmbedded-Core environment
Organization: O.S. Systems Software LTDA.
Some of the unit-tests were not being built due to differences on how
the build system behaves when running inside of the OE-Core. This
fixes those minor issues and increases the number of tests available.
Upstream-Status: Pending
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
diff --git a/test/ar3k_bt/Makefile b/test/ar3k_bt/Makefile
index 92e2901..75d3e78 100755
--- a/test/ar3k_bt/Makefile
+++ b/test/ar3k_bt/Makefile
@@ -21,7 +21,7 @@ all: $(OBJS)
CFLAGS += -lbluetooth
$(OBJDIR)/hciattach-ar3k.bin :
- $(CC) ${INC} -Wall -lbluetooth -g hciattach_ath3k.c hciattach.c hciattach_qualcomm.c hciattach_st.c hciattach_tialt.c hciattach_ti.c -o hciattach-ar3k.bin
+ $(CC) ${INC} -Wall -lbluetooth -g hciattach_ath3k.c hciattach.c hciattach_qualcomm.c hciattach_st.c hciattach_tialt.c hciattach_ti.c -o $(OBJDIR)/hciattach-ar3k.bin
clean:
rm -f *.o hciattach-ar3k.bin
diff --git a/test/make.rules b/test/make.rules
index 8982f36..7ff8b38 100755
--- a/test/make.rules
+++ b/test/make.rules
@@ -33,7 +33,7 @@ $(OBJDIR)/%.out : $(SRCDIR)/%.c
$(OBJDIR)/%.out : $(SRCDIR)/%.s
@mkdir -p `dirname $@`
@echo " Building $@"
- $(VERBOSE)$(CC) -g $(INC) $(CFLAGS) -DASSEMBLER $< -o $@
+ $(VERBOSE)$(CC) -g $(INC) $(CFLAGS)-DASSEMBLER $< -o $@
$(OBJDIR)/%.out : $(SRCDIR)/%.S
@mkdir -p `dirname $@`
diff --git a/test/memtool/Makefile b/test/memtool/Makefile
index 7a72803..c3083a0 100644
--- a/test/memtool/Makefile
+++ b/test/memtool/Makefile
@@ -20,7 +20,7 @@ CFLAGS+= -Os
all : $(TARGET)
$(TARGET):$(OBJ)
- $(LINK) -o $(TARGET) $(OBJ) -Os
+ $(LINK) -o $(TARGET) $(OBJ) $(LDFLAGS) -Os
$(STRIP) $(TARGET)
.PHONY: clean
diff --git a/test/mxc_vpu_test/Makefile b/test/mxc_vpu_test/Makefile
index 6ab989c..985b311 100644
--- a/test/mxc_vpu_test/Makefile
+++ b/test/mxc_vpu_test/Makefile
@@ -23,7 +23,7 @@ endif
all: $(TARGET)
$(TARGET): $(OBJ)
- $(LINK) -o $(TARGET) $(OBJ) ${LIBS} -lvpu -lipu -lrt -lpthread
+ $(LINK) -o $(TARGET) $(OBJ) ${LIBS} $(LDFLAGS) -lvpu -lipu -lrt -lpthread
mkdir -p $(OBJDIR)
mv $(TARGET) $(OBJDIR)
cp autorun-vpu.sh $(OBJDIR)
--
2.1.4
|