Fix up makefile .NOTPARALLEL heuristics so that linear building is only enforced if no object folder set and the "all" target is run. Rename library "ConfigDescriptor.c" file to "ConfigDescriptors.c" to ensure that object filenames are unique.

12 years ago · 3bf7ce15d5
parent b2920402b4
commit 3bf7ce15d5
14 changed files with 51 additions and 32 deletions
--- a/Bootloaders/makefile
+++ b/Bootloaders/makefile
@ -22,16 +22,18 @@ ifeq ($(MAKELEVEL), 10)
   $(error EMERGENCY ABORT: INFINITE RECURSION DETECTED)
 endif

-# If building without a per-project object directory, we can't build in parallel
+# Need to special-case building without a per-project object directory
 ifeq ($(OBJDIR),)
-   .NOTPARALLEL:
-
-   # Ensure projects are pre-cleaned if the target is the default or "all"
+   # 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

--- a/BuildTests/makefile
+++ b/BuildTests/makefile
@ -11,6 +11,7 @@
 # not intended to be modified or compiled by non-developers.

 all:
+
 %:
 	@echo Executing \"make $@\" on all LUFA build tests.
 	@echo
--- a/Demos/Device/ClassDriver/makefile
+++ b/Demos/Device/ClassDriver/makefile
@ -22,16 +22,18 @@ ifeq ($(MAKELEVEL), 10)
   $(error EMERGENCY ABORT: INFINITE RECURSION DETECTED)
 endif

-# If building without a per-project object directory, we can't build in parallel
+# Need to special-case building without a per-project object directory
 ifeq ($(OBJDIR),)
-   .NOTPARALLEL:
-
-   # Ensure projects are pre-cleaned if the target is the default or "all"
+   # 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

--- a/Demos/Device/LowLevel/makefile
+++ b/Demos/Device/LowLevel/makefile
@ -22,16 +22,18 @@ ifeq ($(MAKELEVEL), 10)
   $(error EMERGENCY ABORT: INFINITE RECURSION DETECTED)
 endif

-# If building without a per-project object directory, we can't build in parallel
+# Need to special-case building without a per-project object directory
 ifeq ($(OBJDIR),)
-   .NOTPARALLEL:
-
-   # Ensure projects are pre-cleaned if the target is the default or "all"
+   # 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

--- a/Demos/DualRole/ClassDriver/makefile
+++ b/Demos/DualRole/ClassDriver/makefile
@ -22,16 +22,18 @@ ifeq ($(MAKELEVEL), 10)
   $(error EMERGENCY ABORT: INFINITE RECURSION DETECTED)
 endif

-# If building without a per-project object directory, we can't build in parallel
+# Need to special-case building without a per-project object directory
 ifeq ($(OBJDIR),)
-   .NOTPARALLEL:
-
-   # Ensure projects are pre-cleaned if the target is the default or "all"
+   # 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

--- a/Demos/Host/ClassDriver/makefile
+++ b/Demos/Host/ClassDriver/makefile
@ -22,16 +22,18 @@ ifeq ($(MAKELEVEL), 10)
   $(error EMERGENCY ABORT: INFINITE RECURSION DETECTED)
 endif

-# If building without a per-project object directory, we can't build in parallel
+# Need to special-case building without a per-project object directory
 ifeq ($(OBJDIR),)
-   .NOTPARALLEL:
-
-   # Ensure projects are pre-cleaned if the target is the default or "all"
+   # 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

--- a/Demos/Host/LowLevel/makefile
+++ b/Demos/Host/LowLevel/makefile
@ -22,16 +22,18 @@ ifeq ($(MAKELEVEL), 10)
   $(error EMERGENCY ABORT: INFINITE RECURSION DETECTED)
 endif

-# If building without a per-project object directory, we can't build in parallel
+# Need to special-case building without a per-project object directory
 ifeq ($(OBJDIR),)
-   .NOTPARALLEL:
-
-   # Ensure projects are pre-cleaned if the target is the default or "all"
+   # 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

--- a/LUFA/Build/lufa.sources.in
+++ b/LUFA/Build/lufa.sources.in
@ -75,7 +75,7 @@ LUFA_SRC_USB         := $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/Device_$(ARCH
                        $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/USBInterrupt_$(ARCH).c    \
                        $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/EndpointStream_$(ARCH).c  \
                        $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/PipeStream_$(ARCH).c      \
-                        $(LUFA_ROOT_PATH)/Drivers/USB/Core/ConfigDescriptor.c                \
+                        $(LUFA_ROOT_PATH)/Drivers/USB/Core/ConfigDescriptors.c               \
                        $(LUFA_ROOT_PATH)/Drivers/USB/Core/DeviceStandardReq.c               \
                        $(LUFA_ROOT_PATH)/Drivers/USB/Core/Events.c                          \
                        $(LUFA_ROOT_PATH)/Drivers/USB/Core/HostStandardReq.c                 \
--- a/LUFA/DoxygenPages/MigrationInformation.txt
+++ b/LUFA/DoxygenPages/MigrationInformation.txt
@ -44,6 +44,9 @@
 *    - The MIDI class driver \ref MIDI_EventPacket_t event packet no longer contains seperate \c CableIndex and \c Command entries; these have been combined
 *      into a single \c Event element which can be contructed using the new macro \ref MIDI_EVENT(). Existing applications should use the new macro and structure
 *      element name.
+ *    - The library "LUFA/Drivers/USB/Core/ConfigDescriptor.c" source file has been renamed "LUFA/Drivers/USB/Core/ConfigDescriptors.c" as this was clashing with
+ *      files in some low level host mode demo applications, preventing parallel project builds. If you are referencing the project source files directly instead
+ *      of using the makefile module names, you will need to adjust your project makefile.
 *
 *  \section Sec_Migration120219 Migrating from 111009 to 120219
 *  <b>USB Core</b>
--- a/LUFA/Drivers/USB/Core/ConfigDescriptors.c
+++ b/LUFA/Drivers/USB/Core/ConfigDescriptors.c
@ -29,7 +29,7 @@
 */

 #define  __INCLUDE_FROM_USB_DRIVER
-#include "ConfigDescriptor.h"
+#include "ConfigDescriptors.h"

 #if defined(USB_CAN_BE_HOST)
 uint8_t USB_Host_GetDeviceConfigDescriptor(const uint8_t ConfigNumber,
--- a/LUFA/Drivers/USB/Core/ConfigDescriptors.h
+++ b/LUFA/Drivers/USB/Core/ConfigDescriptors.h
--- a/LUFA/Drivers/USB/USB.h
+++ b/LUFA/Drivers/USB/USB.h
@ -41,7 +41,7 @@
 *
 *  \section Sec_Dependencies Module Source Dependencies
 *  The following files must be built with any user project that uses this module:
- *    - LUFA/Drivers/USB/Core/ConfigDescriptor.c <i>(Makefile source module name: LUFA_SRC_USB)</i>
+ *    - LUFA/Drivers/USB/Core/ConfigDescriptors.c <i>(Makefile source module name: LUFA_SRC_USB)</i>
 *    - LUFA/Drivers/USB/Core/DeviceStandardReq.c <i>(Makefile source module name: LUFA_SRC_USB)</i>
 *    - LUFA/Drivers/USB/Core/Events.c <i>(Makefile source module name: LUFA_SRC_USB)</i>
 *    - LUFA/Drivers/USB/Core/HostStandardReq.c <i>(Makefile source module name: LUFA_SRC_USB)</i>
@ -382,7 +382,7 @@
 		#include "Core/USBTask.h"
 		#include "Core/Events.h"
 		#include "Core/StdDescriptors.h"
-		#include "Core/ConfigDescriptor.h"
+		#include "Core/ConfigDescriptors.h"
 		#include "Core/USBController.h"
 		#include "Core/USBInterrupt.h"

--- a/Projects/makefile
+++ b/Projects/makefile
@ -22,16 +22,18 @@ ifeq ($(MAKELEVEL), 10)
   $(error EMERGENCY ABORT: INFINITE RECURSION DETECTED)
 endif

-# If building without a per-project object directory, we can't build in parallel
+# Need to special-case building without a per-project object directory
 ifeq ($(OBJDIR),)
-   .NOTPARALLEL:
-
-   # Ensure projects are pre-cleaned if the target is the default or "all"
+   # 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

--- a/1
+++ b/1
@ -14,6 +14,7 @@
 # "make help" for additional target build information within a specific project.

 all:
+
 %:
 	@echo Executing \"make $@\" on all LUFA library elements.
 	@echo