janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 12:03:31 +01:00
Code Activity

defs-cpp.mk, mcu-defs.mk, rules.mk: Code beautification and re-ordering

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-03-22 21:43:16 +00:00
commit ed76759a42
3 changed files with 79 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

62
make/defs-cpp.mk
View file

@ -72,11 +72,6 @@ ifneq ($(TARGET_TRIPLET),$(HOST_TRIPLET)) # we're cross-compiling
else # we're not cross-compiling
TC_SYS_ROOT ?= /usr
ifeq ($(LIBTYPE),shared)
LIBFLAGS += -ldl
else
LIBFLAGS += -l:libdl.a
endif
LIBFLAGS += -pthread
endif
@ -107,7 +102,7 @@ ifeq ($(COMPILER_SUITE),gcc)
# Not needed anywhere
#GNU_LD_VERSION := $(shell $(LD) -V | $(SED) '/GNU ld/ !d; s/(.*)//; s/[^0-9.-]*//')
#GNU_LD_VERSION_NUMBERS := $(subst ., ,$(GNU_LD_VERSION))
#GNU_LD_VERSION_NUMBERS := $(subst ., ,$(GNU_LD_VERSION))
#GNU_LD_MAJOR := $(word 1,$(GNU_LD_VERSION_NUMBERS))
#GNU_LD_MINOR := $(word 2,$(GNU_LD_VERSION_NUMBERS))
#GNU_LD_REV := $(word 3,$(GNU_LD_VERSION_NUMBERS))
@ -139,6 +134,27 @@ else ifeq ($(COMPILER_SUITE),clang)
endif # COMPILER_SUITE
# -- jw-build variables based on arch and toolchain
ifeq ($(TARGET_TRIPLET),arm-none-eabi)
LIBTYPE ?= static
else
LIBTYPE ?= shared
endif
INTEL_ARCHS := i386 i486 i586 i686 x86_64
ifneq ($(findstring $(TARGET_ARCH),$(INTEL_ARCHS)),)
TAGGED_TMPL_TAGS += x86
endif
ifeq ($(COMPILER_SUITE),gcc)
DEBUGGER ?= gdb
BUILD_EXTRA_DEBUG_FLAGS += -ggdb
else ifeq ($(COMPILER_SUITE),clang)
DEBUGGER = lldb
endif
# -- gather compiler options in BUILD_XXXFLAGS
BUILD_CFLAGS += $(CFLAGS)
@ -154,9 +170,13 @@ ifeq ($(TARGET_ARCH),$(ARCH_32))
PROJECT_LDFLAGS += -m32
endif
ifeq ($(TARGET_ARCH),x86_64)
ifneq ($(findstring $(TARGET_ARCH),$(INTEL_ARCHS)),)
BUILD_CPPFLAGS += -fPIC
LIBFLAGS +=
ifeq ($(LIBTYPE),shared)
LIBFLAGS += -ldl
else
LIBFLAGS += -l:libdl.a
endif
endif
ifeq ($(TARGET_ARCH),armv7hl)
@ -165,22 +185,8 @@ else ifeq ($(TARGET_ARCH),aarch64)
PROJECT_CPPFLAGS += -fPIC
endif
ifeq ($(TARGET_TRIPLET),arm-none-eabi)
LIBTYPE ?= static
else
LIBTYPE ?= shared
endif
ifeq ($(COMPILER_SUITE),gcc)
DEBUGGER ?= gdb
BUILD_EXTRA_DEBUG_FLAGS += -ggdb
endif
ifeq ($(COMPILER_SUITE),clang)
DEBUGGER = lldb
endif
ifeq ($(DEVELOPMENT),true)
BUILD_CPPFLAGS += -D_DEVELOPMENT_
export G_SLICE = always-malloc
export G_DEBUG = gc-friendly,resident-modules
export MALLOC_CHECK_ = 2
@ -359,12 +365,6 @@ ALL_C += $(LOCAL_C) $(PREREQ_CPP)
ALL_CPP += $(LOCAL_CPP) $(PREREQ_CPP)
ALL_CSRC += $(LOCAL_CSRC) $(PREREQ_CSRC)
# ==
ifeq ($(DEVELOPMENT),true)
BUILD_CPPFLAGS += -D_DEVELOPMENT_
endif
CORE += $(filter-out $(wildcard *.intern-state*),$(wildcard core core.* vgcore vgcore.*))
ifeq ($(GCC_MAJOR),4)
@ -402,10 +402,6 @@ ifeq ($(TARGET),mingw)
BUILD_LDFLAGS += -fstack-protector
endif
# TODO: this shoud be only conditional, but breaks, because not all headers
# do a conditional include of timer headers, yet
GENERATE_FUNC_TIMERS = $(MODDIR)/YStopWatchThreadList/generate_func_timers.sh
ifeq ($(LOG_THREAD_NAMES), true)
BUILD_CPPFLAGS += -DSLOG_THREAD_NAMES
endif

26
make/mcu-defs.mk
View file

@ -6,19 +6,19 @@
# endif
#endef
ifneq ($(MAKECMDGOALS),clean)
ifeq ($(MCU_BOARD_MODEL),)
$(error MCU_BOARD_MODEL not specified)
endif
ifeq ($(MCU_FLASH_OFFSET),)
$(error MCU_FLASH_OFFSET not specified)
endif
ifeq ($(MCU_FLASH_SIZE),)
$(error MCU_FLASH_SIZE not specified)
endif
endif
#ifneq ($(MAKECMDGOALS),clean)
# ifeq ($(MCU_BOARD_MODEL),)
# $(error MCU_BOARD_MODEL not specified)
# endif
#
# ifeq ($(MCU_FLASH_OFFSET),)
# $(error MCU_FLASH_OFFSET not specified)
# endif
#
# ifeq ($(MCU_FLASH_SIZE),)
# $(error MCU_FLASH_SIZE not specified)
# endif
#endif
MCU_PRODUCT_TMPL_DIR ?= $(MODDIR)/tmpl/products

82
make/rules.mk
View file

@ -3,12 +3,11 @@
# contact@jannet.de
# $Id$
# -- standard targets
all:
ifndef JW_BUILD_RULES_MK_INCLUDED
JW_BUILD_RULES_MK_INCLUDED = true
# -- standard targets
all:
install: all
clean: tmpclean
distclean: clean
@ -41,7 +40,6 @@ distclean: clean
remake \
runclean \
textclean \
timerclean \
tmpclean \
uicclean \
varclean \
@ -49,9 +47,6 @@ distclean: clean
# -- phony targets
echo_all:
@echo "$(ALL)"
checkroot:
@if [ "$(CHECK_ROOT)" = true -o "$(CHECK_ROOT)" = TRUE ] ; then \
echo "Error: You can only do this if either" ;\
@ -100,7 +95,7 @@ doneclean:
execlean: allclean objclean runclean textclean
$(RM) -rf $(EXE) $(PLUGIN)
distclean: clean objclean textclean vcdistclean profclean timerclean varclean
distclean: clean objclean textclean vcdistclean profclean varclean
localclean: $(LOCAL_CLEAN)
$(RM) -rf $(CLEAN)
@ -117,9 +112,6 @@ prereqclean:
profclean:
$(RM) -f *.da *.bb *.bbg *.gcov *.gcda *.gcno
timerclean:
$(RM) -f timers_*.h
varclean:
$(RM) -rf $(CLEAN) $(DISTCLEAN) $(AC_FILES)
@ -141,6 +133,9 @@ prepend_header:
remake:
set -e; make $(addprefix -W ,$(SRC_FILES)) $(filter-out remake,$(MAKECMDGOALS))
echo-all:
@echo "ALL = $(ALL)"
echo-target:
@echo "TARGET_TUPLE = $(TARGET_TUPLE)"
@echo "TARGET_TUPLE_WORDS = $(TARGET_TUPLE_WORDS)"
@ -178,48 +173,48 @@ echo-ldflags:
@echo "REAL_LDFLAGS = $(REAL_LDFLAGS)"
echo-cflags:
@echo LOCAL_CFLAGS = $(LOCAL_CFLAGS)
@echo PROJECT_CFLAGS = $(PROJECT_CFLAGS)
@echo BUILD_CFLAGS = $(BUILD_CFLAGS)
@echo LOCAL_CXXFLAGS = $(LOCAL_CXXFLAGS)
@echo PROJECT_CXXFLAGS = $(PROJECT_CXXFLAGS)
@echo BUILD_CXXFLAGS = $(BUILD_CXXFLAGS)
@echo LOCAL_CPPFLAGS = $(LOCAL_CPPFLAGS)
@echo PROJECT_CPPFLAGS = $(PROJECT_CPPFLAGS)
@echo BUILD_CPPFLAGS = $(BUILD_CPPFLAGS)
@echo REAL_CFLAGS = $(REAL_CFLAGS)
@echo REAL_CXXFLAGS = $(REAL_CXXFLAGS)
@echo "LOCAL_CFLAGS = $(LOCAL_CFLAGS)"
@echo "PROJECT_CFLAGS = $(PROJECT_CFLAGS)"
@echo "BUILD_CFLAGS = $(BUILD_CFLAGS)"
@echo "LOCAL_CXXFLAGS = $(LOCAL_CXXFLAGS)"
@echo "PROJECT_CXXFLAGS = $(PROJECT_CXXFLAGS)"
@echo "BUILD_CXXFLAGS = $(BUILD_CXXFLAGS)"
@echo "LOCAL_CPPFLAGS = $(LOCAL_CPPFLAGS)"
@echo "PROJECT_CPPFLAGS = $(PROJECT_CPPFLAGS)"
@echo "BUILD_CPPFLAGS = $(BUILD_CPPFLAGS)"
@echo "REAL_CFLAGS = $(REAL_CFLAGS)"
@echo "REAL_CXXFLAGS = $(REAL_CXXFLAGS)"
echo-development:
echo DEVELOPMENT = $(DEVELOPMENT)
echo "DEVELOPMENT = $(DEVELOPMENT)"
echo-libpath:
@echo LD_LIBRARY_PATH = :$(LD_LIBRARY_PATH) | $(beautify_lib_path)
lddtree:
echo-lddtree:
bash $(MOD_SCRIPT_DIR)/linktree.sh $(REAL_LDFLAGS)
echo-path:
@echo PATH = :$(PATH) | $(beautify_lib_path)
echo-modules:
@echo "USERVER : $(USERVER_DIR)"
@echo "XCHANGE : $(XCHANGE_DIR)"
@echo "FEEDFS : $(FEEDFS_DIR)"
@echo "FEEDFS_UTILS : $(FEEDFS_UTILS_DIR)"
@echo "FEEDFS_NET : $(FEEDFS_NET_DIR)"
@echo "DSPCD : $(DSPCD_DIR)"
@echo "DSPROUT : $(DSPROUT_DIR)"
@echo "DSPIDER_SHARED : $(DSPIDER_SHARED_DIR)"
@echo "BTOOLS : $(BTOOLS_DIR)"
@echo "CCONSOLE : $(CCONSOLE_DIR)"
@echo "JACKJART : $(JACKJART_DIR)"
@echo "JACKRTAI : $(JACKRTAI_DIR)"
@echo "JACKDUMMY : $(JACKDUMMY_DIR)"
@echo "ALSART : $(ALSART_DIR)"
@echo "DSPFS : $(DSPFS_DIR)"
@echo "JW_BUILD : $(JW_BUILD_DIR)"
@echo "SCOPE_CASMIX : $(SCOPE_CASMIX_DIR)"
@echo "USERVER = $(USERVER_DIR)"
@echo "XCHANGE = $(XCHANGE_DIR)"
@echo "FEEDFS = $(FEEDFS_DIR)"
@echo "FEEDFS_UTILS = $(FEEDFS_UTILS_DIR)"
@echo "FEEDFS_NET = $(FEEDFS_NET_DIR)"
@echo "DSPCD = $(DSPCD_DIR)"
@echo "DSPROUT = $(DSPROUT_DIR)"
@echo "DSPIDER_SHARED = $(DSPIDER_SHARED_DIR)"
@echo "BTOOLS = $(BTOOLS_DIR)"
@echo "CCONSOLE = $(CCONSOLE_DIR)"
@echo "JACKJART = $(JACKJART_DIR)"
@echo "JACKRTAI = $(JACKRTAI_DIR)"
@echo "JACKDUMMY = $(JACKDUMMY_DIR)"
@echo "ALSART = $(ALSART_DIR)"
@echo "DSPFS = $(DSPFS_DIR)"
@echo "JW_BUILD = $(JW_BUILD_DIR)"
@echo "SCOPE_CASMIX = $(SCOPE_CASMIX_DIR)"
echo-include:
@echo "INCLUDE : $(INCLUDE)"
@ -254,7 +249,7 @@ core-pattern:
echo core.%e.%p | sudo tee /proc/sys/kernel/core_pattern
ifneq ($(TARGET),mingw)
ldd:
echo-ldd:
ifneq ($(wildcard *.so),)
@echo "======= libraries:"
@for o in *.so; do echo "------- $$o"; ldd $$o; done
@ -333,9 +328,6 @@ $(FLAVOUR_PREFIX)%.o: %.sx
$(LIB_A)(%.o): %.o
$(AR) crU $(LIB_A) $<
timers_%.h: %.h $(GENERATE_FUNC_TIMERS)
sh $(GENERATE_FUNC_TIMERS) $< $@
ifneq ($(USE_QT),)
$(OBJ): $(UIC_H) $(MOC_H) $(UIC_CPP) $(MOC_CPP) $(RCC_CPP)
endif