mirror of
ssh://git.janware.com/srv/git/janware/proj/jw-pkg
synced 2026-01-26 15:23:54 +01:00
conf/jcs, make, tmpl/doxygen: Align equal signs in makefiles to column 30
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
parent
e3142c9624
commit
0eaef0c326
59 changed files with 2065 additions and 2032 deletions
|
|
@ -9,7 +9,7 @@ CACHED_FILES := defs.mk projects.mk platform.mk Makefile
|
||||||
#CACHED_VARS = $(shell sed '/^[ \t]*\([A-Z_]\+\) *\(.=\).*$$.shell/!d; s/ *.=.*//' $(CACHED_FILES))
|
#CACHED_VARS = $(shell sed '/^[ \t]*\([A-Z_]\+\) *\(.=\).*$$.shell/!d; s/ *.=.*//' $(CACHED_FILES))
|
||||||
CACHED_VARS := WHICH ECHO TEST BROWSER SED RM PWD ID CUT TR AWK GETENT XARGS FIND PRINTF HOST_TUPLE OS_NAME_VERSION OS_NAME CAT BIN_INSTALL SUDO
|
CACHED_VARS := WHICH ECHO TEST BROWSER SED RM PWD ID CUT TR AWK GETENT XARGS FIND PRINTF HOST_TUPLE OS_NAME_VERSION OS_NAME CAT BIN_INSTALL SUDO
|
||||||
#CACHED_VARS += TARGET_ARCH RPM_ARCH
|
#CACHED_VARS += TARGET_ARCH RPM_ARCH
|
||||||
CACHED_VARS += TARGET_ARCH
|
#CACHED_VARS += TARGET_ARCH
|
||||||
#CACHED_VARS += DEVELOPMENT
|
#CACHED_VARS += DEVELOPMENT
|
||||||
|
|
||||||
include $(TOPDIR)/make/proj.mk
|
include $(TOPDIR)/make/proj.mk
|
||||||
|
|
|
||||||
|
|
@ -126,7 +126,7 @@ ifeq ($(COMPILER_SUITE),gcc)
|
||||||
STRIP ?= $(TC_BIN_PREFIX)strip
|
STRIP ?= $(TC_BIN_PREFIX)strip
|
||||||
RANLIB ?= $(TC_BIN_PREFIX)ranlib
|
RANLIB ?= $(TC_BIN_PREFIX)ranlib
|
||||||
AR ?= $(TC_BIN_PREFIX)ar
|
AR ?= $(TC_BIN_PREFIX)ar
|
||||||
PKG_CONFIG ?= $(TC_BIN_PREFIX)pkg-config
|
PKG_CONFIG_EXE ?= $(TC_BIN_PREFIX)pkg-config
|
||||||
|
|
||||||
# compiler and linker
|
# compiler and linker
|
||||||
# gcc
|
# gcc
|
||||||
|
|
@ -291,9 +291,9 @@ ifneq ($(filter jw-build,$(PREREQ_BUILD)),)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(USE_SYSTEMD),true)
|
ifeq ($(USE_SYSTEMD),true)
|
||||||
BUILD_CFLAGS += -D_USE_SYSTEMD_ $(shell $(PKG_CONFIG) --cflags libsystemd)
|
BUILD_CFLAGS += -D_USE_SYSTEMD_ $(shell $(PKG_CONFIG_EXE) --cflags libsystemd)
|
||||||
BUILD_CPPFLAGS += -D_USE_SYSTEMD_ $(shell $(PKG_CONFIG) --cflags libsystemd)
|
BUILD_CPPFLAGS += -D_USE_SYSTEMD_ $(shell $(PKG_CONFIG_EXE) --cflags libsystemd)
|
||||||
BUILD_LDFLAGS += $(shell $(PKG_CONFIG) --libs libsystemd)
|
BUILD_LDFLAGS += $(shell $(PKG_CONFIG_EXE) --libs libsystemd)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(USE_TIMER),true)
|
ifeq ($(USE_TIMER),true)
|
||||||
|
|
@ -486,9 +486,9 @@ ifeq ($(USE_FFTW),true)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(USE_GLIB),true)
|
ifeq ($(USE_GLIB),true)
|
||||||
PROJECT_CFLAGS += $(shell $(PKG_CONFIG) --cflags glib-2.0)
|
PROJECT_CFLAGS += $(shell $(PKG_CONFIG_EXE) --cflags glib-2.0)
|
||||||
PROJECT_CPPFLAGS += $(shell $(PKG_CONFIG) --cflags glib-2.0)
|
PROJECT_CPPFLAGS += $(shell $(PKG_CONFIG_EXE) --cflags glib-2.0)
|
||||||
LIBFLAGS += $(shell $(PKG_CONFIG) --libs glib-2.0)
|
LIBFLAGS += $(shell $(PKG_CONFIG_EXE) --libs glib-2.0)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(CC),$(CLANG))
|
ifeq ($(CC),$(CLANG))
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
ifndef DEV_UTILS_MK_INCLUDED
|
ifndef DEV_UTILS_MK_INCLUDED
|
||||||
DEV_UTILS_MK_INCLUDED = true
|
DEV_UTILS_MK_INCLUDED = true
|
||||||
|
|
||||||
MAKEFILE_INDENT_EQUAL_POS ?= 35
|
MAKEFILE_INDENT_EQUAL_POS ?= 30
|
||||||
MAKEFILE_INDENT_NAME_REGEX ?= (\.mk$$|makefile$$|Makefile$$|GNUmakefile$$)
|
MAKEFILE_INDENT_NAME_REGEX ?= (\.mk$$|makefile$$|Makefile$$|GNUmakefile$$)
|
||||||
MAKEFILE_INDENT_ROOT ?= .
|
MAKEFILE_INDENT_ROOT ?= .
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -16,15 +16,48 @@ $(eval $(call try_include,$(MODDIR)/make/pre-local.mk))
|
||||||
$(eval $(call try_include,$(TOPDIR)/make/pre-local.mk))
|
$(eval $(call try_include,$(TOPDIR)/make/pre-local.mk))
|
||||||
$(eval $(call try_include,pre-local.mk))
|
$(eval $(call try_include,pre-local.mk))
|
||||||
|
|
||||||
|
MOD_SCRIPT_DIR := $(firstword $(wildcard $(MODDIR)/scripts $(MODDIR)/bin))
|
||||||
|
ifndef GET_OS_SH
|
||||||
|
GET_OS_SH := $(SHELL) $(MOD_SCRIPT_DIR)/get-os.sh
|
||||||
|
endif
|
||||||
|
|
||||||
ifndef TARGET
|
ifndef TARGET
|
||||||
ifneq ($(subst mingw,,$(CWD)),$(CWD))
|
ifneq ($(subst mingw,,$(CWD)),$(CWD))
|
||||||
TARGET := mingw
|
TARGET := mingw
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
MOD_SCRIPT_DIR := $(firstword $(wildcard $(MODDIR)/scripts $(MODDIR)/bin))
|
DEFINE_FROM_TARGET := false
|
||||||
ifndef GET_OS_SH
|
ifdef TARGET
|
||||||
GET_OS_SH := $(SHELL) $(MOD_SCRIPT_DIR)/get-os.sh
|
ifndef TARGET_TUPLE
|
||||||
|
ifndef TARGET_TRIPLET
|
||||||
|
DEFINE_FROM_TARGET := true
|
||||||
|
endif
|
||||||
|
else ifndef TARGET_TRIPLET
|
||||||
|
ifndef TARGET_TUPLE
|
||||||
|
DEFINE_FROM_TARGET := true
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
ifeq ($(DEFINE_FROM_TARGET),true)
|
||||||
|
ifeq ($(TARGET),mingw)
|
||||||
|
TARGET_ARCH ?= i686
|
||||||
|
TARGET_ABI := mingw32
|
||||||
|
TARGET_OS ?= w64
|
||||||
|
else ifeq ($(TARGET),mingw32)
|
||||||
|
TARGET_ARCH ?= i686
|
||||||
|
TARGET_ABI := mingw32
|
||||||
|
TARGET_OS ?= w64
|
||||||
|
else ifeq ($(TARGET),mingw64)
|
||||||
|
TARGET_ARCH ?= x86_64
|
||||||
|
TARGET_ABI := mingw64
|
||||||
|
TARGET_OS := w64
|
||||||
|
endif
|
||||||
|
TARGET_ARCH ?= i686
|
||||||
|
TARGET_VENDOR ?= unknown
|
||||||
|
TARGET_OS ?= linux
|
||||||
|
TARGET_ABI ?= gnu
|
||||||
|
endif
|
||||||
|
TARGET_TUPLE := $(TARGET_ARCH)-$(TARGET_VENDOR)-$(TARGET_OS)-$(TARGET_ABI)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(HOST_TUPLE),)
|
ifeq ($(HOST_TUPLE),)
|
||||||
|
|
@ -45,29 +78,29 @@ else
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq ($(TARGET_TUPLE),)
|
ifneq ($(TARGET_TUPLE),)
|
||||||
TARGET_TUPLE_WORDS := $(subst -, ,$(TARGET_TUPLE))
|
TARGET_TUPLE_WORDS ?= $(subst -, ,$(TARGET_TUPLE))
|
||||||
TARGET_ARCH := $(word 1,$(TARGET_TUPLE_WORDS))
|
TARGET_ARCH ?= $(word 1,$(TARGET_TUPLE_WORDS))
|
||||||
TARGET_VENDOR := $(word 2,$(TARGET_TUPLE_WORDS))
|
TARGET_VENDOR ?= $(word 2,$(TARGET_TUPLE_WORDS))
|
||||||
TARGET_OS := $(word 3,$(TARGET_TUPLE_WORDS))
|
TARGET_OS ?= $(word 3,$(TARGET_TUPLE_WORDS))
|
||||||
TARGET_ABI := $(word 4,$(TARGET_TUPLE_WORDS))
|
TARGET_ABI ?= $(word 4,$(TARGET_TUPLE_WORDS))
|
||||||
TARGET_TRIPLET := $(TARGET_ARCH)-$(TARGET_OS)-$(TARGET_ABI)
|
TARGET_TRIPLET ?= $(TARGET_ARCH)-$(TARGET_OS)-$(TARGET_ABI)
|
||||||
else ifneq ($(TARGET_TRIPLET),)
|
else ifneq ($(TARGET_TRIPLET),)
|
||||||
TARGET_TRIPLET_WORDS := $(subst -, ,$(TARGET_TRIPLET))
|
TARGET_TRIPLET_WORDS ?= $(subst -, ,$(TARGET_TRIPLET))
|
||||||
TARGET_ARCH := $(word 1,$(TARGET_TRIPLET_WORDS))
|
TARGET_ARCH ?= $(word 1,$(TARGET_TRIPLET_WORDS))
|
||||||
TARGET_VENDOR := unknown
|
TARGET_VENDOR ?= unknown
|
||||||
TARGET_OS := $(word 2,$(TARGET_TRIPLET_WORDS))
|
TARGET_OS ?= $(word 2,$(TARGET_TRIPLET_WORDS))
|
||||||
TARGET_ABI := $(word 3,$(TARGET_TRIPLET_WORDS))
|
TARGET_ABI ?= $(word 3,$(TARGET_TRIPLET_WORDS))
|
||||||
TARGET_TUPLE := $(TARGET_ARCH)-$(TARGET_VENDOR)-$(TARGET_OS)-$(TARGET_ABI)
|
TARGET_TUPLE ?= $(TARGET_ARCH)-$(TARGET_VENDOR)-$(TARGET_OS)-$(TARGET_ABI)
|
||||||
TARGET_TUPLE_WORDS := $(subst -, ,$(TARGET_TUPLE))
|
TARGET_TUPLE_WORDS ?= $(subst -, ,$(TARGET_TUPLE))
|
||||||
else
|
else
|
||||||
TARGET_TUPLE := $(HOST_TUPLE)
|
TARGET_TUPLE ?= $(HOST_TUPLE)
|
||||||
TARGET_TUPLE_WORDS := $(subst -, ,$(TARGET_TUPLE))
|
TARGET_TUPLE_WORDS ?= $(subst -, ,$(TARGET_TUPLE))
|
||||||
TARGET_ARCH := $(word 1,$(TARGET_TUPLE_WORDS))
|
TARGET_ARCH ?= $(word 1,$(TARGET_TUPLE_WORDS))
|
||||||
TARGET_VENDOR := $(word 2,$(TARGET_TUPLE_WORDS))
|
TARGET_VENDOR ?= $(word 2,$(TARGET_TUPLE_WORDS))
|
||||||
TARGET_OS := $(word 3,$(TARGET_TUPLE_WORDS))
|
TARGET_OS ?= $(word 3,$(TARGET_TUPLE_WORDS))
|
||||||
TARGET_ABI := $(word 4,$(TARGET_TUPLE_WORDS))
|
TARGET_ABI ?= $(word 4,$(TARGET_TUPLE_WORDS))
|
||||||
TARGET_TRIPLET := $(TARGET_ARCH)-$(TARGET_OS)-$(TARGET_ABI)
|
TARGET_TRIPLET ?= $(TARGET_ARCH)-$(TARGET_OS)-$(TARGET_ABI)
|
||||||
TARGET_TRIPLET_WORDS := $(subst -, ,$(TARGET_TRIPLET))
|
TARGET_TRIPLET_WORDS ?= $(subst -, ,$(TARGET_TRIPLET))
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(TARGET_TUPLE),)
|
ifeq ($(TARGET_TUPLE),)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue