From 57e70a659ca53a7f3b0435776a0736fa65f3c3f5 Mon Sep 17 00:00:00 2001 From: Christian Mehlis Date: Thu, 13 Jun 2013 21:31:08 +0200 Subject: [PATCH] Remove undefined variables from Makefiles The following variables are included in various Makefiles but never defined. $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) --- Makefile.base | 4 ++-- Makefile.include | 2 +- cpu/lpc214x/Makefile | 4 ++-- sys/shell/Makefile | 4 ++-- sys/shell/commands/Makefile | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile.base b/Makefile.base index 27b51d8497..a05d65d1c2 100644 --- a/Makefile.base +++ b/Makefile.base @@ -18,8 +18,8 @@ $(BINDIR)$(MODULE).a: $(OBJ) $(ASMOBJ) # compile and generate dependency info $(BINDIR)%.o: %.c - @$(CC) $(CFLAGS) $(PROJECTINCLUDE) $(BOARDINCLUDE) $(INCLUDES) -c $*.c -o $(BINDIR)$*.o - @$(CC) $(CFLAGS) $(PROJECTINCLUDE) $(BOARDINCLUDE) $(INCLUDES) -MM $*.c > $(BINDIR)$*.d + @$(CC) $(CFLAGS) $(INCLUDES) -c $*.c -o $(BINDIR)$*.o + @$(CC) $(CFLAGS) $(INCLUDES) -MM $*.c > $(BINDIR)$*.d @printf "$(BINDIR)"|cat - $(BINDIR)$*.d > /tmp/riot_out && mv /tmp/riot_out $(BINDIR)$*.d $(BINDIR)%.o: %.s diff --git a/Makefile.include b/Makefile.include index 6f6b4171de..939a4c8494 100644 --- a/Makefile.include +++ b/Makefile.include @@ -70,7 +70,7 @@ ${PROJBINDIR}/$(PROJECT).a: $(OBJ) ${PROJBINDIR}/%.o: %.c @echo; echo "Compiling.... $*.c"; echo - $(CC) $(CFLAGS) $(BOARDINCLUDE) $(INCLUDES) -c $*.c -o bin/$*.o + $(CC) $(CFLAGS) $(INCLUDES) -c $*.c -o bin/$*.o clean: $(MAKE) -C $(RIOTBOARD) clean diff --git a/cpu/lpc214x/Makefile b/cpu/lpc214x/Makefile index fd9c47f8e6..a281d08a00 100644 --- a/cpu/lpc214x/Makefile +++ b/cpu/lpc214x/Makefile @@ -19,8 +19,8 @@ endif # compile and generate dependency info ../bin/%.o: %.c - $(CC) $(CFLAGS) $(INCLUDES) $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) -c $*.c -o ../bin/$*.o - $(CC) $(CFLAGS) $(INCLUDES) $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) -MM $*.c > ../bin/$*.d + $(CC) $(CFLAGS) $(INCLUDES) $(CPUINCLUDE) -c $*.c -o ../bin/$*.o + $(CC) $(CFLAGS) $(INCLUDES) $(CPUINCLUDE) -MM $*.c > ../bin/$*.d @printf "../bin/"|cat - ../bin/$*.d > /tmp/fw_out && mv /tmp/fw_out ../bin/$*.d # remove compilation products diff --git a/sys/shell/Makefile b/sys/shell/Makefile index 3b88abc0d6..9d889dbf40 100644 --- a/sys/shell/Makefile +++ b/sys/shell/Makefile @@ -13,8 +13,8 @@ $(BINDIR)$(MODULE).a: $(OBJ) # compile and generate dependency info $(BINDIR)%.o: %.c - $(CC) $(CFLAGS) $(PROJECTINCLUDE) $(BOARDINCLUDE) $(INCLUDES) -c $*.c -o $(BINDIR)$*.o - $(CC) $(CFLAGS) $(PROJECTINCLUDE) $(BOARDINCLUDE) $(INCLUDES) -MM $*.c > $(BINDIR)$*.d + $(CC) $(CFLAGS) $(INCLUDES) -c $*.c -o $(BINDIR)$*.o + $(CC) $(CFLAGS) $(INCLUDES) -MM $*.c > $(BINDIR)$*.d @printf "$(BINDIR)"|cat - $(BINDIR)$*.d > /tmp/riot_out && mv /tmp/riot_out $(BINDIR)$*.d # remove compilation products diff --git a/sys/shell/commands/Makefile b/sys/shell/commands/Makefile index c14ee9bcef..8fc4103d22 100644 --- a/sys/shell/commands/Makefile +++ b/sys/shell/commands/Makefile @@ -38,8 +38,8 @@ $(BINDIR)$(MODULE).a: $(OBJ) # compile and generate dependency info $(BINDIR)%.o: %.c - $(CC) $(CFLAGS) $(PROJECTINCLUDE) $(BOARDINCLUDE) $(INCLUDES) -c $*.c -o $(BINDIR)$*.o - $(CC) $(CFLAGS) $(PROJECTINCLUDE) $(BOARDINCLUDE) $(INCLUDES) -MM $*.c > $(BINDIR)$*.d + $(CC) $(CFLAGS) $(INCLUDES) -c $*.c -o $(BINDIR)$*.o + $(CC) $(CFLAGS) $(INCLUDES) -MM $*.c > $(BINDIR)$*.d @printf "$(BINDIR)"|cat - $(BINDIR)$*.d > /tmp/riot_out && mv /tmp/riot_out $(BINDIR)$*.d # remove compilation products