From 7fea5f15ccf572642b98602f9276e62095e7e70e Mon Sep 17 00:00:00 2001
From: authmillenon <mlenders@inf.fu-berlin.de>
Date: Wed, 4 Sep 2013 22:37:23 +0200
Subject: [PATCH] Add capability to Makefiles to use PROJBINDIR
Fixes bug in build-system that does not allow you to use other
PROJBINDIR than $(CURDIR)/bin
---
Makefile.include | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Makefile.include b/Makefile.include
index 389e5b9b50..983297c637 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -67,16 +67,16 @@ SRC = $(wildcard *.c)
# string array of all names replaced .c with .o
OBJ = $(SRC:%.c=${PROJBINDIR}/%.o)
-${PROJBINDIR}/$(PROJECT).a: $(OBJ)
- $(AR) -rc bin/$(PROJECT).a $(OBJ)
+$(PROJBINDIR)/$(PROJECT).a: $(OBJ)
+ $(AR) -rc $(PROJBINDIR)/$(PROJECT).a $(OBJ)
# pull in dependency info for *existing* .o files
-include $(OBJ:.o=.d)
-${PROJBINDIR}/%.o: %.c $(PROJDEPS)
+$(PROJBINDIR)/%.o: %.c $(PROJDEPS)
@echo; echo "Compiling.... $*.c"; echo
@test -d $(PROJBINDIR) || mkdir -p $(PROJBINDIR)
- $(CC) $(CFLAGS) $(INCLUDES) -c $*.c -o bin/$*.o
+ $(CC) $(CFLAGS) $(INCLUDES) -c $*.c -o $(PROJBINDIR)/$*.o
clean:
$(MAKE) -C $(RIOTBOARD) clean
--
GitLab