Skip to content

Commit 403eaca

Browse files
danoli3danoli3
committed
Makefile strict tab
1 parent 6241725 commit 403eaca

File tree

5 files changed

+86
-82
lines changed

5 files changed

+86
-82
lines changed

‎libs/openFrameworksCompiled/project/linux/64/config.linux64.default.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
include $(OF_SHARED_MAKEFILES_PATH)/config.linux.common.mk
2929

3030
ifneq ($(shell command -v ld.gold),)
31-
PLATFORM_LDFLAGS += -fuse-ld=gold
32-
$(info Using Gold linker.)
31+
PLATFORM_LDFLAGS += -fuse-ld=gold
32+
$(info Using Gold linker.)
3333
else
34-
$(info Gold linker not found. Using default linker.)
34+
$(info Gold linker not found. Using default linker.)
3535
endif

‎libs/openFrameworksCompiled/project/linux/aarch64/config.linuxaarch64.default.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/openFrameworks/sound/ofFmodSoundPlay
9595

9696
ifeq ($(CROSS_COMPILING),1)
9797
ifdef MAKEFILE_DEBUG
98-
$(info detected cross compiling $(CROSS_COMPILING))
98+
$(info detected cross compiling $(CROSS_COMPILING))
9999
endif
100100

101101
ifdef GCC_PREFIX

‎libs/openFrameworksCompiled/project/linux/arm64/config.linuxarm64.default.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/openFrameworks/sound/ofFmodSoundPlay
9595

9696
ifeq ($(CROSS_COMPILING),1)
9797
ifdef MAKEFILE_DEBUG
98-
$(info detected cross compiling $(CROSS_COMPILING))
98+
$(info detected cross compiling $(CROSS_COMPILING))
9999
endif
100100

101101
ifdef GCC_PREFIX

‎libs/openFrameworksCompiled/project/makefileCommon/config.addons.mk

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,22 @@
33
########################################################################
44

55
ifeq ($(PLATFORM_OS),Darwin)
6-
PLATFORM_ALTERNATIVE := osx
7-
else
6+
PLATFORM_ALTERNATIVE := osx
7+
else
88
PLATFORM_ALTERNATIVE := void
99
endif
1010

1111
# Variable containing all grep commands to exclude unwanted paths
1212
EXCLUDE_PATHS_GREP = grep -v "/tvos-arm64" | \
13-
grep -v "/tvos-arm64_x86_64-simulator" | \
14-
grep -v "/ios-arm64" | \
15-
grep -v "/ios-arm64_x86_64-simulator" | \
16-
grep -v "/ios-arm64_x86_64-maccatalyst" | \
17-
grep -v "/xros-arm64" | \
18-
grep -v "/xros-arm64_x86_64-simulator" | \
19-
grep -v "/watchos-arm64_32_armv7k" | \
20-
grep -v "/watchos-arm64_i386-simulator" | \
21-
grep -v "/\.[^\.]"
13+
grep -v "/tvos-arm64_x86_64-simulator" | \
14+
grep -v "/ios-arm64" | \
15+
grep -v "/ios-arm64_x86_64-simulator" | \
16+
grep -v "/ios-arm64_x86_64-maccatalyst" | \
17+
grep -v "/xros-arm64" | \
18+
grep -v "/xros-arm64_x86_64-simulator" | \
19+
grep -v "/watchos-arm64_32_armv7k" | \
20+
grep -v "/watchos-arm64_i386-simulator" | \
21+
grep -v "/\.[^\.]"
2222

2323
# parses addons includes, in PARSED_ADDON_INCLUDES receives full PATHS to addons
2424
define parse_addons_includes
@@ -229,7 +229,7 @@ define parse_addon
229229
$(eval PROJECT_ADDONS += $(addon_dep)) \
230230
$(call parse_addon,$(addon_dep)) \
231231
) \
232-
)
232+
)
233233
endef
234234

235235

@@ -268,26 +268,26 @@ OF_PROJECT_ADDONS_DEPS = $(patsubst %.o,%.d,$(PROJECT_ADDONS_OBJ_FILES))
268268
########################################################################
269269
# print debug information if so instructed
270270
ifdef MAKEFILE_DEBUG
271-
$(info ---PROJECT_ADDONS_PATHS---)
272-
$(foreach v, $(PROJECT_ADDONS_PATHS),$(info $(v)))
273-
$(info ---PROJECT_ADDONS_WITH_CONFIG---)
274-
$(foreach v, $(PROJECT_ADDONS_WITH_CONFIG),$(info $(v)))
275-
$(info ---PROJECT_ADDONS_INCLUDES---)
276-
$(foreach v, $(PROJECT_ADDONS_INCLUDES),$(info $(v)))
277-
$(info ---PROJECT_ADDONS_SOURCE_FILES---)
278-
$(foreach v, $(PROJECT_ADDONS_SOURCE_FILES),$(info $(v)))
279-
$(info ---PROJECT_ADDONS_LIBS---)
280-
$(foreach v, $(PROJECT_ADDONS_LIBS),$(info $(v)))
281-
$(info ---PROJECT_ADDONS_OBJFILES---)
282-
$(foreach v, $(PROJECT_ADDONS_OBJFILES),$(info $(v)))
283-
$(info ---PROJECT_ADDONS_BASE_CFLAGS---)
284-
$(foreach v, $(PROJECT_ADDONS_BASE_CFLAGS),$(info $(v)))
285-
$(info ---PROJECT_ADDONS_DEFINES_CFLAGS---)
286-
$(foreach v, $(PROJECT_ADDONS_DEFINES_CFLAGS),$(info $(v)))
287-
$(info ---PROJECT_ADDONS_INCLUDES_CFLAGS---)
288-
$(foreach v, $(PROJECT_ADDONS_INCLUDES_CFLAGS),$(info $(v)))
289-
$(info ---PROJECT_ADDONS_LDFLAGS---)
290-
$(foreach v, $(PROJECT_ADDONS_LDFLAGS),$(info $(v)))
291-
$(info ---PROJECT_ADDONS_DATA---)
292-
$(foreach v, $(PROJECT_ADDONS_DATA),$(info $(v)))
271+
$(info ---PROJECT_ADDONS_PATHS---)
272+
$(foreach v, $(PROJECT_ADDONS_PATHS),$(info $(v)))
273+
$(info ---PROJECT_ADDONS_WITH_CONFIG---)
274+
$(foreach v, $(PROJECT_ADDONS_WITH_CONFIG),$(info $(v)))
275+
$(info ---PROJECT_ADDONS_INCLUDES---)
276+
$(foreach v, $(PROJECT_ADDONS_INCLUDES),$(info $(v)))
277+
$(info ---PROJECT_ADDONS_SOURCE_FILES---)
278+
$(foreach v, $(PROJECT_ADDONS_SOURCE_FILES),$(info $(v)))
279+
$(info ---PROJECT_ADDONS_LIBS---)
280+
$(foreach v, $(PROJECT_ADDONS_LIBS),$(info $(v)))
281+
$(info ---PROJECT_ADDONS_OBJFILES---)
282+
$(foreach v, $(PROJECT_ADDONS_OBJFILES),$(info $(v)))
283+
$(info ---PROJECT_ADDONS_BASE_CFLAGS---)
284+
$(foreach v, $(PROJECT_ADDONS_BASE_CFLAGS),$(info $(v)))
285+
$(info ---PROJECT_ADDONS_DEFINES_CFLAGS---)
286+
$(foreach v, $(PROJECT_ADDONS_DEFINES_CFLAGS),$(info $(v)))
287+
$(info ---PROJECT_ADDONS_INCLUDES_CFLAGS---)
288+
$(foreach v, $(PROJECT_ADDONS_INCLUDES_CFLAGS),$(info $(v)))
289+
$(info ---PROJECT_ADDONS_LDFLAGS---)
290+
$(foreach v, $(PROJECT_ADDONS_LDFLAGS),$(info $(v)))
291+
$(info ---PROJECT_ADDONS_DATA---)
292+
$(foreach v, $(PROJECT_ADDONS_DATA),$(info $(v)))
293293
endif

‎libs/openFrameworksCompiled/project/makefileCommon/config.shared.mk

Lines changed: 47 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ PLATFORM_OS ?= $(shell uname -s)
3131
HOST_OS=$(shell uname -s)
3232

3333
ifdef MAKEFILE_DEBUG
34-
$(info HOST_OS=${HOST_OS})
34+
$(info HOST_OS=${HOST_OS})
3535
endif
3636

3737
ifneq (,$(findstring MSYS_NT,$(HOST_OS)))
@@ -70,13 +70,13 @@ endif
7070

7171

7272
ifdef MAKEFILE_DEBUG
73-
$(info PLATFORM_ARCH=$(PLATFORM_ARCH))
74-
$(info PLATFORM_OS=$(PLATFORM_OS))
75-
$(info HOST_ARCH=$(HOST_ARCH))
76-
$(info HOST_OS=$(HOST_OS))
77-
$(info CROSS_COMPILING=$(CROSS_COMPILING))
78-
$(info PLATFORM_VARIANT=$(PLATFORM_VARIANT))
79-
$(info IS_RASPBIAN=$(IS_RASPBIAN))
73+
$(info PLATFORM_ARCH=$(PLATFORM_ARCH))
74+
$(info PLATFORM_OS=$(PLATFORM_OS))
75+
$(info HOST_ARCH=$(HOST_ARCH))
76+
$(info HOST_OS=$(HOST_OS))
77+
$(info CROSS_COMPILING=$(CROSS_COMPILING))
78+
$(info PLATFORM_VARIANT=$(PLATFORM_VARIANT))
79+
$(info IS_RASPBIAN=$(IS_RASPBIAN))
8080
endif
8181

8282
# if not defined, construct the default PLATFORM_LIB_SUBPATH
@@ -142,11 +142,11 @@ endif
142142

143143
# if desired, print the variables
144144
ifdef MAKEFILE_DEBUG
145-
$(info =================== config.mk platform detection ================)
146-
$(info PLATFORM_ARCH=$(PLATFORM_ARCH))
147-
$(info PLATFORM_OS=$(PLATFORM_OS))
148-
$(info PLATFORM_VARIANT=$(PLATFORM_VARIANT))
149-
$(info PLATFORM_LIB_SUBPATH=$(PLATFORM_LIB_SUBPATH))
145+
$(info =================== config.mk platform detection ================)
146+
$(info PLATFORM_ARCH=$(PLATFORM_ARCH))
147+
$(info PLATFORM_OS=$(PLATFORM_OS))
148+
$(info PLATFORM_VARIANT=$(PLATFORM_VARIANT))
149+
$(info PLATFORM_LIB_SUBPATH=$(PLATFORM_LIB_SUBPATH))
150150
endif
151151

152152

@@ -209,28 +209,32 @@ endif
209209
################################################################################
210210
# print debug information if needed
211211
ifdef MAKEFILE_DEBUG
212-
$(info =================== config.mk paths =============================)
213-
$(info OF_ADDONS_PATH=$(OF_ADDONS_PATH))
214-
$(info OF_EXAMPLES_PATH=$(OF_EXAMPLES_PATH))
215-
$(info OF_APPS_PATH=$(OF_APPS_PATH))
216-
$(info OF_LIBS_PATH=$(OF_LIBS_PATH))
217-
$(info OF_LIBS_OPENFRAMEWORKS_PATH=$(OF_LIBS_OPENFRAMEWORKS_PATH))
218-
$(info OF_LIBS_OF_COMPILED_PATH=$(OF_LIBS_OF_COMPILED_PATH))
219-
$(info OF_LIBS_OF_COMPILED_PROJECT_PATH=$(OF_LIBS_OF_COMPILED_PROJECT_PATH))
220-
$(info OF_SHARED_MAKEFILES_PATH=$(OF_SHARED_MAKEFILES_PATH))
221-
$(info OF_PLATFORM_MAKEFILES=$(OF_PLATFORM_MAKEFILES))
222-
$(info OF_CORE_LIB_PATH=$(OF_CORE_LIB_PATH))
212+
$(info =================== config.mk paths =============================)
213+
$(info OF_ADDONS_PATH=$(OF_ADDONS_PATH))
214+
$(info OF_EXAMPLES_PATH=$(OF_EXAMPLES_PATH))
215+
$(info OF_APPS_PATH=$(OF_APPS_PATH))
216+
$(info OF_LIBS_PATH=$(OF_LIBS_PATH))
217+
$(info OF_LIBS_OPENFRAMEWORKS_PATH=$(OF_LIBS_OPENFRAMEWORKS_PATH))
218+
$(info OF_LIBS_OF_COMPILED_PATH=$(OF_LIBS_OF_COMPILED_PATH))
219+
$(info OF_LIBS_OF_COMPILED_PROJECT_PATH=$(OF_LIBS_OF_COMPILED_PROJECT_PATH))
220+
$(info OF_SHARED_MAKEFILES_PATH=$(OF_SHARED_MAKEFILES_PATH))
221+
$(info OF_PLATFORM_MAKEFILES=$(OF_PLATFORM_MAKEFILES))
222+
$(info OF_CORE_LIB_PATH=$(OF_CORE_LIB_PATH))
223+
$(info PLATFORM_VARIANT=$(PLATFORM_VARIANT))
223224
endif
224225

225226
ifeq ($(wildcard $(OF_LIBS_OF_COMPILED_PROJECT_PATH)/$(PLATFORM_LIB_SUBPATH)),)
226227
$(error This package doesn't support your platform, $(OF_LIBS_OF_COMPILED_PROJECT_PATH) / $(PLATFORM_LIB_SUBPATH) probably you downloaded the wrong package?)
227228
endif
228229

229230
# generate a list of valid core platform variants from the files in the platform makefiles directory
230-
AVAILABLE_PLATFORM_VARIANTS=$(shell $(FIND) $(OF_PLATFORM_MAKEFILES)/config.*.mk -maxdepth 2 -type f | sed -E 's/.*\.([^\.]*)\.mk/\1/' )
231-
$(info AVAILABLE_PLATFORM_VARIANTS=$(AVAILABLE_PLATFORM_VARIANTS))
231+
AVAILABLE_PLATFORM_VARIANTS=$(shell $(FIND) $(OF_PLATFORM_MAKEFILES)/config.*.mk -maxdepth 1 -type f | sed -E 's/.*\.([^\.]*)\.mk/\1/' )
232232
AVAILABLE_PLATFORM_VARIANTS+=default
233233

234+
ifdef MAKEFILE_DEBUG
235+
$(info AVAILABLE_PLATFORM_VARIANTS=$(AVAILABLE_PLATFORM_VARIANTS))
236+
endif
237+
234238
# check to see if we have a file for the desired variant. if not, quit and list the variants.
235239
ifeq ($(findstring $(PLATFORM_VARIANT),$(AVAILABLE_PLATFORM_VARIANTS)),)
236240
$(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)
308312
ifneq ($(strip $(CORE_PKG_CONFIG_LIBRARIES)),)
309313
ifneq ($(strip $(PKG_CONFIG_LIBDIR)),)
310314
ifdef MAKEFILE_DEBUG
311-
$(info checking pkg-config libraries: $(CORE_PKG_CONFIG_LIBRARIES))
312-
$(info with PKG_CONFIG_LIBDIR=$(PKG_CONFIG_LIBDIR))
315+
$(info checking pkg-config libraries: $(CORE_PKG_CONFIG_LIBRARIES))
316+
$(info with PKG_CONFIG_LIBDIR=$(PKG_CONFIG_LIBDIR))
313317
endif
314318
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)
315319
else
316320
ifdef MAKEFILE_DEBUG
317-
$(info checking pkg-config libraries: $(CORE_PKG_CONFIG_LIBRARIES))
318-
$(info with PKG_CONFIG_LIBDIR=$(PKG_CONFIG_LIBDIR))
321+
$(info checking pkg-config libraries: $(CORE_PKG_CONFIG_LIBRARIES))
322+
$(info with PKG_CONFIG_LIBDIR=$(PKG_CONFIG_LIBDIR))
319323
endif
320324
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)
321325
endif
@@ -367,22 +371,22 @@ OF_CORE_HEADER_FILES=$(filter-out $(CORE_EXCLUSIONS),$(shell $(FIND) $(OF_CORE_S
367371
# DEBUG INFO
368372
################################################################################
369373
ifdef MAKEFILE_DEBUG
370-
$(info ========================= config.mk flags ========================)
371-
$(info ---OF_CORE_DEFINES_CFLAGS---)
372-
$(foreach v, $(OF_CORE_DEFINES_CFLAGS),$(info $(v)))
374+
$(info ========================= config.mk flags ========================)
375+
$(info ---OF_CORE_DEFINES_CFLAGS---)
376+
$(foreach v, $(OF_CORE_DEFINES_CFLAGS),$(info $(v)))
373377

374-
$(info ---OF_CORE_INCLUDES_CFLAGS---)
375-
$(foreach v, $(OF_CORE_INCLUDES_CFLAGS),$(info $(v)))
378+
$(info ---OF_CORE_INCLUDES_CFLAGS---)
379+
$(foreach v, $(OF_CORE_INCLUDES_CFLAGS),$(info $(v)))
376380

377-
$(info ---OF_CORE_FRAMEWORKS_CFLAGS---)
378-
$(foreach v, $(OF_CORE_FRAMEWORKS_CFLAGS),$(info $(v)))
381+
$(info ---OF_CORE_FRAMEWORKS_CFLAGS---)
382+
$(foreach v, $(OF_CORE_FRAMEWORKS_CFLAGS),$(info $(v)))
379383

380-
$(info ---OF_CORE_SOURCE_FILES---)
381-
$(foreach v, $(OF_CORE_SOURCE_FILES),$(info $(v)))
384+
$(info ---OF_CORE_SOURCE_FILES---)
385+
$(foreach v, $(OF_CORE_SOURCE_FILES),$(info $(v)))
382386

383-
$(info ---OF_CORE_HEADER_FILES---)
384-
$(foreach v, $(OF_CORE_HEADER_FILES),$(info $(v)))
387+
$(info ---OF_CORE_HEADER_FILES---)
388+
$(foreach v, $(OF_CORE_HEADER_FILES),$(info $(v)))
385389

386-
$(info ---PLATFORM_CORE_EXCLUSIONS---)
387-
$(foreach v, $(PLATFORM_CORE_EXCLUSIONS),$(info $(v)))
390+
$(info ---PLATFORM_CORE_EXCLUSIONS---)
391+
$(foreach v, $(PLATFORM_CORE_EXCLUSIONS),$(info $(v)))
388392
endif

0 commit comments

Comments
 (0)