aboutsummaryrefslogtreecommitdiffstats
path: root/Projects
diff options
context:
space:
mode:
Diffstat (limited to 'Projects')
-rw-r--r--Projects/LEDNotifier/LEDNotifier.c1
-rw-r--r--Projects/Webserver/Lib/DHCPServerApp.c2
-rw-r--r--Projects/XPLAINBridge/makefile2
-rw-r--r--Projects/makefile17
4 files changed, 6 insertions, 16 deletions
diff --git a/Projects/LEDNotifier/LEDNotifier.c b/Projects/LEDNotifier/LEDNotifier.c
index cfad0c288..f252b3dbe 100644
--- a/Projects/LEDNotifier/LEDNotifier.c
+++ b/Projects/LEDNotifier/LEDNotifier.c
@@ -134,6 +134,7 @@ int main(void)
if (Channel & (1 << 7))
SoftPWM_Channel3_Duty = Duty;
+ // cppcheck-suppress IOWithoutPositioning
fputc(ColourUpdate, &USBSerialStream);
CDC_Device_USBTask(&VirtualSerial_CDC_Interface);
diff --git a/Projects/Webserver/Lib/DHCPServerApp.c b/Projects/Webserver/Lib/DHCPServerApp.c
index 22bd6ac01..49bbde4d3 100644
--- a/Projects/Webserver/Lib/DHCPServerApp.c
+++ b/Projects/Webserver/Lib/DHCPServerApp.c
@@ -50,7 +50,7 @@ void DHCPServerApp_Init(void)
uip_listen(HTONS(DHCP_SERVER_PORT));
/* Create a new UDP connection to the DHCP server port for the DHCP solicitation */
- struct uip_udp_conn* BroadcastConnection = uip_udp_new(&uip_broadcast_addr, HTONS(DHCP_CLIENT_PORT));
+ BroadcastConnection = uip_udp_new(&uip_broadcast_addr, HTONS(DHCP_CLIENT_PORT));
/* If the connection was successfully created, bind it to the local DHCP client port */
if (BroadcastConnection != NULL)
diff --git a/Projects/XPLAINBridge/makefile b/Projects/XPLAINBridge/makefile
index 92344e585..0bcf77729 100644
--- a/Projects/XPLAINBridge/makefile
+++ b/Projects/XPLAINBridge/makefile
@@ -36,7 +36,7 @@ all:
# identical OBJDIR directory, we need to enforce the use of this project's object file
# directory as the one where the build object files are to be stored, by giving it a
# path relative to the current folder.
-OBJDIR := ./obj
+OBJDIR := ./xpb-obj
# Include LUFA-specific DMBS extension modules
DMBS_LUFA_PATH ?= $(LUFA_PATH)/Build/LUFA
diff --git a/Projects/makefile b/Projects/makefile
index 992dff860..3f5cd5719 100644
--- a/Projects/makefile
+++ b/Projects/makefile
@@ -22,20 +22,9 @@ ifeq ($(MAKELEVEL), 10)
$(error EMERGENCY ABORT: INFINITE RECURSION DETECTED)
endif
-# Need to special-case building without a per-project object directory
-ifeq ($(OBJDIR),)
- # If no target specified, force "clean all" and disallow parallel build
- ifeq ($(MAKECMDGOALS),)
- MAKECMDGOALS := clean all
- .NOTPARALLEL:
- endif
-
- # If one of the targets is to build, force "clean" beforehand and disallow parallel build
- ifneq ($(findstring all, $(MAKECMDGOALS)),)
- MAKECMDGOALS := clean $(MAKECMDGOALS)
- .NOTPARALLEL:
- endif
-endif
+# Build each directory sequentially, even if we are building using multiple
+# cores within each project
+.NOTPARALLEL:
%: $(PROJECT_DIRECTORIES)
@echo . > /dev/null