mirror of
				https://github.com/mfulz/qmk_firmware.git
				synced 2025-10-30 21:02:32 +01:00 
			
		
		
		
	Clean up DOXYGEN and SOURCES build system modules - use non-recursively evaluated make variables.
This commit is contained in:
		
							parent
							
								
									43e10d666b
								
							
						
					
					
						commit
						6655815b32
					
				| @ -66,11 +66,11 @@ $(call ERROR_IF_NONBOOL, DOXYGEN_FAIL_ON_WARNING) | |||||||
| MSG_DOXYGEN_CMD         := ' [DOXYGEN] :' | MSG_DOXYGEN_CMD         := ' [DOXYGEN] :' | ||||||
| 
 | 
 | ||||||
| # Determine Doxygen invocation command | # Determine Doxygen invocation command | ||||||
| BASE_DOXYGEN_CMD = ( cat $(DOXYGEN_CONF) $(DOXYGEN_OVERRIDE_PARAMS:%=; echo "%") ) | doxygen - | BASE_DOXYGEN_CMD := ( cat $(DOXYGEN_CONF) $(DOXYGEN_OVERRIDE_PARAMS:%=; echo "%") ) | doxygen - | ||||||
| ifeq ($(DOXYGEN_FAIL_ON_WARNING), Y) | ifeq ($(DOXYGEN_FAIL_ON_WARNING), Y) | ||||||
|    DOXYGEN_CMD = if ( $(BASE_DOXYGEN_CMD) 2>&1 | grep -v "warning: ignoring unsupported tag" ;); then exit 1; fi; |    DOXYGEN_CMD := if ( $(BASE_DOXYGEN_CMD) 2>&1 | grep -v "warning: ignoring unsupported tag" ;); then exit 1; fi; | ||||||
| else | else | ||||||
|    DOXYGEN_CMD = $(BASE_DOXYGEN_CMD) |    DOXYGEN_CMD := $(BASE_DOXYGEN_CMD) | ||||||
| endif | endif | ||||||
| 
 | 
 | ||||||
| doxygen: | doxygen: | ||||||
|  | |||||||
| @ -67,49 +67,49 @@ $(call ERROR_IF_EMPTY, ARCH) | |||||||
| LUFA_ROOT_PATH ?= $(patsubst %/,%,$(LUFA_PATH)) | LUFA_ROOT_PATH ?= $(patsubst %/,%,$(LUFA_PATH)) | ||||||
| 
 | 
 | ||||||
| # Construct LUFA module source variables | # Construct LUFA module source variables | ||||||
| LUFA_SRC_USB         = $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/Device_$(ARCH).c          \ | LUFA_SRC_USB         := $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/Device_$(ARCH).c          \ | ||||||
|                        $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/Endpoint_$(ARCH).c        \ |                         $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/Endpoint_$(ARCH).c        \ | ||||||
|                        $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/Host_$(ARCH).c            \ |                         $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/Host_$(ARCH).c            \ | ||||||
|                        $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/Pipe_$(ARCH).c            \ |                         $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/Pipe_$(ARCH).c            \ | ||||||
|                        $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/USBController_$(ARCH).c   \ |                         $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/USBController_$(ARCH).c   \ | ||||||
|                        $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/USBInterrupt_$(ARCH).c    \ |                         $(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)/EndpointStream_$(ARCH).c  \ | ||||||
|                        $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/PipeStream_$(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/ConfigDescriptor.c                \ | ||||||
|                        $(LUFA_ROOT_PATH)/Drivers/USB/Core/DeviceStandardReq.c               \ |                         $(LUFA_ROOT_PATH)/Drivers/USB/Core/DeviceStandardReq.c               \ | ||||||
|                        $(LUFA_ROOT_PATH)/Drivers/USB/Core/Events.c                          \ |                         $(LUFA_ROOT_PATH)/Drivers/USB/Core/Events.c                          \ | ||||||
|                        $(LUFA_ROOT_PATH)/Drivers/USB/Core/HostStandardReq.c                 \ |                         $(LUFA_ROOT_PATH)/Drivers/USB/Core/HostStandardReq.c                 \ | ||||||
|                        $(LUFA_ROOT_PATH)/Drivers/USB/Core/USBTask.c                         \ |                         $(LUFA_ROOT_PATH)/Drivers/USB/Core/USBTask.c                         \ | ||||||
|                        $(LUFA_ROOT_PATH)/Drivers/USB/Class/Common/HIDParser.c |                         $(LUFA_ROOT_PATH)/Drivers/USB/Class/Common/HIDParser.c | ||||||
| LUFA_SRC_USBCLASS    = $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/AudioClassDevice.c        \ | LUFA_SRC_USBCLASS    := $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/AudioClassDevice.c        \ | ||||||
|                        $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/CDCClassDevice.c          \ |                         $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/CDCClassDevice.c          \ | ||||||
|                        $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/HIDClassDevice.c          \ |                         $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/HIDClassDevice.c          \ | ||||||
|                        $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/MassStorageClassDevice.c  \ |                         $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/MassStorageClassDevice.c  \ | ||||||
|                        $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/MIDIClassDevice.c         \ |                         $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/MIDIClassDevice.c         \ | ||||||
|                        $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/RNDISClassDevice.c        \ |                         $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/RNDISClassDevice.c        \ | ||||||
|                        $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/AndroidAccessoryClassHost.c \ |                         $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/AndroidAccessoryClassHost.c \ | ||||||
|                        $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/AudioClassHost.c            \ |                         $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/AudioClassHost.c            \ | ||||||
|                        $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/CDCClassHost.c              \ |                         $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/CDCClassHost.c              \ | ||||||
|                        $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/HIDClassHost.c              \ |                         $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/HIDClassHost.c              \ | ||||||
|                        $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/MassStorageClassHost.c      \ |                         $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/MassStorageClassHost.c      \ | ||||||
|                        $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/MIDIClassHost.c             \ |                         $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/MIDIClassHost.c             \ | ||||||
|                        $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/PrinterClassHost.c          \ |                         $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/PrinterClassHost.c          \ | ||||||
|                        $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/RNDISClassHost.c            \ |                         $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/RNDISClassHost.c            \ | ||||||
|                        $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/StillImageClassHost.c |                         $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/StillImageClassHost.c | ||||||
| LUFA_SRC_TEMPERATURE = $(LUFA_ROOT_PATH)/Drivers/Board/Temperature.c | LUFA_SRC_TEMPERATURE := $(LUFA_ROOT_PATH)/Drivers/Board/Temperature.c | ||||||
| LUFA_SRC_SERIAL      = $(LUFA_ROOT_PATH)/Drivers/Peripheral/$(ARCH)/Serial_$(ARCH).c | LUFA_SRC_SERIAL      := $(LUFA_ROOT_PATH)/Drivers/Peripheral/$(ARCH)/Serial_$(ARCH).c | ||||||
| LUFA_SRC_TWI         = $(LUFA_ROOT_PATH)/Drivers/Peripheral/$(ARCH)/TWI_$(ARCH).c | LUFA_SRC_TWI         := $(LUFA_ROOT_PATH)/Drivers/Peripheral/$(ARCH)/TWI_$(ARCH).c | ||||||
| 
 | 
 | ||||||
| ifeq ($(ARCH), UC3) | ifeq ($(ARCH), UC3) | ||||||
|    LUFA_SRC_PLATFORM = $(LUFA_PATH)/Platform/UC3/Exception.S $(LUFA_PATH)/Platform/UC3/InterruptManagement.c |    LUFA_SRC_PLATFORM := $(LUFA_PATH)/Platform/UC3/Exception.S $(LUFA_PATH)/Platform/UC3/InterruptManagement.c | ||||||
| else | else | ||||||
|    LUFA_SRC_PLATFORM = |    LUFA_SRC_PLATFORM := | ||||||
| endif | endif | ||||||
| 
 | 
 | ||||||
| # Build a list of all available module sources | # Build a list of all available module sources | ||||||
| LUFA_SRC_ALL_FILES   = $(LUFA_SRC_USB)            \ | LUFA_SRC_ALL_FILES   := $(LUFA_SRC_USB)            \ | ||||||
|                        $(LUFA_SRC_USBCLASS)       \ |                         $(LUFA_SRC_USBCLASS)       \ | ||||||
|                        $(LUFA_SRC_TEMPERATURE)    \ |                         $(LUFA_SRC_TEMPERATURE)    \ | ||||||
|                        $(LUFA_SRC_SERIAL)         \ |                         $(LUFA_SRC_SERIAL)         \ | ||||||
|                        $(LUFA_SRC_TWI)            \ |                         $(LUFA_SRC_TWI)            \ | ||||||
| 					   $(LUFA_SRC_PLATFORM) | 					    $(LUFA_SRC_PLATFORM) | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 Dean Camera
						Dean Camera