Skip to content

Commit

Permalink
Fix makefile errors when MAKEFILE_DEBUG is defined. (#6304)
Browse files Browse the repository at this point in the history
#changelog #makefiles
  • Loading branch information
bakercp authored and arturoc committed Jun 6, 2019
1 parent 63de87f commit e71fc74
Show file tree
Hide file tree
Showing 2 changed files with 49 additions and 49 deletions.
44 changes: 22 additions & 22 deletions libs/openFrameworksCompiled/project/makefileCommon/config.addons.mk
Original file line number Diff line number Diff line change
Expand Up @@ -241,26 +241,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
Original file line number Diff line number Diff line change
Expand Up @@ -92,18 +92,18 @@ OF_CORE_LIBRARY_LDFLAGS += $(addprefix -L,$(PLATFORM_LIBRARY_SEARCH_PATHS))
# DEBUG INFO
################################################################################
ifdef MAKEFILE_DEBUG
$(info =============================configure.core.flags.make========================)
$(info ---OF_CORE_LIBS_LDFLAGS---)
$(foreach v, $(OF_CORE_LIBS_LDFLAGS),$(info $(v)))
$(info =============================configure.core.flags.make========================)
$(info ---OF_CORE_LIBS_LDFLAGS---)
$(foreach v, $(OF_CORE_LIBS_LDFLAGS),$(info $(v)))

$(info ---OF_CORE_LIBS---)
$(foreach v, $(OF_CORE_LIBS),$(info $(v)))
$(info ---OF_CORE_LIBS---)
$(foreach v, $(OF_CORE_LIBS),$(info $(v)))
endif

################################# ADDONS ######################################

ifdef MAKEFILE_DEBUG
$(info ===================ADDONS================)
$(info ===================ADDONS================)
endif

# check to make sure OF_ROOT is defined
Expand Down Expand Up @@ -194,9 +194,9 @@ ifdef B_PROCESS_ADDONS
PROJECT_ADDONS = $(filter-out $(INVALID_PROJECT_ADDONS),$(REQUESTED_PROJECT_ADDONS))

ifdef MAKEFILE_DEBUG
$(info ---PROJECT_ADDONS---)
$(foreach v, $(PROJECT_ADDONS),$(info $(v)))
$(info --------------------)
$(info ---PROJECT_ADDONS---)
$(foreach v, $(PROJECT_ADDONS),$(info $(v)))
$(info --------------------)
endif

############################################################################
Expand Down Expand Up @@ -274,11 +274,11 @@ OF_PROJECT_EXCLUSIONS += $(PROJECT_ROOT)/build/%
# create a list of all dirs in the project root that might be valid project
# source directories
ALL_OF_PROJECT_SOURCE_PATHS = $(shell $(FIND) $(PROJECT_ROOT)/src \
-type d \
-not -path "./bin/*" \
-not -path "./obj/*" \
-not -path "./*.xcodeproj/*" \
-not -path "*/\.*")
-type d \
-not -path "./bin/*" \
-not -path "./obj/*" \
-not -path "./*.xcodeproj/*" \
-not -path "*/\.*")
ifneq ($(PROJECT_EXTERNAL_SOURCE_PATHS),)
ALL_OF_PROJECT_SOURCE_PATHS += $(PROJECT_EXTERNAL_SOURCE_PATHS)
ALL_OF_PROJECT_SOURCE_PATHS += $(shell $(FIND) $(PROJECT_EXTERNAL_SOURCE_PATHS) -mindepth 1 -type d | grep -v "/\.[^\.]")
Expand All @@ -288,11 +288,11 @@ endif
OF_PROJECT_SOURCE_PATHS = $(filter-out $(OF_PROJECT_EXCLUSIONS),$(ALL_OF_PROJECT_SOURCE_PATHS))

ifdef MAKEFILE_DEBUG
$(info ---OF_PROJECT_SOURCE_PATHS---)
$(foreach v, $(OF_PROJECT_SOURCE_PATHS),$(info $(v)))
$(info ---OF_PROJECT_SOURCE_PATHS---)
$(foreach v, $(OF_PROJECT_SOURCE_PATHS),$(info $(v)))

$(info ---OF_PROJECT_EXCLUSIONS---)
$(foreach v, $(OF_PROJECT_EXCLUSIONS),$(info $(v)))
$(info ---OF_PROJECT_EXCLUSIONS---)
$(foreach v, $(OF_PROJECT_EXCLUSIONS),$(info $(v)))
endif

# find all sources inside the project's source directory (recursively)
Expand All @@ -307,8 +307,8 @@ OF_PROJECT_INCLUDES_CFLAGS := $(addprefix -I,$(filter-out $(PROJECT_INCLUDE_EXCL
OF_ADDON_INCLUDES_CFLAGS += $(addprefix -I,$(filter-out $(PROJECT_INCLUDE_EXCLUSIONS),$(PROJECT_ADDONS_INCLUDES)))

ifdef MAKEFILE_DEBUG
$(info ---OF_PROJECT_INCLUDES_CFLAGS---)
$(foreach v, $(OF_PROJECT_INCLUDES_CFLAGS),$(info $(v)))
$(info ---OF_PROJECT_INCLUDES_CFLAGS---)
$(foreach v, $(OF_PROJECT_INCLUDES_CFLAGS),$(info $(v)))
endif

################################################################################
Expand Down Expand Up @@ -370,7 +370,7 @@ OF_PROJECT_LDFLAGS += $(addprefix -framework ,$(PROJECT_ADDONS_FRAMEWORKS))

################################################################################
ifdef MAKEFILE_DEBUG
$(info ===================compile.project.make=============================)
$(info ===================compile.project.make=============================)
endif

ifdef PROJECT_CXX
Expand Down Expand Up @@ -487,12 +487,12 @@ endif
# define the subdirectory for our target name

ifdef MAKEFILE_DEBUG
$(info ---OF_PROJECT_SOURCE_FILES---)
$(foreach v, $(OF_PROJECT_SOURCE_FILES),$(info $(v)))
$(info ---OF_PROJECT_SOURCE_FILES---)
$(foreach v, $(OF_PROJECT_SOURCE_FILES),$(info $(v)))
endif
ifdef MAKEFILE_DEBUG
$(info ---OF_PROJECT_DEPENDENCY_FILES---)
$(foreach v, $(OF_PROJECT_DEPENDENCY_FILES),$(info $(v)))
$(info ---OF_PROJECT_DEPENDENCY_FILES---)
$(foreach v, $(OF_PROJECT_DEPENDENCY_FILES),$(info $(v)))
endif


Expand All @@ -509,6 +509,6 @@ OF_PROJECT_DEPENDENCY_FILES = $(OF_PROJECT_DEPS) $(OF_PROJECT_ADDONS_DEPS)


ifdef MAKEFILE_DEBUG
$(info ---OF_PROJECT_DEPENDENCY_FILES---)
$(foreach v, $(OF_PROJECT_DEPENDENCY_FILES),$(info $(v)))
$(info ---OF_PROJECT_DEPENDENCY_FILES---)
$(foreach v, $(OF_PROJECT_DEPENDENCY_FILES),$(info $(v)))
endif

0 comments on commit e71fc74

Please sign in to comment.