mirror of
				https://github.com/mfulz/qmk_firmware.git
				synced 2025-11-04 07:12:33 +01:00 
			
		
		
		
	Avoid loading keymap rules.mk twice (#24665)
This commit is contained in:
		
							parent
							
								
									1da8aa8259
								
							
						
					
					
						commit
						5eb53be671
					
				@ -197,8 +197,10 @@ ifneq ("$(wildcard $(KEYMAP_JSON))", "")
 | 
				
			|||||||
    KEYMAP_C := $(INTERMEDIATE_OUTPUT)/src/keymap.c
 | 
					    KEYMAP_C := $(INTERMEDIATE_OUTPUT)/src/keymap.c
 | 
				
			||||||
    KEYMAP_H := $(INTERMEDIATE_OUTPUT)/src/config.h
 | 
					    KEYMAP_H := $(INTERMEDIATE_OUTPUT)/src/config.h
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    # Load the keymap-level rules.mk if exists
 | 
					    ifeq ($(OTHER_KEYMAP_C),)
 | 
				
			||||||
 | 
					        # Load the keymap-level rules.mk if exists (and we havent already loaded it for keymap.c)
 | 
				
			||||||
        -include $(KEYMAP_PATH)/rules.mk
 | 
					        -include $(KEYMAP_PATH)/rules.mk
 | 
				
			||||||
 | 
					    endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    # Load any rules.mk content from keymap.json
 | 
					    # Load any rules.mk content from keymap.json
 | 
				
			||||||
    INFO_RULES_MK = $(shell $(QMK_BIN) generate-rules-mk --quiet --escape --output $(INTERMEDIATE_OUTPUT)/src/rules.mk $(KEYMAP_JSON))
 | 
					    INFO_RULES_MK = $(shell $(QMK_BIN) generate-rules-mk --quiet --escape --output $(INTERMEDIATE_OUTPUT)/src/rules.mk $(KEYMAP_JSON))
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user