From 24a35b573a3e677f11d320ad97a498083d29d356 Mon Sep 17 00:00:00 2001
From: Zakaria Kasmi <zkasmi@inf.fu-berlin.de>
Date: Wed, 7 Aug 2013 12:32:01 +0200
Subject: [PATCH] updated Makefiles for MSB-A2 and AVSEXTREM
* updated Makefilde dep, add the gpioint dependency to use cc110x on MSBA2
board
* updated CFLAGS Variable
---
Makefile | 4 ++--
avsextrem/Makefile | 4 +++-
avsextrem/drivers/Makefile | 24 ++++++++++++++++++++++++
msba2-common/Makefile | 7 ++++---
4 files changed, 33 insertions(+), 6 deletions(-)
create mode 100644 avsextrem/drivers/Makefile
diff --git a/Makefile b/Makefile
index e0f39c5c4d..7a3c9d345b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
all:
- $(MAKE) -C $(BOARD)
+ "$(MAKE)" -C $(BOARD)
clean:
- $(MAKE) -C $(BOARD) clean
+ "$(MAKE)" -C $(BOARD) clean
diff --git a/avsextrem/Makefile b/avsextrem/Makefile
index 3818708b88..0340a2a81b 100644
--- a/avsextrem/Makefile
+++ b/avsextrem/Makefile
@@ -12,6 +12,7 @@ INCLUDES += -I$(RIOTBASE)/drivers/cc110x
all: $(BINDIR)$(ARCH)
"$(MAKE)" -C ../msba2-common
+ "$(MAKE)" -C drivers
$(BINDIR)$(ARCH): $(OBJ)
$(AR) rcs $(BINDIR)$(ARCH) $(OBJ)
@@ -29,10 +30,11 @@ $(BINDIR)%.o: %.c
# remove compilation products
clean:
"$(MAKE)" -C ../msba2-common clean
+ "$(MAKE)" -C drivers clean
rm -f $(BINDIR)$(ARCH) $(OBJ) $(DEP)
@if [ -d $(BINDIR) ] ; \
then rmdir $(BINDIR) ; \
fi
-
+
diff --git a/avsextrem/drivers/Makefile b/avsextrem/drivers/Makefile
new file mode 100644
index 0000000000..e3bb5c62ff
--- /dev/null
+++ b/avsextrem/drivers/Makefile
@@ -0,0 +1,24 @@
+SRC = $(wildcard *.c)
+BINDIR = $(RIOTBOARD)/$(BOARD)/bin/
+OBJ = $(SRC:%.c=$(BINDIR)%.o)
+DEP = $(SRC:%.c=$(BINDIR)%.d)
+
+INCLUDES += -I$(RIOTBASE)/sys/include/ -I$(RIOTBASE)/drivers/cc110x_ng/include/
+
+$(BINDIR)avsextrem_base.a: $(OBJ)
+ $(AR) rcs $(BINDIR)${ARCH} $(OBJ)
+
+# pull in dependency info for *existing* .o files
+-include $(OBJ:.o=.d)
+
+# compile and generate dependency info
+$(BINDIR)%.o: %.c
+ $(CC) $(CFLAGS) $(INCLUDES) $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) -c $*.c -o $(BINDIR)$*.o
+ $(CC) $(CFLAGS) $(INCLUDES) $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) -MM $*.c > $(BINDIR)$*.d
+ @printf "$(BINDIR)" | cat - $(BINDIR)$*.d > /tmp/riot_out && mv /tmp/riot_out $(BINDIR)$*.d
+
+# remove compilation products
+
+clean:
+ rm -f $(BINDIR)$(MODULE).a $(OBJ) $(DEP) $(ASMOBJ)
+
diff --git a/msba2-common/Makefile b/msba2-common/Makefile
index 1ac90178e1..6e64f29bb8 100644
--- a/msba2-common/Makefile
+++ b/msba2-common/Makefile
@@ -1,4 +1,4 @@
-SRC = $(wildcard *.c)
+SRC = $(wildcard *.c)
BINDIR = $(RIOTBOARD)/$(BOARD)/bin/
OBJ = $(SRC:%.c=$(BINDIR)%.o)## defines
DEP = $(SRC:%.c=$(BINDIR)%.d)
@@ -7,11 +7,12 @@ INCLUDES += -I$(RIOTBOARD)/msba2-common/include/
INCLUDES += -I$(RIOTBASE)/cpu/arm_common/include/
INCLUDES += -I$(RIOTBASE)/cpu/lpc2387/include/
INCLUDES += -I$(RIOTBASE)/drivers/include/
+INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
.PHONY: $(BINDIR)msba2_common_base.a
all: $(BINDIR)msba2_common_base.a
- $(MAKE) -C drivers
+ "$(MAKE)" -C drivers
$(BINDIR)msba2_common_base.a: $(OBJ)
$(AR) rcs $(BINDIR)$(ARCH) $(OBJ)
@@ -27,6 +28,6 @@ $(BINDIR)%.o: %.c
# remove compilation products
clean:
- ${MAKE} -C drivers clean
+ "$(MAKE)" -C drivers clean
rm -f $(OBJ) $(DEP)
--
GitLab