Makefile strict tab

openframeworks · Jan 16, 2025 · 403eaca · 403eaca
1 parent 6241725
commit 403eaca
Show file tree

Hide file tree

Showing 5 changed files with 86 additions and 82 deletions.
diff --git a/libs/openFrameworksCompiled/project/linux/64/config.linux64.default.mk b/libs/openFrameworksCompiled/project/linux/64/config.linux64.default.mk
@@ -28,8 +28,8 @@
 include $(OF_SHARED_MAKEFILES_PATH)/config.linux.common.mk
 
 ifneq ($(shell command -v ld.gold),)
-    PLATFORM_LDFLAGS += -fuse-ld=gold
-    $(info Using Gold linker.)
+	PLATFORM_LDFLAGS += -fuse-ld=gold
+	$(info Using Gold linker.)
 else
-    $(info Gold linker not found. Using default linker.)
+	$(info Gold linker not found. Using default linker.)
 endif
diff --git a/libs/openFrameworksCompiled/project/linux/aarch64/config.linuxaarch64.default.mk b/libs/openFrameworksCompiled/project/linux/aarch64/config.linuxaarch64.default.mk
@@ -95,7 +95,7 @@ PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/openFrameworks/sound/ofFmodSoundPlay
 
 ifeq ($(CROSS_COMPILING),1)
 ifdef MAKEFILE_DEBUG
-    $(info detected cross compiling $(CROSS_COMPILING))
+	$(info detected cross compiling $(CROSS_COMPILING))
 endif
 
 	ifdef GCC_PREFIX

diff --git a/libs/openFrameworksCompiled/project/linux/arm64/config.linuxarm64.default.mk b/libs/openFrameworksCompiled/project/linux/arm64/config.linuxarm64.default.mk
@@ -95,7 +95,7 @@ PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/openFrameworks/sound/ofFmodSoundPlay
 
 ifeq ($(CROSS_COMPILING),1)
 ifdef MAKEFILE_DEBUG
-    $(info detected cross compiling $(CROSS_COMPILING))
+	$(info detected cross compiling $(CROSS_COMPILING))
 endif
 
 	ifdef GCC_PREFIX

diff --git a/libs/openFrameworksCompiled/project/makefileCommon/config.addons.mk b/libs/openFrameworksCompiled/project/makefileCommon/config.addons.mk
@@ -3,22 +3,22 @@
 ########################################################################
 
 ifeq ($(PLATFORM_OS),Darwin)
-    PLATFORM_ALTERNATIVE := osx
-else 
+	PLATFORM_ALTERNATIVE := osx
+else
 	PLATFORM_ALTERNATIVE := void
 endif
 
 # Variable containing all grep commands to exclude unwanted paths
 EXCLUDE_PATHS_GREP = grep -v "/tvos-arm64" | \
-                     grep -v "/tvos-arm64_x86_64-simulator" | \
-                     grep -v "/ios-arm64" | \
-                     grep -v "/ios-arm64_x86_64-simulator" | \
-                     grep -v "/ios-arm64_x86_64-maccatalyst" | \
-                     grep -v "/xros-arm64" | \
-                     grep -v "/xros-arm64_x86_64-simulator" | \
-                     grep -v "/watchos-arm64_32_armv7k" | \
-                     grep -v "/watchos-arm64_i386-simulator" | \
-                     grep -v "/\.[^\.]"
+					 grep -v "/tvos-arm64_x86_64-simulator" | \
+					 grep -v "/ios-arm64" | \
+					 grep -v "/ios-arm64_x86_64-simulator" | \
+					 grep -v "/ios-arm64_x86_64-maccatalyst" | \
+					 grep -v "/xros-arm64" | \
+					 grep -v "/xros-arm64_x86_64-simulator" | \
+					 grep -v "/watchos-arm64_32_armv7k" | \
+					 grep -v "/watchos-arm64_i386-simulator" | \
+					 grep -v "/\.[^\.]"
 
 # parses addons includes, in PARSED_ADDON_INCLUDES receives full PATHS to addons
 define parse_addons_includes
@@ -229,7 +229,7 @@ define parse_addon
 			$(eval PROJECT_ADDONS += $(addon_dep)) \
 			$(call parse_addon,$(addon_dep)) \
 		) \
-	)	
+	)
 endef
 
 
@@ -268,26 +268,26 @@ OF_PROJECT_ADDONS_DEPS = $(patsubst %.o,%.d,$(PROJECT_ADDONS_OBJ_FILES))
 ########################################################################
 # print debug information if so instructed
 ifdef MAKEFILE_DEBUG
-    $(info ---PROJECT_ADDONS_PATHS---)
-    $(foreach v, $(PROJECT_ADDONS_PATHS),$(info $(v)))
-    $(info ---PROJECT_ADDONS_WITH_CONFIG---)
-    $(foreach v, $(PROJECT_ADDONS_WITH_CONFIG),$(info $(v)))
-    $(info ---PROJECT_ADDONS_INCLUDES---)
-    $(foreach v, $(PROJECT_ADDONS_INCLUDES),$(info $(v)))
-    $(info ---PROJECT_ADDONS_SOURCE_FILES---)
-    $(foreach v, $(PROJECT_ADDONS_SOURCE_FILES),$(info $(v)))
-    $(info ---PROJECT_ADDONS_LIBS---)
-    $(foreach v, $(PROJECT_ADDONS_LIBS),$(info $(v)))
-    $(info ---PROJECT_ADDONS_OBJFILES---)
-    $(foreach v, $(PROJECT_ADDONS_OBJFILES),$(info $(v)))
-    $(info ---PROJECT_ADDONS_BASE_CFLAGS---)
-    $(foreach v, $(PROJECT_ADDONS_BASE_CFLAGS),$(info $(v)))
-    $(info ---PROJECT_ADDONS_DEFINES_CFLAGS---)
-    $(foreach v, $(PROJECT_ADDONS_DEFINES_CFLAGS),$(info $(v)))
-    $(info ---PROJECT_ADDONS_INCLUDES_CFLAGS---)
-    $(foreach v, $(PROJECT_ADDONS_INCLUDES_CFLAGS),$(info $(v)))
-    $(info ---PROJECT_ADDONS_LDFLAGS---)
-    $(foreach v, $(PROJECT_ADDONS_LDFLAGS),$(info $(v)))
-    $(info ---PROJECT_ADDONS_DATA---)
-    $(foreach v, $(PROJECT_ADDONS_DATA),$(info $(v)))
+	$(info ---PROJECT_ADDONS_PATHS---)
+	$(foreach v, $(PROJECT_ADDONS_PATHS),$(info $(v)))
+	$(info ---PROJECT_ADDONS_WITH_CONFIG---)
+	$(foreach v, $(PROJECT_ADDONS_WITH_CONFIG),$(info $(v)))
+	$(info ---PROJECT_ADDONS_INCLUDES---)
+	$(foreach v, $(PROJECT_ADDONS_INCLUDES),$(info $(v)))
+	$(info ---PROJECT_ADDONS_SOURCE_FILES---)
+	$(foreach v, $(PROJECT_ADDONS_SOURCE_FILES),$(info $(v)))
+	$(info ---PROJECT_ADDONS_LIBS---)
+	$(foreach v, $(PROJECT_ADDONS_LIBS),$(info $(v)))
+	$(info ---PROJECT_ADDONS_OBJFILES---)
+	$(foreach v, $(PROJECT_ADDONS_OBJFILES),$(info $(v)))
+	$(info ---PROJECT_ADDONS_BASE_CFLAGS---)
+	$(foreach v, $(PROJECT_ADDONS_BASE_CFLAGS),$(info $(v)))
+	$(info ---PROJECT_ADDONS_DEFINES_CFLAGS---)
+	$(foreach v, $(PROJECT_ADDONS_DEFINES_CFLAGS),$(info $(v)))
+	$(info ---PROJECT_ADDONS_INCLUDES_CFLAGS---)
+	$(foreach v, $(PROJECT_ADDONS_INCLUDES_CFLAGS),$(info $(v)))
+	$(info ---PROJECT_ADDONS_LDFLAGS---)
+	$(foreach v, $(PROJECT_ADDONS_LDFLAGS),$(info $(v)))
+	$(info ---PROJECT_ADDONS_DATA---)
+	$(foreach v, $(PROJECT_ADDONS_DATA),$(info $(v)))
 endif
diff --git a/libs/openFrameworksCompiled/project/makefileCommon/config.shared.mk b/libs/openFrameworksCompiled/project/makefileCommon/config.shared.mk
@@ -31,7 +31,7 @@ PLATFORM_OS ?= $(shell uname -s)
 HOST_OS=$(shell uname -s)
 
 ifdef MAKEFILE_DEBUG
-    $(info HOST_OS=${HOST_OS})
+	$(info HOST_OS=${HOST_OS})
 endif
 
 ifneq (,$(findstring MSYS_NT,$(HOST_OS)))
@@ -70,13 +70,13 @@ endif
 
 
 ifdef MAKEFILE_DEBUG
-    $(info PLATFORM_ARCH=$(PLATFORM_ARCH))
-    $(info PLATFORM_OS=$(PLATFORM_OS))
-    $(info HOST_ARCH=$(HOST_ARCH))
-    $(info HOST_OS=$(HOST_OS))
-    $(info CROSS_COMPILING=$(CROSS_COMPILING))
-    $(info PLATFORM_VARIANT=$(PLATFORM_VARIANT))
-    $(info IS_RASPBIAN=$(IS_RASPBIAN))
+	$(info PLATFORM_ARCH=$(PLATFORM_ARCH))
+	$(info PLATFORM_OS=$(PLATFORM_OS))
+	$(info HOST_ARCH=$(HOST_ARCH))
+	$(info HOST_OS=$(HOST_OS))
+	$(info CROSS_COMPILING=$(CROSS_COMPILING))
+	$(info PLATFORM_VARIANT=$(PLATFORM_VARIANT))
+	$(info IS_RASPBIAN=$(IS_RASPBIAN))
 endif
 
 # if not defined, construct the default PLATFORM_LIB_SUBPATH
@@ -142,11 +142,11 @@ endif
 
 # if desired, print the variables
 ifdef MAKEFILE_DEBUG
-    $(info =================== config.mk platform detection ================)
-    $(info PLATFORM_ARCH=$(PLATFORM_ARCH))
-    $(info PLATFORM_OS=$(PLATFORM_OS))
-    $(info PLATFORM_VARIANT=$(PLATFORM_VARIANT))
-    $(info PLATFORM_LIB_SUBPATH=$(PLATFORM_LIB_SUBPATH))
+	$(info =================== config.mk platform detection ================)
+	$(info PLATFORM_ARCH=$(PLATFORM_ARCH))
+	$(info PLATFORM_OS=$(PLATFORM_OS))
+	$(info PLATFORM_VARIANT=$(PLATFORM_VARIANT))
+	$(info PLATFORM_LIB_SUBPATH=$(PLATFORM_LIB_SUBPATH))
 endif
 
 
@@ -209,28 +209,32 @@ endif
 ################################################################################
 # print debug information if needed
 ifdef MAKEFILE_DEBUG
-    $(info =================== config.mk paths =============================)
-    $(info OF_ADDONS_PATH=$(OF_ADDONS_PATH))
-    $(info OF_EXAMPLES_PATH=$(OF_EXAMPLES_PATH))
-    $(info OF_APPS_PATH=$(OF_APPS_PATH))
-    $(info OF_LIBS_PATH=$(OF_LIBS_PATH))
-    $(info OF_LIBS_OPENFRAMEWORKS_PATH=$(OF_LIBS_OPENFRAMEWORKS_PATH))
-    $(info OF_LIBS_OF_COMPILED_PATH=$(OF_LIBS_OF_COMPILED_PATH))
-    $(info OF_LIBS_OF_COMPILED_PROJECT_PATH=$(OF_LIBS_OF_COMPILED_PROJECT_PATH))
-    $(info OF_SHARED_MAKEFILES_PATH=$(OF_SHARED_MAKEFILES_PATH))
-    $(info OF_PLATFORM_MAKEFILES=$(OF_PLATFORM_MAKEFILES))
-    $(info OF_CORE_LIB_PATH=$(OF_CORE_LIB_PATH))
+	$(info =================== config.mk paths =============================)
+	$(info OF_ADDONS_PATH=$(OF_ADDONS_PATH))
+	$(info OF_EXAMPLES_PATH=$(OF_EXAMPLES_PATH))
+	$(info OF_APPS_PATH=$(OF_APPS_PATH))
+	$(info OF_LIBS_PATH=$(OF_LIBS_PATH))
+	$(info OF_LIBS_OPENFRAMEWORKS_PATH=$(OF_LIBS_OPENFRAMEWORKS_PATH))
+	$(info OF_LIBS_OF_COMPILED_PATH=$(OF_LIBS_OF_COMPILED_PATH))
+	$(info OF_LIBS_OF_COMPILED_PROJECT_PATH=$(OF_LIBS_OF_COMPILED_PROJECT_PATH))
+	$(info OF_SHARED_MAKEFILES_PATH=$(OF_SHARED_MAKEFILES_PATH))
+	$(info OF_PLATFORM_MAKEFILES=$(OF_PLATFORM_MAKEFILES))
+	$(info OF_CORE_LIB_PATH=$(OF_CORE_LIB_PATH))
+	$(info PLATFORM_VARIANT=$(PLATFORM_VARIANT))
 endif
 
 ifeq ($(wildcard $(OF_LIBS_OF_COMPILED_PROJECT_PATH)/$(PLATFORM_LIB_SUBPATH)),)
 $(error This package doesn't support your platform, $(OF_LIBS_OF_COMPILED_PROJECT_PATH) / $(PLATFORM_LIB_SUBPATH) probably you downloaded the wrong package?)
 endif
 
 # generate a list of valid core platform variants from the files in the platform makefiles directory
-AVAILABLE_PLATFORM_VARIANTS=$(shell $(FIND) $(OF_PLATFORM_MAKEFILES)/config.*.mk -maxdepth 2 -type f | sed -E 's/.*\.([^\.]*)\.mk/\1/' )
-$(info AVAILABLE_PLATFORM_VARIANTS=$(AVAILABLE_PLATFORM_VARIANTS))
+AVAILABLE_PLATFORM_VARIANTS=$(shell $(FIND) $(OF_PLATFORM_MAKEFILES)/config.*.mk -maxdepth 1 -type f | sed -E 's/.*\.([^\.]*)\.mk/\1/' )
 AVAILABLE_PLATFORM_VARIANTS+=default
 
+ifdef MAKEFILE_DEBUG
+	$(info AVAILABLE_PLATFORM_VARIANTS=$(AVAILABLE_PLATFORM_VARIANTS))
+endif
+
 # check to see if we have a file for the desired variant.  if not, quit and list the variants.
 ifeq ($(findstring $(PLATFORM_VARIANT),$(AVAILABLE_PLATFORM_VARIANTS)),)
 	$(error Platform Variant "$(PLATFORM_VARIANT)" is not valid. Valid variants include [$(strip $(AVAILABLE_PLATFORM_VARIANTS))])
@@ -308,14 +312,14 @@ CORE_PKG_CONFIG_LIBRARIES += $(PROJECT_PKG_CONFIG_LIBRARIES)
 ifneq ($(strip $(CORE_PKG_CONFIG_LIBRARIES)),)
 ifneq ($(strip $(PKG_CONFIG_LIBDIR)),)
 ifdef MAKEFILE_DEBUG
-    $(info checking pkg-config libraries: $(CORE_PKG_CONFIG_LIBRARIES))
-    $(info with PKG_CONFIG_LIBDIR=$(PKG_CONFIG_LIBDIR))
+	$(info checking pkg-config libraries: $(CORE_PKG_CONFIG_LIBRARIES))
+	$(info with PKG_CONFIG_LIBDIR=$(PKG_CONFIG_LIBDIR))
 endif
 FAILED_PKG=$(shell export PKG_CONFIG_LIBDIR=$(PKG_CONFIG_LIBDIR); for pkg in $(CORE_PKG_CONFIG_LIBRARIES); do $(PLATFORM_PKG_CONFIG) $$pkg --cflags > /dev/null; if [ $$? -ne 0 ]; then echo $$pkg; return; fi; done; echo 0)
 else
 ifdef MAKEFILE_DEBUG
-    $(info checking pkg-config libraries: $(CORE_PKG_CONFIG_LIBRARIES))
-    $(info with PKG_CONFIG_LIBDIR=$(PKG_CONFIG_LIBDIR))
+	$(info checking pkg-config libraries: $(CORE_PKG_CONFIG_LIBRARIES))
+	$(info with PKG_CONFIG_LIBDIR=$(PKG_CONFIG_LIBDIR))
 endif
 FAILED_PKG=$(shell for pkg in $(CORE_PKG_CONFIG_LIBRARIES); do $(PLATFORM_PKG_CONFIG) $$pkg --cflags > /dev/null; if [ $$? -ne 0 ]; then echo $$pkg; return; fi; done; echo 0)
 endif
@@ -367,22 +371,22 @@ OF_CORE_HEADER_FILES=$(filter-out $(CORE_EXCLUSIONS),$(shell $(FIND) $(OF_CORE_S
 # DEBUG INFO
 ################################################################################
 ifdef MAKEFILE_DEBUG
-    $(info ========================= config.mk flags ========================)
-    $(info ---OF_CORE_DEFINES_CFLAGS---)
-    $(foreach v, $(OF_CORE_DEFINES_CFLAGS),$(info $(v)))
+	$(info ========================= config.mk flags ========================)
+	$(info ---OF_CORE_DEFINES_CFLAGS---)
+	$(foreach v, $(OF_CORE_DEFINES_CFLAGS),$(info $(v)))
 
-    $(info ---OF_CORE_INCLUDES_CFLAGS---)
-    $(foreach v, $(OF_CORE_INCLUDES_CFLAGS),$(info $(v)))
+	$(info ---OF_CORE_INCLUDES_CFLAGS---)
+	$(foreach v, $(OF_CORE_INCLUDES_CFLAGS),$(info $(v)))
 
-    $(info ---OF_CORE_FRAMEWORKS_CFLAGS---)
-    $(foreach v, $(OF_CORE_FRAMEWORKS_CFLAGS),$(info $(v)))
+	$(info ---OF_CORE_FRAMEWORKS_CFLAGS---)
+	$(foreach v, $(OF_CORE_FRAMEWORKS_CFLAGS),$(info $(v)))
 
-    $(info ---OF_CORE_SOURCE_FILES---)
-    $(foreach v, $(OF_CORE_SOURCE_FILES),$(info $(v)))
+	$(info ---OF_CORE_SOURCE_FILES---)
+	$(foreach v, $(OF_CORE_SOURCE_FILES),$(info $(v)))
 
-    $(info ---OF_CORE_HEADER_FILES---)
-    $(foreach v, $(OF_CORE_HEADER_FILES),$(info $(v)))
+	$(info ---OF_CORE_HEADER_FILES---)
+	$(foreach v, $(OF_CORE_HEADER_FILES),$(info $(v)))
 
-    $(info ---PLATFORM_CORE_EXCLUSIONS---)
-    $(foreach v, $(PLATFORM_CORE_EXCLUSIONS),$(info $(v)))
+	$(info ---PLATFORM_CORE_EXCLUSIONS---)
+	$(foreach v, $(PLATFORM_CORE_EXCLUSIONS),$(info $(v)))
 endif