janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-24 14:50:38 +01:00
Code Activity

conf/jcs, make, tmpl/doxygen: Align equal signs in makefiles to column 30

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-03-03 18:12:28 +00:00
commit 0eaef0c326
59 changed files with 2065 additions and 2032 deletions
Download patch file Download diff file Expand all files Collapse all files

28
conf/jcs/jcs.mk
View file

@ -1,18 +1,18 @@
SHELL = /bin/sh SHELL = /bin/sh
WD := $(shell pwd) WD := $(shell pwd)
MOD := $(shell pwd | xargs basename) MOD := $(shell pwd | xargs basename)
LOG_DIR := $(shell . /etc/jcs/jcs.conf; echo $$jcs_log_dir) LOG_DIR := $(shell . /etc/jcs/jcs.conf; echo $$jcs_log_dir)
INSTALL_LOG := $(LOG_DIR)/install.log INSTALL_LOG := $(LOG_DIR)/install.log
SETUP_LOG := $(LOG_DIR)/setup.log SETUP_LOG := $(LOG_DIR)/setup.log
TEE := /usr/bin/tee TEE := /usr/bin/tee
BINDIR := /usr/local/bin BINDIR := /usr/local/bin
SBINDIR := /usr/local/bin SBINDIR := /usr/local/bin
INF := $(wildcard *.inf) INF := $(wildcard *.inf)
INF_DONE := $(addsuffix .done,$(basename $(INF))) INF_DONE := $(addsuffix .done,$(basename $(INF)))
INF_SU_DONE := $(addsuffix .su_done,$(basename $(INF))) INF_SU_DONE := $(addsuffix .su_done,$(basename $(INF)))
JCS_HTTP_PATH := $(shell . /etc/jcs/jcs.conf; echo $$jcs_http_path) JCS_HTTP_PATH := $(shell . /etc/jcs/jcs.conf; echo $$jcs_http_path)
JCS = /opt/jw-build/bin/jcs JCS = /opt/jw-build/bin/jcs
export SETUP_LOG INSTALL_LOG TEE BINDIR SBINDIR export SETUP_LOG INSTALL_LOG TEE BINDIR SBINDIR

14
make/Makefile
View file

@ -3,14 +3,14 @@
# contact@jannet.de # contact@jannet.de
# $Id$ # $Id$
TOPDIR = .. TOPDIR = ..
CACHED_FILES := defs.mk projects.mk platform.mk Makefile 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
include $(MODDIR)/make/make.mk include $(MODDIR)/make/make.mk

12
make/autoconf.mk
View file

@ -3,12 +3,12 @@
# contact@jannet.de # contact@jannet.de
# $Id$ # $Id$
CONFIG_ACDONE := $(wildcard config.acdone) CONFIG_ACDONE := $(wildcard config.acdone)
DISTCLEAN += configure config.log autoscan.log configure.ac config.status DISTCLEAN += configure config.log autoscan.log configure.ac config.status
AC_FILES_IN = $(shell find . -maxdepth 2 -name '*.in' | grep -ve "contrib\|dist\|nomake") AC_FILES_IN = $(shell find . -maxdepth 2 -name '*.in' | grep -ve "contrib\|dist\|nomake")
AC_FILES = $(basename $(AC_FILES_IN)) AC_FILES = $(basename $(AC_FILES_IN))
CAT ?= /bin/cat CAT ?= /bin/cat
SED ?= $(firstword $(wildcard /usr/bin/sed /bin/sed)) SED ?= $(firstword $(wildcard /usr/bin/sed /bin/sed))
all: config.acdone make_all all: config.acdone make_all
config: config.acdone $(AC_FILES) config: config.acdone $(AC_FILES)

10
make/backup.mk
View file

@ -1,11 +1,11 @@
BACKUP_SOURCE ?= . BACKUP_SOURCE ?= .
BACKUP_TARGET ?= .. BACKUP_TARGET ?= ..
BACKUP_DATE ?= $(shell date +'%y%m%d-%H%M%S') BACKUP_DATE ?= $(shell date +'%y%m%d-%H%M%S')
_BACKUP_SOURCE = $(notdir $(shell cd $(BACKUP_SOURCE); $(PWD))) _BACKUP_SOURCE = $(notdir $(shell cd $(BACKUP_SOURCE); $(PWD)))
ifndef BACKUP_MK_INCLUDED ifndef BACKUP_MK_INCLUDED
BACKUP_MK_INCLUDED = true BACKUP_MK_INCLUDED = true
backup: distclean backup: distclean
tar -C .. $(_BACKUP_SOURCE) -cjf $(BACKUP_TARGET)/$(_BACKUP_SOURCE)-$(BACKUP_DATE).tar.bz2 tar -C .. $(_BACKUP_SOURCE) -cjf $(BACKUP_TARGET)/$(_BACKUP_SOURCE)-$(BACKUP_DATE).tar.bz2

10
make/cleandirs.mk
View file

@ -7,14 +7,14 @@ distclean: do.distclean
include $(MODDIR)/make/defs.mk include $(MODDIR)/make/defs.mk
SUBDIRS ?= $(FIND_SUBDIRS) SUBDIRS ?= $(FIND_SUBDIRS)
ifeq ($(FORCE_REBUILD_CLEANDIRS),true) ifeq ($(FORCE_REBUILD_CLEANDIRS),true)
SUBDIRS_ALL = $(SUBDIRS) SUBDIRS_ALL = $(SUBDIRS)
SUBDIRS_INSTALL = $(SUBDIRS) SUBDIRS_INSTALL = $(SUBDIRS)
else else
SUBDIRS_ALL ?= SUBDIRS_ALL ?=
SUBDIRS_INSTALL ?= SUBDIRS_INSTALL ?=
endif endif
do.all: do.all:

28
make/dav.mk
View file

@ -1,17 +1,17 @@
DAV_GROUP ?= jannet DAV_GROUP ?= jannet
DAV_GROUP_PROJECT ?= $(PROJECT_DIRNAME) DAV_GROUP_PROJECT ?= $(PROJECT_DIRNAME)
DAV_GROUP_PROJECT_GROUP ?= $(shell id -gn) DAV_GROUP_PROJECT_GROUP ?= $(shell id -gn)
DAV_GROUP_PROJECT_USER ?= $(shell id -un) DAV_GROUP_PROJECT_USER ?= $(shell id -un)
DAV_SERVER ?= cvs.jannet.de DAV_SERVER ?= cvs.jannet.de
DAV_RSYNC_SERVER ?= $(DAV_SERVER) DAV_RSYNC_SERVER ?= $(DAV_SERVER)
DAV_RSYNC_DIR ?= /srv/dav/pub/groups/$(DAV_GROUP)/$(DAV_GROUP_PROJECT) DAV_RSYNC_DIR ?= /srv/dav/pub/groups/$(DAV_GROUP)/$(DAV_GROUP_PROJECT)
DAV_RSYNC_URL = $(DAV_RSYNC_SERVER):$(DAV_RSYNC_DIR) DAV_RSYNC_URL = $(DAV_RSYNC_SERVER):$(DAV_RSYNC_DIR)
DAV_RSYNC_EXCLUDE ?= $(shell bash $(MOD_SCRIPT_DIR)/scm.sh ls-files) DAV_RSYNC_EXCLUDE ?= $(shell bash $(MOD_SCRIPT_DIR)/scm.sh ls-files)
DAV_RSYNC_EXCLUDE_OPTS = $(addprefix --exclude , $(DAV_RSYNC_EXCLUDE) '*.done') DAV_RSYNC_EXCLUDE_OPTS = $(addprefix --exclude , $(DAV_RSYNC_EXCLUDE) '*.done')
DAV_RSYNC_EXTRA_OPTS ?= DAV_RSYNC_EXTRA_OPTS ?=
DAV_RSYNC ?= rsync $(DAV_RSYNC_EXCLUDE_OPTS) DAV_RSYNC ?= rsync $(DAV_RSYNC_EXCLUDE_OPTS)
DAV_RSYNC_MODE ?= 664 DAV_RSYNC_MODE ?= 664
DAV_RSYNC_DIRMODE ?= 775 DAV_RSYNC_DIRMODE ?= 775
include $(MODDIR)/make/defs.mk include $(MODDIR)/make/defs.mk

10
make/debugger.mk
View file

@ -1,19 +1,19 @@
ifeq "$(COMPILER_SUITE)" "gcc" ifeq "$(COMPILER_SUITE)" "gcc"
DEBUGGER = gdb DEBUGGER = gdb
endif endif
ifeq "$(COMPILER_SUITE)" "clang" ifeq "$(COMPILER_SUITE)" "clang"
DEBUGGER = lldb DEBUGGER = lldb
endif endif
CORE_DUMPER = $(shell echo -e "quit" | $(DEBUGGER) --core=$(CORE) 2>&1 | \ CORE_DUMPER = $(shell echo -e "quit" | $(DEBUGGER) --core=$(CORE) 2>&1 | \
$(SED) '/Core was generated/ !d; s/Core was generated by `//; s/ .*//') $(SED) '/Core was generated/ !d; s/Core was generated by `//; s/ .*//')
ifeq ($(CORE_DUMPER),) ifeq ($(CORE_DUMPER),)
CORE_DUMPER = $(EXE_PATH) CORE_DUMPER = $(EXE_PATH)
endif endif
PID = $(shell pidof $(EXE_PATH)) PID = $(shell pidof $(EXE_PATH))
all: all:

522
make/defs-cpp.mk
View file

@ -1,163 +1,163 @@
# ----- compilation options # ----- compilation options
CREATE_DEVEL ?= true CREATE_DEVEL ?= true
#COMPILER_SUITE ?= clang #COMPILER_SUITE ?= clang
COMPILER_SUITE ?= gcc COMPILER_SUITE ?= gcc
ifeq ($(TARGET_ARCH),$(ARCH_32)) ifeq ($(TARGET_ARCH),$(ARCH_32))
PROJECT_CFLAGS += -m32 PROJECT_CFLAGS += -m32
PROJECT_CPPFLAGS += -m32 PROJECT_CPPFLAGS += -m32
PROJECT_LDFLAGS += -m32 PROJECT_LDFLAGS += -m32
endif endif
ifeq ($(TARGET_ARCH),armv7hl) ifeq ($(TARGET_ARCH),armv7hl)
PROJECT_CFLAGS += -fPIC PROJECT_CFLAGS += -fPIC
PROJECT_CPPFLAGS += -fPIC PROJECT_CPPFLAGS += -fPIC
PROJECT_LDFLAGS += PROJECT_LDFLAGS +=
else ifeq ($(TARGET_ARCH),aarch64) else ifeq ($(TARGET_ARCH),aarch64)
PROJECT_CFLAGS += -fPIC PROJECT_CFLAGS += -fPIC
PROJECT_CPPFLAGS += -fPIC PROJECT_CPPFLAGS += -fPIC
PROJECT_LDFLAGS += PROJECT_LDFLAGS +=
endif endif
ifeq ($(findstring $(TARGET_OS),linux),) ifeq ($(findstring $(TARGET_OS),linux),)
USE_SYSTEMD := false USE_SYSTEMD := false
endif endif
ifeq ($(DEVELOPMENT),true) ifeq ($(DEVELOPMENT),true)
export G_SLICE=always-malloc export G_SLICE = always-malloc
export G_DEBUG=gc-friendly,resident-modules export G_DEBUG = gc-friendly,resident-modules
export MALLOC_CHECK_=2 export MALLOC_CHECK_ = 2
endif endif
USE_PROJECT_LIB ?= true USE_PROJECT_LIB ?= true
EXPORT_PROJECT_LIB ?= $(USE_PROJECT_LIB) EXPORT_PROJECT_LIB ?= $(USE_PROJECT_LIB)
USE_JW_BUILD ?= true USE_JW_BUILD ?= true
USE_EXCEPTIONS_IN_C ?= true USE_EXCEPTIONS_IN_C ?= true
USE_COMPILER_OPTIMIZATION_OPTS = false USE_COMPILER_OPTIMIZATION_OPTS = false
USE_COMPILER_DEBUG_OPTS = true USE_COMPILER_DEBUG_OPTS = true
COMPILE_DEBUG_CODE = true COMPILE_DEBUG_CODE = true
BUILD_CFLAGS += $(CFLAGS) BUILD_CFLAGS += $(CFLAGS)
BUILD_CPPFLAGS += $(CPPFLAGS) BUILD_CPPFLAGS += $(CPPFLAGS)
BUILD_LDFLAGS += $(LDFLAGS) BUILD_LDFLAGS += $(LDFLAGS)
BUILD_CFLAGS += -D_FILE_OFFSET_BITS=64 -Wall -Wno-unused-value -fexceptions -DPROJECT_STR=\"$(PROJECT)\" BUILD_CFLAGS += -D_FILE_OFFSET_BITS=64 -Wall -Wno-unused-value -fexceptions -DPROJECT_STR=\"$(PROJECT)\"
BUILD_CPPFLAGS += -D_FILE_OFFSET_BITS=64 -Wall -Wno-unused-value -Wno-deprecated -DPROJECT_STR=\"$(PROJECT)\" BUILD_CPPFLAGS += -D_FILE_OFFSET_BITS=64 -Wall -Wno-unused-value -Wno-deprecated -DPROJECT_STR=\"$(PROJECT)\"
BUILD_LDFLAGS += -Wall BUILD_LDFLAGS += -Wall
LOG_QUAL_PREFIX ?= $(LOGID): LOG_QUAL_PREFIX ?= $(LOGID):
ifneq ($(LOG_QUAL_PREFIX),) ifneq ($(LOG_QUAL_PREFIX),)
PROJECT_CFLAGS += -DKEEP_FILES_OPEN -DLOG_QUAL_PREFIX=\"$(LOG_QUAL_PREFIX)\" PROJECT_CFLAGS += -DKEEP_FILES_OPEN -DLOG_QUAL_PREFIX=\"$(LOG_QUAL_PREFIX)\"
PROJECT_CPPFLAGS += -DKEEP_FILES_OPEN -DLOG_QUAL_PREFIX=\"$(LOG_QUAL_PREFIX)\" PROJECT_CPPFLAGS += -DKEEP_FILES_OPEN -DLOG_QUAL_PREFIX=\"$(LOG_QUAL_PREFIX)\"
endif endif
ifeq ($(CATCH_ONLY_YERROR),true) ifeq ($(CATCH_ONLY_YERROR),true)
BUILD_CFLAGS += -DCATCH_ONLY_YERROR BUILD_CFLAGS += -DCATCH_ONLY_YERROR
BUILD_CPPFLAGS += -DCATCH_ONLY_YERROR BUILD_CPPFLAGS += -DCATCH_ONLY_YERROR
endif endif
SYSCFG_DIR ?= /etc/sysconfig SYSCFG_DIR ?= /etc/sysconfig
SYSCFG_FILE ?= $(SYSCFG_DIR)/$(PROJECT) SYSCFG_FILE ?= $(SYSCFG_DIR)/$(PROJECT)
OPTS_PID_FILE ?= $(PIDDIR)/$(PROJECT).pid OPTS_PID_FILE ?= $(PIDDIR)/$(PROJECT).pid
USE_VERSION_MACROS ?= true USE_VERSION_MACROS ?= true
ifeq ($(USE_VERSION_MACROS),true) ifeq ($(USE_VERSION_MACROS),true)
BUILD_CFLAGS += -DVERSION=$(HEX_VERSION) -DVERSION_STR=\"$(VERSION)\" BUILD_CFLAGS += -DVERSION=$(HEX_VERSION) -DVERSION_STR=\"$(VERSION)\"
BUILD_CPPFLAGS += -DVERSION=$(HEX_VERSION) -DVERSION_STR=\"$(VERSION)\" BUILD_CPPFLAGS += -DVERSION=$(HEX_VERSION) -DVERSION_STR=\"$(VERSION)\"
endif endif
# ----- tool chain # ----- tool chain
ifneq ($(TARGET_TRIPLET),$(HOST_TRIPLET)) # we're cross-compiling ifneq ($(TARGET_TRIPLET),$(HOST_TRIPLET)) # we're cross-compiling
TC_BIN_PREFIX ?= $(TARGET_TRIPLET)- TC_BIN_PREFIX ?= $(TARGET_TRIPLET)-
TC_SYS_ROOT ?= /usr/$(TARGET_TRIPLET) TC_SYS_ROOT ?= /usr/$(TARGET_TRIPLET)
ifeq ($(TARGET),mingw) ifeq ($(TARGET),mingw)
ifneq ($(wildcard $(TC_BIN_PREFIX)gcc),) ifneq ($(wildcard $(TC_BIN_PREFIX)gcc),)
CROSS_TOOL_DIR ?= CROSS_TOOL_DIR ?=
TC_SYS_ROOT ?= /usr/$(TARGET_TRIPLET)/sys-root/mingw TC_SYS_ROOT ?= /usr/$(TARGET_TRIPLET)/sys-root/mingw
else else
CROSS_TOOL_DIR ?= /opt/cross-tools CROSS_TOOL_DIR ?= /opt/cross-tools
TC_BIN_PREFIX ?= $(CROSS_TOOL_DIR)/bin/i686-pc-mingw32- TC_BIN_PREFIX ?= $(CROSS_TOOL_DIR)/bin/i686-pc-mingw32-
endif endif
PROJECT_CFLAGS += -D_WINDOWS PROJECT_CFLAGS += -D_WINDOWS
PROJECT_CPPFLAGS += -D_WINDOWS PROJECT_CPPFLAGS += -D_WINDOWS
BUILD_LDFLAGS += -lws2_32 BUILD_LDFLAGS += -lws2_32
WINDRES ?= $(TC_BIN_PREFIX)windres WINDRES ?= $(TC_BIN_PREFIX)windres
USE_GFILTER ?= false USE_GFILTER ?= false
MS_LD ?= wine $(HOME)/local/mingw/packages/msvcpp/bin/LIB.EXE MS_LD ?= wine $(HOME)/local/mingw/packages/msvcpp/bin/LIB.EXE
endif endif
PROJECT_CFLAGS += -I$(TC_SYS_ROOT)/include PROJECT_CFLAGS += -I$(TC_SYS_ROOT)/include
PROJECT_CPPFLAGS += -I$(TC_SYS_ROOT)/include PROJECT_CPPFLAGS += -I$(TC_SYS_ROOT)/include
PROJECT_LDFLAGS += -L$(TC_SYS_ROOT)/lib PROJECT_LDFLAGS += -L$(TC_SYS_ROOT)/lib
else # we're not cross-compiling else # we're not cross-compiling
TC_SYS_ROOT ?= /usr TC_SYS_ROOT ?= /usr
LIBFLAGS += -ldl -lpthread LIBFLAGS += -ldl -lpthread
endif endif
ifeq ($(TARGET_ARCH),x86_64) ifeq ($(TARGET_ARCH),x86_64)
BUILD_CFLAGS += -fPIC BUILD_CFLAGS += -fPIC
BUILD_CPPFLAGS += -fPIC BUILD_CPPFLAGS += -fPIC
LIBFLAGS += LIBFLAGS +=
endif endif
ifeq ($(TARGET_TRIPLET),arm-none-eabi) ifeq ($(TARGET_TRIPLET),arm-none-eabi)
BUILD_CFLAGS += -mcpu=cortex-m3 -mthumb BUILD_CFLAGS += -mcpu=cortex-m3 -mthumb
BUILD_CPPFLAGS += -mcpu=cortex-m3 -mthumb BUILD_CPPFLAGS += -mcpu=cortex-m3 -mthumb
endif endif
ifeq ($(COMPILER_SUITE),gcc) ifeq ($(COMPILER_SUITE),gcc)
GCC ?= $(TC_BIN_PREFIX)gcc GCC ?= $(TC_BIN_PREFIX)gcc
GPP ?= $(TC_BIN_PREFIX)g++ GPP ?= $(TC_BIN_PREFIX)g++
CPP ?= $(GPP) CPP ?= $(GPP)
GNU_LD ?= $(TC_BIN_PREFIX)ld GNU_LD ?= $(TC_BIN_PREFIX)ld
CLANG ?= $(TC_BIN_PREFIX)clang CLANG ?= $(TC_BIN_PREFIX)clang
CLANGPP ?= $(TC_BIN_PREFIX)clang++ CLANGPP ?= $(TC_BIN_PREFIX)clang++
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
GCC_VERSION := $(shell $(GCC) -v 2>&1 | $(SED) '/gcc.version/I !d; s/.*version *//I; s/ \+.*//') GCC_VERSION := $(shell $(GCC) -v 2>&1 | $(SED) '/gcc.version/I !d; s/.*version *//I; s/ \+.*//')
GCC_VERSION_NUMBERS := $(subst ., ,$(GCC_VERSION)) GCC_VERSION_NUMBERS := $(subst ., ,$(GCC_VERSION))
GCC_MAJOR := $(word 1,$(GCC_VERSION_NUMBERS)) GCC_MAJOR := $(word 1,$(GCC_VERSION_NUMBERS))
GCC_MINOR := $(word 2,$(GCC_VERSION_NUMBERS)) GCC_MINOR := $(word 2,$(GCC_VERSION_NUMBERS))
GCC_REV := $(word 3,$(GCC_VERSION_NUMBERS)) GCC_REV := $(word 3,$(GCC_VERSION_NUMBERS))
# Not needed anywhere # Not needed anywhere
#GNU_LD_VERSION := $(shell $(LD) -V | $(SED) '/GNU ld/ !d; s/(.*)//; s/[^0-9.-]*//') #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_MAJOR := $(word 1,$(GNU_LD_VERSION_NUMBERS))
#GNU_LD_MINOR := $(word 2,$(GNU_LD_VERSION_NUMBERS)) #GNU_LD_MINOR := $(word 2,$(GNU_LD_VERSION_NUMBERS))
#GNU_LD_REV := $(word 3,$(GNU_LD_VERSION_NUMBERS)) #GNU_LD_REV := $(word 3,$(GNU_LD_VERSION_NUMBERS))
CC = $(GCC) CC = $(GCC)
CPP = $(GPP) CPP = $(GPP)
LD = $(GPP) LD = $(GPP)
ifneq ($(GCC_VERSION),4.1.0) ifneq ($(GCC_VERSION),4.1.0)
ifneq ($(GCC_VERSION),4.5.1) ifneq ($(GCC_VERSION),4.5.1)
BUILD_CFLAGS += -std=gnu11 BUILD_CFLAGS += -std=gnu11
BUILD_CPPFLAGS += -std=c++11 BUILD_CPPFLAGS += -std=c++11
#BUILD_CPPFLAGS += -Wsuggest-override #BUILD_CPPFLAGS += -Wsuggest-override
endif endif
endif endif
ifeq ($(shell $(TEST) $(GCC_MAJOR) -ge 5; $(ECHO) $$?),0) ifeq ($(shell $(TEST) $(GCC_MAJOR) -ge 5; $(ECHO) $$?),0)
ifeq ($(USE_CPP_FORCE_OVERRIDE),true) ifeq ($(USE_CPP_FORCE_OVERRIDE),true)
GCC_CPPFLAGS += -Werror=suggest-override GCC_CPPFLAGS += -Werror=suggest-override
endif endif
endif endif
@ -165,62 +165,62 @@ else ifeq ($(COMPILER_SUITE),clang)
# clang # clang
CLANG_CPPFLAGS += -Wno-unused-private-field -Wno-self-assign-field -Wno-overloaded-virtual CLANG_CPPFLAGS += -Wno-unused-private-field -Wno-self-assign-field -Wno-overloaded-virtual
CC = $(CLANG) CC = $(CLANG)
CPP = $(CLANGPP) CPP = $(CLANGPP)
LD = $(CLANGPP) LD = $(CLANGPP)
ifeq ($(USE_CPP_WARN_INCONSISTENT_OVERRIDE),true) ifeq ($(USE_CPP_WARN_INCONSISTENT_OVERRIDE),true)
CLANG_CPPFLAGS += -Winconsistent-missing-override CLANG_CPPFLAGS += -Winconsistent-missing-override
endif endif
endif # COMPILER_SUITE endif # COMPILER_SUITE
# -- target files and dirs # -- target files and dirs
SRC_SUFFIX += $(sort $(suffix $(wildcard $(TOPDIR)/hdr/*))) SRC_SUFFIX += $(sort $(suffix $(wildcard $(TOPDIR)/hdr/*)))
LOCAL_SRC += Makefile $(wildcard $(addprefix *,$(SRC_SUFFIX))) LOCAL_SRC += Makefile $(wildcard $(addprefix *,$(SRC_SUFFIX)))
SRC_HEADERED += $(shell if [ "$(LOCAL_SRC)" ]; then grep -ic "it services" $(LOCAL_SRC) | $(SED) '/:0$$/ d; s/:.*$$//'; fi) SRC_HEADERED += $(shell if [ "$(LOCAL_SRC)" ]; then grep -ic "it services" $(LOCAL_SRC) | $(SED) '/:0$$/ d; s/:.*$$//'; fi)
SRC_UNHEADERED += $(filter-out $(SRC_HEADERED),$(LOCAL_SRC)) SRC_UNHEADERED += $(filter-out $(SRC_HEADERED),$(LOCAL_SRC))
LOCAL_C ?= $(wildcard *.c) LOCAL_C ?= $(wildcard *.c)
LOCAL_CPP ?= $(wildcard *.cc *.cpp *.C) LOCAL_CPP ?= $(wildcard *.cc *.cpp *.C)
LOCAL_H ?= $(wildcard *.h *.H *.hpp) LOCAL_H ?= $(wildcard *.h *.H *.hpp)
SFILES ?= $(wildcard *.S) SFILES ?= $(wildcard *.S)
#PREREQ_H += $(foreach dir,$(PREREQ_DIR),$(wildcard $(dir)/*.h)) #PREREQ_H += $(foreach dir,$(PREREQ_DIR),$(wildcard $(dir)/*.h))
ALL_H += $(LOCAL_H) $(PREREQ_H) ALL_H += $(LOCAL_H) $(PREREQ_H)
SRC_ALL_CPP += $(LOCAL_C) $(LOCAL_CPP) $(LOCAL_H) SRC_ALL_CPP += $(LOCAL_C) $(LOCAL_CPP) $(LOCAL_H)
SRC_C += $(filter %.c, $(SRC_ALL_CPP)) SRC_C += $(filter %.c, $(SRC_ALL_CPP))
SRC_CPP += $(filter %.cc %.cpp %.C, $(SRC_ALL_CPP)) SRC_CPP += $(filter %.cc %.cpp %.C, $(SRC_ALL_CPP))
OBJ += $(addprefix $(FLAVOUR_PREFIX),$(patsubst %.C,%.o,$(patsubst %.cpp,%.o,$(patsubst %.cc,%.o,$(patsubst %.c,%.o,$(filter %.c %.cpp %.cc %.C, $(SRC_ALL_CPP))))))) OBJ += $(addprefix $(FLAVOUR_PREFIX),$(patsubst %.C,%.o,$(patsubst %.cpp,%.o,$(patsubst %.cc,%.o,$(patsubst %.c,%.o,$(filter %.c %.cpp %.cc %.C, $(SRC_ALL_CPP)))))))
OBJ += $(addprefix $(FLAVOUR_PREFIX),$(patsubst %.S,%.o,$(SFILES))) OBJ += $(addprefix $(FLAVOUR_PREFIX),$(patsubst %.S,%.o,$(SFILES)))
#PREREQ_C += $(foreach dir,$(PREREQ_DIR),$(wildcard $(dir)/*.c)) #PREREQ_C += $(foreach dir,$(PREREQ_DIR),$(wildcard $(dir)/*.c))
#PREREQ_CPP += $(foreach dir,$(PREREQ_DIR),$(wildcard $(dir)/*.c)) \ #PREREQ_CPP += $(foreach dir,$(PREREQ_DIR),$(wildcard $(dir)/*.c)) \
# $(foreach dir,$(PREREQ_DIR),$(wildcard $(dir)/*.cpp)) # $(foreach dir,$(PREREQ_DIR),$(wildcard $(dir)/*.cpp))
#PREREQ_CSRC += $(PREREQ_H) $(PREREQ_C) $(PREREQ_CPP) #PREREQ_CSRC += $(PREREQ_H) $(PREREQ_C) $(PREREQ_CPP)
REQUIRED_DIR += $(patsubst %,$(MODDIR)/%,$(REQUIRED)) REQUIRED_DIR += $(patsubst %,$(MODDIR)/%,$(REQUIRED))
REQUIRED_DONE += $(patsubst %,%/all.done,$(REQUIRED_DIR)) REQUIRED_DONE += $(patsubst %,%/all.done,$(REQUIRED_DIR))
REQUIRED_H += $(foreach dir,$(REQUIRED_DIR),$(wildcard $(dir)/*.h)) REQUIRED_H += $(foreach dir,$(REQUIRED_DIR),$(wildcard $(dir)/*.h))
REQUIRED_C += $(foreach dir,$(REQUIRED_DIR),$(wildcard $(dir)/*.c)) REQUIRED_C += $(foreach dir,$(REQUIRED_DIR),$(wildcard $(dir)/*.c))
REQUIRED_CPP += $(foreach dir,$(REQUIRED_DIR),$(wildcard $(dir)/*.cpp)) \ REQUIRED_CPP += $(foreach dir,$(REQUIRED_DIR),$(wildcard $(dir)/*.cpp)) \
$(foreach dir,$(PREREQ_DIR),$(wildcard $(dir)/*.cpp)) $(foreach dir,$(PREREQ_DIR),$(wildcard $(dir)/*.cpp))
REQUIRED_CSRC += $(REQUIRED_H) $(REQUIRED_C) $(REQUIRED_CPP) REQUIRED_CSRC += $(REQUIRED_H) $(REQUIRED_C) $(REQUIRED_CPP)
ALL_C += $(LOCAL_C) $(PREREQ_CPP) ALL_C += $(LOCAL_C) $(PREREQ_CPP)
ALL_CPP += $(LOCAL_CPP) $(PREREQ_CPP) ALL_CPP += $(LOCAL_CPP) $(PREREQ_CPP)
ALL_CSRC += $(LOCAL_CSRC) $(PREREQ_CSRC) ALL_CSRC += $(LOCAL_CSRC) $(PREREQ_CSRC)
# == # ==
ifeq ($(DEVELOPMENT),true) ifeq ($(DEVELOPMENT),true)
BUILD_CFLAGS += -D_DEVELOPMENT_ BUILD_CFLAGS += -D_DEVELOPMENT_
BUILD_CPPFLAGS+= -D_DEVELOPMENT_ BUILD_CPPFLAGS += -D_DEVELOPMENT_
endif endif
CORE += $(filter-out $(wildcard *.intern-state*),$(wildcard core core.* vgcore vgcore.*)) CORE += $(filter-out $(wildcard *.intern-state*),$(wildcard core core.* vgcore vgcore.*))
ifeq ($(GCC_MAJOR),4) ifeq ($(GCC_MAJOR),4)
BUILD_CFLAGS += -DGCC_HASCLASSVISIBILITY BUILD_CFLAGS += -DGCC_HASCLASSVISIBILITY
BUILD_CPPFLAGS+= -DGCC_HASCLASSVISIBILITY BUILD_CPPFLAGS += -DGCC_HASCLASSVISIBILITY
endif endif
ifeq ($(USE_QT),true) ifeq ($(USE_QT),true)
@ -229,44 +229,44 @@ ifeq ($(USE_QT),true)
endif endif
ifeq ($(USE_X),true) ifeq ($(USE_X),true)
BUILD_LDFLAGS += -L/usr/X11/$(SYSTEM_LIBDIR_NAME) -lXext -lX11 BUILD_LDFLAGS += -L/usr/X11/$(SYSTEM_LIBDIR_NAME) -lXext -lX11
endif endif
LPPFLAGS += -lstdc++ LPPFLAGS += -lstdc++
ifeq ($(GCC_MAJOR),2) ifeq ($(GCC_MAJOR),2)
LPPFLAGS += -lm LPPFLAGS += -lm
BUILD_CFLAGS += -I/usr/local/include BUILD_CFLAGS += -I/usr/local/include
BUILD_CPPFLAGS += -I/usr/local/include BUILD_CPPFLAGS += -I/usr/local/include
else else
ifeq ($(GCC_MAJOR),3) ifeq ($(GCC_MAJOR),3)
ifeq ($(GCC_MINOR),3) ifeq ($(GCC_MINOR),3)
LPPFLAGS += -lgcc_s LPPFLAGS += -lgcc_s
# LPPFLAGS += -L/usr/local/gcc3.3/lib # LPPFLAGS += -L/usr/local/gcc3.3/lib
endif endif
endif endif
endif endif
ifeq ($(TARGET),mingw) ifeq ($(TARGET),mingw)
BUILD_CFLAGS += -DWIN32 BUILD_CFLAGS += -DWIN32
BUILD_CPPFLAGS += -DWIN32 BUILD_CPPFLAGS += -DWIN32
# see https://stackoverflow.com/questions/4492799 # see https://stackoverflow.com/questions/4492799
BUILD_LDFLAGS += -fstack-protector BUILD_LDFLAGS += -fstack-protector
endif endif
ifeq ($(LIBTYPE),shared) ifeq ($(LIBTYPE),shared)
ifneq ($(TARGET),mingw) ifneq ($(TARGET),mingw)
BUILD_LDFLAGS += -rdynamic BUILD_LDFLAGS += -rdynamic
endif endif
endif endif
# TODO: this shoud be only conditional, but breaks, because not all headers # TODO: this shoud be only conditional, but breaks, because not all headers
# do a conditional include of timer headers, yet # do a conditional include of timer headers, yet
GENERATE_FUNC_TIMERS = $(MODDIR)/YStopWatchThreadList/generate_func_timers.sh GENERATE_FUNC_TIMERS = $(MODDIR)/YStopWatchThreadList/generate_func_timers.sh
ifeq ($(LOG_THREAD_NAMES), true) ifeq ($(LOG_THREAD_NAMES), true)
BUILD_CFLAGS += -DSLOG_THREAD_NAMES BUILD_CFLAGS += -DSLOG_THREAD_NAMES
BUILD_CPPFLAGS+= -DSLOG_THREAD_NAMES BUILD_CPPFLAGS += -DSLOG_THREAD_NAMES
endif endif
# ----- standard features, switched on with USE_XXX = true # ----- standard features, switched on with USE_XXX = true
@ -274,160 +274,160 @@ endif
#include $(MODDIR)/make/lib-deps.mk #include $(MODDIR)/make/lib-deps.mk
ifeq ($(USE_GFILTER),true) ifeq ($(USE_GFILTER),true)
GFILT = sh $(firstword $(wildcard $(MODDIR)/contrib/gfilt/gfilt $(MODDIR)/bin/gfilt)) GFILT = sh $(firstword $(wildcard $(MODDIR)/contrib/gfilt/gfilt $(MODDIR)/bin/gfilt))
ifneq ($(strip $(GFILT)),sh) ifneq ($(strip $(GFILT)),sh)
GPP = $(GFILT) GPP = $(GFILT)
endif endif
endif endif
ifeq ($(USE_PROJECT_LIB),true) ifeq ($(USE_PROJECT_LIB),true)
PROJECTLIB_LDFLAGS += -L$(TOPDIR)/lib -l$(LIBNAME) PROJECTLIB_LDFLAGS += -L$(TOPDIR)/lib -l$(LIBNAME)
endif endif
ifneq ($(filter jw-build,$(PREREQ_BUILD)),) ifneq ($(filter jw-build,$(PREREQ_BUILD)),)
ifeq ($(TARGET),mingw) ifeq ($(TARGET),mingw)
JW_BUILD_LDFLAGS += -lglib-2.0 -lws2_32 -lstdc++ JW_BUILD_LDFLAGS += -lglib-2.0 -lws2_32 -lstdc++
endif endif
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)
BUILD_CFLAGS += -D_USE_TIMER_ BUILD_CFLAGS += -D_USE_TIMER_
BUILD_CPPFLAGS += -D_USE_TIMER_ BUILD_CPPFLAGS += -D_USE_TIMER_
endif endif
ifeq ($(USE_FAST_LOG),false) ifeq ($(USE_FAST_LOG),false)
BUILD_CFLAGS +=-D_USE_FAST_LOG_=0 BUILD_CFLAGS += -D_USE_FAST_LOG_=0
BUILD_CPPFLAGS +=-D_USE_FAST_LOG_=0 BUILD_CPPFLAGS += -D_USE_FAST_LOG_=0
endif endif
ifeq ($(USE_YAMD),true) ifeq ($(USE_YAMD),true)
CC = yamd-gcc CC = yamd-gcc
endif endif
ifeq ($(USE_MPATROL),true) ifeq ($(USE_MPATROL),true)
BUILD_CFLAGS += -include /usr/include/mpatrol.h BUILD_CFLAGS += -include /usr/include/mpatrol.h
#BUILD_CPPFLAGS += -include /usr/include/mpatrol.h #BUILD_CPPFLAGS += -include /usr/include/mpatrol.h
BUILD_LDFLAGS += -lmpatrolmt -lbfd -liberty BUILD_LDFLAGS += -lmpatrolmt -lbfd -liberty
endif endif
ifeq ($(USE_VALGRIND),true) ifeq ($(USE_VALGRIND),true)
BUILD_CFLAGS += -include /usr/include/valgrind/memcheck.h -D_VALGRIND_ BUILD_CFLAGS += -include /usr/include/valgrind/memcheck.h -D_VALGRIND_
BUILD_CPPFLAGS += -include /usr/include/valgrind/memcheck.h -D_VALGRIND_ BUILD_CPPFLAGS += -include /usr/include/valgrind/memcheck.h -D_VALGRIND_
# BUILD_LDFLAGS += # BUILD_LDFLAGS +=
endif endif
ifeq ($(USE_MCHECK),true) ifeq ($(USE_MCHECK),true)
BUILD_LDFLAGS += -lmcheck BUILD_LDFLAGS += -lmcheck
endif endif
ifeq ($(USE_STACK_PROTECTOR),true) ifeq ($(USE_STACK_PROTECTOR),true)
BUILD_CFLAGS += -fstack-protector-all BUILD_CFLAGS += -fstack-protector-all
BUILD_CPPFLAGS += -fstack-protector-all BUILD_CPPFLAGS += -fstack-protector-all
#BUILD_CFLAGS += -fstack-protector #BUILD_CFLAGS += -fstack-protector
endif endif
ifeq ($(USE_STACK_CHECKER),true) ifeq ($(USE_STACK_CHECKER),true)
ifeq "$(COMPILER_SUITE)" "clang" ifeq "$(COMPILER_SUITE)" "clang"
BUILD_CFLAGS += -fsanitize=address -fno-omit-frame-pointer BUILD_CFLAGS += -fsanitize=address -fno-omit-frame-pointer
BUILD_CPPFLAGS += -fsanitize=address -fno-omit-frame-pointer BUILD_CPPFLAGS += -fsanitize=address -fno-omit-frame-pointer
BUILD_LDFLAGS += -fsanitize=address BUILD_LDFLAGS += -fsanitize=address
endif endif
endif endif
ifeq ($(USE_DBMALLOC),true) ifeq ($(USE_DBMALLOC),true)
CONTRIB_LIBS += dbmalloc CONTRIB_LIBS += dbmalloc
BUILD_CFLAGS += -DDBMALLOC -DEXITFUN=_exit -I$(TOPDIR)/contrib/dbmalloc BUILD_CFLAGS += -DDBMALLOC -DEXITFUN=_exit -I$(TOPDIR)/contrib/dbmalloc
BUILD_CPPFLAGS += -DDBMALLOC -DEXITFUN=_exit -I$(TOPDIR)/contrib/dbmalloc BUILD_CPPFLAGS += -DDBMALLOC -DEXITFUN=_exit -I$(TOPDIR)/contrib/dbmalloc
BUILD_LDFLAGS += -ldbmalloc BUILD_LDFLAGS += -ldbmalloc
endif endif
ifeq ($(USE_DMALLOC),true) ifeq ($(USE_DMALLOC),true)
BUILD_CFLAGS += -DDMALLOC -DDMALLOC_FUNC_CHECK -DSTORE_SEEN_COUNT BUILD_CFLAGS += -DDMALLOC -DDMALLOC_FUNC_CHECK -DSTORE_SEEN_COUNT
BUILD_CPPFLAGS += -DDMALLOC -DDMALLOC_FUNC_CHECK -DSTORE_SEEN_COUNT BUILD_CPPFLAGS += -DDMALLOC -DDMALLOC_FUNC_CHECK -DSTORE_SEEN_COUNT
BUILD_LDFLAGS += -ldmallocthcxx -ldmallocth BUILD_LDFLAGS += -ldmallocthcxx -ldmallocth
endif endif
ifeq ($(USE_MEMWATCH),true) ifeq ($(USE_MEMWATCH),true)
BUILD_CFLAGS += -DMEMWATCH -DMW_STDIO BUILD_CFLAGS += -DMEMWATCH -DMW_STDIO
BUILD_CPPFLAGS += -DMEMWATCH -DMW_STDIO BUILD_CPPFLAGS += -DMEMWATCH -DMW_STDIO
endif endif
ifeq ($(USE_EFENCE),true) ifeq ($(USE_EFENCE),true)
BUILD_CFLAGS += -DEFENCE BUILD_CFLAGS += -DEFENCE
BUILD_CPPFLAGS += -DEFENCE BUILD_CPPFLAGS += -DEFENCE
BUILD_LDFLAGS += -lefence BUILD_LDFLAGS += -lefence
endif endif
ifeq ($(USE_TRACING),true) ifeq ($(USE_TRACING),true)
BUILD_CFLAGS += -D_DO_TRACE_ BUILD_CFLAGS += -D_DO_TRACE_
BUILD_CPPFLAGS += -D_DO_TRACE_ BUILD_CPPFLAGS += -D_DO_TRACE_
endif endif
ifeq ($(USE_ASSERTIONS),false) ifeq ($(USE_ASSERTIONS),false)
BUILD_CFLAGS += -DNDEBUG BUILD_CFLAGS += -DNDEBUG
BUILD_CPPFLAGS += -DNDEBUG BUILD_CPPFLAGS += -DNDEBUG
endif endif
ifeq ($(COMPILE_DEBUG_CODE),true) ifeq ($(COMPILE_DEBUG_CODE),true)
BUILD_CFLAGS += -D_DEBUG_ BUILD_CFLAGS += -D_DEBUG_
BUILD_CPPFLAGS += -D_DEBUG_ BUILD_CPPFLAGS += -D_DEBUG_
endif endif
ifeq ($(COMPILE_DEBUG_LOG),true) ifeq ($(COMPILE_DEBUG_LOG),true)
BUILD_CFLAGS += -D_LOG_DEBUG_ BUILD_CFLAGS += -D_LOG_DEBUG_
BUILD_CPPFLAGS += -D_LOG_DEBUG_ BUILD_CPPFLAGS += -D_LOG_DEBUG_
endif endif
ifeq ($(USE_MPATROL),true) ifeq ($(USE_MPATROL),true)
BUILD_CFLAGS += -include $(MODDIR)/include/mpatrol.h BUILD_CFLAGS += -include $(MODDIR)/include/mpatrol.h
BUILD_CPPFLAGS += -include $(MODDIR)/include/mpatrol.h BUILD_CPPFLAGS += -include $(MODDIR)/include/mpatrol.h
BUILD_LDFLAGS += -lmpatrolmt -lbfd -liberty BUILD_LDFLAGS += -lmpatrolmt -lbfd -liberty
endif endif
ifeq ($(BREAK_ABI),true) ifeq ($(BREAK_ABI),true)
BUILD_CFLAGS += -D_BREAK_ABI_ BUILD_CFLAGS += -D_BREAK_ABI_
BUILD_CPPFLAGS += -D_BREAK_ABI_ BUILD_CPPFLAGS += -D_BREAK_ABI_
endif endif
ifeq ($(USE_STACK_CHECK),true) ifeq ($(USE_STACK_CHECK),true)
BUILD_CFLAGS += -fstack-check BUILD_CFLAGS += -fstack-check
BUILD_CPPFLAGS += -fstack-check BUILD_CPPFLAGS += -fstack-check
endif endif
ifeq ($(USE_COMPILER_DEBUG_OPTS),true) ifeq ($(USE_COMPILER_DEBUG_OPTS),true)
BUILD_CFLAGS += -gdwarf-2 -g3 -ggdb BUILD_CFLAGS += -gdwarf-2 -g3 -ggdb
BUILD_CPPFLAGS += -gdwarf-2 -g3 -ggdb BUILD_CPPFLAGS += -gdwarf-2 -g3 -ggdb
BUILD_LDFLAGS += -gdwarf-2 -g3 -ggdb BUILD_LDFLAGS += -gdwarf-2 -g3 -ggdb
endif endif
ifeq ($(CC),$(GCC)) ifeq ($(CC),$(GCC))
GCC_NO_OPT_FLAGS = \ GCC_NO_OPT_FLAGS = \
-fno-inline-functions-called-once \ -fno-inline-functions-called-once \
-fno-tree-loop-optimize \ -fno-tree-loop-optimize \
-fno-early-inlining \ -fno-early-inlining \
-fno-default-inline -fno-default-inline
else ifeq ($(CC),$(CLANG)) else ifeq ($(CC),$(CLANG))
BUILD_CFLAGS += -Werror BUILD_CFLAGS += -Werror
BUILD_CPPFLAGS += -Werror BUILD_CPPFLAGS += -Werror
endif endif
ifeq ($(USE_COMPILER_OPTIMIZATION_OPTS),true) ifeq ($(USE_COMPILER_OPTIMIZATION_OPTS),true)
BUILD_CFLAGS += -funroll-loops -O3 BUILD_CFLAGS += -funroll-loops -O3
BUILD_CPPFLAGS += -funroll-loops -O3 BUILD_CPPFLAGS += -funroll-loops -O3
else else
NO_OPT_FLAGS = \ NO_OPT_FLAGS = \
-O0 -g -fno-inline -fno-omit-frame-pointer \ -O0 -g -fno-inline -fno-omit-frame-pointer \
-fno-builtin -fno-optimize-sibling-calls \ -fno-builtin -fno-optimize-sibling-calls \
$(GCC_NO_OPT_FLAGS) $(GCC_NO_OPT_FLAGS)
# -fconserve-stack # -fconserve-stack
_NO_OPT_FLAGS = \ _NO_OPT_FLAGS = \
-O0 \ -O0 \
-fno-implicit-inline-templates \ -fno-implicit-inline-templates \
-fno-implement-inlines \ -fno-implement-inlines \
@ -438,44 +438,44 @@ else
-fno-inline-functions \ -fno-inline-functions \
$(GCC_NO_OPT_FLAGS) $(GCC_NO_OPT_FLAGS)
BUILD_CFLAGS += $(NO_OPT_FLAGS) BUILD_CFLAGS += $(NO_OPT_FLAGS)
BUILD_CPPFLAGS += $(NO_OPT_FLAGS) BUILD_CPPFLAGS += $(NO_OPT_FLAGS)
BUILD_LDFLAGS += $(NO_OPT_FLAGS) BUILD_LDFLAGS += $(NO_OPT_FLAGS)
endif endif
ifeq ($(USE_EXCEPTIONS_IN_C),true) ifeq ($(USE_EXCEPTIONS_IN_C),true)
BUILD_CFLAGS += -fexceptions BUILD_CFLAGS += -fexceptions
GCC_LDFLAGS += -shared-libgcc GCC_LDFLAGS += -shared-libgcc
endif endif
ifeq ($(STRIP_SYMBOLS),true) ifeq ($(STRIP_SYMBOLS),true)
STRIP_DONE ?= strip.done STRIP_DONE ?= strip.done
endif endif
INCLUDE += $(LOCAL_INCLUDE) INCLUDE += $(LOCAL_INCLUDE)
# force use of double quotes, allow header namespaces # force use of double quotes, allow header namespaces
ifeq ($(HDRDIR_SCOPE_SUFFIX),) ifeq ($(HDRDIR_SCOPE_SUFFIX),)
INCLUDE += -I. INCLUDE += -I.
else else
INCLUDE += -iquote . INCLUDE += -iquote .
endif endif
ifeq ($(USE_PROJECT_LIB),true) ifeq ($(USE_PROJECT_LIB),true)
INCLUDE += $(PROJECT_INCLUDE) -I$(TOPDIR)/include INCLUDE += $(PROJECT_INCLUDE) -I$(TOPDIR)/include
LIBFLAGS += -L$(BUILD_LIBDIR) LIBFLAGS += -L$(BUILD_LIBDIR)
endif endif
INCLUDE += $(call proj_query, cflags $(PREREQ_BUILD) $(PROJECT)) INCLUDE += $(call proj_query, cflags $(PREREQ_BUILD) $(PROJECT))
LDFLAGS_QUERY_ARGS = $(addprefix --exclude ,$(LDFLAGS_EXCLUDE)) LDFLAGS_QUERY_ARGS = $(addprefix --exclude ,$(LDFLAGS_EXCLUDE))
LIBFLAGS += $(call proj_query, ldflags $(LDFLAGS_QUERY_ARGS) --add-self $(PREREQ_BUILD)) LIBFLAGS += $(call proj_query, ldflags $(LDFLAGS_QUERY_ARGS) --add-self $(PREREQ_BUILD))
# the following is necessary, because not all projects have build.libname = none in project.conf # the following is necessary, because not all projects have build.libname = none in project.conf
ifeq ($(USE_PROJECT_LIB),true) ifeq ($(USE_PROJECT_LIB),true)
LDFLAGS_QUERY_ARGS_SELF = --add-self LDFLAGS_QUERY_ARGS_SELF = --add-self
endif endif
LIBFLAGS += $(call proj_query, ldflags $(LDFLAGS_QUERY_ARGS) $(LDFLAGS_QUERY_ARGS_SELF) $(PROJECT)) LIBFLAGS += $(call proj_query, ldflags $(LDFLAGS_QUERY_ARGS) $(LDFLAGS_QUERY_ARGS_SELF) $(PROJECT))
ifeq ($(USE_SNDFILE),true) ifeq ($(USE_SNDFILE),true)
LIBFLAGS += -lsndfile LIBFLAGS += -lsndfile
@ -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))
@ -503,69 +503,69 @@ ifeq ($(CC),$(GCC))
COMPILER_LDFLAGS += $(GCC_LDFLAGS) COMPILER_LDFLAGS += $(GCC_LDFLAGS)
endif endif
BUILD_CFLAGS += $(LOCAL_CFLAGS) $(PROJECT_CFLAGS) $(COMPLILER_CFLAGS) $(INCLUDE) BUILD_CFLAGS += $(LOCAL_CFLAGS) $(PROJECT_CFLAGS) $(COMPLILER_CFLAGS) $(INCLUDE)
BUILD_CPPFLAGS += $(LOCAL_CPPFLAGS) $(PROJECT_CPPFLAGS) $(COMPILER_CPPFLAGS) $(INCLUDE) BUILD_CPPFLAGS += $(LOCAL_CPPFLAGS) $(PROJECT_CPPFLAGS) $(COMPILER_CPPFLAGS) $(INCLUDE)
BUILD_LDFLAGS += $(LOCAL_LDFLAGS) $(PROJECTLIB_LDFLAGS) $(PROJECT_LDFLAGS) $(COMPILER_LDFLAGS) $(LPPFLAGS) $(LIBFLAGS) BUILD_LDFLAGS += $(LOCAL_LDFLAGS) $(PROJECTLIB_LDFLAGS) $(PROJECT_LDFLAGS) $(COMPILER_LDFLAGS) $(LPPFLAGS) $(LIBFLAGS)
#RPM_REQUIRES = $(shell echo "$(RPM_REQUIRES_RUN) $(RPM_REQUIRES_DEVEL)" | $(add_flavour_prefix)) #RPM_REQUIRES = $(shell echo "$(RPM_REQUIRES_RUN) $(RPM_REQUIRES_DEVEL)" | $(add_flavour_prefix))
RPM_REQUIRES += $(RPM_REQUIRES_RUN) $(RPM_REQUIRES_DEVEL) RPM_REQUIRES += $(RPM_REQUIRES_RUN) $(RPM_REQUIRES_DEVEL)
# -- LIB # -- LIB
INSTALLATION_FILE_TYPES += LIB INSTALLATION_FILE_TYPES += LIB
#BUILD_PIDIR = $(BUILD_LIBDIR) #BUILD_PIDIR = $(BUILD_LIBDIR)
#BUILD_PI = $(addprefix $(BUILD_PIDIR)/,$(PLUGIN)) #BUILD_PI = $(addprefix $(BUILD_PIDIR)/,$(PLUGIN))
#INSTALL_PIDIR = $(INSTALL_LIBDIR) #INSTALL_PIDIR = $(INSTALL_LIBDIR)
#INSTALLED_PI = $(addprefix $(INSTALL_PIDIR)/,$(PLUGIN)) #INSTALLED_PI = $(addprefix $(INSTALL_PIDIR)/,$(PLUGIN))
BUILD_LIBDIR = $(TOPDIR)/lib BUILD_LIBDIR = $(TOPDIR)/lib
LOCAL_LIBS += $(CONTRIB_LIBS) $(PLUGIN) LOCAL_LIBS += $(CONTRIB_LIBS) $(PLUGIN)
ifeq ($(TARGET),mingw) ifeq ($(TARGET),mingw)
ifeq ($(TC_SYS_ROOT),) ifeq ($(TC_SYS_ROOT),)
CONTRIB_LIBS_PATH += $(CROSS_TOOL_DIR)/bin CONTRIB_LIBS_PATH += $(CROSS_TOOL_DIR)/bin
else else
CONTRIB_LIBS_PATH += $(TC_SYS_ROOT)/lib CONTRIB_LIBS_PATH += $(TC_SYS_ROOT)/lib
endif endif
endif endif
LIBTYPE ?= shared LIBTYPE ?= shared
INSTALL_LIBDIR ?= $(EXE_PREFIX)/lib INSTALL_LIBDIR ?= $(EXE_PREFIX)/lib
ifeq ($(USE_PROJECT_LIB),true) ifeq ($(USE_PROJECT_LIB),true)
LIBNAME ?= $(PROJECT) LIBNAME ?= $(PROJECT)
MEMBERS += $(LIB_A)($(OBJ)) MEMBERS += $(LIB_A)($(OBJ))
VERSION_SCRIPT = $(BUILD_LIBDIR)/version.ldscript VERSION_SCRIPT = $(BUILD_LIBDIR)/version.ldscript
# TODO: use something like this as unifying variable, there are far too many # TODO: use something like this as unifying variable, there are far too many
# lib-related variables # lib-related variables
LOCAL_LIBS += LOCAL_LIBS +=
ifneq ($(TARGET),mingw) ifneq ($(TARGET),mingw)
LIB_A = $(BUILD_LIBDIR)/lib$(LIBNAME).a LIB_A = $(BUILD_LIBDIR)/lib$(LIBNAME).a
SO_SUFFIX = so.$(MAJOR_MINOR_RELEASE) SO_SUFFIX = so.$(MAJOR_MINOR_RELEASE)
SO_PREFIX ?= lib SO_PREFIX ?= lib
LIB_SO = $(BUILD_LIBDIR)/lib$(LIBNAME).$(SO_SUFFIX) LIB_SO = $(BUILD_LIBDIR)/lib$(LIBNAME).$(SO_SUFFIX)
LINKS_SO += $(shell echo $(LIB_SO) | $(SED) -e "s/\.so\..*$$/.so/" | grep -v $(LIB_SO)) LINKS_SO += $(shell echo $(LIB_SO) | $(SED) -e "s/\.so\..*$$/.so/" | grep -v $(LIB_SO))
INSTALLED_LINKS_SO += $(shell echo $(INSTALLED_LIB_SO) | $(SED) -e "s/\.so\..*$$/.so/" | grep -v $(INSTALLED_LIB_SO)) INSTALLED_LINKS_SO += $(shell echo $(INSTALLED_LIB_SO) | $(SED) -e "s/\.so\..*$$/.so/" | grep -v $(INSTALLED_LIB_SO))
INSTALLED_LIB_A = $(INSTALL_LIBDIR)/lib$(LIBNAME).a INSTALLED_LIB_A = $(INSTALL_LIBDIR)/lib$(LIBNAME).a
else else
LIB_A = $(BUILD_LIBDIR)/lib$(LIBNAME)-static.a LIB_A = $(BUILD_LIBDIR)/lib$(LIBNAME)-static.a
#WINRES_RC_TMPL = $(MODDIR)/make/winres-minimal.rc.tmpl #WINRES_RC_TMPL = $(MODDIR)/make/winres-minimal.rc.tmpl
WINRES_RC_TMPL = $(MODDIR)/make/winres.rc.tmpl WINRES_RC_TMPL = $(MODDIR)/make/winres.rc.tmpl
WINRES_RC = $(BUILD_LIBDIR)/$(PROJECT).rc WINRES_RC = $(BUILD_LIBDIR)/$(PROJECT).rc
WINRES_O = $(WINRES_RC).o WINRES_O = $(WINRES_RC).o
SO_SUFFIX = dll SO_SUFFIX = dll
SO_PREFIX ?= SO_PREFIX ?=
LIB_DEF = $(BUILD_LIBDIR)/$(LIBNAME).def LIB_DEF = $(BUILD_LIBDIR)/$(LIBNAME).def
MSVCPP_IMPLIB = $(BUILD_LIBDIR)/$(LIBNAME).lib MSVCPP_IMPLIB = $(BUILD_LIBDIR)/$(LIBNAME).lib
LIB_SO = $(BUILD_LIBDIR)/$(LIBNAME).dll LIB_SO = $(BUILD_LIBDIR)/$(LIBNAME).dll
INSTALLED_LIB_A = $(INSTALL_LIBDIR)/lib$(LIBNAME).a INSTALLED_LIB_A = $(INSTALL_LIBDIR)/lib$(LIBNAME).a
endif # mingw endif # mingw
BUILD_LIB += $(LIB_SO) BUILD_LIB += $(LIB_SO)
endif # USE_PROJECT_LIB endif # USE_PROJECT_LIB
INSTALLED_LIB_SO = $(addprefix $(INSTALL_LIBDIR)/,$(notdir $(LIB_SO))) INSTALLED_LIB_SO = $(addprefix $(INSTALL_LIBDIR)/,$(notdir $(LIB_SO)))
INSTALLED_DEF = $(addprefix $(INSTALL_LIBDIR)/,$(wildcard *.lib *.exp)) INSTALLED_DEF = $(addprefix $(INSTALL_LIBDIR)/,$(wildcard *.lib *.exp))
INSTALLED_LIB += $(addprefix $(INSTALL_LIBDIR)/,$(LOCAL_LIBS)) INSTALLED_LIB += $(addprefix $(INSTALL_LIBDIR)/,$(LOCAL_LIBS))
BUILD_LIB += $(addprefix $(BUILD_LIBDIR)/,$(LOCAL_LIBS)) BUILD_LIB += $(addprefix $(BUILD_LIBDIR)/,$(LOCAL_LIBS))
INSTALLED_ALL_LIBS = $(addprefix $(INSTALL_LIBDIR)/,$(wildcard *.a)) INSTALLED_ALL_LIBS = $(addprefix $(INSTALL_LIBDIR)/,$(wildcard *.a))
INSTALLED_LIB += $(INSTALLED_LIB_SO) $(INSTALLED_SHOBJS) \ INSTALLED_LIB += $(INSTALLED_LIB_SO) $(INSTALLED_SHOBJS) \
$(INSTALLED_LINKS_SO) $(sort $(INSTALLED_LIB_A) $(INSTALLED_ALL_LIBS)) \ $(INSTALLED_LINKS_SO) $(sort $(INSTALLED_LIB_A) $(INSTALLED_ALL_LIBS)) \
$(INSTALLED_DEF) $(INSTALLED_DEF)

546
make/defs-dev.mk
View file

@ -4,250 +4,250 @@
# $Id$ # $Id$
# -- files # -- files
#CONTRIBDIR ?= $(TOPDIR)/contrib #CONTRIBDIR ?= $(TOPDIR)/contrib
PROJECT_DIRNAME ?= $(PROJECT) PROJECT_DIRNAME ?= $(PROJECT)
PROJECT_DIRPATH ?= $(shell readlink -f $(TOPDIR)) PROJECT_DIRPATH ?= $(shell readlink -f $(TOPDIR))
PREFIX ?= $(ENV_PREFIX)$(HOME)/dat/test/$(FLAVOUR_PREFIX)$(PROJECT_DIRNAME)-$(VERSION) PREFIX ?= $(ENV_PREFIX)$(HOME)/dat/test/$(FLAVOUR_PREFIX)$(PROJECT_DIRNAME)-$(VERSION)
ROOT_PREFIX ?= $(ENV_PREFIX)$(HOME)/dat/test ROOT_PREFIX ?= $(ENV_PREFIX)$(HOME)/dat/test
VAR_PREFIX ?= $(PREFIX)/var VAR_PREFIX ?= $(PREFIX)/var
DOC_PREFIX ?= $(PREFIX)/doc/$(PROJECT) DOC_PREFIX ?= $(PREFIX)/doc/$(PROJECT)
EXE_PREFIX ?= $(PREFIX) EXE_PREFIX ?= $(PREFIX)
INIT_PREFIX ?= $(EXE_PREFIX) INIT_PREFIX ?= $(EXE_PREFIX)
HTDOCS_PREFIX ?= $(PREFIX)/srv/www HTDOCS_PREFIX ?= $(PREFIX)/srv/www
SYSTEMD_DIR ?= $(PREFIX)/usr/lib/systemd/system SYSTEMD_DIR ?= $(PREFIX)/usr/lib/systemd/system
JS_PREFIX ?= $(PREFIX)/usr/share/javascript JS_PREFIX ?= $(PREFIX)/usr/share/javascript
JS_DIR ?= $(JS_PREFIX)/$(PROJECT_DIRNAME) JS_DIR ?= $(JS_PREFIX)/$(PROJECT_DIRNAME)
SYSCFG_DIR ?= $(PREFIX)/sysconfig SYSCFG_DIR ?= $(PREFIX)/sysconfig
CONFIG_DIR ?= $(ENV_PREFIX)$(HOME)/etc/$(FLAVOUR_PATH_PREFIX)$(PROJECT_DIRNAME) CONFIG_DIR ?= $(ENV_PREFIX)$(HOME)/etc/$(FLAVOUR_PATH_PREFIX)$(PROJECT_DIRNAME)
LD_CONF_DIR ?= $(ENV_PREFIX)$(HOME)/etc/ld.so.conf.d LD_CONF_DIR ?= $(ENV_PREFIX)$(HOME)/etc/ld.so.conf.d
LOGROT_DIR ?= $(ENV_PREFIX)$(HOME)/etc/logrotate.d LOGROT_DIR ?= $(ENV_PREFIX)$(HOME)/etc/logrotate.d
APACHE_CONF_DIR ?= $(ENV_PREFIX)$(HOME)/etc/apache/conf.d APACHE_CONF_DIR ?= $(ENV_PREFIX)$(HOME)/etc/apache/conf.d
APACHE_VHOSTS_DIR?= $(ENV_PREFIX)$(HOME)/etc/apache/vhosts.d APACHE_VHOSTS_DIR ?= $(ENV_PREFIX)$(HOME)/etc/apache/vhosts.d
APACHE_SNIPPETS_DIR?= $(ENV_PREFIX)$(HOME)/etc/apache/snippets.d APACHE_SNIPPETS_DIR ?= $(ENV_PREFIX)$(HOME)/etc/apache/snippets.d
RSYSLOG_DIR ?= $(ENV_PREFIX)$(HOME)/etc/rsyslog.d RSYSLOG_DIR ?= $(ENV_PREFIX)$(HOME)/etc/rsyslog.d
IMG_PREFIX ?= $(PREFIX) IMG_PREFIX ?= $(PREFIX)
LOG_PREFIX ?= $(PREFIX)/log LOG_PREFIX ?= $(PREFIX)/log
JAVA_PREFIX ?= $(PREFIX) JAVA_PREFIX ?= $(PREFIX)
HDR_SCOPE_PREFIX ?= HDR_SCOPE_PREFIX ?=
IMAGEDIR ?= $(MODDIR)/../../images IMAGEDIR ?= $(MODDIR)/../../images
CTRLDIR ?= $(ENV_PREFIX)$(HOME)/bin$(FLAVOUR_PATH_SUFFIX) CTRLDIR ?= $(ENV_PREFIX)$(HOME)/bin$(FLAVOUR_PATH_SUFFIX)
DAEMON_RUN_DIR ?= $(ENV_PREFIX)$(HOME) DAEMON_RUN_DIR ?= $(ENV_PREFIX)$(HOME)
PROFILE_DIR ?= $(ENV_PREFIX)$(HOME)/.profile.d$(FLAVOUR_PATH_SUFFIX) PROFILE_DIR ?= $(ENV_PREFIX)$(HOME)/.profile.d$(FLAVOUR_PATH_SUFFIX)
INSTALL_CRONTABDIR ?= $(ENV_PREFIX)$(HOME)/etc/$(FLAVOUR_PATH_PREFIX)cron.d INSTALL_CRONTABDIR ?= $(ENV_PREFIX)$(HOME)/etc/$(FLAVOUR_PATH_PREFIX)cron.d
INSTALL_PKG_CONFIGDIR ?= $(CONFIG_DIR)/pkgconfig INSTALL_PKG_CONFIGDIR ?= $(CONFIG_DIR)/pkgconfig
PIDDIR ?= $(VAR_PREFIX)$(FLAVOUR_PATH_PREFIX)run PIDDIR ?= $(VAR_PREFIX)$(FLAVOUR_PATH_PREFIX)run
DOWNLOADDIRS ?= root@cvs.jannet.de:/usr/local/httpd/htdocs/www.jannet.de_443/$(CUSTOMER)/projects/$(PROJECT) DOWNLOADDIRS ?= root@cvs.jannet.de:/usr/local/httpd/htdocs/www.jannet.de_443/$(CUSTOMER)/projects/$(PROJECT)
WORKING_DIR ?= $(ENV_PREFIX)$(HOME) WORKING_DIR ?= $(ENV_PREFIX)$(HOME)
WORKING_DIR ?= $(VAR_PREFIX)/lock WORKING_DIR ?= $(VAR_PREFIX)/lock
JAVADIR ?= $(JAVA_PREFIX)/share/java JAVADIR ?= $(JAVA_PREFIX)/share/java
HTML_PROJECT ?= $(patsubst www-%,%,$(PROJECT_DIRNAME)) HTML_PROJECT ?= $(patsubst www-%,%,$(PROJECT_DIRNAME))
PROJECT_HTML_BASE_DIR ?= $(HTDOCS_PREFIX)/proj PROJECT_HTML_BASE_DIR ?= $(HTDOCS_PREFIX)/proj
PROJECT_HTMLDIR ?= $(PROJECT_HTML_BASE_DIR)/$(HTML_PROJECT) PROJECT_HTMLDIR ?= $(PROJECT_HTML_BASE_DIR)/$(HTML_PROJECT)
PROJECT_HTML_THEMES_DIR ?= $(PROJECT_HTML_BASE_DIR)/themes PROJECT_HTML_THEMES_DIR ?= $(PROJECT_HTML_BASE_DIR)/themes
PROJECT_TMPLDIR ?= $(PREFIX)/tmpl PROJECT_TMPLDIR ?= $(PREFIX)/tmpl
SITE_MODULES_DIR ?= $(HTDOCS_PREFIX)/proj/site/modules.d SITE_MODULES_DIR ?= $(HTDOCS_PREFIX)/proj/site/modules.d
CGI_DIR ?= $(PROJECT_HTMLDIR)/cgi-bin CGI_DIR ?= $(PROJECT_HTMLDIR)/cgi-bin
# -- misc # -- misc
LOGID ?= $(shell $(ECHO) $(BUILD_USER) | cut -c1-2)-$(PROJECT) LOGID ?= $(shell $(ECHO) $(BUILD_USER) | cut -c1-2)-$(PROJECT)
DAEMON_RUN_USER ?= $(BUILD_USER) DAEMON_RUN_USER ?= $(BUILD_USER)
DAEMON_RUN_GROUP ?= $(BUILD_GROUP) DAEMON_RUN_GROUP ?= $(BUILD_GROUP)
CATCH_ONLY_YERROR?= true CATCH_ONLY_YERROR ?= true
# -- file attributes # -- file attributes
EXEOWNER ?= $(BUILD_USER) EXEOWNER ?= $(BUILD_USER)
EXEGROUP ?= $(BUILD_GROUP) EXEGROUP ?= $(BUILD_GROUP)
EXEMODE ?= 770 EXEMODE ?= 770
EXEDIROWNER ?= $(BUILD_USER) EXEDIROWNER ?= $(BUILD_USER)
EXEDIRGROUP ?= $(BUILD_GROUP) EXEDIRGROUP ?= $(BUILD_GROUP)
EXEDIRMODE ?= 755 EXEDIRMODE ?= 755
CFGOWNER ?= $(BUILD_USER) CFGOWNER ?= $(BUILD_USER)
CFGGROUP ?= $(BUILD_GROUP) CFGGROUP ?= $(BUILD_GROUP)
CFGMODE ?= 660 CFGMODE ?= 660
CFGDIROWNER ?= $(EXEDIROWNER) CFGDIROWNER ?= $(EXEDIROWNER)
CFGDIRGROUP ?= $(EXEDIRGROUP) CFGDIRGROUP ?= $(EXEDIRGROUP)
CFGDIRMODE ?= $(EXEDIRMODE) CFGDIRMODE ?= $(EXEDIRMODE)
SYSCFGOWNER ?= $(CFGOWNER) SYSCFGOWNER ?= $(CFGOWNER)
SYSCFGGROUP ?= $(CFGGROUP) SYSCFGGROUP ?= $(CFGGROUP)
SYSCFGMODE ?= $(CFGMODE) SYSCFGMODE ?= $(CFGMODE)
SYSCFGDIROWNER ?= $(CFGDIROWNER) SYSCFGDIROWNER ?= $(CFGDIROWNER)
SYSCFGDIRGROUP ?= $(CFGDIRGROUP) SYSCFGDIRGROUP ?= $(CFGDIRGROUP)
SYSCFGDIRMODE ?= $(CFGDIRMODE) SYSCFGDIRMODE ?= $(CFGDIRMODE)
HDROWNER ?= $(BUILD_USER) HDROWNER ?= $(BUILD_USER)
HDRGROUP ?= $(BUILD_GROUP) HDRGROUP ?= $(BUILD_GROUP)
HDRMODE ?= 644 HDRMODE ?= 644
HDRDIROWNER ?= $(EXEDIROWNER) HDRDIROWNER ?= $(EXEDIROWNER)
HDRDIRGROUP ?= $(EXEDIRGROUP) HDRDIRGROUP ?= $(EXEDIRGROUP)
HDRDIRMODE ?= $(EXEDIRMODE) HDRDIRMODE ?= $(EXEDIRMODE)
CTRLOWNER ?= $(EXEOWNER) CTRLOWNER ?= $(EXEOWNER)
CTRLGROUP ?= $(EXEGROUP) CTRLGROUP ?= $(EXEGROUP)
CTRLMODE ?= $(EXEMODE) CTRLMODE ?= $(EXEMODE)
CTRLDIROWNER ?= $(EXEDIROWNER) CTRLDIROWNER ?= $(EXEDIROWNER)
CTRLDIRGROUP ?= $(EXEDIRGROUP) CTRLDIRGROUP ?= $(EXEDIRGROUP)
CTRLDIRMODE ?= $(EXEDIRMODE) CTRLDIRMODE ?= $(EXEDIRMODE)
SCRIPTOWNER ?= $(EXEOWNER) SCRIPTOWNER ?= $(EXEOWNER)
SCRIPTGROUP ?= $(EXEGROUP) SCRIPTGROUP ?= $(EXEGROUP)
SCRIPTMODE ?= $(EXEMODE) SCRIPTMODE ?= $(EXEMODE)
SCRIPTDIROWNER ?= $(EXEDIROWNER) SCRIPTDIROWNER ?= $(EXEDIROWNER)
SCRIPTDIRGROUP ?= $(EXEDIRGROUP) SCRIPTDIRGROUP ?= $(EXEDIRGROUP)
SCRIPTDIRMODE ?= $(EXEDIRMODE) SCRIPTDIRMODE ?= $(EXEDIRMODE)
PYMODOWNER ?= $(BUILD_USER) PYMODOWNER ?= $(BUILD_USER)
PYMODGROUP ?= $(BUILD_GROUP) PYMODGROUP ?= $(BUILD_GROUP)
PYMODMODE ?= 644 PYMODMODE ?= 644
PYMODDIROWNER ?= $(BUILD_USER) PYMODDIROWNER ?= $(BUILD_USER)
PYMODDIRGROUP ?= $(BUILD_GROUP) PYMODDIRGROUP ?= $(BUILD_GROUP)
PYMODDIRMODE ?= 755 PYMODDIRMODE ?= 755
INITOWNER ?= $(EXEOWNER) INITOWNER ?= $(EXEOWNER)
INITGROUP ?= $(EXEGROUP) INITGROUP ?= $(EXEGROUP)
INITMODE ?= $(EXEMODE) INITMODE ?= $(EXEMODE)
INITDIROWNER ?= $(EXEDIROWNER) INITDIROWNER ?= $(EXEDIROWNER)
INITDIRGROUP ?= $(EXEDIRGROUP) INITDIRGROUP ?= $(EXEDIRGROUP)
INITDIRMODE ?= $(EXEDIRMODE) INITDIRMODE ?= $(EXEDIRMODE)
CGIOWNER ?= $(EXEOWNER) CGIOWNER ?= $(EXEOWNER)
CGIGROUP ?= $(EXEGROUP) CGIGROUP ?= $(EXEGROUP)
CGIMODE ?= $(EXEMODE) CGIMODE ?= $(EXEMODE)
CGIDIROWNER ?= $(EXEDIROWNER) CGIDIROWNER ?= $(EXEDIROWNER)
CGIDIRGROUP ?= $(EXEDIRGROUP) CGIDIRGROUP ?= $(EXEDIRGROUP)
CGIDIRMODE ?= $(EXEDIRMODE) CGIDIRMODE ?= $(EXEDIRMODE)
HTMLOWNER ?= $(BUILD_USER) HTMLOWNER ?= $(BUILD_USER)
HTMLGROUP ?= $(BUILD_GROUP) HTMLGROUP ?= $(BUILD_GROUP)
HTMLMODE ?= 644 HTMLMODE ?= 644
HTMLDIROWNER ?= $(BUILD_USER) HTMLDIROWNER ?= $(BUILD_USER)
HTMLDIRGROUP ?= $(BUILD_GROUP) HTMLDIRGROUP ?= $(BUILD_GROUP)
HTMLDIRMODE ?= 755 HTMLDIRMODE ?= 755
SYSTEMDOWNER ?= $(BUILD_USER) SYSTEMDOWNER ?= $(BUILD_USER)
SYSTEMDGROUP ?= $(BUILD_GROUP) SYSTEMDGROUP ?= $(BUILD_GROUP)
SYSTEMDMODE ?= 644 SYSTEMDMODE ?= 644
SYSTEMDDIROWNER ?= $(BUILD_USER) SYSTEMDDIROWNER ?= $(BUILD_USER)
SYSTEMDDIRGROUP ?= $(BUILD_GROUP) SYSTEMDDIRGROUP ?= $(BUILD_GROUP)
SYSTEMDDIRMODE ?= 755 SYSTEMDDIRMODE ?= 755
LIBOWNER ?= $(EXEOWNER) LIBOWNER ?= $(EXEOWNER)
LIBGROUP ?= $(EXEGROUP) LIBGROUP ?= $(EXEGROUP)
LIBMODE ?= $(EXEMODE) LIBMODE ?= $(EXEMODE)
LIBDIROWNER ?= $(EXEDIROWNER) LIBDIROWNER ?= $(EXEDIROWNER)
LIBDIRGROUP ?= $(EXEDIRGROUP) LIBDIRGROUP ?= $(EXEDIRGROUP)
LIBDIRMODE ?= $(EXEDIRMODE) LIBDIRMODE ?= $(EXEDIRMODE)
PIOWNER ?= $(LIBOWNER) PIOWNER ?= $(LIBOWNER)
PIGROUP ?= $(LIBGROUP) PIGROUP ?= $(LIBGROUP)
PIMODE ?= $(LIBMODE) PIMODE ?= $(LIBMODE)
PIDIROWNER ?= $(LIBDIROWNER) PIDIROWNER ?= $(LIBDIROWNER)
PIDIRGROUP ?= $(LIBDIRGROUP) PIDIRGROUP ?= $(LIBDIRGROUP)
PIDIRMODE ?= $(LIBDIRMODE) PIDIRMODE ?= $(LIBDIRMODE)
MAKEOWNER ?= $(HDROWNER) MAKEOWNER ?= $(HDROWNER)
MAKEGROUP ?= $(HDRGROUP) MAKEGROUP ?= $(HDRGROUP)
MAKEMODE ?= $(HDRMODE) MAKEMODE ?= $(HDRMODE)
MAKEDIROWNER ?= $(HDRDIROWNER) MAKEDIROWNER ?= $(HDRDIROWNER)
MAKEDIRGROUP ?= $(HDRDIRGROUP) MAKEDIRGROUP ?= $(HDRDIRGROUP)
MAKEDIRMODE ?= $(HDRDIRMODE) MAKEDIRMODE ?= $(HDRDIRMODE)
PROFILEOWNER ?= $(EXEOWNER) PROFILEOWNER ?= $(EXEOWNER)
PROFILEGROUP ?= $(EXEGROUP) PROFILEGROUP ?= $(EXEGROUP)
PROFILEMODE ?= $(EXEMODE) PROFILEMODE ?= $(EXEMODE)
PROFILEDIROWNER ?= $(BUILD_USER) PROFILEDIROWNER ?= $(BUILD_USER)
PROFILEDIRGROUP ?= $(BUILD_GROUP) PROFILEDIRGROUP ?= $(BUILD_GROUP)
PROFILEDIRMODE ?= 770 PROFILEDIRMODE ?= 770
ROOTOWNER ?= $(BUILD_USER) ROOTOWNER ?= $(BUILD_USER)
ROOTGROUP ?= $(BUILD_GROUP) ROOTGROUP ?= $(BUILD_GROUP)
ROOTMODE ?= 770 ROOTMODE ?= 770
ROOTDIROWNER ?= $(BUILD_USER) ROOTDIROWNER ?= $(BUILD_USER)
ROOTDIRGROUP ?= $(BUILD_GROUP) ROOTDIRGROUP ?= $(BUILD_GROUP)
ROOTDIRMODE ?= 750 ROOTDIRMODE ?= 750
DOCOWNER ?= $(HDROWNER) DOCOWNER ?= $(HDROWNER)
DOCGROUP ?= $(HDRGROUP) DOCGROUP ?= $(HDRGROUP)
DOCMODE ?= $(HDRMODE) DOCMODE ?= $(HDRMODE)
DOCDIROWNER ?= $(HDRDIROWNER) DOCDIROWNER ?= $(HDRDIROWNER)
DOCDIRGROUP ?= $(HDRDIRGROUP) DOCDIRGROUP ?= $(HDRDIRGROUP)
DOCDIRMODE ?= $(HDRDIRMODE) DOCDIRMODE ?= $(HDRDIRMODE)
TMPLOWNER ?= $(DOCOWNER) TMPLOWNER ?= $(DOCOWNER)
TMPLGROUP ?= $(DOCGROUP) TMPLGROUP ?= $(DOCGROUP)
TMPLMODE ?= $(DOCMODE) TMPLMODE ?= $(DOCMODE)
TMPLDIROWNER ?= $(DOCDIROWNER) TMPLDIROWNER ?= $(DOCDIROWNER)
TMPLDIRGROUP ?= $(DOCDIRGROUP) TMPLDIRGROUP ?= $(DOCDIRGROUP)
TMPLDIRMODE ?= $(DOCDIRMODE) TMPLDIRMODE ?= $(DOCDIRMODE)
VAROWNER ?= $(BUILD_USER) VAROWNER ?= $(BUILD_USER)
VARGROUP ?= $(BUILD_GROUP) VARGROUP ?= $(BUILD_GROUP)
VARMODE ?= 666 VARMODE ?= 666
VARDIROWNER ?= $(BUILD_USER) VARDIROWNER ?= $(BUILD_USER)
VARDIRGROUP ?= $(BUILD_GROUP) VARDIRGROUP ?= $(BUILD_GROUP)
VARDIRMODE ?= 770 VARDIRMODE ?= 770
PREFIXOWNER ?= $(EXEOWNER) PREFIXOWNER ?= $(EXEOWNER)
PREFIXGROUP ?= $(EXEGROUP) PREFIXGROUP ?= $(EXEGROUP)
PREFIXMODE ?= 770 PREFIXMODE ?= 770
PREFIXDIROWNER ?= $(EXEDIROWNER) PREFIXDIROWNER ?= $(EXEDIROWNER)
PREFIXDIRGROUP ?= $(EXEDIRGROUP) PREFIXDIRGROUP ?= $(EXEDIRGROUP)
PREFIXDIRMODE ?= 770 PREFIXDIRMODE ?= 770
IMGOWNER ?= $(BUILD_USER) IMGOWNER ?= $(BUILD_USER)
IMGGROUP ?= $(BUILD_GROUP) IMGGROUP ?= $(BUILD_GROUP)
IMGMODE ?= 666 IMGMODE ?= 666
IMGDIROWNER ?= $(BUILD_USER) IMGDIROWNER ?= $(BUILD_USER)
IMGDIRGROUP ?= $(BUILD_GROUP) IMGDIRGROUP ?= $(BUILD_GROUP)
IMGDIRMODE ?= 770 IMGDIRMODE ?= 770
MOOWNER ?= $(BUILD_USER) MOOWNER ?= $(BUILD_USER)
MOGROUP ?= $(BUILD_GROUP) MOGROUP ?= $(BUILD_GROUP)
MOMODE ?= 666 MOMODE ?= 666
MODIROWNER ?= $(BUILD_USER) MODIROWNER ?= $(BUILD_USER)
MODIRGROUP ?= $(BUILD_GROUP) MODIRGROUP ?= $(BUILD_GROUP)
MODIRMODE ?= 775 MODIRMODE ?= 775
LOGOWNER ?= $(DOCOWNER) LOGOWNER ?= $(DOCOWNER)
LOGGROUP ?= $(DOCGROUP) LOGGROUP ?= $(DOCGROUP)
LOGMODE ?= $(DOCMODE) LOGMODE ?= $(DOCMODE)
LOGDIROWNER ?= $(DOCDIROWNER) LOGDIROWNER ?= $(DOCDIROWNER)
LOGDIRGROUP ?= $(DOCDIROWNER) LOGDIRGROUP ?= $(DOCDIROWNER)
LOGDIRMODE ?= $(DOCDIRMODE) LOGDIRMODE ?= $(DOCDIRMODE)
JAVAOWNER ?= $(LIBOWNER) JAVAOWNER ?= $(LIBOWNER)
JAVAGROUP ?= $(LIBGROUP) JAVAGROUP ?= $(LIBGROUP)
JAVAMODE ?= $(LIBMODE) JAVAMODE ?= $(LIBMODE)
JAVADIROWNER ?= $(LIBDIROWNER) JAVADIROWNER ?= $(LIBDIROWNER)
JAVADIRGROUP ?= $(LIBDIRGROUP) JAVADIRGROUP ?= $(LIBDIRGROUP)
JAVADIRMODE ?= $(LIBDIRMODE) JAVADIRMODE ?= $(LIBDIRMODE)
LD_CONFOWNER ?= $(CFGOWNER) LD_CONFOWNER ?= $(CFGOWNER)
LD_CONFGROUP ?= $(CFGGROUP) LD_CONFGROUP ?= $(CFGGROUP)
LD_CONFMODE ?= 664 LD_CONFMODE ?= 664
LD_CONFDIROWNER ?= $(CFGDIROWNER) LD_CONFDIROWNER ?= $(CFGDIROWNER)
LD_CONFDIRGROUP ?= $(CFGDIROWNER) LD_CONFDIRGROUP ?= $(CFGDIROWNER)
LD_CONFDIRMODE ?= $(CFGDIRMODE) LD_CONFDIRMODE ?= $(CFGDIRMODE)
LOGROTOWNER ?= $(CFGOWNER) LOGROTOWNER ?= $(CFGOWNER)
LOGROTGROUP ?= $(CFGGROUP) LOGROTGROUP ?= $(CFGGROUP)
LOGROTMODE ?= 644 # group writable files are ignored by logrotate LOGROTMODE ?= 644 # group writable files are ignored by logrotate
LOGROTDIROWNER ?= $(CFGDIROWNER) LOGROTDIROWNER ?= $(CFGDIROWNER)
LOGROTDIRGROUP ?= $(CFGDIRGROUP) LOGROTDIRGROUP ?= $(CFGDIRGROUP)
LOGROTDIRMODE ?= $(CFGDIRMODE) LOGROTDIRMODE ?= $(CFGDIRMODE)
APACHE_CONFOWNER ?= $(CFGOWNER) APACHE_CONFOWNER ?= $(CFGOWNER)
APACHE_CONFGROUP ?= $(CFGGROUP) APACHE_CONFGROUP ?= $(CFGGROUP)
APACHE_CONFMODE ?= $(CFGDIRMODE) APACHE_CONFMODE ?= $(CFGDIRMODE)
APACHE_CONFDIROWNER ?= $(CFGDIROWNER) APACHE_CONFDIROWNER ?= $(CFGDIROWNER)
APACHE_CONFDIRGROUP ?= $(CFGDIROWNER) APACHE_CONFDIRGROUP ?= $(CFGDIROWNER)
APACHE_CONFDIRMODE ?= $(CFGDIRMODE) APACHE_CONFDIRMODE ?= $(CFGDIRMODE)
SITEOWNER ?= $(APACHE_CONFOWNER) SITEOWNER ?= $(APACHE_CONFOWNER)
SITEGROUP ?= $(APACHE_CONFGROUP) SITEGROUP ?= $(APACHE_CONFGROUP)
SITEMODE ?= $(APACHE_CONFMODE) SITEMODE ?= $(APACHE_CONFMODE)
SITEDIROWNER ?= $(APACHE_CONFDIROWNER) SITEDIROWNER ?= $(APACHE_CONFDIROWNER)
SITEDIRGROUP ?= $(APACHE_CONFDIROWNER) SITEDIRGROUP ?= $(APACHE_CONFDIROWNER)
SITEDIRMODE ?= $(APACHE_CONFDIRMODE) SITEDIRMODE ?= $(APACHE_CONFDIRMODE)
RSYSLOGOWNER ?= $(CFGOWNER) RSYSLOGOWNER ?= $(CFGOWNER)
RSYSLOGGROUP ?= $(CFGGROUP) RSYSLOGGROUP ?= $(CFGGROUP)
RSYSLOGMODE ?= $(CFGMODE) RSYSLOGMODE ?= $(CFGMODE)
RSYSLOGDIROWNER ?= $(CFGDIROWNER) RSYSLOGDIROWNER ?= $(CFGDIROWNER)
RSYSLOGDIRGROUP ?= $(CFGDIROWNER) RSYSLOGDIRGROUP ?= $(CFGDIROWNER)
RSYSLOGDIRMODE ?= $(CFGDIRMODE) RSYSLOGDIRMODE ?= $(CFGDIRMODE)
CRONTABOWNER ?= $(CFGOWNER) CRONTABOWNER ?= $(CFGOWNER)
CRONTABGROUP ?= $(CFGGROUP) CRONTABGROUP ?= $(CFGGROUP)
CRONTABMODE ?= 600 CRONTABMODE ?= 600
CRONTABDIROWNER ?= $(CFGDIROWNER) CRONTABDIROWNER ?= $(CFGDIROWNER)
CRONTABDIRGROUP ?= $(CFGDIROWNER) CRONTABDIRGROUP ?= $(CFGDIROWNER)
CRONTABDIRMODE ?= $(CFGDIRMODE) CRONTABDIRMODE ?= $(CFGDIRMODE)
KIO_PROTOCOLOWNER ?= $(CFGOWNER) KIO_PROTOCOLOWNER ?= $(CFGOWNER)
KIO_PROTOCOLGROUP ?= $(CFGGROUP) KIO_PROTOCOLGROUP ?= $(CFGGROUP)
KIO_PROTOCOLMODE ?= 664 KIO_PROTOCOLMODE ?= 664
KIO_PROTOCOLDIROWNER ?= $(CFGDIROWNER) KIO_PROTOCOLDIROWNER ?= $(CFGDIROWNER)
KIO_PROTOCOLDIRGROUP ?= $(CFGDIROWNER) KIO_PROTOCOLDIRGROUP ?= $(CFGDIROWNER)
KIO_PROTOCOLDIRMODE ?= $(CFGDIRMODE) KIO_PROTOCOLDIRMODE ?= $(CFGDIRMODE)
PKG_CONFIGOWNER ?= $(CFGOWNER) PKG_CONFIGOWNER ?= $(CFGOWNER)
PKG_CONFIGGROUP ?= $(CFGGROUP) PKG_CONFIGGROUP ?= $(CFGGROUP)
PKG_CONFIGMODE ?= 664 PKG_CONFIGMODE ?= 664
PKG_CONFIGDIROWNER ?= $(CFGDIROWNER) PKG_CONFIGDIROWNER ?= $(CFGDIROWNER)
PKG_CONFIGDIRGROUP ?= $(CFGDIROWNER) PKG_CONFIGDIRGROUP ?= $(CFGDIROWNER)
PKG_CONFIGDIRMODE ?= $(CFGDIRMODE) PKG_CONFIGDIRMODE ?= $(CFGDIRMODE)
# -- options # -- options
@ -255,47 +255,47 @@ PKG_CONFIGDIRMODE ?= $(CFGDIRMODE)
# for using the dbmalloc lib, before you will need to do: # for using the dbmalloc lib, before you will need to do:
# cd $(MODDIR)/contrib/dbmalloc; tar -xzf dbmalloc-ver.sion.tar.gz # cd $(MODDIR)/contrib/dbmalloc; tar -xzf dbmalloc-ver.sion.tar.gz
#USE_BTOOLS ?= true #USE_BTOOLS ?= true
#USE_DSPFS ?= true #USE_DSPFS ?= true
#USE_ENGINE_BENNO ?= true #USE_ENGINE_BENNO ?= true
#USE_ENGINE_JAN ?= true #USE_ENGINE_JAN ?= true
#USE_JACK ?= true #USE_JACK ?= true
#USE_JACKDUMMY ?= true #USE_JACKDUMMY ?= true
#USE_JACKJART ?= true #USE_JACKJART ?= true
#USE_JACKRTAI ?= true #USE_JACKRTAI ?= true
#USE_JACK ?= true #USE_JACK ?= true
#USE_DBMALLOC ?= true #USE_DBMALLOC ?= true
#USE_DMALLOC ?= true #USE_DMALLOC ?= true
#USE_EFENCE ?= true #USE_EFENCE ?= true
#USE_VALGRIND ?= true #USE_VALGRIND ?= true
#USE_MCHECK ?= true # not thread-safe #USE_MCHECK ?= true # not thread-safe
#USE_MEMWATCH ?= true #USE_MEMWATCH ?= true
#USE_MPATROL ?= true #USE_MPATROL ?= true
#USE_TRACING ?= true #USE_TRACING ?= true
#USE_TIMER ?= true #USE_TIMER ?= true
LOG_THREAD_NAMES ?= true LOG_THREAD_NAMES ?= true
#STRIP_SYMBOLS ?= true #STRIP_SYMBOLS ?= true
COMPILE_DEBUG_CODE ?= true COMPILE_DEBUG_CODE ?= true
#COMPILE_DEBUG_LOG ?= true #COMPILE_DEBUG_LOG ?= true
USE_COMPILER_DEBUG_OPTS ?= true USE_COMPILER_DEBUG_OPTS ?= true
#USE_COMPILER_OPTIMIZATION_OPTS ?= true #USE_COMPILER_OPTIMIZATION_OPTS?= true
ifeq ($(TARGET),mingw) ifeq ($(TARGET),mingw)
USE_STACK_PROTECTOR ?= false USE_STACK_PROTECTOR ?= false
else else
USE_STACK_PROTECTOR ?= true USE_STACK_PROTECTOR ?= true
endif endif
#USE_STACK_CHECKER ?= true #USE_STACK_CHECKER ?= true
#USE_FUSE ?= true #USE_FUSE ?= true
#USE_SNDFILE ?= true #USE_SNDFILE ?= true
#USE_GLIB ?= true #USE_GLIB ?= true
#USE_ASSERTIONS ?= false #USE_ASSERTIONS ?= false
BREAK_ABI ?= true BREAK_ABI ?= true
#INSTALL_HOME_BIN_WRAPPERS ?= true #INSTALL_HOME_BIN_WRAPPERS ?= true
#export MALLOC_CHECK_ = 3 #export MALLOC_CHECK_ = 3

12
make/defs-dirs.mk
View file

@ -1,10 +1,10 @@
FIND_SUBDIRS := $(filter-out . .. nomake CVS $(IGNORE_SUBDIRS),\ FIND_SUBDIRS := $(filter-out . .. nomake CVS $(IGNORE_SUBDIRS),\
$(patsubst ./%,%,$(patsubst %/,%,$(dir $(shell $(FIND) . -maxdepth 2 -mindepth 2 -a \( -iname Makefile -o -iname GNUmakefile \)))))) $(patsubst ./%,%,$(patsubst %/,%,$(dir $(shell $(FIND) . -maxdepth 2 -mindepth 2 -a \( -iname Makefile -o -iname GNUmakefile \))))))
SUBDIRS_TO_ITERATE = $(filter-out $(IGNORE_SUBDIRS),$(SUBDIRS)) SUBDIRS_TO_ITERATE = $(filter-out $(IGNORE_SUBDIRS),$(SUBDIRS))
ALLOWED_SUBDIR_TARGETS ?= all install clean distclean test link-in ALLOWED_SUBDIR_TARGETS ?= all install clean distclean test link-in
SUBDIRS ?= $(ORDERED_SUBDIRS) $(filter-out $(ORDERED_SUBDIRS),$(FIND_SUBDIRS)) SUBDIRS ?= $(ORDERED_SUBDIRS) $(filter-out $(ORDERED_SUBDIRS),$(FIND_SUBDIRS))
#SUBDIRS ?= $(filter-out $(ORDERED_SUBDIRS),$(FIND_SUBDIRS)) #SUBDIRS ?= $(filter-out $(ORDERED_SUBDIRS),$(FIND_SUBDIRS))
#SUBDIRS ?= $(FIND_SUBDIRS) #SUBDIRS ?= $(FIND_SUBDIRS)

544
make/defs-dist.mk
View file

@ -4,291 +4,291 @@
# $Id$ # $Id$
# -- files # -- files
#CONTRIBDIR ?= $(TOPDIR)/contrib #CONTRIBDIR ?= $(TOPDIR)/contrib
PROJECT_DIRNAME ?= $(PROJECT) PROJECT_DIRNAME ?= $(PROJECT)
PROJECT_DIRPATH ?= /opt/$(FLAVOUR_PATH_PREFIX)$(PROJECT_DIRNAME) PROJECT_DIRPATH ?= /opt/$(FLAVOUR_PATH_PREFIX)$(PROJECT_DIRNAME)
PREFIX ?= $(ENV_PREFIX)$(PROJECT_DIRPATH) PREFIX ?= $(ENV_PREFIX)$(PROJECT_DIRPATH)
ROOT_PREFIX ?= $(ENV_PREFIX) ROOT_PREFIX ?= $(ENV_PREFIX)
VAR_PREFIX ?= $(ENV_PREFIX)/var/$(FLAVOUR_PATH_PREFIX)lib VAR_PREFIX ?= $(ENV_PREFIX)/var/$(FLAVOUR_PATH_PREFIX)lib
DOC_PREFIX ?= $(ENV_PREFIX)/usr/share/doc/packages/$(FLAVOUR_PREFIX)$(PROJECT_DIRNAME) DOC_PREFIX ?= $(ENV_PREFIX)/usr/share/doc/packages/$(FLAVOUR_PREFIX)$(PROJECT_DIRNAME)
EXE_PREFIX ?= $(PREFIX) EXE_PREFIX ?= $(PREFIX)
INIT_PREFIX ?= $(ENV_PREFIX)/etc$(FLAVOUR_PATH_SUFFIX) INIT_PREFIX ?= $(ENV_PREFIX)/etc$(FLAVOUR_PATH_SUFFIX)
HTDOCS_PREFIX ?= $(ENV_PREFIX)/srv/www HTDOCS_PREFIX ?= $(ENV_PREFIX)/srv/www
SYSTEMD_DIR ?= $(ENV_PREFIX)/usr/lib/systemd/system SYSTEMD_DIR ?= $(ENV_PREFIX)/usr/lib/systemd/system
JS_PREFIX ?= $(ENV_PREFIX)/usr/share/javascript JS_PREFIX ?= $(ENV_PREFIX)/usr/share/javascript
JS_DIR ?= $(JS_PREFIX)/$(PROJECT_DIRNAME) JS_DIR ?= $(JS_PREFIX)/$(PROJECT_DIRNAME)
SYSCFG_DIR ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)sysconfig SYSCFG_DIR ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)sysconfig
CONFIG_DIR ?= $(ENV_PREFIX)/etc/opt/$(FLAVOUR_PATH_PREFIX)$(PROJECT_DIRNAME) CONFIG_DIR ?= $(ENV_PREFIX)/etc/opt/$(FLAVOUR_PATH_PREFIX)$(PROJECT_DIRNAME)
LD_CONF_DIR ?= $(ENV_PREFIX)/etc/ld.so.conf.d LD_CONF_DIR ?= $(ENV_PREFIX)/etc/ld.so.conf.d
LOGROT_DIR ?= $(ENV_PREFIX)/etc/logrotate.d LOGROT_DIR ?= $(ENV_PREFIX)/etc/logrotate.d
APACHE_CONF_DIR ?= $(ENV_PREFIX)/etc/jw-apache/conf.d APACHE_CONF_DIR ?= $(ENV_PREFIX)/etc/jw-apache/conf.d
APACHE_VHOSTS_DIR?= $(ENV_PREFIX)/etc/jw-apache/vhosts.d APACHE_VHOSTS_DIR ?= $(ENV_PREFIX)/etc/jw-apache/vhosts.d
APACHE_SNIPPETS_DIR?= $(ENV_PREFIX)/etc/jw-apache/snippets.d APACHE_SNIPPETS_DIR ?= $(ENV_PREFIX)/etc/jw-apache/snippets.d
RSYSLOG_DIR ?= $(ENV_PREFIX)/etc/rsyslog.d RSYSLOG_DIR ?= $(ENV_PREFIX)/etc/rsyslog.d
IMG_PREFIX ?= $(PREFIX) IMG_PREFIX ?= $(PREFIX)
LOG_PREFIX ?= $(ENV_PREFIX)/var/log LOG_PREFIX ?= $(ENV_PREFIX)/var/log
JAVA_PREFIX ?= $(PREFIX) JAVA_PREFIX ?= $(PREFIX)
HDR_SCOPE_PREFIX ?= HDR_SCOPE_PREFIX ?=
IMAGEDIR ?= $(FLAVOUR_PATH_PREFIX)$(PREFIX)/images IMAGEDIR ?= $(FLAVOUR_PATH_PREFIX)$(PREFIX)/images
CTRLDIR ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)init.d CTRLDIR ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)init.d
DAEMON_RUN_DIR ?= $(VAR_PREFIX)/corefiles DAEMON_RUN_DIR ?= $(VAR_PREFIX)/corefiles
PROFILE_DIR ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)profile.d PROFILE_DIR ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)profile.d
INSTALL_CRONTABDIR ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)cron.d INSTALL_CRONTABDIR ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)cron.d
INSTALL_PKG_CONFIGDIR ?= $(ENV_PREFIX)$(SYSTEM_LIBDIR)/pkgconfig INSTALL_PKG_CONFIGDIR ?= $(ENV_PREFIX)$(SYSTEM_LIBDIR)/pkgconfig
PIDDIR ?= $(VAR_PREFIX)/run PIDDIR ?= $(VAR_PREFIX)/run
DOWNLOADDIRS ?= root@cvs.jannet.de:/usr/local/httpd/htdocs/www.jannet.de_443/$(CUSTOMER)/projects/$(PROJECT) DOWNLOADDIRS ?= root@cvs.jannet.de:/usr/local/httpd/htdocs/www.jannet.de_443/$(CUSTOMER)/projects/$(PROJECT)
WORKING_DIR ?= $(VAR_PREFIX)/coredumps WORKING_DIR ?= $(VAR_PREFIX)/coredumps
WORKING_DIR ?= $(VAR_PREFIX)/lock WORKING_DIR ?= $(VAR_PREFIX)/lock
JAVADIR ?= $(JAVA_PREFIX)/share/java JAVADIR ?= $(JAVA_PREFIX)/share/java
HTML_PROJECT ?= $(patsubst www-%,%,$(PROJECT_DIRNAME)) HTML_PROJECT ?= $(patsubst www-%,%,$(PROJECT_DIRNAME))
PROJECT_HTML_BASE_DIR ?= $(HTDOCS_PREFIX)/proj PROJECT_HTML_BASE_DIR ?= $(HTDOCS_PREFIX)/proj
PROJECT_HTMLDIR ?= $(PROJECT_HTML_BASE_DIR)/$(HTML_PROJECT) PROJECT_HTMLDIR ?= $(PROJECT_HTML_BASE_DIR)/$(HTML_PROJECT)
PROJECT_HTML_THEMES_DIR ?= $(PROJECT_HTML_BASE_DIR)/themes PROJECT_HTML_THEMES_DIR ?= $(PROJECT_HTML_BASE_DIR)/themes
PROJECT_TMPLDIR ?= $(PREFIX)/share/tmpl PROJECT_TMPLDIR ?= $(PREFIX)/share/tmpl
SITE_MODULES_DIR ?= $(HTDOCS_PREFIX)/proj/site/modules.d SITE_MODULES_DIR ?= $(HTDOCS_PREFIX)/proj/site/modules.d
CGI_DIR ?= $(PROJECT_HTMLDIR)/cgi-bin CGI_DIR ?= $(PROJECT_HTMLDIR)/cgi-bin
# -- misc # -- misc
LOGID ?= $(PROJECT) LOGID ?= $(PROJECT)
DAEMON_RUN_USER ?= root DAEMON_RUN_USER ?= root
DAEMON_RUN_GROUP ?= root DAEMON_RUN_GROUP ?= root
CATCH_ONLY_YERROR?= false CATCH_ONLY_YERROR ?= false
# -- file attributes # -- file attributes
EXEOWNER ?= root EXEOWNER ?= root
EXEGROUP ?= root EXEGROUP ?= root
EXEMODE ?= 755 EXEMODE ?= 755
EXEDIROWNER ?= root EXEDIROWNER ?= root
EXEDIRGROUP ?= root EXEDIRGROUP ?= root
EXEDIRMODE ?= 755 EXEDIRMODE ?= 755
CFGOWNER ?= root CFGOWNER ?= root
CFGGROUP ?= root CFGGROUP ?= root
CFGMODE ?= 664 CFGMODE ?= 664
CFGDIROWNER ?= $(EXEDIROWNER) CFGDIROWNER ?= $(EXEDIROWNER)
CFGDIRGROUP ?= $(EXEDIRGROUP) CFGDIRGROUP ?= $(EXEDIRGROUP)
CFGDIRMODE ?= $(EXEDIRMODE) CFGDIRMODE ?= $(EXEDIRMODE)
SYSCFGOWNER ?= $(CFGOWNER) SYSCFGOWNER ?= $(CFGOWNER)
SYSCFGGROUP ?= $(CFGGROUP) SYSCFGGROUP ?= $(CFGGROUP)
SYSCFGMODE ?= $(CFGMODE) SYSCFGMODE ?= $(CFGMODE)
SYSCFGDIROWNER ?= $(CFGDIROWNER) SYSCFGDIROWNER ?= $(CFGDIROWNER)
SYSCFGDIRGROUP ?= $(CFGDIRGROUP) SYSCFGDIRGROUP ?= $(CFGDIRGROUP)
SYSCFGDIRMODE ?= $(CFGDIRMODE) SYSCFGDIRMODE ?= $(CFGDIRMODE)
HDROWNER ?= root HDROWNER ?= root
HDRGROUP ?= root HDRGROUP ?= root
HDRMODE ?= 644 HDRMODE ?= 644
HDRDIROWNER ?= $(EXEDIROWNER) HDRDIROWNER ?= $(EXEDIROWNER)
HDRDIRGROUP ?= $(EXEDIRGROUP) HDRDIRGROUP ?= $(EXEDIRGROUP)
HDRDIRMODE ?= $(EXEDIRMODE) HDRDIRMODE ?= $(EXEDIRMODE)
CTRLOWNER ?= $(EXEOWNER) CTRLOWNER ?= $(EXEOWNER)
CTRLGROUP ?= $(EXEGROUP) CTRLGROUP ?= $(EXEGROUP)
CTRLMODE ?= $(EXEMODE) CTRLMODE ?= $(EXEMODE)
CTRLDIROWNER ?= $(EXEDIROWNER) CTRLDIROWNER ?= $(EXEDIROWNER)
CTRLDIRGROUP ?= $(EXEDIRGROUP) CTRLDIRGROUP ?= $(EXEDIRGROUP)
CTRLDIRMODE ?= $(EXEDIRMODE) CTRLDIRMODE ?= $(EXEDIRMODE)
SCRIPTOWNER ?= $(EXEOWNER) SCRIPTOWNER ?= $(EXEOWNER)
SCRIPTGROUP ?= $(EXEGROUP) SCRIPTGROUP ?= $(EXEGROUP)
SCRIPTMODE ?= $(EXEMODE) SCRIPTMODE ?= $(EXEMODE)
SCRIPTDIROWNER ?= $(EXEDIROWNER) SCRIPTDIROWNER ?= $(EXEDIROWNER)
SCRIPTDIRGROUP ?= $(EXEDIRGROUP) SCRIPTDIRGROUP ?= $(EXEDIRGROUP)
SCRIPTDIRMODE ?= $(EXEDIRMODE) SCRIPTDIRMODE ?= $(EXEDIRMODE)
PYMODOWNER ?= root PYMODOWNER ?= root
PYMODGROUP ?= root PYMODGROUP ?= root
PYMODMODE ?= 644 PYMODMODE ?= 644
PYMODDIROWNER ?= root PYMODDIROWNER ?= root
PYMODDIRGROUP ?= root PYMODDIRGROUP ?= root
PYMODDIRMODE ?= 755 PYMODDIRMODE ?= 755
INITDIRMODE ?= $(EXEDIRMODE) INITDIRMODE ?= $(EXEDIRMODE)
INITOWNER ?= $(EXEOWNER) INITOWNER ?= $(EXEOWNER)
INITGROUP ?= $(EXEGROUP) INITGROUP ?= $(EXEGROUP)
INITMODE ?= $(EXEMODE) INITMODE ?= $(EXEMODE)
INITDIROWNER ?= $(EXEDIROWNER) INITDIROWNER ?= $(EXEDIROWNER)
INITDIRGROUP ?= $(EXEDIRGROUP) INITDIRGROUP ?= $(EXEDIRGROUP)
INITDIRMODE ?= $(EXEDIRMODE) INITDIRMODE ?= $(EXEDIRMODE)
CGIOWNER ?= $(EXEOWNER) CGIOWNER ?= $(EXEOWNER)
CGIGROUP ?= $(EXEGROUP) CGIGROUP ?= $(EXEGROUP)
CGIMODE ?= $(EXEMODE) CGIMODE ?= $(EXEMODE)
CGIDIROWNER ?= $(EXEDIROWNER) CGIDIROWNER ?= $(EXEDIROWNER)
CGIDIRGROUP ?= $(EXEDIRGROUP) CGIDIRGROUP ?= $(EXEDIRGROUP)
CGIDIRMODE ?= $(EXEDIRMODE) CGIDIRMODE ?= $(EXEDIRMODE)
HTMLOWNER ?= wwwrun HTMLOWNER ?= wwwrun
HTMLGROUP ?= www HTMLGROUP ?= www
HTMLMODE ?= 644 HTMLMODE ?= 644
HTMLDIROWNER ?= wwwrun HTMLDIROWNER ?= wwwrun
HTMLDIRGROUP ?= www HTMLDIRGROUP ?= www
HTMLDIRMODE ?= 755 HTMLDIRMODE ?= 755
SYSTEMDOWNER ?= root SYSTEMDOWNER ?= root
SYSTEMDGROUP ?= root SYSTEMDGROUP ?= root
SYSTEMDMODE ?= 644 SYSTEMDMODE ?= 644
SYSTEMDDIROWNER ?= root SYSTEMDDIROWNER ?= root
SYSTEMDDIRGROUP ?= root SYSTEMDDIRGROUP ?= root
SYSTEMDDIRMODE ?= 755 SYSTEMDDIRMODE ?= 755
LIBOWNER ?= $(EXEOWNER) LIBOWNER ?= $(EXEOWNER)
LIBGROUP ?= $(EXEGROUP) LIBGROUP ?= $(EXEGROUP)
LIBMODE ?= $(EXEMODE) LIBMODE ?= $(EXEMODE)
LIBDIROWNER ?= $(EXEDIROWNER) LIBDIROWNER ?= $(EXEDIROWNER)
LIBDIRGROUP ?= $(EXEDIRGROUP) LIBDIRGROUP ?= $(EXEDIRGROUP)
LIBDIRMODE ?= $(EXEDIRMODE) LIBDIRMODE ?= $(EXEDIRMODE)
PIOWNER ?= $(LIBOWNER) PIOWNER ?= $(LIBOWNER)
PIGROUP ?= $(LIBGROUP) PIGROUP ?= $(LIBGROUP)
PIMODE ?= $(LIBMODE) PIMODE ?= $(LIBMODE)
PIDIROWNER ?= $(LIBDIROWNER) PIDIROWNER ?= $(LIBDIROWNER)
PIDIRGROUP ?= $(LIBDIRGROUP) PIDIRGROUP ?= $(LIBDIRGROUP)
PIDIRMODE ?= $(LIBDIRMODE) PIDIRMODE ?= $(LIBDIRMODE)
MAKEOWNER ?= $(HDROWNER) MAKEOWNER ?= $(HDROWNER)
MAKEGROUP ?= $(HDRGROUP) MAKEGROUP ?= $(HDRGROUP)
MAKEMODE ?= $(HDRMODE) MAKEMODE ?= $(HDRMODE)
MAKEDIROWNER ?= $(HDRDIROWNER) MAKEDIROWNER ?= $(HDRDIROWNER)
MAKEDIRGROUP ?= $(HDRDIRGROUP) MAKEDIRGROUP ?= $(HDRDIRGROUP)
MAKEDIRMODE ?= $(HDRDIRMODE) MAKEDIRMODE ?= $(HDRDIRMODE)
PROFILEOWNER ?= $(EXEOWNER) PROFILEOWNER ?= $(EXEOWNER)
PROFILEGROUP ?= $(EXEGROUP) PROFILEGROUP ?= $(EXEGROUP)
PROFILEMODE ?= $(EXEMODE) PROFILEMODE ?= $(EXEMODE)
PROFILEDIROWNER ?= root PROFILEDIROWNER ?= root
PROFILEDIRGROUP ?= root PROFILEDIRGROUP ?= root
PROFILEDIRMODE ?= 755 PROFILEDIRMODE ?= 755
ROOTOWNER ?= root ROOTOWNER ?= root
ROOTGROUP ?= root ROOTGROUP ?= root
ROOTMODE ?= 600 ROOTMODE ?= 600
ROOTDIROWNER ?= root ROOTDIROWNER ?= root
ROOTDIRGROUP ?= root ROOTDIRGROUP ?= root
ROOTDIRMODE ?= 750 ROOTDIRMODE ?= 750
DOCOWNER ?= $(HDROWNER) DOCOWNER ?= $(HDROWNER)
DOCGROUP ?= $(HDRGROUP) DOCGROUP ?= $(HDRGROUP)
DOCMODE ?= $(HDRMODE) DOCMODE ?= $(HDRMODE)
DOCDIROWNER ?= $(HDRDIROWNER) DOCDIROWNER ?= $(HDRDIROWNER)
DOCDIRGROUP ?= $(HDRDIROWNER) DOCDIRGROUP ?= $(HDRDIROWNER)
DOCDIRMODE ?= $(HDRDIRMODE) DOCDIRMODE ?= $(HDRDIRMODE)
TMPLOWNER ?= $(DOCOWNER) TMPLOWNER ?= $(DOCOWNER)
TMPLGROUP ?= $(DOCGROUP) TMPLGROUP ?= $(DOCGROUP)
TMPLMODE ?= $(DOCMODE) TMPLMODE ?= $(DOCMODE)
TMPLDIROWNER ?= $(DOCDIROWNER) TMPLDIROWNER ?= $(DOCDIROWNER)
TMPLDIRGROUP ?= $(DOCDIRGROUP) TMPLDIRGROUP ?= $(DOCDIRGROUP)
TMPLDIRMODE ?= $(DOCDIRMODE) TMPLDIRMODE ?= $(DOCDIRMODE)
VAROWNER ?= nogroup VAROWNER ?= nogroup
VARGROUP ?= nobody VARGROUP ?= nobody
VARMODE ?= 666 VARMODE ?= 666
VARDIROWNER ?= root VARDIROWNER ?= root
VARDIRGROUP ?= root VARDIRGROUP ?= root
VARDIRMODE ?= 775 VARDIRMODE ?= 775
PREFIXOWNER ?= $(EXEOWNER) PREFIXOWNER ?= $(EXEOWNER)
PREFIXGROUP ?= $(EXEGROUP) PREFIXGROUP ?= $(EXEGROUP)
PREFIXMODE ?= 644 PREFIXMODE ?= 644
PREFIXDIROWNER ?= $(EXEOWNER) PREFIXDIROWNER ?= $(EXEOWNER)
PREFIXDIRGROUP ?= $(EXEGROUP) PREFIXDIRGROUP ?= $(EXEGROUP)
PREFIXDIRMODE ?= 755 PREFIXDIRMODE ?= 755
IMGOWNER ?= $(DOCOWNER) IMGOWNER ?= $(DOCOWNER)
IMGGROUP ?= $(DOCGROUP) IMGGROUP ?= $(DOCGROUP)
IMGMODE ?= $(DOCMODE) IMGMODE ?= $(DOCMODE)
IMGDIROWNER ?= $(DOCDIROWNER) IMGDIROWNER ?= $(DOCDIROWNER)
IMGDIRGROUP ?= $(DOCDIROWNER) IMGDIRGROUP ?= $(DOCDIROWNER)
IMGDIRMODE ?= $(DOCDIRMODE) IMGDIRMODE ?= $(DOCDIRMODE)
MOOWNER ?= $(EXEOWNER) MOOWNER ?= $(EXEOWNER)
MOGROUP ?= $(EXEGROUP) MOGROUP ?= $(EXEGROUP)
MOMODE ?= 644 MOMODE ?= 644
MODIROWNER ?= $(EXEDIROWNER) MODIROWNER ?= $(EXEDIROWNER)
MODIRGROUP ?= $(EXEDIROWNER) MODIRGROUP ?= $(EXEDIROWNER)
MODIRMODE ?= $(EXEDIRMODE) MODIRMODE ?= $(EXEDIRMODE)
LOGOWNER ?= $(DOCOWNER) LOGOWNER ?= $(DOCOWNER)
LOGGROUP ?= $(DOCGROUP) LOGGROUP ?= $(DOCGROUP)
LOGMODE ?= $(DOCMODE) LOGMODE ?= $(DOCMODE)
LOGDIROWNER ?= $(DOCDIROWNER) LOGDIROWNER ?= $(DOCDIROWNER)
LOGDIRGROUP ?= $(DOCDIROWNER) LOGDIRGROUP ?= $(DOCDIROWNER)
LOGDIRMODE ?= $(DOCDIRMODE) LOGDIRMODE ?= $(DOCDIRMODE)
JAVAOWNER ?= $(LIBOWNER) JAVAOWNER ?= $(LIBOWNER)
JAVAGROUP ?= $(LIBGROUP) JAVAGROUP ?= $(LIBGROUP)
JAVAMODE ?= $(LIBMODE) JAVAMODE ?= $(LIBMODE)
JAVADIROWNER ?= $(LIBDIROWNER) JAVADIROWNER ?= $(LIBDIROWNER)
JAVADIRGROUP ?= $(LIBDIRGROUP) JAVADIRGROUP ?= $(LIBDIRGROUP)
JAVADIRMODE ?= $(LIBDIRMODE) JAVADIRMODE ?= $(LIBDIRMODE)
LD_CONFOWNER ?= $(CFGOWNER) LD_CONFOWNER ?= $(CFGOWNER)
LD_CONFGROUP ?= $(CFGGROUP) LD_CONFGROUP ?= $(CFGGROUP)
LD_CONFMODE ?= 664 LD_CONFMODE ?= 664
LD_CONFDIROWNER ?= $(CFGDIROWNER) LD_CONFDIROWNER ?= $(CFGDIROWNER)
LD_CONFDIRGROUP ?= $(CFGDIROWNER) LD_CONFDIRGROUP ?= $(CFGDIROWNER)
LD_CONFDIRMODE ?= $(CFGDIRMODE) LD_CONFDIRMODE ?= $(CFGDIRMODE)
LOGROTOWNER ?= $(CFGOWNER) LOGROTOWNER ?= $(CFGOWNER)
LOGROTGROUP ?= $(CFGGROUP) LOGROTGROUP ?= $(CFGGROUP)
LOGROTMODE ?= 644 # group writable files are ignored by logrotate LOGROTMODE ?= 644 # group writable files are ignored by logrotate
LOGROTDIROWNER ?= $(CFGDIROWNER) LOGROTDIROWNER ?= $(CFGDIROWNER)
LOGROTDIRGROUP ?= $(CFGDIROWNER) LOGROTDIRGROUP ?= $(CFGDIROWNER)
LOGROTDIRMODE ?= $(CFGDIRMODE) LOGROTDIRMODE ?= $(CFGDIRMODE)
APACHE_CONFOWNER ?= $(CFGOWNER) APACHE_CONFOWNER ?= $(CFGOWNER)
APACHE_CONFGROUP ?= $(CFGGROUP) APACHE_CONFGROUP ?= $(CFGGROUP)
APACHE_CONFMODE ?= $(CFGMODE) APACHE_CONFMODE ?= $(CFGMODE)
APACHE_CONFDIROWNER ?= $(CFGDIROWNER) APACHE_CONFDIROWNER ?= $(CFGDIROWNER)
APACHE_CONFDIRGROUP ?= $(CFGDIROWNER) APACHE_CONFDIRGROUP ?= $(CFGDIROWNER)
APACHE_CONFDIRMODE ?= $(CFGDIRMODE) APACHE_CONFDIRMODE ?= $(CFGDIRMODE)
SITEOWNER ?= $(APACHE_CONFOWNER) SITEOWNER ?= $(APACHE_CONFOWNER)
SITEGROUP ?= $(APACHE_CONFGROUP) SITEGROUP ?= $(APACHE_CONFGROUP)
SITEMODE ?= $(APACHE_CONFMODE) SITEMODE ?= $(APACHE_CONFMODE)
SITEDIROWNER ?= $(APACHE_CONFDIROWNER) SITEDIROWNER ?= $(APACHE_CONFDIROWNER)
SITEDIRGROUP ?= $(APACHE_CONFDIROWNER) SITEDIRGROUP ?= $(APACHE_CONFDIROWNER)
SITEDIRMODE ?= $(APACHE_CONFDIRMODE) SITEDIRMODE ?= $(APACHE_CONFDIRMODE)
RSYSLOGOWNER ?= $(CFGOWNER) RSYSLOGOWNER ?= $(CFGOWNER)
RSYSLOGGROUP ?= $(CFGGROUP) RSYSLOGGROUP ?= $(CFGGROUP)
RSYSLOGMODE ?= $(CFGMODE) RSYSLOGMODE ?= $(CFGMODE)
RSYSLOGDIROWNER ?= $(CFGDIROWNER) RSYSLOGDIROWNER ?= $(CFGDIROWNER)
RSYSLOGDIRGROUP ?= $(CFGDIROWNER) RSYSLOGDIRGROUP ?= $(CFGDIROWNER)
RSYSLOGDIRMODE ?= $(CFGDIRMODE) RSYSLOGDIRMODE ?= $(CFGDIRMODE)
CRONTABOWNER ?= $(CFGOWNER) CRONTABOWNER ?= $(CFGOWNER)
CRONTABGROUP ?= $(CFGGROUP) CRONTABGROUP ?= $(CFGGROUP)
CRONTABMODE ?= 600 CRONTABMODE ?= 600
CRONTABDIROWNER ?= $(CFGDIROWNER) CRONTABDIROWNER ?= $(CFGDIROWNER)
CRONTABDIRGROUP ?= $(CFGDIROWNER) CRONTABDIRGROUP ?= $(CFGDIROWNER)
CRONTABDIRMODE ?= $(CFGDIRMODE) CRONTABDIRMODE ?= $(CFGDIRMODE)
KIO_PROTOCOLOWNER ?= $(CFGOWNER) KIO_PROTOCOLOWNER ?= $(CFGOWNER)
KIO_PROTOCOLGROUP ?= $(CFGGROUP) KIO_PROTOCOLGROUP ?= $(CFGGROUP)
KIO_PROTOCOLMODE ?= 664 KIO_PROTOCOLMODE ?= 664
KIO_PROTOCOLDIROWNER ?= $(CFGDIROWNER) KIO_PROTOCOLDIROWNER ?= $(CFGDIROWNER)
KIO_PROTOCOLDIRGROUP ?= $(CFGDIROWNER) KIO_PROTOCOLDIRGROUP ?= $(CFGDIROWNER)
KIO_PROTOCOLDIRMODE ?= $(CFGDIRMODE) KIO_PROTOCOLDIRMODE ?= $(CFGDIRMODE)
PKG_CONFIGOWNER ?= $(CFGOWNER) PKG_CONFIGOWNER ?= $(CFGOWNER)
PKG_CONFIGGROUP ?= $(CFGGROUP) PKG_CONFIGGROUP ?= $(CFGGROUP)
PKG_CONFIGMODE ?= 664 PKG_CONFIGMODE ?= 664
PKG_CONFIGDIROWNER ?= $(CFGDIROWNER) PKG_CONFIGDIROWNER ?= $(CFGDIROWNER)
PKG_CONFIGDIRGROUP ?= $(CFGDIROWNER) PKG_CONFIGDIRGROUP ?= $(CFGDIROWNER)
PKG_CONFIGDIRMODE ?= $(CFGDIRMODE) PKG_CONFIGDIRMODE ?= $(CFGDIRMODE)
# -- options # -- options
# for using the dbmalloc lib, before you will need to do: # for using the dbmalloc lib, before you will need to do:
# cd $(MODDIR)/contrib/dbmalloc; tar -xzf dbmalloc-ver.sion.tar.gz # cd $(MODDIR)/contrib/dbmalloc; tar -xzf dbmalloc-ver.sion.tar.gz
#USE_BTOOLS ?= true #USE_BTOOLS ?= true
#USE_DSPFS ?= true #USE_DSPFS ?= true
#USE_ENGINE_BENNO ?= true #USE_ENGINE_BENNO ?= true
#USE_ENGINE_JAN ?= true #USE_ENGINE_JAN ?= true
#USE_JACK ?= true #USE_JACK ?= true
#USE_JACKDUMMY ?= true #USE_JACKDUMMY ?= true
#USE_JACKJART ?= true #USE_JACKJART ?= true
#USE_JACKRTAI ?= true #USE_JACKRTAI ?= true
#USE_JACK ?= true #USE_JACK ?= true
#USE_DBMALLOC ?= true #USE_DBMALLOC ?= true
#USE_DMALLOC ?= true #USE_DMALLOC ?= true
#USE_EFENCE ?= true #USE_EFENCE ?= true
#USE_VALGRIND ?= true #USE_VALGRIND ?= true
#USE_MCHECK ?= true #USE_MCHECK ?= true
#USE_MEMWATCH ?= true #USE_MEMWATCH ?= true
#USE_MPATROL ?= true #USE_MPATROL ?= true
#USE_TRACING ?= true #USE_TRACING ?= true
#USE_TIMER ?= true #USE_TIMER ?= true
LOG_THREAD_NAMES ?= true LOG_THREAD_NAMES ?= true
#STRIP_SYMBOLS ?= true #STRIP_SYMBOLS ?= true
#COMPILE_DEBUG_CODE ?= true #COMPILE_DEBUG_CODE ?= true
#COMPILE_DEBUG_LOG ?= true #COMPILE_DEBUG_LOG ?= true
USE_COMPILER_DEBUG_OPTS ?= true USE_COMPILER_DEBUG_OPTS ?= true
USE_COMPILER_OPTIMIZATION_OPTS ?= true USE_COMPILER_OPTIMIZATION_OPTS?= true
USE_STACK_PROTECTOR ?= true USE_STACK_PROTECTOR ?= true
#USE_STACK_CHECKER ?= true #USE_STACK_CHECKER ?= true
#USE_FUSE ?= true #USE_FUSE ?= true
#USE_SNDFILE ?= true #USE_SNDFILE ?= true
#USE_GLIB ?= true #USE_GLIB ?= true
USE_ASSERTIONS ?= false USE_ASSERTIONS ?= false
BREAK_ABI ?= false BREAK_ABI ?= false
INSTALL_HOME_BIN_WRAPPERS ?= false INSTALL_HOME_BIN_WRAPPERS ?= false

498
make/defs.mk
View file

@ -3,113 +3,113 @@
# $Id$ # $Id$
ifndef JW_BUILD_DEF_MK_INCLUDED ifndef JW_BUILD_DEF_MK_INCLUDED
JW_BUILD_DEF_MK_INCLUDED = true JW_BUILD_DEF_MK_INCLUDED = true
MAKEFLAGS += -r MAKEFLAGS += -r
include $(MODDIR)/make/projects.mk include $(MODDIR)/make/projects.mk
ifeq ($(MAKE_BENCHMARK),true) ifeq ($(MAKE_BENCHMARK),true)
export SHELL := /bin/bash $(MOD_SCRIPT_DIR)/timed-make-shell.sh export SHELL := /bin/bash $(MOD_SCRIPT_DIR)/timed-make-shell.sh
else else
export SHELL := /bin/bash export SHELL := /bin/bash
endif endif
# ----- executables # ----- executables
ifndef WHICH ifndef WHICH
WHICH := $(firstword $(wildcard /usr/bin/which) $(shell which which)) WHICH := $(firstword $(wildcard /usr/bin/which) $(shell which which))
endif endif
ifndef GREP ifndef GREP
GREP := $(shell $(WHICH) grep) GREP := $(shell $(WHICH) grep)
endif endif
ifndef ECHO ifndef ECHO
ECHO := $(shell $(WHICH) echo) ECHO := $(shell $(WHICH) echo)
endif endif
ifndef TEST ifndef TEST
TEST := $(shell $(WHICH) test) TEST := $(shell $(WHICH) test)
endif endif
ifndef SED ifndef SED
SED := $(shell $(WHICH) sed) SED := $(shell $(WHICH) sed)
endif endif
ifndef CAT ifndef CAT
CAT := $(shell $(WHICH) cat) CAT := $(shell $(WHICH) cat)
endif endif
ifndef BROWSER ifndef BROWSER
BROWSER := $(shell $(WHICH) xdg-open) BROWSER := $(shell $(WHICH) xdg-open)
endif endif
ifeq ($(origin RM),default) ifeq ($(origin RM),default)
RM := $(shell $(WHICH) rm) RM := $(shell $(WHICH) rm)
endif endif
ifndef AR ifndef AR
AR = $(shell $(WHICH) ar) AR = $(shell $(WHICH) ar)
endif endif
#ifndef PWD #ifndef PWD
PWD := $(shell $(WHICH) pwd) PWD := $(shell $(WHICH) pwd)
#endif #endif
ifndef CWD ifndef CWD
CWD := $(shell $(PWD)) CWD := $(shell $(PWD))
endif endif
ifndef BIN_INSTALL ifndef BIN_INSTALL
BIN_INSTALL := $(shell $(WHICH) install) BIN_INSTALL := $(shell $(WHICH) install)
endif endif
ifndef SUDO ifndef SUDO
SUDO := $(shell $(WHICH) sudo) SUDO := $(shell $(WHICH) sudo)
endif endif
ifndef MY_SHELL ifndef MY_SHELL
MY_SHELL := /bin/bash MY_SHELL := /bin/bash
endif endif
ifndef ID ifndef ID
ID := $(shell $(WHICH) id) ID := $(shell $(WHICH) id)
endif endif
ifndef CUT ifndef CUT
CUT := $(shell $(WHICH) cut) CUT := $(shell $(WHICH) cut)
endif endif
ifndef TR ifndef TR
TR := $(shell $(WHICH) tr) TR := $(shell $(WHICH) tr)
endif endif
ifndef AWK ifndef AWK
AWK := $(shell $(WHICH) awk) AWK := $(shell $(WHICH) awk)
endif endif
ifndef GETENT ifndef GETENT
GETENT := $(shell $(WHICH) getent) GETENT := $(shell $(WHICH) getent)
endif endif
ifndef XARGS ifndef XARGS
XARGS := $(shell $(WHICH) xargs) XARGS := $(shell $(WHICH) xargs)
endif endif
ifndef FIND ifndef FIND
FIND := $(shell $(WHICH) find) FIND := $(shell $(WHICH) find)
endif endif
ifndef PRINTF ifndef PRINTF
PRINTF := $(shell $(WHICH) printf) PRINTF := $(shell $(WHICH) printf)
endif endif
PKG_SH_EXE := /bin/bash $(MOD_SCRIPT_DIR)/pkg.sh PKG_SH_EXE := /bin/bash $(MOD_SCRIPT_DIR)/pkg.sh
LOG_INSTALL_SH := $(PKG_SH_EXE) log-install LOG_INSTALL_SH := $(PKG_SH_EXE) log-install
UPDATE_REPO_SH := /opt/packager-server/bin/packager-server schedule-rebuild UPDATE_REPO_SH := /opt/packager-server/bin/packager-server schedule-rebuild
ifdef INSTALL_LINK ifdef INSTALL_LINK
INSTALL = $(SUDO) $(LOG_INSTALL_SH) -WA $(LOG_INSTALL_EXTRA_OPTS) INSTALL = $(SUDO) $(LOG_INSTALL_SH) -WA $(LOG_INSTALL_EXTRA_OPTS)
LINK_LIB = $(SUDO) $(LOG_INSTALL_SH) -LA $(LOG_INSTALL_EXTRA_OPTS) LINK_LIB = $(SUDO) $(LOG_INSTALL_SH) -LA $(LOG_INSTALL_EXTRA_OPTS)
else ifdef INSTALL_SYMLINK else ifdef INSTALL_SYMLINK
INSTALL = $(SUDO) $(LOG_INSTALL_SH) -LA $(LOG_INSTALL_EXTRA_OPTS) INSTALL = $(SUDO) $(LOG_INSTALL_SH) -LA $(LOG_INSTALL_EXTRA_OPTS)
LINK_LIB = $(SUDO) $(LOG_INSTALL_SH) -LA $(LOG_INSTALL_EXTRA_OPTS) LINK_LIB = $(SUDO) $(LOG_INSTALL_SH) -LA $(LOG_INSTALL_EXTRA_OPTS)
else else
ifdef INSTALL_LOG ifdef INSTALL_LOG
INSTALL = $(LOG_INSTALL_SH) -p -l $(INSTALL_LOG) $(LOG_INSTALL_EXTRA_OPTS) INSTALL = $(LOG_INSTALL_SH) -p -l $(INSTALL_LOG) $(LOG_INSTALL_EXTRA_OPTS)
LINK_LIB = $(LOG_INSTALL_SH) -L -l $(INSTALL_LOG) $(LOG_INSTALL_EXTRA_OPTS) LINK_LIB = $(LOG_INSTALL_SH) -L -l $(INSTALL_LOG) $(LOG_INSTALL_EXTRA_OPTS)
else else
ifndef INSTALL ifndef INSTALL
INSTALL = install INSTALL = install
endif endif
ifndef LINK_LIB ifndef LINK_LIB
LINK_LIB = $(LOG_INSTALL_SH) -L LINK_LIB = $(LOG_INSTALL_SH) -L
endif endif
endif endif
endif endif
# ----- function definitions # ----- function definitions
reverse = $(if $(wordlist 2,2,$(1)),$(call reverse,$(wordlist 2,$(words $(1)),$(1))) $(firstword $(1)),$(1)) reverse = $(if $(wordlist 2,2,$(1)),$(call reverse,$(wordlist 2,$(words $(1)),$(1))) $(firstword $(1)),$(1))
define make_subdirs define make_subdirs
set -e; for D in $(SUBDIRS) ; do make -C $$D ; done set -e; for D in $(SUBDIRS) ; do make -C $$D ; done
@ -136,9 +136,9 @@ define beautify_lib_path
endef endef
ifeq ($(INCLUDE_REV_IN_VERSIONS),true) ifeq ($(INCLUDE_REV_IN_VERSIONS),true)
version = $(shell $(CAT) $1/VERSION | $(SED) 's/-dev//; s/[ ]*//g') version = $(shell $(CAT) $1/VERSION | $(SED) 's/-dev//; s/[ ]*//g')
else else
version = $(shell $(CAT) $1/VERSION | $(SED) 's/-.*//; s/[ ]*//g') version = $(shell $(CAT) $1/VERSION | $(SED) 's/-.*//; s/[ ]*//g')
endif endif
define install_links define install_links
@ -155,120 +155,120 @@ endef
# ----- standard variables # ----- standard variables
ifeq ($(PROJECT),) ifeq ($(PROJECT),)
PROJECT := $(shell $(ECHO) $(patsubst $(FLAVOUR_PREFIX)%,%,$(notdir $(realpath $(TOPDIR)))) | $(SED) 's/-[0-9].*//') PROJECT := $(shell $(ECHO) $(patsubst $(FLAVOUR_PREFIX)%,%,$(notdir $(realpath $(TOPDIR)))) | $(SED) 's/-[0-9].*//')
endif endif
ifneq ($(wildcard $(TOPDIR)/.git),) ifneq ($(wildcard $(TOPDIR)/.git),)
VCS ?= git VCS ?= git
else ifneq ($(wildcard $(TOPDIR)/CVS),) else ifneq ($(wildcard $(TOPDIR)/CVS),)
VCS ?= cvs VCS ?= cvs
endif endif
# ----- user and organization # ----- user and organization
ifndef BUILD_USER ifndef BUILD_USER
BUILD_USER := $(shell $(ID) -un) BUILD_USER := $(shell $(ID) -un)
endif endif
ifndef BUILD_GROUP ifndef BUILD_GROUP
BUILD_GROUP := $(shell $(ID) -gn) BUILD_GROUP := $(shell $(ID) -gn)
endif endif
JANWARE_USER ?= $(BUILD_USER) JANWARE_USER ?= $(BUILD_USER)
export JANWARE_USER export JANWARE_USER
ifndef FULL_NAME ifndef FULL_NAME
FULL_NAME := $(shell $(ID) -nu | $(XARGS) $(GETENT) passwd | $(CUT) -d: -f5) FULL_NAME := $(shell $(ID) -nu | $(XARGS) $(GETENT) passwd | $(CUT) -d: -f5)
endif endif
JANWARE_CLIENT ?= jw JANWARE_CLIENT ?= jw
CUSTOMER ?= $(JANWARE_CLIENT) CUSTOMER ?= $(JANWARE_CLIENT)
ifeq ($(JANWARE_CLIENT),jw) ifeq ($(JANWARE_CLIENT),jw)
JANWARE_WIKI ?= priv JANWARE_WIKI ?= priv
else else
JANWARE_WIKI ?= $(JANWARE_CLIENT) JANWARE_WIKI ?= $(JANWARE_CLIENT)
endif endif
JANWARE_URL_DOC_MODULE ?= https://janware.com/wiki/$(JANWARE_WIKI)/assets/types/data/sw/$(PROJECT)/$(notdir $(CWD)) JANWARE_URL_DOC_MODULE ?= https://janware.com/wiki/$(JANWARE_WIKI)/assets/types/data/sw/$(PROJECT)/$(notdir $(CWD))
JANWARE_URL_DOC_PROJECT ?= https://janware.com/wiki/$(JANWARE_WIKI)/assets/types/data/sw/$(PROJECT)/start JANWARE_URL_DOC_PROJECT ?= https://janware.com/wiki/$(JANWARE_WIKI)/assets/types/data/sw/$(PROJECT)/start
PUBLIC_PATH_DEVEL_DOC = /doc/devel PUBLIC_PATH_DEVEL_DOC = /doc/devel
UPLOAD_URL_DEVEL_DOC = rsync_ssh://$(JANWARE_USER)@janware.com:/srv/dav/pub/clients/$(JANWARE_CLIENT)/$(PUBLIC_PATH_DEVEL_DOC) UPLOAD_URL_DEVEL_DOC = rsync_ssh://$(JANWARE_USER)@janware.com:/srv/dav/pub/clients/$(JANWARE_CLIENT)/$(PUBLIC_PATH_DEVEL_DOC)
PKG_VENDOR ?= janware GmbH PKG_VENDOR ?= janware GmbH
# ----- packaging variables # ----- packaging variables
ifneq ($(filter debian%,$(OS_NAME_VERSION)),) ifneq ($(filter debian%,$(OS_NAME_VERSION)),)
PKG_FORMAT ?= debian PKG_FORMAT ?= debian
else else
PKG_FORMAT ?= rpm PKG_FORMAT ?= rpm
endif endif
ifeq ($(PKG_FORMAT),debian) ifeq ($(PKG_FORMAT),debian)
RPM ?= /bin/bash $(MOD_SCRIPT_DIR)/dpm.sh RPM ?= /bin/bash $(MOD_SCRIPT_DIR)/dpm.sh
RPM_ARCH := $(shell dpkg --print-architecture) RPM_ARCH := $(shell dpkg --print-architecture)
RPM_SUFFIX ?= deb RPM_SUFFIX ?= deb
else else
RPM ?= /bin/rpm RPM ?= /bin/rpm
RPM_ARCH ?= $(TARGET_ARCH) RPM_ARCH ?= $(TARGET_ARCH)
RPM_SUFFIX ?= rpm RPM_SUFFIX ?= rpm
endif endif
ifeq ($(PKG_FORMAT),debian) ifeq ($(PKG_FORMAT),debian)
export INCLUDE_REV_IN_VERSIONS = true export INCLUDE_REV_IN_VERSIONS = true
endif endif
PROJECT_DESCR_FILE ?= $(wildcard $(TOPDIR)/make/project.conf) PROJECT_DESCR_FILE ?= $(wildcard $(TOPDIR)/make/project.conf)
PROJECT_SHORT_NAME ?= $(PROJECT) PROJECT_SHORT_NAME ?= $(PROJECT)
PROJECT_CAPNAME := $(shell $(ECHO) $(PROJECT) | tr [a-z] [A-Z] | $(SED) 's/-/_/g') PROJECT_CAPNAME := $(shell $(ECHO) $(PROJECT) | tr [a-z] [A-Z] | $(SED) 's/-/_/g')
PROJECT_DESCR ?= $(call proj_query, summary $(PROJECT)) PROJECT_DESCR ?= $(call proj_query, summary $(PROJECT))
PROJECT_SUMMARY ?= $(PROJECT_DESCR) PROJECT_SUMMARY ?= $(PROJECT_DESCR)
ifneq ($(PROJECT_DESCR_FILE),) ifneq ($(PROJECT_DESCR_FILE),)
ifeq ($(shell $(GREP) "^ *subpackages *=.*devel" $(PROJECT_DESCR_FILE)),) ifeq ($(shell $(GREP) "^ *subpackages * = .*devel" $(PROJECT_DESCR_FILE)),)
CREATE_DEVEL = false CREATE_DEVEL = false
endif endif
endif endif
ifeq ($(VERSION),) ifeq ($(VERSION),)
ifneq ($(wildcard $(VERSION_FILE)),) ifneq ($(wildcard $(VERSION_FILE)),)
VERSION := $(shell $(CAT) $(VERSION_FILE)) VERSION := $(shell $(CAT) $(VERSION_FILE))
endif endif
endif endif
DIST_VERSION ?= $(patsubst %-dev,%,$(VERSION)) DIST_VERSION ?= $(patsubst %-dev,%,$(VERSION))
HEX_VERSION := $(shell $(ECHO) $(DIST_VERSION) | \ HEX_VERSION := $(shell $(ECHO) $(DIST_VERSION) | \
$(SED) 's/-dev//; s/pre[^\.]*//; s/F[^\.]//; s/[\.-]/ /g' | $(XARGS) $(PRINTF) "0x%02x%02x%02x%02x") $(SED) 's/-dev//; s/pre[^\.]*//; s/F[^\.]//; s/[\.-]/ /g' | $(XARGS) $(PRINTF) "0x%02x%02x%02x%02x")
BINARY_VERSION := $(shell $(ECHO) $(PROJECT)_$(DIST_VERSION) | tr [a-z] [A-Z] | $(SED) 's/-[^-]*$$//; s/-/_/g') BINARY_VERSION := $(shell $(ECHO) $(PROJECT)_$(DIST_VERSION) | tr [a-z] [A-Z] | $(SED) 's/-[^-]*$$//; s/-/_/g')
WINVERSION = $(subst .,_,$(VERSION)) WINVERSION = $(subst .,_,$(VERSION))
LOCAL_VERSION = $(VERSION) LOCAL_VERSION = $(VERSION)
LOCAL_WINVERSION = $(subst .,_,$(VERSION)) LOCAL_WINVERSION = $(subst .,_,$(VERSION))
DIST_VERSION = $(patsubst %-dev,%,$(VERSION)) DIST_VERSION = $(patsubst %-dev,%,$(VERSION))
DIST_WINVERSION = $(patsubst %-dev,%,$(WINVERSION)) DIST_WINVERSION = $(patsubst %-dev,%,$(WINVERSION))
LOCAL_DIST_VERSION = $(patsubst %-dev,%,$(LOCAL_VERSION)) LOCAL_DIST_VERSION = $(patsubst %-dev,%,$(LOCAL_VERSION))
LOCAL_DIST_WINVERSION = $(patsubst %-dev,%,$(LOCAL_WINVERSION)) LOCAL_DIST_WINVERSION = $(patsubst %-dev,%,$(LOCAL_WINVERSION))
DIST_VERSION_WORDS = $(subst ., ,$(subst -, ,$(DIST_VERSION))) DIST_VERSION_WORDS = $(subst ., ,$(subst -, ,$(DIST_VERSION)))
MAJOR_VERSION = $(word 1,$(DIST_VERSION_WORDS)) MAJOR_VERSION = $(word 1,$(DIST_VERSION_WORDS))
MINOR_VERSION = $(word 2,$(DIST_VERSION_WORDS)) MINOR_VERSION = $(word 2,$(DIST_VERSION_WORDS))
RELEASE_VERSION = $(word 2,$(DIST_VERSION_WORDS)) RELEASE_VERSION = $(word 2,$(DIST_VERSION_WORDS))
BUILD_NUMBER = $(word 4,$(DIST_VERSION_WORDS)) BUILD_NUMBER = $(word 4,$(DIST_VERSION_WORDS))
MAJOR_MINOR_RELEASE = $(MAJOR_VERSION).$(MINOR_VERSION).$(RELEASE_VERSION) MAJOR_MINOR_RELEASE = $(MAJOR_VERSION).$(MINOR_VERSION).$(RELEASE_VERSION)
CVS_RSH ?= /usr/bin/ssh CVS_RSH ?= /usr/bin/ssh
# ----- input dirs # ----- input dirs
JW_BUILD_DIR = $(MODDIR) JW_BUILD_DIR = $(MODDIR)
PROJECT_STEM = $(PROJECT)-$(DIST_VERSION) PROJECT_STEM = $(PROJECT)-$(DIST_VERSION)
# only works if checked out true to CVS, i.e. below proj # only works if checked out true to CVS, i.e. below proj
ifeq ($(VCS),cvs) ifeq ($(VCS),cvs)
CVS_MODULE = $(shell $(SED) "s%/$$%%" CVS/Repository) CVS_MODULE = $(shell $(SED) "s%/$$%%" CVS/Repository)
CVS_ROOT_DIR = $(patsubst %/$(CVS_MODULE),%,$(CWD)) CVS_ROOT_DIR = $(patsubst %/$(CVS_MODULE),%,$(CWD))
endif endif
REV_SUBDIRS = $(call reverse $(SUBDIRS)) REV_SUBDIRS = $(call reverse $(SUBDIRS))
FRESH_CVSDIR = $(HOME)/local/src/cvs.fresh FRESH_CVSDIR = $(HOME)/local/src/cvs.fresh
IMAGE_DIR ?= $(CVS_ROOT_DIR)/images IMAGE_DIR ?= $(CVS_ROOT_DIR)/images
PCKG_DEPS_DIR = $(MODDIR)/make/deps.d PCKG_DEPS_DIR = $(MODDIR)/make/deps.d
PCKG_DEFS_DIR = $(MODDIR)/make/defs.d PCKG_DEFS_DIR = $(MODDIR)/make/defs.d
HDRDIR_SCOPE_SUFFIX ?= $(PROJECT) HDRDIR_SCOPE_SUFFIX ?= $(PROJECT)
CONTRIB_MOD += $(addprefix contrib/,$(CONTRIB_LIBS)) CONTRIB_MOD += $(addprefix contrib/,$(CONTRIB_LIBS))
REQUIRED := $(CONTRIB_MOD) $(REQUIRED) REQUIRED := $(CONTRIB_MOD) $(REQUIRED)
ifeq ($(DEVELOPMENT),true) ifeq ($(DEVELOPMENT),true)
-include $(MODDIR)/make/defs-dev.mk -include $(MODDIR)/make/defs-dev.mk
@ -282,211 +282,211 @@ else
endif endif
endif endif
IMAGES += $(wildcard *.png *.jpg *.bmp *.gif *.ico *.svg) IMAGES += $(wildcard *.png *.jpg *.bmp *.gif *.ico *.svg)
FONTS += $(wildcard *.woff *.svg) FONTS += $(wildcard *.woff *.svg)
LOCAL_MKFILES ?= $(wildcard GNUmakefile makefile Makefile *.mk) LOCAL_MKFILES ?= $(wildcard GNUmakefile makefile Makefile *.mk)
# -- standard dirs and files for build and install # -- standard dirs and files for build and install
# -- CFG # -- CFG
INSTALLATION_FILE_TYPES += CFG INSTALLATION_FILE_TYPES += CFG
CONFIG_FILE ?= $(CONFIG_DIR)/$(PROJECT).conf CONFIG_FILE ?= $(CONFIG_DIR)/$(PROJECT).conf
SYSCFG_FILE ?= $(SYSCFG_DIR)/$(PROJECT) SYSCFG_FILE ?= $(SYSCFG_DIR)/$(PROJECT)
BUILD_CFGDIR = $(TOPDIR)/conf BUILD_CFGDIR = $(TOPDIR)/conf
ifeq ($(CONFIG_SUBDIR),) ifeq ($(CONFIG_SUBDIR),)
INSTALL_CFGDIR ?= $(CONFIG_DIR) INSTALL_CFGDIR ?= $(CONFIG_DIR)
else else
INSTALL_CFGDIR ?= $(CONFIG_DIR)/$(CONFIG_SUBDIR) INSTALL_CFGDIR ?= $(CONFIG_DIR)/$(CONFIG_SUBDIR)
endif endif
LOCAL_CFG ?= $(filter-out %.site.conf, $(filter-out rsyslog-%, $(wildcard *.conf *.xml *.bprof *.jw-tmpl *.ini))) $(LOCAL_EXTRA_CFG) LOCAL_CFG ?= $(filter-out %.site.conf, $(filter-out rsyslog-%, $(wildcard *.conf *.xml *.bprof *.jw-tmpl *.ini))) $(LOCAL_EXTRA_CFG)
INSTALLED_CFG ?= $(addprefix $(INSTALL_CFGDIR)/,$(LOCAL_CFG)) INSTALLED_CFG ?= $(addprefix $(INSTALL_CFGDIR)/,$(LOCAL_CFG))
# -- SYSCFG # -- SYSCFG
INSTALLATION_FILE_TYPES += SYSCFG INSTALLATION_FILE_TYPES += SYSCFG
SYSCFG_FILES += $(basename $(wildcard *.sysconf)) SYSCFG_FILES += $(basename $(wildcard *.sysconf))
BUILD_SYSCFG = $(TOPDIR)/conf BUILD_SYSCFG = $(TOPDIR)/conf
BUILD_SYSCFGDIR = $(BUILD_SYSCFG) BUILD_SYSCFGDIR = $(BUILD_SYSCFG)
INSTALL_SYSCFGDIR ?= $(SYSCFG_DIR) INSTALL_SYSCFGDIR ?= $(SYSCFG_DIR)
INSTALLED_SYSCFG ?= $(addprefix $(INSTALL_SYSCFGDIR)/,$(SYSCFG_FILES)) INSTALLED_SYSCFG ?= $(addprefix $(INSTALL_SYSCFGDIR)/,$(SYSCFG_FILES))
# -- HDR # -- HDR
INSTALLATION_FILE_TYPES += HDR INSTALLATION_FILE_TYPES += HDR
BUILD_HDRDIR_BASE ?= $(TOPDIR)/include BUILD_HDRDIR_BASE ?= $(TOPDIR)/include
BUILD_HDRDIR ?= $(BUILD_HDRDIR_BASE)/$(HDRDIR_SCOPE_SUFFIX) BUILD_HDRDIR ?= $(BUILD_HDRDIR_BASE)/$(HDRDIR_SCOPE_SUFFIX)
SRC_H += $(filter %.h %.H %.hpp, $(SRC_ALL_CPP)) SRC_H += $(filter %.h %.H %.hpp, $(SRC_ALL_CPP))
BUILD_H = $(addprefix $(BUILD_HDRDIR)/,$(SRC_H)) BUILD_H = $(addprefix $(BUILD_HDRDIR)/,$(SRC_H))
BUILD_HDR += $(addprefix $(BUILD_HDRDIR)/,$(SRC_H)) BUILD_HDR += $(addprefix $(BUILD_HDRDIR)/,$(SRC_H))
INSTALL_HDRDIR ?= $(PREFIX)/include INSTALL_HDRDIR ?= $(PREFIX)/include
INSTALLED_HDR += $(addprefix $(INSTALL_HDRDIR)/,$(SRC_H)) INSTALLED_HDR += $(addprefix $(INSTALL_HDRDIR)/,$(SRC_H))
# -- DOC # -- DOC
INSTALLATION_FILE_TYPES += DOC INSTALLATION_FILE_TYPES += DOC
DOCS += $(wildcard VERSION README* CHANGES TODO* LICENSE AUTHORS CREDITS RELEASES *.pdf *.txt *.html) DOCS += $(wildcard VERSION README* CHANGES TODO* LICENSE AUTHORS CREDITS RELEASES *.pdf *.txt *.html)
DOCSUBDIRS += $(wildcard html tex info examples src) DOCSUBDIRS += $(wildcard html tex info examples src)
BUILD_DOCDIR ?= $(TOPDIR)/doc BUILD_DOCDIR ?= $(TOPDIR)/doc
BUILD_DOC ?= $(DOC_PREFIX) BUILD_DOC ?= $(DOC_PREFIX)
INSTALL_DOCDIR ?= $(DOC_PREFIX) INSTALL_DOCDIR ?= $(DOC_PREFIX)
INSTALLED_DOC ?= $(addprefix $(INSTALL_DOCDIR)/,$(DOCS)) INSTALLED_DOC ?= $(addprefix $(INSTALL_DOCDIR)/,$(DOCS))
## -- PI ## -- PI
#BUILD_PIDIR = $(BUILD_LIBDIR) #BUILD_PIDIR = $(BUILD_LIBDIR)
#BUILD_PI = $(addprefix $(BUILD_PIDIR)/,$(PLUGIN)) #BUILD_PI = $(addprefix $(BUILD_PIDIR)/,$(PLUGIN))
#INSTALL_PIDIR = $(INSTALL_LIBDIR) #INSTALL_PIDIR = $(INSTALL_LIBDIR)
#INSTALLED_PI = $(addprefix $(INSTALL_PIDIR)/,$(PLUGIN)) #INSTALLED_PI = $(addprefix $(INSTALL_PIDIR)/,$(PLUGIN))
# -- EXE # -- EXE
INSTALLATION_FILE_TYPES += EXE INSTALLATION_FILE_TYPES += EXE
EXE_SH += $(filter-out $(DONT_INSTALL),$(wildcard *.sh *.pl *.pm *.py *.bat *.feedfs)) EXE_SH += $(filter-out $(DONT_INSTALL),$(wildcard *.sh *.pl *.pm *.py *.bat *.feedfs))
EXE_SH += $(patsubst %.sh.tmpl,%.sh,$(filter-out $(DONT_INSTALL),$(wildcard *.sh.tmpl))) EXE_SH += $(patsubst %.sh.tmpl,%.sh,$(filter-out $(DONT_INSTALL),$(wildcard *.sh.tmpl)))
#EXE_ALL += $(EXE) $(wildcard *.a *.dll *.so *.so.*) #EXE_ALL += $(EXE) $(wildcard *.a *.dll *.so *.so.*)
BUILD_EXE_BIN += $(addprefix $(BUILD_EXEDIR)/,$(EXE) $(EXE_SH)) BUILD_EXE_BIN += $(addprefix $(BUILD_EXEDIR)/,$(EXE) $(EXE_SH))
INSTALLED_EXE_BIN += $(addprefix $(INSTALL_EXEDIR)/,$(EXE_BIN)) INSTALLED_EXE_BIN += $(addprefix $(INSTALL_EXEDIR)/,$(EXE_BIN))
BUILD_EXEDIR = $(TOPDIR)/bin BUILD_EXEDIR = $(TOPDIR)/bin
INSTALL_EXEDIR ?= $(EXE_PREFIX)/bin INSTALL_EXEDIR ?= $(EXE_PREFIX)/bin
BUILD_EXE += $(BUILD_EXE_BIN) BUILD_EXE += $(BUILD_EXE_BIN)
INSTALLED_EXE += $(addprefix $(INSTALL_EXEDIR)/,$(EXE) $(EXE_SH)) $(INSTALLED_EXE_BIN) INSTALLED_EXE += $(addprefix $(INSTALL_EXEDIR)/,$(EXE) $(EXE_SH)) $(INSTALLED_EXE_BIN)
# -- SCRIPT # -- SCRIPT
#INSTALLATION_FILE_TYPES += SCRIPT #INSTALLATION_FILE_TYPES += SCRIPT
#BUILD_SCRIPTDIR = $(TOPDIR)/bin #BUILD_SCRIPTDIR = $(TOPDIR)/bin
#INSTALL_SCRIPTDIR ?= $(EXE_PREFIX)/bin #INSTALL_SCRIPTDIR ?= $(EXE_PREFIX)/bin
#BUILD_SCRIPT += $(addprefix $(BUILD_SCRIPTDIR)/,$(EXE_SH)) #BUILD_SCRIPT += $(addprefix $(BUILD_SCRIPTDIR)/,$(EXE_SH))
#INSTALLED_SCRIPT += $(addprefix $(INSTALL_SCRIPTDIR)/,$(EXE_SH)) #INSTALLED_SCRIPT += $(addprefix $(INSTALL_SCRIPTDIR)/,$(EXE_SH))
# -- CGI # -- CGI
INSTALLATION_FILE_TYPES += CGI INSTALLATION_FILE_TYPES += CGI
EXE_CGI += $(filter-out $(DONT_INSTALL),$(wildcard *.cgi)) EXE_CGI += $(filter-out $(DONT_INSTALL),$(wildcard *.cgi))
EXE_CGI += $(patsubst %.cgi.tmpl,%.cgi,$(filter-out $(DONT_INSTALL),$(wildcard *.cgi.tmpl))) EXE_CGI += $(patsubst %.cgi.tmpl,%.cgi,$(filter-out $(DONT_INSTALL),$(wildcard *.cgi.tmpl)))
BUILD_CGIDIR = $(TOPDIR)/bin BUILD_CGIDIR = $(TOPDIR)/bin
INSTALL_CGIDIR = $(CGI_DIR) INSTALL_CGIDIR = $(CGI_DIR)
BUILD_CGI += $(addprefix $(BUILD_CGIDIR)/,$(EXE_CGI)) BUILD_CGI += $(addprefix $(BUILD_CGIDIR)/,$(EXE_CGI))
INSTALLED_CGI += $(addprefix $(INSTALL_CGIDIR)/,$(EXE_CGI)) INSTALLED_CGI += $(addprefix $(INSTALL_CGIDIR)/,$(EXE_CGI))
# -- SYSTEMD # -- SYSTEMD
INSTALLATION_FILE_TYPES += SYSTEMD INSTALLATION_FILE_TYPES += SYSTEMD
BUILD_SYSTEMDDIR = $(TOPDIR)/bin/systemd BUILD_SYSTEMDDIR = $(TOPDIR)/bin/systemd
LOCAL_SYSTEMD += $(filter-out $(DONT_INSTALL),$(wildcard *.service)) LOCAL_SYSTEMD += $(filter-out $(DONT_INSTALL),$(wildcard *.service))
INSTALL_SYSTEMDDIR = $(SYSTEMD_DIR) INSTALL_SYSTEMDDIR = $(SYSTEMD_DIR)
INSTALLED_SYSTEMD += $(addprefix $(INSTALL_SYSTEMDDIR)/,$(LOCAL_SYSTEMD)) INSTALLED_SYSTEMD += $(addprefix $(INSTALL_SYSTEMDDIR)/,$(LOCAL_SYSTEMD))
# -- INIT # -- INIT
INSTALLATION_FILE_TYPES += INIT INSTALLATION_FILE_TYPES += INIT
BUILD_INITDIR = $(TOPDIR)/bin BUILD_INITDIR = $(TOPDIR)/bin
INSTALL_INITDIR = $(INIT_PREFIX)/init.d INSTALL_INITDIR = $(INIT_PREFIX)/init.d
_INIT_SCRIPTS = $(basename $(filter-out $(DONT_INSTALL),$(wildcard *.init))) _INIT_SCRIPTS = $(basename $(filter-out $(DONT_INSTALL),$(wildcard *.init)))
INIT_SCRIPTS += $(_INIT_SCRIPTS) INIT_SCRIPTS += $(_INIT_SCRIPTS)
BUILD_INIT += $(addprefix $(BUILD_INITDIR)/,$(INIT_SCRIPTS)) BUILD_INIT += $(addprefix $(BUILD_INITDIR)/,$(INIT_SCRIPTS))
INSTALLED_INIT += $(addprefix $(INSTALL_INITDIR)/,$(INIT_SCRIPTS)) INSTALLED_INIT += $(addprefix $(INSTALL_INITDIR)/,$(INIT_SCRIPTS))
# -- MAKE # -- MAKE
INSTALLATION_FILE_TYPES += MAKE INSTALLATION_FILE_TYPES += MAKE
BUILD_MAKEDIR = $(TOPDIR)/make BUILD_MAKEDIR = $(TOPDIR)/make
MKFILES += $(filter-out pckg-defs.mk pckg-deps.mk local.mk,$(filter-out $(DONT_INSTALL),$(wildcard *.mk))) MKFILES += $(filter-out pckg-defs.mk pckg-deps.mk local.mk,$(filter-out $(DONT_INSTALL),$(wildcard *.mk)))
INSTALL_MAKEDIR ?= $(PREFIX)/make INSTALL_MAKEDIR ?= $(PREFIX)/make
INSTALLED_MAKE += $(addprefix $(INSTALL_MAKEDIR)/,$(MKFILES)) INSTALLED_MAKE += $(addprefix $(INSTALL_MAKEDIR)/,$(MKFILES))
# -- IMG # -- IMG
INSTALLATION_FILE_TYPES += IMG INSTALLATION_FILE_TYPES += IMG
BUILD_IMG ?= BUILD_IMG ?=
BUILD_IMGDIR ?= $(TOPDIR)/images BUILD_IMGDIR ?= $(TOPDIR)/images
INSTALL_IMGDIR ?= $(IMG_PREFIX)/images INSTALL_IMGDIR ?= $(IMG_PREFIX)/images
INSTALLED_IMG ?= $(addprefix $(INSTALL_IMGDIR)/,$(IMAGES)) INSTALLED_IMG ?= $(addprefix $(INSTALL_IMGDIR)/,$(IMAGES))
# -- MO # -- MO
INSTALLATION_FILE_TYPES += MO INSTALLATION_FILE_TYPES += MO
BUILD_MO ?= BUILD_MO ?=
BUILD_MODIR ?= $(CWD) BUILD_MODIR ?= $(CWD)
INSTALL_MODIR ?= $(ENV_PREFIX)/usr/share/locale/$(GETTEXT_LOCALE)/LC_MESSAGES INSTALL_MODIR ?= $(ENV_PREFIX)/usr/share/locale/$(GETTEXT_LOCALE)/LC_MESSAGES
INSTALLED_MO ?= $(addprefix $(INSTALL_MODIR)/,$(wildcard *.mo)) INSTALLED_MO ?= $(addprefix $(INSTALL_MODIR)/,$(wildcard *.mo))
# -- LOG # -- LOG
INSTALLATION_FILE_TYPES += LOG INSTALLATION_FILE_TYPES += LOG
BUILD_LOGDIR ?= $(TOPDIR)/log BUILD_LOGDIR ?= $(TOPDIR)/log
BUILD_LOG ?= BUILD_LOG ?=
INSTALL_LOGDIR ?= $(LOG_PREFIX)/$(PROJECT) INSTALL_LOGDIR ?= $(LOG_PREFIX)/$(PROJECT)
INSTALLED_LOG ?= INSTALLED_LOG ?=
# -- PROFILE # -- PROFILE
INSTALLATION_FILE_TYPES += PROFILE INSTALLATION_FILE_TYPES += PROFILE
# TODO: path_ file is omnipresent # TODO: path_ file is omnipresent
BUILD_PROFILEDIR = $(TOPDIR)/profile.d BUILD_PROFILEDIR = $(TOPDIR)/profile.d
#PROFILE += path_$(PROJECT).sh #PROFILE += path_$(PROJECT).sh
INSTALL_PROFILEDIR ?= $(PROFILE_DIR) INSTALL_PROFILEDIR ?= $(PROFILE_DIR)
INSTALLED_PROFILE ?= $(addprefix $(INSTALL_PROFILEDIR)/,$(PROFILE)) INSTALLED_PROFILE ?= $(addprefix $(INSTALL_PROFILEDIR)/,$(PROFILE))
# -- JAVA # -- JAVA
INSTALLATION_FILE_TYPES += JAVA INSTALLATION_FILE_TYPES += JAVA
BUILD_JAVADIR = $(TOPDIR)/share/java BUILD_JAVADIR = $(TOPDIR)/share/java
BUILD_JAVADIR_CLASSES = classes BUILD_JAVADIR_CLASSES = classes
JAVA_JARS ?= $(filter-out $(DONT_INSTALL),$(wildcard *.jar)) JAVA_JARS ?= $(filter-out $(DONT_INSTALL),$(wildcard *.jar))
INSTALL_JAVADIR ?= $(JAVADIR) INSTALL_JAVADIR ?= $(JAVADIR)
INSTALLED_JAVA ?= $(addprefix $(INSTALL_JAVADIR)/,$(JAVA_JARS)) INSTALLED_JAVA ?= $(addprefix $(INSTALL_JAVADIR)/,$(JAVA_JARS))
# -- LD_CONF # -- LD_CONF
ifneq ($(findstring $(TARGET_OS),linux),) ifneq ($(findstring $(TARGET_OS),linux),)
INSTALLATION_FILE_TYPES += LD_CONF INSTALLATION_FILE_TYPES += LD_CONF
LD_CONF += $(filter-out $(DONT_INSTALL),ld-$(PROJECT).conf) LD_CONF += $(filter-out $(DONT_INSTALL),ld-$(PROJECT).conf)
BUILD_LD_CONFDIR = $(TOPDIR)/lib/ld.so.conf.d BUILD_LD_CONFDIR = $(TOPDIR)/lib/ld.so.conf.d
INSTALL_LD_CONFDIR = $(LD_CONF_DIR) INSTALL_LD_CONFDIR = $(LD_CONF_DIR)
INSTALLED_LD_CONF = $(addprefix $(INSTALL_LD_CONFDIR)/,$(LD_CONF)) INSTALLED_LD_CONF = $(addprefix $(INSTALL_LD_CONFDIR)/,$(LD_CONF))
endif endif
# -- LOGROT # -- LOGROT
ifneq ($(findstring $(TARGET_OS),linux),) ifneq ($(findstring $(TARGET_OS),linux),)
INSTALLATION_FILE_TYPES += LOGROT INSTALLATION_FILE_TYPES += LOGROT
LOGROT += $(basename $(filter-out $(DONT_INSTALL),$(wildcard *.logrotate))) LOGROT += $(basename $(filter-out $(DONT_INSTALL),$(wildcard *.logrotate)))
BUILD_LOGROTDIR = $(TOPDIR)/bin/logrotate.d BUILD_LOGROTDIR = $(TOPDIR)/bin/logrotate.d
INSTALL_LOGROTDIR = $(LOGROT_DIR) INSTALL_LOGROTDIR = $(LOGROT_DIR)
INSTALLED_LOGROT = $(addprefix $(INSTALL_LOGROTDIR)/,$(LOGROT)) INSTALLED_LOGROT = $(addprefix $(INSTALL_LOGROTDIR)/,$(LOGROT))
endif endif
# -- APACHE_CONF # -- APACHE_CONF
ifneq ($(findstring $(TARGET_OS),linux),) ifneq ($(findstring $(TARGET_OS),linux),)
INSTALLATION_FILE_TYPES += APACHE_CONF INSTALLATION_FILE_TYPES += APACHE_CONF
APACHE_CONF += $(filter-out $(DONT_INSTALL),$(wildcard *.apache-conf)) APACHE_CONF += $(filter-out $(DONT_INSTALL),$(wildcard *.apache-conf))
BUILD_APACHE_CONFDIR = $(TOPDIR)/bin/apache/conf.d BUILD_APACHE_CONFDIR = $(TOPDIR)/bin/apache/conf.d
INSTALL_APACHE_CONFDIR = $(APACHE_CONF_DIR) INSTALL_APACHE_CONFDIR = $(APACHE_CONF_DIR)
INSTALLED_APACHE_CONF = $(addprefix $(INSTALL_APACHE_CONFDIR)/,$(patsubst %.apache-conf,%.conf,$(APACHE_CONF))) INSTALLED_APACHE_CONF = $(addprefix $(INSTALL_APACHE_CONFDIR)/,$(patsubst %.apache-conf,%.conf,$(APACHE_CONF)))
endif endif
# -- RSYSLOG # -- RSYSLOG
ifneq ($(findstring $(TARGET_OS),linux),) ifneq ($(findstring $(TARGET_OS),linux),)
INSTALLATION_FILE_TYPES += RSYSLOG INSTALLATION_FILE_TYPES += RSYSLOG
RSYSLOG += $(filter-out $(DONT_INSTALL),$(wildcard *.rsyslog rsyslog-*.bprof)) RSYSLOG += $(filter-out $(DONT_INSTALL),$(wildcard *.rsyslog rsyslog-*.bprof))
BUILD_RSYSLOGDIR = $(TOPDIR)/bin/rsyslog.d BUILD_RSYSLOGDIR = $(TOPDIR)/bin/rsyslog.d
INSTALL_RSYSLOGDIR = $(RSYSLOG_DIR) INSTALL_RSYSLOGDIR = $(RSYSLOG_DIR)
INSTALLED_RSYSLOG = $(addprefix $(INSTALL_RSYSLOGDIR)/,$(subst rsyslog-,,$(RSYSLOG))) INSTALLED_RSYSLOG = $(addprefix $(INSTALL_RSYSLOGDIR)/,$(subst rsyslog-,,$(RSYSLOG)))
INSTALLED_RSYSLOG += $(addprefix $(INSTALL_RSYSLOGDIR)/,$(patsubst %.rsyslog,%.conf,$(RSYSLOG))) INSTALLED_RSYSLOG += $(addprefix $(INSTALL_RSYSLOGDIR)/,$(patsubst %.rsyslog,%.conf,$(RSYSLOG)))
endif endif
# -- CRONTAB # -- CRONTAB
ifneq ($(findstring $(TARGET_OS),linux),) ifneq ($(findstring $(TARGET_OS),linux),)
INSTALLATION_FILE_TYPES += CRONTAB INSTALLATION_FILE_TYPES += CRONTAB
CRONTAB += $(filter-out $(DONT_INSTALL),$(wildcard *.crontab)) CRONTAB += $(filter-out $(DONT_INSTALL),$(wildcard *.crontab))
BUILD_CRONTABDIR = $(TOPDIR)/cron.d BUILD_CRONTABDIR = $(TOPDIR)/cron.d
INSTALLED_CRONTAB = $(addprefix $(INSTALL_CRONTABDIR)/,$(CRONTAB)) INSTALLED_CRONTAB = $(addprefix $(INSTALL_CRONTABDIR)/,$(CRONTAB))
endif endif
# -- PKG_CONFIG # -- PKG_CONFIG
ifneq ($(findstring $(TARGET_OS),linux),) ifneq ($(findstring $(TARGET_OS),linux),)
INSTALLATION_FILE_TYPES += PKG_CONFIG INSTALLATION_FILE_TYPES += PKG_CONFIG
PKG_CONFIG += $(sort $(filter-out $(DONT_INSTALL),$(wildcard *.pc) $(LOCAL_PKG_CONFIG))) PKG_CONFIG += $(sort $(filter-out $(DONT_INSTALL),$(wildcard *.pc) $(LOCAL_PKG_CONFIG)))
ifeq ($(DEVELOPMENT),true) ifeq ($(DEVELOPMENT),true)
BUILD_PKG_CONFIGDIR = $(MODDIR)/pkgconfig BUILD_PKG_CONFIGDIR = $(MODDIR)/pkgconfig
else else
BUILD_PKG_CONFIGDIR = $(TOPDIR)/make BUILD_PKG_CONFIGDIR = $(TOPDIR)/make
endif endif
LOCAL_PKG_CONFIG = $(PROJECT).pc LOCAL_PKG_CONFIG = $(PROJECT).pc
BUILD_PKG_CONFIG = $(BUILD_PKG_CONFIGDIR)/$(LOCAL_PKG_CONFIG) BUILD_PKG_CONFIG = $(BUILD_PKG_CONFIGDIR)/$(LOCAL_PKG_CONFIG)
INSTALLED_PKG_CONFIG = $(addprefix $(INSTALL_PKG_CONFIGDIR)/,$(PKG_CONFIG)) INSTALLED_PKG_CONFIG = $(addprefix $(INSTALL_PKG_CONFIGDIR)/,$(PKG_CONFIG))
endif endif
INSTALL_FILE ?= $(INSTALL) INSTALL_FILE ?= $(INSTALL)
INSTALL_DIR ?= $(INSTALL) INSTALL_DIR ?= $(INSTALL)
# ----- local.mk # ----- local.mk
@ -496,19 +496,19 @@ $(eval $(call try_include,$(MODDIR)/make/local.mk))
$(eval $(call try_include,$(TOPDIR)/make/local.mk)) $(eval $(call try_include,$(TOPDIR)/make/local.mk))
$(eval $(call try_include,local.mk)) $(eval $(call try_include,local.mk))
BTOOLS_DIR ?= $(call proj_dir, dspider-btools) BTOOLS_DIR ?= $(call proj_dir, dspider-btools)
#DSPCD_DIR ?= $(call proj_dir, dspcd) #DSPCD_DIR ?= $(call proj_dir, dspcd)
#DSPCD_EC_DIR ?= $(call proj_dir, dspcd-ec) #DSPCD_EC_DIR ?= $(call proj_dir, dspcd-ec)
FEEDFSD_DIR ?= $(call proj_dir, feedfsd) FEEDFSD_DIR ?= $(call proj_dir, feedfsd)
FEEDFS_DIR := $(call proj_dir, feedfs) FEEDFS_DIR := $(call proj_dir, feedfs)
FEEDFS_GUI_DIR ?= $(call proj_dir, feedfs-gui) FEEDFS_GUI_DIR ?= $(call proj_dir, feedfs-gui)
FEEDFS_OBJECTS_DIR ?= $(call proj_dir, feedfs-objects) FEEDFS_OBJECTS_DIR ?= $(call proj_dir, feedfs-objects)
FEEDFS_UTILS_DIR ?= $(call proj_dir, feedfs-utils) FEEDFS_UTILS_DIR ?= $(call proj_dir, feedfs-utils)
FEEDFS_WT_DIR ?= $(call proj_dir, feedfs-wt) FEEDFS_WT_DIR ?= $(call proj_dir, feedfs-wt)
JUX_SHARED_DIR ?= $(call proj_dir, jux-shared) JUX_SHARED_DIR ?= $(call proj_dir, jux-shared)
SITE_DIR ?= $(call proj_dir, site) SITE_DIR ?= $(call proj_dir, site)
VALDI_DIR ?= $(call proj_dir, valdi) VALDI_DIR ?= $(call proj_dir, valdi)
XCHANGE_DIR ?= $(call proj_dir, xchange) XCHANGE_DIR ?= $(call proj_dir, xchange)
all: all:

8
make/depend.mk
View file

@ -1,7 +1,7 @@
# variables # variables
DEPEND_CFLAGS += -D__MAKEDEPEND__ DEPEND_CFLAGS += -D__MAKEDEPEND__
DEPEND_CPPFLAGS += -D__MAKEDEPEND__ DEPEND_CPPFLAGS += -D__MAKEDEPEND__
DEPEND_MK += $(addprefix .,$(addsuffix .dep.mk, $(OBJ))) DEPEND_MK += $(addprefix .,$(addsuffix .dep.mk, $(OBJ)))
ifeq ($(DEPEND_MK_INCLUDED),) ifeq ($(DEPEND_MK_INCLUDED),)
@ -41,4 +41,4 @@ show-vars-depend-mk:
@echo BUILD_HDR = $(BUILD_HDR) @echo BUILD_HDR = $(BUILD_HDR)
endif # DEPEND_MK_INCLUDED endif # DEPEND_MK_INCLUDED
DEPEND_MK_INCLUDED := true DEPEND_MK_INCLUDED := true

8
make/dev-utils.mk
View file

@ -1,9 +1,9 @@
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 ?= .
all: all:
install: install:

36
make/dist.mk
View file

@ -1,27 +1,27 @@
# -- general, and important # -- general, and important
LOCAL_PROJECT = $(PROJECT) LOCAL_PROJECT = $(PROJECT)
TARGET_HOST = cvs.jannet.de TARGET_HOST = cvs.jannet.de
UPLOAD_DOCUMENT_ROOT = /usr/local/httpd/htdocs UPLOAD_DOCUMENT_ROOT = /usr/local/httpd/htdocs
UPLOAD_VIRTUAL_SERVER_ROOT = www.jannet.de_443 UPLOAD_VIRTUAL_SERVER_ROOT = www.jannet.de_443
TARGET_USER = root TARGET_USER = root
TARGET_GROUP = root TARGET_GROUP = root
TARGET_FILE_MODE = 755 TARGET_FILE_MODE = 755
TARGET_DIR_MODE = 755 TARGET_DIR_MODE = 755
DOWNLOAD_SERVER = https://www.jannet.de:443 DOWNLOAD_SERVER = https://www.jannet.de:443
URL_RELATIVE_PATH = $(CUSTOMER)/projects/$(LOCAL_PROJECT)/download URL_RELATIVE_PATH = $(CUSTOMER)/projects/$(LOCAL_PROJECT)/download
SSI_DOWNLOAD_TMPL = $(MODDIR)/doctmpl/html/ssi/ssi_download.html.tmpl SSI_DOWNLOAD_TMPL = $(MODDIR)/doctmpl/html/ssi/ssi_download.html.tmpl
DOWNLOAD_REFERRER_DIRS = $(addprefix $(UPLOAD_DOCUMENT_ROOT)/, \ DOWNLOAD_REFERRER_DIRS = $(addprefix $(UPLOAD_DOCUMENT_ROOT)/, \
$(UPLOAD_VIRTUAL_SERVER_ROOT)/$(URL_RELATIVE_PATH) \ $(UPLOAD_VIRTUAL_SERVER_ROOT)/$(URL_RELATIVE_PATH) \
) )
# -- general, and less important # -- general, and less important
DISTDIR = $(TOPDIR)/dist DISTDIR = $(TOPDIR)/dist
DIST_FILE = $(DISTDIR)/$(PROJECT)-$(VERSION).tar.gz DIST_FILE = $(DISTDIR)/$(PROJECT)-$(VERSION).tar.gz
TMPHTML=$(DISTDIR)/html TMPHTML = $(DISTDIR)/html
DOWNLOAD_URLDIR=$(DOWNLOAD_SERVER)/$(URL_RELATIVE_PATH) DOWNLOAD_URLDIR = $(DOWNLOAD_SERVER)/$(URL_RELATIVE_PATH)
TARGET_DIR ?= $(UPLOAD_DOCUMENT_ROOT)/$(UPLOAD_VIRTUAL_SERVER_ROOT)/$(URL_RELATIVE_PATH) TARGET_DIR ?= $(UPLOAD_DOCUMENT_ROOT)/$(UPLOAD_VIRTUAL_SERVER_ROOT)/$(URL_RELATIVE_PATH)
SSI_PREFIX = $(TMPHTML)/ssi_download_ SSI_PREFIX = $(TMPHTML)/ssi_download_
$(TMPHTML): $(TMPHTML):
mkdir -p $(TMPHTML) mkdir -p $(TMPHTML)

44
make/doxygen.mk
View file

@ -3,40 +3,40 @@ include $(MODDIR)/make/defs.mk
# broken by IMAGEDIR in rpmbuild # broken by IMAGEDIR in rpmbuild
ifeq ($(DEVELOPMENT),true) ifeq ($(DEVELOPMENT),true)
GENERATE_DOXYGEN ?= true GENERATE_DOXYGEN ?= true
endif endif
ifneq ($(GENERATE_DOXYGEN),true) ifneq ($(GENERATE_DOXYGEN),true)
include $(MODDIR)/make/dummy.mk include $(MODDIR)/make/dummy.mk
else else
UPLOAD_FILE_MODE ?= 644 UPLOAD_FILE_MODE ?= 644
UPLOAD_DIR_MODE ?= 755 UPLOAD_DIR_MODE ?= 755
include $(MODDIR)/make/upload-defs.mk include $(MODDIR)/make/upload-defs.mk
UPLOAD_URL ?= $(UPLOAD_URL_DEVEL_DOC)/$(PROJECT)/doxygen/:$(UPLOAD_FILE_MODE):$(UPLOAD_DIR_MODE):$(UPLOAD_USER).$(UPLOAD_GROUP) UPLOAD_URL ?= $(UPLOAD_URL_DEVEL_DOC)/$(PROJECT)/doxygen/:$(UPLOAD_FILE_MODE):$(UPLOAD_DIR_MODE):$(UPLOAD_USER).$(UPLOAD_GROUP)
DX_INCLUDE ?= header.html footer.html styles.css logo.png DX_INCLUDE ?= header.html footer.html styles.css logo.png
DX_UNTEMPLATED = $(patsubst %.tmpl,%,$(wildcard *.tmpl)) DX_UNTEMPLATED = $(patsubst %.tmpl,%,$(wildcard *.tmpl))
DX_OUTPUT_DIR ?= html DX_OUTPUT_DIR ?= html
DX_INSTALL_DIR ?= $(DOC_PREFIX)/devel DX_INSTALL_DIR ?= $(DOC_PREFIX)/devel
DX_DOC_FILES = $(DX_INCLUDE) DX_DOC_FILES = $(DX_INCLUDE)
DX_DOXYGEN_CONF ?= doxygen.conf DX_DOXYGEN_CONF ?= doxygen.conf
DX_INCLUDE_TMPL_DIR ?= $(MODDIR)/tmpl/doxygen DX_INCLUDE_TMPL_DIR ?= $(MODDIR)/tmpl/doxygen
DX_FALLBACK_CONF_TMPL ?= $(DX_INCLUDE_TMPL_DIR)/doxygen.conf.tmpl DX_FALLBACK_CONF_TMPL ?= $(DX_INCLUDE_TMPL_DIR)/doxygen.conf.tmpl
DX_BROWSER ?= $(BROWSER) DX_BROWSER ?= $(BROWSER)
# replaced pattern defaults # replaced pattern defaults
DX_FILE_PATTERNS ?= *.h *.c *.cpp DX_FILE_PATTERNS ?= *.h *.c *.cpp
DX_INPUT_DIRS ?= $(TOPDIR)/include DX_INPUT_DIRS ?= $(TOPDIR)/include
DX_SRC_IS_JAVA ?= NO DX_SRC_IS_JAVA ?= NO
DX_EXCLUDE_FILES ?= DX_EXCLUDE_FILES ?=
DX_INCLUDE_PATH ?= DX_INCLUDE_PATH ?=
DX_RECURSIVE ?= YES DX_RECURSIVE ?= YES
DX_EXTRACT_STATIC ?= NO DX_EXTRACT_STATIC ?= NO
DX_INLINE_SOURCES ?= NO DX_INLINE_SOURCES ?= NO
DX_SOURCE_BROWSER ?= NO DX_SOURCE_BROWSER ?= NO
all: html all: html
install: install.done install: install.done

24
make/gettext.mk
View file

@ -1,19 +1,19 @@
GETTEXT_LOCALE ?= $(notdir $(shell $(PWD))) GETTEXT_LOCALE ?= $(notdir $(shell $(PWD)))
include $(MODDIR)/make/defs.mk include $(MODDIR)/make/defs.mk
include $(MODDIR)/make/rules.mk include $(MODDIR)/make/rules.mk
include $(MODDIR)/make/dev-utils.mk include $(MODDIR)/make/dev-utils.mk
GETTEXT_PROJECT_PO ?= $(PROJECT).po GETTEXT_PROJECT_PO ?= $(PROJECT).po
GETTEXT_PROJECT_POT ?= $(PROJECT).pot GETTEXT_PROJECT_POT ?= $(PROJECT).pot
GETTEXT_PO ?= $(wildcard *.po) GETTEXT_PO ?= $(wildcard *.po)
GETTEXT_POT ?= $(patsubst %.po,%.pot,$(GETTEXT_PO)) GETTEXT_POT ?= $(patsubst %.po,%.pot,$(GETTEXT_PO))
GETTEXT_MO ?= $(patsubst %.po,%.mo,$(GETTEXT_PO)) GETTEXT_MO ?= $(patsubst %.po,%.mo,$(GETTEXT_PO))
GETTEXT_INPUT_DIRS ?= $(wildcard $(TOPDIR)/tools $(TOPDIR)/src $(TOPDIR)/conf) GETTEXT_INPUT_DIRS ?= $(wildcard $(TOPDIR)/tools $(TOPDIR)/src $(TOPDIR)/conf)
GETTEXT_INPUT_FILES ?= $(foreach d,$(GETTEXT_INPUT_DIRS),\ GETTEXT_INPUT_FILES ?= $(foreach d,$(GETTEXT_INPUT_DIRS),\
$(shell find $d -name '*.php' -o -name '*.cpp' -o -name '*.conf')) $(shell find $d -name '*.php' -o -name '*.cpp' -o -name '*.conf'))
GETTEXT_KEYWORDS ?= htr ehtr $(GETTEXT_EXTRA_KEYWORDS) GETTEXT_KEYWORDS ?= htr ehtr $(GETTEXT_EXTRA_KEYWORDS)
all: $(GETTEXT_MO) all: $(GETTEXT_MO)
clean: clean-mo clean: clean-mo
@ -50,12 +50,12 @@ edit: merge $(GETTEXT_PROJECT_POT)
mv $@.tmp $@ mv $@.tmp $@
#msginit --no-translator --locale es_MX --output-file $(PROJECT)_spanish.po --input $(PROJECT).pot #msginit --no-translator --locale es_MX --output-file $(PROJECT)_spanish.po --input $(PROJECT).pot
#sed --in-place $(PROJECT)_spanish.po --expression='/"hello, world!"/,/#: / s/""/"hola mundo"/' #sed --in-place $(PROJECT)_spanish.po --expression = '/"hello, world!"/,/#: / s/""/"hola mundo"/'
#mkdir --parents ./es_MX.utf8/LC_MESSAGES #mkdir --parents ./es_MX.utf8/LC_MESSAGES
#msgfmt --check --verbose --output-file ./es_MX.utf8/LC_MESSAGES/$(PROJECT).mo $(PROJECT)_spanish.po #msgfmt --check --verbose --output-file ./es_MX.utf8/LC_MESSAGES/$(PROJECT).mo $(PROJECT)_spanish.po
GETTEXT_TMP = $(patsubst %.php,%.htr,$(GETTEXT_PREPROCESS)) GETTEXT_TMP = $(patsubst %.php,%.htr,$(GETTEXT_PREPROCESS))
GETTEXT_INPUT_FILES += $(GETTEXT_TMP) GETTEXT_INPUT_FILES += $(GETTEXT_TMP)
all: htr all: htr
clean: htr-tmp-clean clean: htr-tmp-clean

12
make/git-submod.mk
View file

@ -5,14 +5,14 @@
# - run git-init-submod-remote # - run git-init-submod-remote
ifeq ($(USE_USER_URL),) ifeq ($(USE_USER_URL),)
JANWARE_USER_PREFIX = $(JANWARE_USER)@ JANWARE_USER_PREFIX = $(JANWARE_USER)@
endif endif
GIT_SRV_ADMIN_SH = ssh $(JANWARE_USER_PREFIX)git.janware.com /opt/jw-build/bin/git-srv-admin.sh GIT_SRV_ADMIN_SH = ssh $(JANWARE_USER_PREFIX)git.janware.com /opt/jw-build/bin/git-srv-admin.sh
GIT_REPO_URL = ssh://$(JANWARE_USER_PREFIX)git.janware.com/srv/git/$(JANWARE_USER)/contrib/$(PROJECT_DIRNAME) GIT_REPO_URL = ssh://$(JANWARE_USER_PREFIX)git.janware.com/srv/git/$(JANWARE_USER)/contrib/$(PROJECT_DIRNAME)
SUBMOD_PATH = $(patsubst $(abspath $(TOPDIR))/%,%,$(abspath $(shell $(CWD))/$(SUBMOD_SRC_DIR))) SUBMOD_PATH = $(patsubst $(abspath $(TOPDIR))/%,%,$(abspath $(shell $(CWD))/$(SUBMOD_SRC_DIR)))
SUBMOD_SRC_DIR ?= . SUBMOD_SRC_DIR ?= .
SUB_GIT = git -C $(SUBMOD_SRC_DIR) SUB_GIT = git -C $(SUBMOD_SRC_DIR)
all: all:
install: install:

20
make/htdocs.mk
View file

@ -1,22 +1,22 @@
LESS_SRC ?= $(wildcard *.less) LESS_SRC ?= $(wildcard *.less)
LESS_GENERATED_CSS ?= $(patsubst %.less,%.css,$(LESS_SRC)) LESS_GENERATED_CSS ?= $(patsubst %.less,%.css,$(LESS_SRC))
LESS_CPY ?= lesscpy LESS_CPY ?= lesscpy
include $(MODDIR)/make/defs.mk include $(MODDIR)/make/defs.mk
# -- HTML # -- HTML
INSTALLATION_FILE_TYPES += HTML INSTALLATION_FILE_TYPES += HTML
BUILD_HTMLDIR = $(TOPDIR)/htdocs BUILD_HTMLDIR = $(TOPDIR)/htdocs
LOCAL_HTML += $(filter-out $(DONT_INSTALL),$(wildcard *.html *.css *.php *.js) $(FONTS) $(IMAGES)) LOCAL_HTML += $(filter-out $(DONT_INSTALL),$(wildcard *.html *.css *.php *.js) $(FONTS) $(IMAGES))
ifeq ($(HTML_SUBDIR),) ifeq ($(HTML_SUBDIR),)
HTML_SUBDIR := $(shell $(PWD) | $(SED) '/.*\/htdocs\(\/\|$$\)/!d; s%.*/htdocs\(/\|$$\)%%') HTML_SUBDIR := $(shell $(PWD) | $(SED) '/.*\/htdocs\(\/\|$$\)/!d; s%.*/htdocs\(/\|$$\)%%')
endif endif
ifeq ($(HTML_SUBDIR),) ifeq ($(HTML_SUBDIR),)
INSTALL_HTMLDIR ?= $(PROJECT_HTMLDIR) INSTALL_HTMLDIR ?= $(PROJECT_HTMLDIR)
else else
INSTALL_HTMLDIR ?= $(PROJECT_HTMLDIR)/$(HTML_SUBDIR) INSTALL_HTMLDIR ?= $(PROJECT_HTMLDIR)/$(HTML_SUBDIR)
endif endif
INSTALLED_HTML += $(addprefix $(INSTALL_HTMLDIR)/,$(LOCAL_HTML)) INSTALLED_HTML += $(addprefix $(INSTALL_HTMLDIR)/,$(LOCAL_HTML))
include $(MODDIR)/make/js.mk include $(MODDIR)/make/js.mk

26
make/install-files.mk
View file

@ -1,25 +1,25 @@
SOURCE_FILES ?= $(filter-out CVS .git $(LOCAL_MKFILES) %.done, $(wildcard *)) SOURCE_FILES ?= $(filter-out CVS .git $(LOCAL_MKFILES) %.done, $(wildcard *))
TARGET_DIR ?= $(PREFIX)/share TARGET_DIR ?= $(PREFIX)/share
SOURCE_BASE ?= . SOURCE_BASE ?= .
RELPATHS = $(foreach f,$(SOURCE_FILES),$(shell realpath -s --relative-to "$(SOURCE_BASE)" "$f")) RELPATHS = $(foreach f,$(SOURCE_FILES),$(shell realpath -s --relative-to "$(SOURCE_BASE)" "$f"))
INSTALLED_FILES = $(addprefix $(TARGET_DIR)/,$(RELPATHS)) INSTALLED_FILES = $(addprefix $(TARGET_DIR)/,$(RELPATHS))
include $(MODDIR)/make/defs.mk include $(MODDIR)/make/defs.mk
include $(MODDIR)/make/dev-utils.mk include $(MODDIR)/make/dev-utils.mk
ifeq ($(DEVELOPMENT),true) ifeq ($(DEVELOPMENT),true)
TARGET_OWNER ?= $(shell id -un) TARGET_OWNER ?= $(shell id -un)
TARGET_GROUP ?= $(shell id -gn) TARGET_GROUP ?= $(shell id -gn)
else else
TARGET_OWNER ?= root TARGET_OWNER ?= root
TARGET_GROUP ?= root TARGET_GROUP ?= root
endif endif
TARGET_DIR_OWNER ?= $(TARGET_OWNER) TARGET_DIR_OWNER ?= $(TARGET_OWNER)
TARGET_DIR_GROUP ?= $(TARGET_GROUP) TARGET_DIR_GROUP ?= $(TARGET_GROUP)
TARGET_MODE ?= 440 TARGET_MODE ?= 440
TARGET_DIR_MODE ?= 770 TARGET_DIR_MODE ?= 770
all: all:
install: install.done install: install.done

28
make/isolinux.mk
View file

@ -1,18 +1,18 @@
# == defs # == defs
URL_BASE = http://www.kernel.org/pub/linux/utils/boot/syslinux URL_BASE = http://www.kernel.org/pub/linux/utils/boot/syslinux
URL_FILE = SYSLINUX_URL URL_FILE = SYSLINUX_URL
URL = $(shell $(CAT) $(URL_FILE)) URL = $(shell $(CAT) $(URL_FILE))
DLOAD_DIR = /home/samba/dat/share/exe/linux/syslinux DLOAD_DIR = /home/samba/dat/share/exe/linux/syslinux
BUILD_DIR = cd_root BUILD_DIR = cd_root
DIRS = $(DLOAD_DIR) $(BUILD_DIR) DIRS = $(DLOAD_DIR) $(BUILD_DIR)
UNPACK_DIR = isolinux UNPACK_DIR = isolinux
ISO_IMAGE ?= image.iso ISO_IMAGE ?= image.iso
ISOLINUX_BIN = $(UNPACK_DIR)/isolinux.bin ISOLINUX_BIN = $(UNPACK_DIR)/isolinux.bin
MENU_32 = $(UNPACK_DIR)/com32/menu/menu.c32 MENU_32 = $(UNPACK_DIR)/com32/menu/menu.c32
INITRD = /boot/initrd INITRD = /boot/initrd
CD_FILES = \ CD_FILES = \
$(MENU_32) \ $(MENU_32) \
$(ISOLINUX_BIN) $(ISOLINUX_BIN)
@ -55,8 +55,8 @@ unpack.done: $(URL_FILE) dload.done
mv $(SYSLINUX_BASE) $(UNPACK_DIR) mv $(SYSLINUX_BASE) $(UNPACK_DIR)
touch $@ touch $@
GENERATE = /bin/bash $(MOD_SCRIPT_DIR)/generate-boot-medium.sh GENERATE = /bin/bash $(MOD_SCRIPT_DIR)/generate-boot-medium.sh
BOOT_CONF = boot.conf BOOT_CONF = boot.conf
$(ISO_IMAGE): $(BOOT_CONF) dirs.done $(CD_FILES) $(ISO_IMAGE): $(BOOT_CONF) dirs.done $(CD_FILES)
$(GENERATE) -o $@ -d $(BUILD_DIR) -f $< $(CD_FILES) $(GENERATE) -o $@ -d $(BUILD_DIR) -f $< $(CD_FILES)

8
make/java.mk
View file

@ -1,7 +1,7 @@
JAVA_SRC_DIR ?= . JAVA_SRC_DIR ?= .
JAVA_SRC ?= $(wildcard $(JAVA_SRC_DIR)/*.java) JAVA_SRC ?= $(wildcard $(JAVA_SRC_DIR)/*.java)
JAVA_CLASSFILES += $(patsubst %.java,%.class,$(JAVA_SRC)) JAVA_CLASSFILES += $(patsubst %.java,%.class,$(JAVA_SRC))
JAVA_CLASSPATH = $(shell echo $(CLASSPATH) | sed 's/ */:/g') JAVA_CLASSPATH = $(shell echo $(CLASSPATH) | sed 's/ */:/g')
include $(MODDIR)/make/defs.mk include $(MODDIR)/make/defs.mk

26
make/js.mk
View file

@ -1,23 +1,23 @@
JAVA ?= /usr/bin/java JAVA ?= /usr/bin/java
JS_MINIFY_FILTER_IN ?= sed 's/console\.[a-z]\+([^)]\+) *;//g' JS_MINIFY_FILTER_IN ?= sed 's/console\.[a-z]\+([^)]\+) *;//g'
JS_SRC ?= $(filter-out %.min.js,$(wildcard *.js)) JS_SRC ?= $(filter-out %.min.js,$(wildcard *.js))
JS_GENERATED ?= $(patsubst %.js,%.min.js,$(JS_SRC)) JS_GENERATED ?= $(patsubst %.js,%.min.js,$(JS_SRC))
JS_EXTRA_EXTERNS ?= JS_EXTRA_EXTERNS ?=
JS_CC_BUILD_ROOT ?= $(PROJECTS_DIR)/closure-compiler/contrib/closure-compiler/install-root JS_CC_BUILD_ROOT ?= $(PROJECTS_DIR)/closure-compiler/contrib/closure-compiler/install-root
JS_EXTERNS_DIRS ?= $(firstword $(wildcard $(JS_CC_BUILD_ROOT)/$(realpath $(PROJECTS_DIR))/closure-compiler/share/externs /opt/closure-compiler/share/externs)) JS_EXTERNS_DIRS ?= $(firstword $(wildcard $(JS_CC_BUILD_ROOT)/$(realpath $(PROJECTS_DIR))/closure-compiler/share/externs /opt/closure-compiler/share/externs))
JS_EXTERNS ?= $(sort $(JS_EXTRA_EXTERNS) jquery-3.3.js) JS_EXTERNS ?= $(sort $(JS_EXTRA_EXTERNS) jquery-3.3.js)
JS_EXTERN_PATHS ?= $(wildcard $(foreach d,$(JS_EXTERNS_DIRS),$(addprefix $d/,$(JS_EXTERNS)))) JS_EXTERN_PATHS ?= $(wildcard $(foreach d,$(JS_EXTERNS_DIRS),$(addprefix $d/,$(JS_EXTERNS))))
JS_MINIFY_OPTS ?= $(addprefix --externs ,$(JS_EXTERN_PATHS)) --compilation_level ADVANCED --strict_mode_input JS_MINIFY_OPTS ?= $(addprefix --externs ,$(JS_EXTERN_PATHS)) --compilation_level ADVANCED --strict_mode_input
JS_MINIFY_EXE ?= $(JAVA) -jar $(firstword $(wildcard \ JS_MINIFY_EXE ?= $(JAVA) -jar $(firstword $(wildcard \
$(JS_CC_BUILD_ROOT)/usr/share/java/closure-compiler.jar \ $(JS_CC_BUILD_ROOT)/usr/share/java/closure-compiler.jar \
/usr/share/java/closure-compiler.jar \ /usr/share/java/closure-compiler.jar \
)) ))
JS_MINIFY ?= $(JS_MINIFY_EXE) $(JS_MINIFY_OPTS) JS_MINIFY ?= $(JS_MINIFY_EXE) $(JS_MINIFY_OPTS)
# This is not nice. It requires install-files to be included from elsewhere, # This is not nice. It requires install-files to be included from elsewhere,
# which is not obvious. OTOH, if it isn't, SOURCE_FILES doesn't do any harm, # which is not obvious. OTOH, if it isn't, SOURCE_FILES doesn't do any harm,
# either. # either.
SOURCE_FILES += $(JS_GENERATED) SOURCE_FILES += $(JS_GENERATED)
all: $(JS_GENERATED) all: $(JS_GENERATED)
clean: minify.clean clean: minify.clean

14
make/ldlibpath.mk
View file

@ -3,15 +3,15 @@
# contact@jannet.de # contact@jannet.de
# $Id$ # $Id$
LD_LIB_PATH_ENV := $(LD_LIBRARY_PATH) LD_LIB_PATH_ENV := $(LD_LIBRARY_PATH)
EXE_SEARCH_PATH_ENV := $(PATH) EXE_SEARCH_PATH_ENV := $(PATH)
LD_LIB_PATH_LDFLAGS = $(shell echo $(BUILD_LDFLAGS) | $(SED) 's/^-[^L] *[^ ]*/ /g; s/[ ]-[^L] *[^ ]*/ /g; s/-L[ ]*\([^ ]*\)[ ]*/\1:/g') LD_LIB_PATH_LDFLAGS = $(shell echo $(BUILD_LDFLAGS) | $(SED) 's/^-[^L] *[^ ]*/ /g; s/[ ]-[^L] *[^ ]*/ /g; s/-L[ ]*\([^ ]*\)[ ]*/\1:/g')
ifeq ($(TARGET),mingw) ifeq ($(TARGET),mingw)
DLL_PATH = $(shell echo $(LD_LIBRARY_PATH) | $(SED) 's/:/;/g');$(CROSS_TOOL_DIR)/bin DLL_PATH = $(shell echo $(LD_LIBRARY_PATH) | $(SED) 's/:/;/g');$(CROSS_TOOL_DIR)/bin
endif endif
#export LD_LIBRARY_PATH=$(shell echo $(strip $(LD_LIB_PATH_LDFLAGS):$(LD_LIB_PATH):$(LD_LIB_PATH_ENV)) | $(SED) 's/ /:/g; s/::/:/g') #export LD_LIBRARY_PATH = $(shell echo $(strip $(LD_LIB_PATH_LDFLAGS):$(LD_LIB_PATH):$(LD_LIB_PATH_ENV)) | $(SED) 's/ /:/g; s/::/:/g')
LD_LIBRARY_PATH := $(call proj_query, ldlibpath $(PROJECT) $(PREREQ_BUILD)) LD_LIBRARY_PATH := $(call proj_query, ldlibpath $(PROJECT) $(PREREQ_BUILD))
export LD_LIBRARY_PATH export LD_LIBRARY_PATH
export PATH := $(call proj_query, exepath $(PROJECT) $(PREREQ_BUILD)):$(EXE_SEARCH_PATH_ENV) export PATH := $(call proj_query, exepath $(PROJECT) $(PREREQ_BUILD)):$(EXE_SEARCH_PATH_ENV)

84
make/linux-rpm-build.mk
View file

@ -6,21 +6,21 @@ define COMPLETE_VERSION
$(shell $(CAT) COMPLETE_VERSION) $(shell $(CAT) COMPLETE_VERSION)
endef endef
HOST ?= $(HOSTNAME) HOST ?= $(HOSTNAME)
KERNEL_BASE ?= lx-$(HOST) KERNEL_BASE ?= lx-$(HOST)
BOOT_LABEL ?= lx-$(KERNEL_VERSION)-$(RPM_RELEASE) BOOT_LABEL ?= lx-$(KERNEL_VERSION)-$(RPM_RELEASE)
KERNEL_PKG_SUFFIX ?= .tar.gz KERNEL_PKG_SUFFIX ?= .tar.gz
CUSTOMER ?= jannet CUSTOMER ?= jannet
KERNEL_DLOAD_DIR ?= /home/samba/dat/exe/linux/os KERNEL_DLOAD_DIR ?= /home/samba/dat/exe/linux/os
KERNEL_PKG ?= $(KERNEL_DLOAD_DIR)/$(shell echo $(KERNEL_VERSION) | $(SED) 's/\([0-9]\.[0-9]*\)\..*/\1/')/linux-$(shell echo $(KERNEL_VERSION) | $(SED) 's/\(2\.6\.[0-9]+\)-..*/\1/')$(KERNEL_PKG_SUFFIX) KERNEL_PKG ?= $(KERNEL_DLOAD_DIR)/$(shell echo $(KERNEL_VERSION) | $(SED) 's/\([0-9]\.[0-9]*\)\..*/\1/')/linux-$(shell echo $(KERNEL_VERSION) | $(SED) 's/\(2\.6\.[0-9]+\)-..*/\1/')$(KERNEL_PKG_SUFFIX)
UPLOAD_HOST ?= pkg.janware.com UPLOAD_HOST ?= pkg.janware.com
UPLOAD_PATH ?= /srv/dav/pub/packages/$(CUSTOMER)/$(KERNEL_BASE) UPLOAD_PATH ?= /srv/dav/pub/packages/$(CUSTOMER)/$(KERNEL_BASE)
UPLOAD_OWNER ?= $(shell whoami) UPLOAD_OWNER ?= $(shell whoami)
KERNEL_MAJOR = $(shell echo $(KERNEL_VERSION) | cut -d\. -f1) KERNEL_MAJOR = $(shell echo $(KERNEL_VERSION) | cut -d\. -f1)
KERNEL_MINOR = $(shell echo $(KERNEL_VERSION) | cut -d\. -f2) KERNEL_MINOR = $(shell echo $(KERNEL_VERSION) | cut -d\. -f2)
KERNEL_RELEASE = $(shell echo $(KERNEL_VERSION) | cut -d\. -f3) KERNEL_RELEASE = $(shell echo $(KERNEL_VERSION) | cut -d\. -f3)
KERNEL_PKG_BASE = $(KERNEL_DLOAD_DIR)/$(KERNEL_MAJOR).$(KERNEL_MINOR)/linux-$(KERNEL_VERSION).tar KERNEL_PKG_BASE = $(KERNEL_DLOAD_DIR)/$(KERNEL_MAJOR).$(KERNEL_MINOR)/linux-$(KERNEL_VERSION).tar
ifneq ($(wildcard $(KERNEL_PKG_BASE).*),) ifneq ($(wildcard $(KERNEL_PKG_BASE).*),)
ifneq ($(wildcard $(KERNEL_PKG_BASE).gz),) ifneq ($(wildcard $(KERNEL_PKG_BASE).gz),)
KERNEL_PKG = $(KERNEL_PKG_BASE).gz KERNEL_PKG = $(KERNEL_PKG_BASE).gz
@ -34,56 +34,56 @@ else
KERNEL_PKG = $(KERNEL_PKG_BASE).bz2 KERNEL_PKG = $(KERNEL_PKG_BASE).bz2
KERNEL_SRC_DIR = linux-$(KERNEL_VERSION) KERNEL_SRC_DIR = linux-$(KERNEL_VERSION)
endif endif
#HOST = $(shell cd ../..; $(PWD) | xargs basename) #HOST = $(shell cd ../..; $(PWD) | xargs basename)
WD := $(shell $(PWD)) WD := $(shell $(PWD))
TAG = $(shell echo V_$(KERNEL_VERSION)_$(RPM_RELEASE) | $(SED) 's/\./_/g') TAG = $(shell echo V_$(KERNEL_VERSION)_$(RPM_RELEASE) | $(SED) 's/\./_/g')
ARCH = $(shell $(RPMBUILD) --showrc | $(SED) '/build arch / !d; s/.*build arch *://; s/ //g') ARCH = $(shell $(RPMBUILD) --showrc | $(SED) '/build arch / !d; s/.*build arch *://; s/ //g')
RPMBUILD = $(shell which rpmbuild 2>/dev/null) RPMBUILD = $(shell which rpmbuild 2>/dev/null)
ifeq ($(RPMBUILD),) ifeq ($(RPMBUILD),)
RPMBUILD = $(shell which rpm 2>/dev/null) RPMBUILD = $(shell which rpm 2>/dev/null)
endif endif
#ifeq ($(wildcard RELEASE-$(KERNEL_VERSION)),) #ifeq ($(wildcard RELEASE-$(KERNEL_VERSION)),)
#RPM_RELEASE := $(shell make newrelease; exit 1) #RPM_RELEASE := $(shell make newrelease; exit 1)
#else #else
#RPM_RELEASE_NUM := $(strip $(shell grep Id: RELEASE-$(KERNEL_VERSION) | $(SED) "s/.*RELEASE-$(KERNEL_VERSION),v[ ]*[0-9]*\.\([0-9]*\)[^0-9]*.*/\1/")) #RPM_RELEASE_NUM := $(strip $(shell grep Id: RELEASE-$(KERNEL_VERSION) | $(SED) "s/.*RELEASE-$(KERNEL_VERSION),v[ ]*[0-9]*\.\([0-9]*\)[^0-9]*.*/\1/"))
#ifeq ($(UNAME_SUFFIX),) #ifeq ($(UNAME_SUFFIX),)
#RPM_RELEASE = $(RPM_RELEASE_NUM) #RPM_RELEASE = $(RPM_RELEASE_NUM)
#else #else
#RPM_RELEASE = $(UNAME_SUFFIX)$(RPM_RELEASE_NUM) #RPM_RELEASE = $(UNAME_SUFFIX)$(RPM_RELEASE_NUM)
#endif #endif
#endif #endif
BASE = $(KERNEL_BASE)-$(COMPLETE_VERSION) BASE = $(KERNEL_BASE)-$(COMPLETE_VERSION)
TMP_INSTALL = $(KERNEL_BASE)-$(COMPLETE_VERSION) TMP_INSTALL = $(KERNEL_BASE)-$(COMPLETE_VERSION)
BASE_RUN = $(KERNEL_BASE)-run-$(COMPLETE_VERSION) BASE_RUN = $(KERNEL_BASE)-run-$(COMPLETE_VERSION)
BASE_DEVEL = $(KERNEL_BASE)-devel-$(COMPLETE_VERSION) BASE_DEVEL = $(KERNEL_BASE)-devel-$(COMPLETE_VERSION)
ifeq ($(BOOT_LABEL),) ifeq ($(BOOT_LABEL),)
BOOT_LABEL = lx-$(COMPLETE_VERSION) BOOT_LABEL = lx-$(COMPLETE_VERSION)
endif endif
KERNEL_TGZ = $(notdir $(KERNEL_PKG)) KERNEL_TGZ = $(notdir $(KERNEL_PKG))
F_SPEC = $(BASE).spec F_SPEC = $(BASE).spec
F_TGZ = $(BASE).tar.gz F_TGZ = $(BASE).tar.gz
F_SPM = $(BASE).src.rpm F_SPM = $(BASE).src.rpm
F_RPM_RUN = $(BASE_RUN).$(ARCH).rpm F_RPM_RUN = $(BASE_RUN).$(ARCH).rpm
F_RPM_DEVEL = $(BASE_DEVEL).$(ARCH).rpm F_RPM_DEVEL = $(BASE_DEVEL).$(ARCH).rpm
F_RPMS = $(F_RPM_RUN) $(F_RPM_DEVEL) F_RPMS = $(F_RPM_RUN) $(F_RPM_DEVEL)
F_BOOTFILES = $(addsuffix -$(COMPLETE_VERSION),$(addprefix $(TMP_INSTALL)/boot/,vmlinuz config System.map)) F_BOOTFILES = $(addsuffix -$(COMPLETE_VERSION),$(addprefix $(TMP_INSTALL)/boot/,vmlinuz config System.map))
F_CURRENT = $(addprefix CURRENT_, SRC RPM_SRC RPM_RUN_I386 RPM_DEVEL_I386) F_CURRENT = $(addprefix CURRENT_, SRC RPM_SRC RPM_RUN_I386 RPM_DEVEL_I386)
F_ULDONE = $(addsuffix .uldone,$(F_RPMS) $(F_TGZ) $(F_SPM) current) F_ULDONE = $(addsuffix .uldone,$(F_RPMS) $(F_TGZ) $(F_SPM) current)
# note that order matters for F_ULDONE and F_RPMS (remote directory attributes) # note that order matters for F_ULDONE and F_RPMS (remote directory attributes)
KERNEL_INSTALL_PREFIX= $(shell pwd)/$(TMP_INSTALL) KERNEL_INSTALL_PREFIX = $(shell pwd)/$(TMP_INSTALL)
BUILD = sh $(MODDIR)/devutil/jcs/build_linux.sh \ BUILD = sh $(MODDIR)/devutil/jcs/build_linux.sh \
-c config-$(KERNEL_VERSION) \ -c config-$(KERNEL_VERSION) \
-t $(HOST) \ -t $(HOST) \
-b $(WD) \ -b $(WD) \
-a i386 \ -a i386 \
-s $(KERNEL_SRC_DIR) \ -s $(KERNEL_SRC_DIR) \
-i $(TMP_INSTALL) -i $(TMP_INSTALL)
MKSPEC := $(MODDIR)/devutil/jcs/mkspec-linux.sh MKSPEC := $(MODDIR)/devutil/jcs/mkspec-linux.sh
# exports # exports
export KERNEL_VERSION export KERNEL_VERSION

32
make/linux-rpm.mk
View file

@ -6,13 +6,13 @@ define COMPLETE_VERSION
$(shell $(CAT) COMPLETE_VERSION) $(shell $(CAT) COMPLETE_VERSION)
endef endef
KERNEL_MAJOR = $(shell echo $(KERNEL_VERSION) | cut -d\. -f1) KERNEL_MAJOR = $(shell echo $(KERNEL_VERSION) | cut -d\. -f1)
KERNEL_MINOR = $(shell echo $(KERNEL_VERSION) | cut -d\. -f2) KERNEL_MINOR = $(shell echo $(KERNEL_VERSION) | cut -d\. -f2)
KERNEL_RELEASE = $(shell echo $(KERNEL_VERSION) | cut -d\. -f3) KERNEL_RELEASE = $(shell echo $(KERNEL_VERSION) | cut -d\. -f3)
KERNEL_DLOAD_DIR ?= /home/samba/dat/share/exe/linux/os KERNEL_DLOAD_DIR ?= /home/samba/dat/share/exe/linux/os
KERNEL_PKG_BASE = $(KERNEL_DLOAD_DIR)/$(KERNEL_MAJOR).$(KERNEL_MINOR)/linux-$(KERNEL_VERSION).tar KERNEL_PKG_BASE = $(KERNEL_DLOAD_DIR)/$(KERNEL_MAJOR).$(KERNEL_MINOR)/linux-$(KERNEL_VERSION).tar
LINUX_KERNEL_PATCH_DIR ?= $(CVS_ROOT_DIR)/conf/jannet.de/all/lx-patches LINUX_KERNEL_PATCH_DIR ?= $(CVS_ROOT_DIR)/conf/jannet.de/all/lx-patches
HOST ?= $(HOSTNAME) HOST ?= $(HOSTNAME)
ifneq ($(wildcard $(KERNEL_PKG_BASE).*),) ifneq ($(wildcard $(KERNEL_PKG_BASE).*),)
ifneq ($(wildcard $(KERNEL_PKG_BASE).gz),) ifneq ($(wildcard $(KERNEL_PKG_BASE).gz),)
@ -27,17 +27,17 @@ else
KERNEL_PKG = $(KERNEL_PKG_BASE).bz2 KERNEL_PKG = $(KERNEL_PKG_BASE).bz2
KERNEL_SRC_DIR = linux-$(KERNEL_VERSION) KERNEL_SRC_DIR = linux-$(KERNEL_VERSION)
endif endif
WD := $(shell $(PWD)) WD := $(shell $(PWD))
TAG = $(shell echo V_$(KERNEL_VERSION)_$(RPM_RELEASE) | $(SED) 's/\./_/g') TAG = $(shell echo V_$(KERNEL_VERSION)_$(RPM_RELEASE) | $(SED) 's/\./_/g')
ARCH = $(shell $(RPMBUILD) --showrc | $(SED) '/build arch / !d; s/.*build arch *://; s/ //g') ARCH = $(shell $(RPMBUILD) --showrc | $(SED) '/build arch / !d; s/.*build arch *://; s/ //g')
PATCHES += $(wildcard $(LINUX_KERNEL_PATCH_DIR)/*-$(KERNEL_VERSION).patch) \ PATCHES += $(wildcard $(LINUX_KERNEL_PATCH_DIR)/*-$(KERNEL_VERSION).patch) \
$(wildcard $(LINUX_KERNEL_PATCH_DIR)/*-$(KERNEL_VERSION).diff) $(wildcard $(LINUX_KERNEL_PATCH_DIR)/*-$(KERNEL_VERSION).diff)
LOCAL_PATCHES = $(notdir $(PATCHES)) LOCAL_PATCHES = $(notdir $(PATCHES))
SUBMAKEFILE = $(MODDIR)/make/linux-rpm-build.mk SUBMAKEFILE = $(MODDIR)/make/linux-rpm-build.mk
KERNEL_URL = ftp.kernel.org:/pub/linux/kernel/v$(KERNEL_MAJOR).$(KERNEL_MINOR)/linux-$(KERNEL_VERSION).tar.bz2 KERNEL_URL = ftp.kernel.org:/pub/linux/kernel/v$(KERNEL_MAJOR).$(KERNEL_MINOR)/linux-$(KERNEL_VERSION).tar.bz2
KERNEL_TGZ = $(notdir $(KERNEL_URL)) KERNEL_TGZ = $(notdir $(KERNEL_URL))
# exports # exports
export KERNEL_VERSION export KERNEL_VERSION
@ -155,7 +155,7 @@ patch: patches.done
prepare: unpack patch EXTRAVERSION COMPLETE_VERSION prepare: unpack patch EXTRAVERSION COMPLETE_VERSION
install: all install: all
DEFERRED_TARGETS = \ DEFERRED_TARGETS = \
current.uldone ping ssh build \ current.uldone ping ssh build \
tgz spm rpm upload tag copy-run copy-devel copy \ tgz spm rpm upload tag copy-run copy-devel copy \
shutdown reboot update-rpm erase-rpm shutdown reboot update-rpm erase-rpm

42
make/lo.mk
View file

@ -1,10 +1,10 @@
# === change this > # === change this >
TOOLS_DIR ?= $(TOPDIR)/tools TOOLS_DIR ?= $(TOPDIR)/tools
TOOLS_INCLUDE_DIR ?= $(TOOLS_DIR) TOOLS_INCLUDE_DIR ?= $(TOOLS_DIR)
CPP_PREFIX ?= YLo CPP_PREFIX ?= YLo
CPP_SUFFIX ?= CPP_SUFFIX ?=
SO_PREFIX ?= lo_ SO_PREFIX ?= lo_
LOADABLE_OBJ_HOOK ?= LOADABLE_OBJECT_HOOK LOADABLE_OBJ_HOOK ?= LOADABLE_OBJECT_HOOK
# === change this < # === change this <
include $(MODDIR)/make/defs.mk include $(MODDIR)/make/defs.mk
@ -13,28 +13,28 @@ include $(MODDIR)/make/profiler-defs.mk
include $(MODDIR)/make/dev-utils.mk include $(MODDIR)/make/dev-utils.mk
.PRECIOUS: %.cpp %.o .PRECIOUS: %.cpp %.o
LOADABLE_OBJS_HEADER ?= $(wildcard $(TOOLS_INCLUDE_DIR)/$(CPP_PREFIX)*$(CPP_SUFFIX).h) LOADABLE_OBJS_HEADER ?= $(wildcard $(TOOLS_INCLUDE_DIR)/$(CPP_PREFIX)*$(CPP_SUFFIX).h)
LOADABLE_OBJS_BASE ?= $(patsubst %$(CPP_SUFFIX),%,$(patsubst $(CPP_PREFIX)%,%,$(basename $(notdir $(LOADABLE_OBJS_HEADER))))) LOADABLE_OBJS_BASE ?= $(patsubst %$(CPP_SUFFIX),%,$(patsubst $(CPP_PREFIX)%,%,$(basename $(notdir $(LOADABLE_OBJS_HEADER)))))
LOADABLE_OBJS = $(filter-out $(LOADABLE_OBJ_IGNORE),$(LOADABLE_OBJS_BASE)) LOADABLE_OBJS = $(filter-out $(LOADABLE_OBJ_IGNORE),$(LOADABLE_OBJS_BASE))
LOADABLE_OBJ_CPP = $(patsubst %,%.cpp,$(LOADABLE_OBJS)) LOADABLE_OBJ_CPP = $(patsubst %,%.cpp,$(LOADABLE_OBJS))
LOADABLE_OBJS_O = $(patsubst %,%.o,$(LOADABLE_OBJS)) LOADABLE_OBJS_O = $(patsubst %,%.o,$(LOADABLE_OBJS))
OTHER_CPP_IGNORE = $(patsubst %,$(CPP_PREFIX)%.cpp,$(LOADABLE_OBJ_IGNORE)) OTHER_CPP_IGNORE = $(patsubst %,$(CPP_PREFIX)%.cpp,$(LOADABLE_OBJ_IGNORE))
OTHER_CPP ?= $(filter-out $(LOADABLE_OBJ_CPP) $(OTHER_CPP_IGNORE),$(wildcard *.cpp)) OTHER_CPP ?= $(filter-out $(LOADABLE_OBJ_CPP) $(OTHER_CPP_IGNORE),$(wildcard *.cpp))
ifneq ($(OTHER_CPP),) ifneq ($(OTHER_CPP),)
OTHER_O = $(patsubst %.cpp,%.o,$(OTHER_CPP)) OTHER_O = $(patsubst %.cpp,%.o,$(OTHER_CPP))
OTHER_LIB = liblocal.a OTHER_LIB = liblocal.a
OTHER_LIB_LDFLAGS = -L. -llocal OTHER_LIB_LDFLAGS = -L. -llocal
OTHER_MEMBERS_O = $(OTHER_LIB)($(OTHER_O)) OTHER_MEMBERS_O = $(OTHER_LIB)($(OTHER_O))
endif endif
ifneq ($(TARGET),mingw) ifneq ($(TARGET),mingw)
LOADABLE_OBJ_LIBS = $(addprefix $(SO_PREFIX), $(addsuffix .so, $(LOADABLE_OBJS))) LOADABLE_OBJ_LIBS = $(addprefix $(SO_PREFIX), $(addsuffix .so, $(LOADABLE_OBJS)))
else else
LOADABLE_OBJ_LIBS = $(addprefix $(SO_PREFIX), $(addsuffix .dll, $(LOADABLE_OBJS))) LOADABLE_OBJ_LIBS = $(addprefix $(SO_PREFIX), $(addsuffix .dll, $(LOADABLE_OBJS)))
endif endif
BUILD_LOADABLE_OBJ_LIBS = $(addprefix $(BUILD_LIBDIR)/, $(LOADABLE_OBJ_LIBS)) BUILD_LOADABLE_OBJ_LIBS = $(addprefix $(BUILD_LIBDIR)/, $(LOADABLE_OBJ_LIBS))
INSTALLED_LOADABLE_OBJ_LIBS = $(addprefix $(INSTALL_LIBDIR)/, $(LOADABLE_OBJ_LIBS)) INSTALLED_LOADABLE_OBJ_LIBS = $(addprefix $(INSTALL_LIBDIR)/, $(LOADABLE_OBJ_LIBS))
all: $(LOADABLE_OBJ_LIBS) $(BUILD_LOADABLE_OBJ_LIBS) all: $(LOADABLE_OBJ_LIBS) $(BUILD_LOADABLE_OBJ_LIBS)
install: $(INSTALLED_LOADABLE_OBJ_LIBS) install: $(INSTALLED_LOADABLE_OBJ_LIBS)

24
make/make.mk
View file

@ -7,29 +7,29 @@ include $(MODDIR)/make/defs.mk
include $(MODDIR)/make/defs-dirs.mk include $(MODDIR)/make/defs-dirs.mk
include $(MODDIR)/make/dev-utils.mk include $(MODDIR)/make/dev-utils.mk
CACHED_FILES ?= $(VERSION_FILE) $(wildcard $(TOPDIR)/make/project.conf) CACHED_FILES ?= $(VERSION_FILE) $(wildcard $(TOPDIR)/make/project.conf)
CACHED_VARS ?= PROJECT PREREQ VERSION HEX_VERSION FULL_NAME CACHED_VARS ?= PROJECT PREREQ VERSION HEX_VERSION FULL_NAME
include $(MODDIR)/make/cache.mk include $(MODDIR)/make/cache.mk
ifneq ($(CREATE_DEVEL),false) ifneq ($(CREATE_DEVEL),false)
MKFILES += $(wildcard project.conf) MKFILES += $(wildcard project.conf)
DEVEL_TARGETS += install_MAKE $(INSTALLED_PKG_MK) install_PKG_CONFIG DEVEL_TARGETS += install_MAKE $(INSTALLED_PKG_MK) install_PKG_CONFIG
endif endif
include $(MODDIR)/make/rules.mk include $(MODDIR)/make/rules.mk
#LOCAL_PKG_CONFIG = $(PROJECT).pc #LOCAL_PKG_CONFIG = $(PROJECT).pc
# BUILD_PKG_CONFIG = $(MODDIR)/pkgconfig/$(LOCAL_PKG_CONFIG) # BUILD_PKG_CONFIG = $(MODDIR)/pkgconfig/$(LOCAL_PKG_CONFIG)
INSTALL_PCKG_DEPS_DIR = $(ENV_PREFIX)$(MODDIR)/make/deps.d INSTALL_PCKG_DEPS_DIR = $(ENV_PREFIX)$(MODDIR)/make/deps.d
ifneq ($(wildcard pckg-deps.mk),) ifneq ($(wildcard pckg-deps.mk),)
INSTALLED_PKG_MK += $(INSTALL_PCKG_DEPS_DIR)/$(PROJECT).mk INSTALLED_PKG_MK += $(INSTALL_PCKG_DEPS_DIR)/$(PROJECT).mk
endif endif
INSTALL_PCKG_DEFS_DIR = $(MODDIR)/make/defs.d INSTALL_PCKG_DEFS_DIR = $(MODDIR)/make/defs.d
ifneq ($(wildcard pckg-defs.mk),) ifneq ($(wildcard pckg-defs.mk),)
INSTALLED_PKG_MK += $(INSTALL_PCKG_DEFS_DIR)/$(PROJECT).mk INSTALLED_PKG_MK += $(INSTALL_PCKG_DEFS_DIR)/$(PROJECT).mk
endif endif
#all: $(BUILD_PKG_CONFIG) #all: $(BUILD_PKG_CONFIG)
@ -55,8 +55,8 @@ do-install-links:
@$(call install_links,MAKE) @$(call install_links,MAKE)
ifeq ($(EXPORT_PROJECT_LIB),true) ifeq ($(EXPORT_PROJECT_LIB),true)
CREATE_PKG_CONFIG_OPTS += -c "-I$(PROJECT_DIRPATH)/include" CREATE_PKG_CONFIG_OPTS += -c "-I$(PROJECT_DIRPATH)/include"
CREATE_PKG_CONFIG_OPTS += -l "-L$(PROJECT_DIRPATH)/lib -l$(PROJECT)" CREATE_PKG_CONFIG_OPTS += -l "-L$(PROJECT_DIRPATH)/lib -l$(PROJECT)"
endif endif
$(LOCAL_PKG_CONFIG): $(PROJECT_DESCR_FILE) $(MODDIR)/make/make.mk $(MOD_SCRIPT_DIR)/create-pkg-config.sh $(LOCAL_PKG_CONFIG): $(PROJECT_DESCR_FILE) $(MODDIR)/make/make.mk $(MOD_SCRIPT_DIR)/create-pkg-config.sh

52
make/mcu-defs.mk
View file

@ -1,4 +1,4 @@
#PROJECT ?= $(shell cd $(TOPDIR); /bin/pwd | xargs notdir) #PROJECT ?= $(shell cd $(TOPDIR); /bin/pwd | xargs notdir)
#define mcu_check_var #define mcu_check_var
# ifeq ($($(1)),) # ifeq ($($(1)),)
@ -18,35 +18,35 @@ ifeq ($(MCU_FLASH_SIZE),)
error MCU_FLASH_SIZE not specified error MCU_FLASH_SIZE not specified
endif endif
MCU_BOARD_MODEL_LC ?= $(shell echo $(MCU_BOARD_MODEL) | tr '[A-Z]' '[a-z]') MCU_BOARD_MODEL_LC ?= $(shell echo $(MCU_BOARD_MODEL) | tr '[A-Z]' '[a-z]')
MCU_BOARD ?= $(MCU_BOARD_MODEL) MCU_BOARD ?= $(MCU_BOARD_MODEL)
MCU_BOARD_LC ?= $(shell echo $(MCU_BOARD) | tr '[A-Z]' '[a-z]') MCU_BOARD_LC ?= $(shell echo $(MCU_BOARD) | tr '[A-Z]' '[a-z]')
MCU_OPENOCD_CFG_FILE ?= $(TOPDIR)/make/openocd-$(MCU_BOARD_LC).cfg MCU_OPENOCD_CFG_FILE ?= $(TOPDIR)/make/openocd-$(MCU_BOARD_LC).cfg
MCU_OPENOCD_OPTS ?= -f $(MCU_OPENOCD_CFG_FILE) -c "echo \"Started by jw-build\"" -c "gdb_port 3333" -c "telnet_port 4444" -c "tcl_port 6666" MCU_OPENOCD_OPTS ?= -f $(MCU_OPENOCD_CFG_FILE) -c "echo \"Started by jw-build\"" -c "gdb_port 3333" -c "telnet_port 4444" -c "tcl_port 6666"
MCU_OPENOCD_BIN ?= openocd MCU_OPENOCD_BIN ?= openocd
MCU_OPENOCD ?= $(MCU_OPENOCD_BIN) $(MCU_OPENOCD_OPTS) MCU_OPENOCD ?= $(MCU_OPENOCD_BIN) $(MCU_OPENOCD_OPTS)
MCU_FLASH_FETCH_BANK ?= $(MCU_FLASH_BANK) MCU_FLASH_FETCH_BANK ?= $(MCU_FLASH_BANK)
MCU_FLASH_FETCH_FILE_BIN ?= $(MCU_FLASH_FILE_BIN) MCU_FLASH_FETCH_FILE_BIN ?= $(MCU_FLASH_FILE_BIN)
MCU_FLASH_FETCH_FILE_HEX ?= $(MCU_FLASH_FILE_HEX) MCU_FLASH_FETCH_FILE_HEX ?= $(MCU_FLASH_FILE_HEX)
MCU_FLASH_FETCH_OFFSET ?= $(MCU_FLASH_OFFSET) MCU_FLASH_FETCH_OFFSET ?= $(MCU_FLASH_OFFSET)
MCU_FLASH_FETCH_SIZE ?= $(MCU_FLASH_SIZE) MCU_FLASH_FETCH_SIZE ?= $(MCU_FLASH_SIZE)
MCU_FLASH_PUSH_BANK ?= $(MCU_FLASH_BANK) MCU_FLASH_PUSH_BANK ?= $(MCU_FLASH_BANK)
MCU_FLASH_PUSH_FILE_BIN ?= $(MCU_FLASH_FILE_BIN) MCU_FLASH_PUSH_FILE_BIN ?= $(MCU_FLASH_FILE_BIN)
MCU_FLASH_PUSH_FILE_HEX ?= $(MCU_FLASH_FILE_HEX) MCU_FLASH_PUSH_FILE_HEX ?= $(MCU_FLASH_FILE_HEX)
MCU_FLASH_PUSH_OFFSET ?= $(MCU_FLASH_OFFSET) MCU_FLASH_PUSH_OFFSET ?= $(MCU_FLASH_OFFSET)
MCU_FLASH_PUSH_SIZE ?= $(MCU_FLASH_SIZE) MCU_FLASH_PUSH_SIZE ?= $(MCU_FLASH_SIZE)
TOOLCHAIN_PREFIX ?= arm-none-eabi- TOOLCHAIN_PREFIX ?= arm-none-eabi-
MCU_OBJCOPY ?= $(TOOLCHAIN_PREFIX)objcopy MCU_OBJCOPY ?= $(TOOLCHAIN_PREFIX)objcopy
MCU_FLASH_BANK ?= 0 MCU_FLASH_BANK ?= 0
MCU_FLASH_FILE_BIN ?= $(TOPDIR)/bin/$(MCU_BOARD_LC).bin MCU_FLASH_FILE_BIN ?= $(TOPDIR)/bin/$(MCU_BOARD_LC).bin
MCU_FLASH_FILE_HEX ?= $(TOPDIR)/bin/$(MCU_BOARD_LC).hex MCU_FLASH_FILE_HEX ?= $(TOPDIR)/bin/$(MCU_BOARD_LC).hex
#MCU_FLASH_OFFSET ?= 0x0000000 #MCU_FLASH_OFFSET ?= 0x0000000
#MCU_FLASH_SIZE ?= 0x5000 #MCU_FLASH_SIZE ?= 0x5000
ifneq ($(MCU_FLASH_FETCH_OFFSET),) ifneq ($(MCU_FLASH_FETCH_OFFSET),)
MCU_OBJCOPY_FETCH_OPTS += --change-addresses $(MCU_FLASH_FETCH_OFFSET) MCU_OBJCOPY_FETCH_OPTS += --change-addresses $(MCU_FLASH_FETCH_OFFSET)
endif endif

161
make/platform.mk
View file

@ -1,7 +1,7 @@
# ----- host and target variables # ----- host and target variables
ifndef PLATFORM_MK_INCLUDED ifndef PLATFORM_MK_INCLUDED
PLATFORM_MK_INCLUDED = true PLATFORM_MK_INCLUDED = true
# "-include" tries search path, we don't want that # "-include" tries search path, we don't want that
define try_include define try_include
@ -16,58 +16,91 @@ $(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),)
HOST_TUPLE := $(shell $(GET_OS_SH) tuple) HOST_TUPLE := $(shell $(GET_OS_SH) tuple)
HOST_TUPLE_WORDS := $(subst -, ,$(HOST_TUPLE)) HOST_TUPLE_WORDS := $(subst -, ,$(HOST_TUPLE))
HOST_ARCH := $(word 1,$(HOST_TUPLE_WORDS)) HOST_ARCH := $(word 1,$(HOST_TUPLE_WORDS))
HOST_VENDOR := $(word 2,$(HOST_TUPLE_WORDS)) HOST_VENDOR := $(word 2,$(HOST_TUPLE_WORDS))
HOST_OS := $(word 3,$(HOST_TUPLE_WORDS)) HOST_OS := $(word 3,$(HOST_TUPLE_WORDS))
HOST_ABI := $(word 4,$(HOST_TUPLE_WORDS)) HOST_ABI := $(word 4,$(HOST_TUPLE_WORDS))
HOST_TRIPLET := $(HOST_ARCH)-$(HOST_OS)-$(HOST_ABI) HOST_TRIPLET := $(HOST_ARCH)-$(HOST_OS)-$(HOST_ABI)
else else
HOST_TUPLE_WORDS := $(subst -, ,$(HOST_TUPLE)) HOST_TUPLE_WORDS := $(subst -, ,$(HOST_TUPLE))
HOST_ARCH := $(word 1,$(HOST_TUPLE_WORDS)) HOST_ARCH := $(word 1,$(HOST_TUPLE_WORDS))
HOST_VENDOR := $(word 2,$(HOST_TUPLE_WORDS)) HOST_VENDOR := $(word 2,$(HOST_TUPLE_WORDS))
HOST_OS := $(word 3,$(HOST_TUPLE_WORDS)) HOST_OS := $(word 3,$(HOST_TUPLE_WORDS))
HOST_ABI := $(word 4,$(HOST_TUPLE_WORDS)) HOST_ABI := $(word 4,$(HOST_TUPLE_WORDS))
HOST_TRIPLET := $(HOST_ARCH)-$(HOST_OS)-$(HOST_ABI) HOST_TRIPLET := $(HOST_ARCH)-$(HOST_OS)-$(HOST_ABI)
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),)
@ -76,54 +109,54 @@ endif
# - support legacy jw-build target variables # - support legacy jw-build target variables
ifneq ($(findstring $(TARGET_ABI),mingw mingw32 mingw64),) ifneq ($(findstring $(TARGET_ABI),mingw mingw32 mingw64),)
TARGET ?= mingw TARGET ?= mingw
else else
TARGET ?= $(TARGET_OS) TARGET ?= $(TARGET_OS)
endif endif
ifeq ($(OS_NAME_VERSION),) ifeq ($(OS_NAME_VERSION),)
OS_NAME_VERSION := $(shell $(GET_OS_SH)) OS_NAME_VERSION := $(shell $(GET_OS_SH))
endif endif
ifeq ($(OS_NAME),) ifeq ($(OS_NAME),)
OS_NAME := $(shell $(GET_OS_SH) name) OS_NAME := $(shell $(GET_OS_SH) name)
endif endif
ARCH ?= $(TARGET_ARCH) ARCH ?= $(TARGET_ARCH)
ARCH_32 = i586 ARCH_32 = i586
ifndef ARCH ifndef ARCH
# TODO unreached code, test and fix this # TODO unreached code, test and fix this
ifeq ($(shell uname -m),armv7l) ifeq ($(shell uname -m),armv7l)
ARCH = armv7hl ARCH = armv7hl
SYSTEM_LIBDIR_NAME = lib SYSTEM_LIBDIR_NAME = lib
else ifeq ($(shell uname -m),armv6l) else ifeq ($(shell uname -m),armv6l)
ARCH = armv6hl ARCH = armv6hl
SYSTEM_LIBDIR_NAME = lib SYSTEM_LIBDIR_NAME = lib
else ifeq ($(shell uname -m),aarch64) else ifeq ($(shell uname -m),aarch64)
ARCH = aarch64 ARCH = aarch64
SYSTEM_LIBDIR_NAME = lib SYSTEM_LIBDIR_NAME = lib
else ifeq ($(shell uname -m),x86_64) else ifeq ($(shell uname -m),x86_64)
ARCH = x86_64 ARCH = x86_64
SYSTEM_LIBDIR_NAME = lib64 SYSTEM_LIBDIR_NAME = lib64
else else
ARCH = $(ARCH_32) ARCH = $(ARCH_32)
SYSTEM_LIBDIR_NAME = lib SYSTEM_LIBDIR_NAME = lib
endif endif
SYSTEM_LIBDIR = /usr/$(SYSTEM_LIBDIR_NAME) SYSTEM_LIBDIR = /usr/$(SYSTEM_LIBDIR_NAME)
endif endif
ifneq ($(TARGET_TRIPLET),$(HOST_TRIPLET)) ifneq ($(TARGET_TRIPLET),$(HOST_TRIPLET))
ifeq ($(TARGET),mingw) ifeq ($(TARGET),mingw)
FLAVOUR_PREFIX ?= win32- FLAVOUR_PREFIX ?= win32-
FLAVOUR_SUFFIX ?= -win32 FLAVOUR_SUFFIX ?= -win32
FLAVOUR_PATH_PREFIX ?= win32/ FLAVOUR_PATH_PREFIX ?= win32/
FLAVOUR_PATH_SUFFIX ?= /win32 FLAVOUR_PATH_SUFFIX ?= /win32
else else
FLAVOUR_PREFIX ?= $(TARGET_TRIPLET)- FLAVOUR_PREFIX ?= $(TARGET_TRIPLET)-
FLAVOUR_SUFFIX ?= -$(TARGET_TRIPLET) FLAVOUR_SUFFIX ?= -$(TARGET_TRIPLET)
FLAVOUR_PATH_PREFIX ?= $(TARGET_TRIPLET)/ FLAVOUR_PATH_PREFIX ?= $(TARGET_TRIPLET)/
FLAVOUR_PATH_SUFFIX ?= /$(TARGET_TRIPLET) FLAVOUR_PATH_SUFFIX ?= /$(TARGET_TRIPLET)
endif endif
endif endif

32
make/plugin-defs.mk
View file

@ -1,29 +1,29 @@
IS_PLUGIN = true IS_PLUGIN = true
USE_PLUGIN_VERSION_LIB ?= true USE_PLUGIN_VERSION_LIB ?= true
PLUGIN_API ?= $(notdir $(shell cd ..; $(PWD))) PLUGIN_API ?= $(notdir $(shell cd ..; $(PWD)))
PLUGIN_NAME ?= $(notdir $(shell $(PWD))) PLUGIN_NAME ?= $(notdir $(shell $(PWD)))
PLUGIN_PREFIX ?= feedfs PLUGIN_PREFIX ?= feedfs
ifneq ($(TARGET),mingw) ifneq ($(TARGET),mingw)
PLUGIN_SUFFIX ?= so PLUGIN_SUFFIX ?= so
else else
PLUGIN_SUFFIX ?= dll PLUGIN_SUFFIX ?= dll
endif endif
ifneq ($(PLUGIN_PREFIX),) ifneq ($(PLUGIN_PREFIX),)
PLUGIN_PREFIX_ = $(PLUGIN_PREFIX)_ PLUGIN_PREFIX_ = $(PLUGIN_PREFIX)_
endif endif
PLUGIN_PREFIX_AND_API ?= $(PLUGIN_PREFIX_)$(PLUGIN_API) PLUGIN_PREFIX_AND_API ?= $(PLUGIN_PREFIX_)$(PLUGIN_API)
PLUGIN ?= $(PLUGIN_PREFIX_AND_API)_$(PLUGIN_NAME).$(PLUGIN_SUFFIX) PLUGIN ?= $(PLUGIN_PREFIX_AND_API)_$(PLUGIN_NAME).$(PLUGIN_SUFFIX)
CFLAGS += -D PLUGIN_NAME=$(PLUGIN_NAME) -D PLUGIN_NAME_STR=\"$(PLUGIN_NAME)\" CFLAGS += -D PLUGIN_NAME=$(PLUGIN_NAME) -D PLUGIN_NAME_STR=\"$(PLUGIN_NAME)\"
CPPFLAGS += -D PLUGIN_NAME=$(PLUGIN_NAME) -D PLUGIN_NAME_STR=\"$(PLUGIN_NAME)\" CPPFLAGS += -D PLUGIN_NAME=$(PLUGIN_NAME) -D PLUGIN_NAME_STR=\"$(PLUGIN_NAME)\"
ifeq ($(USE_PLUGIN_VERSION_LIB),true) ifeq ($(USE_PLUGIN_VERSION_LIB),true)
PLUGIN_VERSION_LIB_BASENAME = $(PLUGIN_PREFIX_AND_API)_version PLUGIN_VERSION_LIB_BASENAME = $(PLUGIN_PREFIX_AND_API)_version
PLUGIN_VERSION_LIB = $(BUILD_LIBDIR)/lib$(PLUGIN_VERSION_LIB_BASENAME).a PLUGIN_VERSION_LIB = $(BUILD_LIBDIR)/lib$(PLUGIN_VERSION_LIB_BASENAME).a
#INSTALLED_PLUGIN_VERSION_LIB = $(INSTALL_LIBDIR)/lib$(PLUGIN_VERSION_LIB_BASENAME).a #INSTALLED_PLUGIN_VERSION_LIB = $(INSTALL_LIBDIR)/lib$(PLUGIN_VERSION_LIB_BASENAME).a
PROJECT_LDFLAGS += -Wl,--whole-archive -l$(PLUGIN_VERSION_LIB_BASENAME) -Wl,--no-whole-archive PROJECT_LDFLAGS += -Wl,--whole-archive -l$(PLUGIN_VERSION_LIB_BASENAME) -Wl,--no-whole-archive
endif endif

8
make/profile.mk
View file

@ -3,14 +3,14 @@
# contact@jannet.de # contact@jannet.de
# $Id$ # $Id$
PATH_PROFILE ?= path-$(PROJECT).sh PATH_PROFILE ?= path-$(PROJECT).sh
EXE_SH = EXE_SH =
ifeq ($(PROFILE),) ifeq ($(PROFILE),)
PROFILE = $(PATH_PROFILE) PROFILE = $(PATH_PROFILE)
endif endif
PROFILE += $(filter-out $(PATH_PROFILE),$(wildcard *.sh)) PROFILE += $(filter-out $(PATH_PROFILE),$(wildcard *.sh))
include $(MODDIR)/make/defs.mk include $(MODDIR)/make/defs.mk
include $(MODDIR)/make/rules.mk include $(MODDIR)/make/rules.mk

24
make/profiler-defs.mk
View file

@ -1,30 +1,30 @@
all: all:
clean: clean:
PROF_EXE_PATH ?= $(EXE_PATH) PROF_EXE_PATH ?= $(EXE_PATH)
CALLGRIND_OUT ?= callgrind.out CALLGRIND_OUT ?= callgrind.out
OPROF_OUT_DIR ?= oprofile-data OPROF_OUT_DIR ?= oprofile-data
ifeq ($(USE_GPROF),true) ifeq ($(USE_GPROF),true)
PROJECT_CPPFLAGS += -pg PROJECT_CPPFLAGS += -pg
PROJECT_CFLAGS += -pg PROJECT_CFLAGS += -pg
PROJECT_LDFLAGS += -pg PROJECT_LDFLAGS += -pg
clean: clean.gprof clean: clean.gprof
endif endif
ifeq ($(COMPILER_SUITE),gcc) ifeq ($(COMPILER_SUITE),gcc)
ifeq ($(USE_GCOV),true) ifeq ($(USE_GCOV),true)
PROJECT_CPPFLAGS += -fprofile-arcs -ftest-coverage PROJECT_CPPFLAGS += -fprofile-arcs -ftest-coverage
PROJECT_CFLAGS += -fprofile-arcs -ftest-coverage PROJECT_CFLAGS += -fprofile-arcs -ftest-coverage
PROJECT_LDFLAGS += -fprofile-arcs -ftest-coverage PROJECT_LDFLAGS += -fprofile-arcs -ftest-coverage
clean: clean.gcov clean: clean.gcov
endif endif
endif endif
ifeq ($(COMPILER_SUITE),clang) ifeq ($(COMPILER_SUITE),clang)
ifeq ($(USE_XRAY),true) ifeq ($(USE_XRAY),true)
PROJECT_CPPFLAGS += -fxray-instrument -fxray-instruction-threshold=1 PROJECT_CPPFLAGS += -fxray-instrument -fxray-instruction-threshold=1
PROJECT_CFLAGS += -fxray-instrument -fxray-instruction-threshold=1 PROJECT_CFLAGS += -fxray-instrument -fxray-instruction-threshold=1
#PROJECT_LDFLAGS += -fxray-instrument #PROJECT_LDFLAGS += -fxray-instrument
endif endif
endif endif

34
make/proj.mk
View file

@ -3,11 +3,11 @@
# contact@jannet.de # contact@jannet.de
# $Id$ # $Id$
PROJECT = jw-build PROJECT = jw-build
MODDIR ?= $(TOPDIR) MODDIR ?= $(TOPDIR)
JANWARE_WIKI = priv JANWARE_WIKI = priv
REQUIRED = inst/pre \ REQUIRED = inst/pre \
make \ make \
doc \ doc \
debug misc slog platform \ debug misc slog platform \
@ -26,11 +26,11 @@ REQUIRED = inst/pre \
inst/post inst/post
# rpmdist.mk variable overrides # rpmdist.mk variable overrides
FTP_SRC_GROUP = ytsrc FTP_SRC_GROUP = ytsrc
FTP_RUN_GROUP = ytrun FTP_RUN_GROUP = ytrun
FTP_DEV_GROUP = ytdev FTP_DEV_GROUP = ytdev
FTP_FILE_MODE = 644 FTP_FILE_MODE = 644
FTP_DIR_MODE = 755 FTP_DIR_MODE = 755
ifeq ($(DEVELOPMENT),true) ifeq ($(DEVELOPMENT),true)
include $(TOPDIR)/make/cfg_dev.mk include $(TOPDIR)/make/cfg_dev.mk
@ -38,13 +38,13 @@ else
include $(TOPDIR)/make/cfg_dist.mk include $(TOPDIR)/make/cfg_dist.mk
endif endif
PREREQ_BUILD += jw-build PREREQ_BUILD += jw-build
USE_GLIB = true USE_GLIB = true
CFLAGS += -D_USRDLL -DJW_BUILD_EXPORTS CFLAGS += -D_USRDLL -DJW_BUILD_EXPORTS
CPPFLAGS += -D_USRDLL -DJW_BUILD_EXPORTS CPPFLAGS += -D_USRDLL -DJW_BUILD_EXPORTS
#DEBUG_FORMAT_FLAG ?= -gstabs+ #DEBUG_FORMAT_FLAG ?= -gstabs+
PROJECT_CFLAGS += $(DEBUG_FORMAT_FLAG) PROJECT_CFLAGS += $(DEBUG_FORMAT_FLAG)
PROJECT_CPPFLAGS += $(DEBUG_FORMAT_FLAG) PROJECT_CPPFLAGS += $(DEBUG_FORMAT_FLAG)
PROJECT_LDFLAGS += $(DEBUG_FORMAT_FLAG) PROJECT_LDFLAGS += $(DEBUG_FORMAT_FLAG)

90
make/projects-dir.mk
View file

@ -6,7 +6,7 @@
# #
# Some of its targets download software from janware GmbH servers. For those, # Some of its targets download software from janware GmbH servers. For those,
# you will need a janware.com user account. Ask admin@janware.com if you want # you will need a janware.com user account. Ask admin@janware.com if you want
# one, then define the JANWARE_USER=<janware user name> environment variable. # one, then define the JANWARE_USER = <janware user name> environment variable.
# #
# Current documentation on how this Makefile is meant to be used can be found # Current documentation on how this Makefile is meant to be used can be found
# under https://janware.com/wiki/pub/en/sw/build/. Running "make doc-module" # under https://janware.com/wiki/pub/en/sw/build/. Running "make doc-module"
@ -17,47 +17,47 @@
-include local.mk -include local.mk
SHELL = /bin/bash -o pipefail SHELL = /bin/bash -o pipefail
PROJECTS_TXT ?= projects.txt PROJECTS_TXT ?= projects.txt
JW_BUILD_VERBOSE ?= false JW_BUILD_VERBOSE ?= false
BASE_PKGS = git cvs make sudo BASE_PKGS = git cvs make sudo
PREREQ_RELEASE ?= pull PREREQ_RELEASE ?= pull
# ------------ evaluate Makefile and environment variables # ------------ evaluate Makefile and environment variables
ifneq ($(wildcard $(PROJECTS_TXT)),) ifneq ($(wildcard $(PROJECTS_TXT)),)
PROJECTS ?= $(shell cat $(PROJECTS_TXT) | sed '/^ *\#/ d') PROJECTS ?= $(shell cat $(PROJECTS_TXT) | sed '/^ *\#/ d')
else else
PROJECTS ?= $(shell ls -d */GNUmakefile */Makefile 2>/dev/null | sed 's%/[^/]*%%' | sort -u) PROJECTS ?= $(shell ls -d */GNUmakefile */Makefile 2>/dev/null | sed 's%/[^/]*%%' | sort -u)
endif endif
ifeq ($(JW_BUILD_VERBOSE),true) ifeq ($(JW_BUILD_VERBOSE),true)
SSH_WRAPPER_TRACE ?= -x SSH_WRAPPER_TRACE ?= -x
endif endif
export JW_BUILD_VERBOSE export JW_BUILD_VERBOSE
# ------------ external programs I # ------------ external programs I
CWD := $(dir $(abspath $(lastword $(MAKEFILE_LIST)))) CWD := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
MOD_SCRIPT_DIR = ./jw-build/scripts MOD_SCRIPT_DIR = ./jw-build/scripts
GET_OS_SH = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/get-os.sh /opt/jw-build/bin/get-os.sh) get-os-sh-not-found) GET_OS_SH = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/get-os.sh /opt/jw-build/bin/get-os.sh) get-os-sh-not-found)
SSH_WRAPPER_SH := $(CWD)/ssh-wrapper.sh SSH_WRAPPER_SH := $(CWD)/ssh-wrapper.sh
EXCLUDES_FILE ?= exclude.txt EXCLUDES_FILE ?= exclude.txt
EXCLUDES_FILES = $(wildcard exclude-$(shell $(GET_OS_SH) name 2>/dev/null).txt exclude-$(shell $(GET_OS_SH) 2>/dev/null).txt $(EXCLUDES_FILE)) EXCLUDES_FILES = $(wildcard exclude-$(shell $(GET_OS_SH) name 2>/dev/null).txt exclude-$(shell $(GET_OS_SH) 2>/dev/null).txt $(EXCLUDES_FILE))
ifneq ($(EXCLUDES_FILES),) ifneq ($(EXCLUDES_FILES),)
EXCLUDE_FROM_BUILD += $(shell sed 's/\#.*//g' $(EXCLUDES_FILES)) EXCLUDE_FROM_BUILD += $(shell sed 's/\#.*//g' $(EXCLUDES_FILES))
endif endif
TEXT_FILES_CACHE ?= text-files.txt TEXT_FILES_CACHE ?= text-files.txt
ifndef JANWARE_USER ifndef JANWARE_USER
ifneq ($(wildcard CVS/Root),) ifneq ($(wildcard CVS/Root),)
JANWARE_USER = $(shell sed '/^:ext/ !d; s/:ext:\([^@]\+\)@.*/\1/' CVS/Root) JANWARE_USER = $(shell sed '/^:ext/ !d; s/:ext:\([^@]\+\)@.*/\1/' CVS/Root)
$(warning Assuming JANWARE_USER=$(JANWARE_USER) from CVS/Root) $(warning Assuming JANWARE_USER=$(JANWARE_USER) from CVS/Root)
else else
JANWARE_USER = $(shell id -un) JANWARE_USER = $(shell id -un)
$(warning Assuming JANWARE_USER=$(JANWARE_USER) from id -un) $(warning Assuming JANWARE_USER=$(JANWARE_USER) from id -un)
endif endif
$(warning Explicitly set environment variable JANWARE_USER to turn off this warning!) $(warning Explicitly set environment variable JANWARE_USER to turn off this warning!)
@ -65,25 +65,25 @@ ifndef JANWARE_USER
endif endif
ifeq ($(JANWARE_USER),) ifeq ($(JANWARE_USER),)
OFFLINE ?= true OFFLINE ?= true
endif endif
ifeq ($(OFFLINE),true) ifeq ($(OFFLINE),true)
UNAVAILABLE_TARGETS ?= pull.done update.done clone.done UNAVAILABLE_TARGETS ?= pull.done update.done clone.done
else else
UNAVAILABLE_TARGETS ?= UNAVAILABLE_TARGETS ?=
export CVSROOT = :ext:$(JANWARE_USER)@cvs.janware.com:/srv/cvs export CVSROOT = :ext:$(JANWARE_USER)@cvs.janware.com:/srv/cvs
endif endif
ifneq ($(JW_BUILD_SSH),) ifneq ($(JW_BUILD_SSH),)
export CVS_RSH := $(JW_BUILD_SSH) export CVS_RSH := $(JW_BUILD_SSH)
else else
export CVS_RSH := $(SSH_WRAPPER_SH) export CVS_RSH := $(SSH_WRAPPER_SH)
endif endif
export GIT_SSH := $(CVS_RSH) export GIT_SSH := $(CVS_RSH)
ifeq ($(filter pkg-%,$(MAKECMDGOALS)),) ifeq ($(filter pkg-%,$(MAKECMDGOALS)),)
export JW_BUILD_SSH_EXTRA_OPTS += -o StrictHostKeyChecking=no -o ControlMaster=auto -o ControlPath=/tmp/%r@jw-build:%h:%p -o ControlPersist=3m -l $(JANWARE_USER) export JW_BUILD_SSH_EXTRA_OPTS+= -o StrictHostKeyChecking=no -o ControlMaster=auto -o ControlPath=/tmp/%r@jw-build:%h:%p -o ControlPersist=3m -l $(JANWARE_USER)
endif endif
ifneq ($(CLONE_FROM_USER),) ifneq ($(CLONE_FROM_USER),)
@ -93,33 +93,33 @@ else
endif endif
ifneq ($(EXCLUDE_FROM_BUILD),) ifneq ($(EXCLUDE_FROM_BUILD),)
PROJECTS_PY_EXTRA_BUILD_OPTS += --exclude "$(EXCLUDE_FROM_BUILD)" PROJECTS_PY_EXTRA_BUILD_OPTS+= --exclude "$(EXCLUDE_FROM_BUILD)"
endif endif
# ------------ external programs II # ------------ external programs II
BROWSER ?= xdg-open BROWSER ?= xdg-open
EDITOR ?= xdg-open EDITOR ?= xdg-open
ifeq ($(TIME),) ifeq ($(TIME),)
TIME = $(shell which time) -p TIME = $(shell which time) -p
endif endif
PROJECTS_PY = python2 $(MOD_SCRIPT_DIR)/projects.py --prefix $(shell pwd) $(PROJECTS_PY_EXTRA_OPTS) PROJECTS_PY = python2 $(MOD_SCRIPT_DIR)/projects.py --prefix $(shell pwd) $(PROJECTS_PY_EXTRA_OPTS)
PROJECTS_PY_BUILD = $(PROJECTS_PY) build $(PROJECTS_PY_EXTRA_BUILD_OPTS) PROJECTS_PY_BUILD = $(PROJECTS_PY) build $(PROJECTS_PY_EXTRA_BUILD_OPTS)
PGIT_SH = /bin/bash $(MOD_SCRIPT_DIR)/pgit.sh PGIT_SH = /bin/bash $(MOD_SCRIPT_DIR)/pgit.sh
PURGE_SH = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/purge-stale-projects.sh /opt/jw-build/bin/purge-stale-projects.sh) purge-not-found) PURGE_SH = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/purge-stale-projects.sh /opt/jw-build/bin/purge-stale-projects.sh) purge-not-found)
PKG_MANAGER_SH ?= /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/pkg-manager.sh /opt/jw-build/bin/pkg-manager.sh) pkg-manager-not-found) PKG_MANAGER_SH ?= /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/pkg-manager.sh /opt/jw-build/bin/pkg-manager.sh) pkg-manager-not-found)
CREATE_PROJECT_SH ?= /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/jw-build-create-project.sh /opt/jw-build/bin/jw-build-create-project.sh) jw-build-create-project-not-found) CREATE_PROJECT_SH ?= /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/jw-build-create-project.sh /opt/jw-build/bin/jw-build-create-project.sh) jw-build-create-project-not-found)
LIST_VCS_FILES_SH = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/scm.sh /opt/jw-build/bin/scm.sh) scm-sh-not-found) ls-files LIST_VCS_FILES_SH = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/scm.sh /opt/jw-build/bin/scm.sh) scm-sh-not-found) ls-files
JW_PKG = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/jw-pkg /opt/jw-build/bin/jw-pkg) jw-pkg-not-found) JW_PKG = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/jw-pkg /opt/jw-build/bin/jw-pkg) jw-pkg-not-found)
GIT_SRV_ADMIN_SH = JW_BUILD_SSH_EXTRA_OPTS="$(JW_BUILD_SSH_EXTRA_OPTS)" $(GIT_SSH) $(JANWARE_USER)@git.janware.com /opt/jw-build/bin/git-srv-admin.sh GIT_SRV_ADMIN_SH = JW_BUILD_SSH_EXTRA_OPTS="$(JW_BUILD_SSH_EXTRA_OPTS)" $(GIT_SSH) $(JANWARE_USER)@git.janware.com /opt/jw-build/bin/git-srv-admin.sh
CVS_ADMIN_SH = JW_BUILD_SSH_EXTRA_OPTS="$(JW_BUILD_SSH_EXTRA_OPTS)" $(GIT_SSH) $(JANWARE_USER)@cvs.janware.com /opt/jw-build/bin/cvs-admin.sh CVS_ADMIN_SH = JW_BUILD_SSH_EXTRA_OPTS="$(JW_BUILD_SSH_EXTRA_OPTS)" $(GIT_SSH) $(JANWARE_USER)@cvs.janware.com /opt/jw-build/bin/cvs-admin.sh
# ------------ projects to be built # ------------ projects to be built
TARGET_PROJECTS = $(filter-out $(EXCLUDE_FROM_BUILD),$(PROJECTS)) TARGET_PROJECTS = $(filter-out $(EXCLUDE_FROM_BUILD),$(PROJECTS))
BUILD_PROJECTS = $(shell $(PROJECTS_PY_BUILD) --build-order all $(TARGET_PROJECTS)) BUILD_PROJECTS = $(shell $(PROJECTS_PY_BUILD) --build-order all $(TARGET_PROJECTS))
GIT_PROJECTS = $(patsubst %/,%,$(dir $(wildcard $(addsuffix /.git,$(BUILD_PROJECTS))))) GIT_PROJECTS = $(patsubst %/,%,$(dir $(wildcard $(addsuffix /.git,$(BUILD_PROJECTS)))))
CVS_PROJECTS = $(patsubst %/,%,$(dir $(wildcard $(addsuffix /CVS,$(BUILD_PROJECTS))))) CVS_PROJECTS = $(patsubst %/,%,$(dir $(wildcard $(addsuffix /CVS,$(BUILD_PROJECTS)))))
# ------------ targets # ------------ targets

22
make/projects.mk
View file

@ -3,28 +3,28 @@
include $(MODDIR)/make/platform.mk include $(MODDIR)/make/platform.mk
# -- What do I know about myself? # -- What do I know about myself?
VERSION_FILE := $(firstword $(wildcard VERSION) $(TOPDIR)/VERSION) VERSION_FILE := $(firstword $(wildcard VERSION) $(TOPDIR)/VERSION)
ifndef DEVELOPMENT ifndef DEVELOPMENT
ifeq ($(wildcard $(VERSION_FILE)),) ifeq ($(wildcard $(VERSION_FILE)),)
DEVELOPMENT := true DEVELOPMENT := true
else else
DEVELOPMENT := $(shell grep -q 'dev' $(VERSION_FILE) && echo true) DEVELOPMENT := $(shell grep -q 'dev' $(VERSION_FILE) && echo true)
endif endif
endif endif
# -- Conclude the build system's location: # -- Conclude the build system's location:
PROJECTS_DIR ?= $(TOPDIR)/.. PROJECTS_DIR ?= $(TOPDIR)/..
ifeq ($(DEVELOPMENT),true) ifeq ($(DEVELOPMENT),true)
PRJS_DIR ?= $(PROJECTS_DIR) PRJS_DIR ?= $(PROJECTS_DIR)
else else
PRJS_DIR ?= /opt PRJS_DIR ?= /opt
endif endif
# -- Query the build system about other projects: # -- Query the build system about other projects:
PYTHON ?= /usr/bin/python2 PYTHON ?= /usr/bin/python2
ifneq ($(TOPDIR),) ifneq ($(TOPDIR),)
proj_query_cmd = $(PYTHON) $(MOD_SCRIPT_DIR)/projects.py -p $(PRJS_DIR) -t $(TOPDIR) $(PROJECTS_PY_EXTRA_ARGS) proj_query_cmd = $(PYTHON) $(MOD_SCRIPT_DIR)/projects.py -p $(PRJS_DIR) -t $(TOPDIR) $(PROJECTS_PY_EXTRA_ARGS)
proj_query = $(shell $(proj_query_cmd) $(1)) proj_query = $(shell $(proj_query_cmd) $(1))
proj_dir = $(call proj_query,proj-dir $(1)) proj_dir = $(call proj_query,proj-dir $(1))
htdocs_dir = $(call proj_query,htdocs-dir $(1)) htdocs_dir = $(call proj_query,htdocs-dir $(1))
endif endif

52
make/py-defs.mk
View file

@ -1,41 +1,41 @@
ENV_PYTHONPATH := $(PYTHONPATH) ENV_PYTHONPATH := $(PYTHONPATH)
PYTHON ?= python2 PYTHON ?= python2
#PYTHON = python3 #PYTHON = python3
ifneq ($(DEVELOPMENT),true) ifneq ($(DEVELOPMENT),true)
PY_SITE_PACKAGES_PATH = $(shell $(PYTHON) -c "import site; print site.getsitepackages()[0]") PY_SITE_PACKAGES_PATH = $(shell $(PYTHON) -c "import site; print site.getsitepackages()[0]")
else else
PY_SITE_PACKAGES_PATH = $(PREFIX)/python2/site-packages PY_SITE_PACKAGES_PATH = $(PREFIX)/python2/site-packages
endif endif
PY_PREREQ_BUILD ?= $(shell $(proj_query_cmd) pkg-requires --subsections jw -d ' ' -p --no-version build $(PROJECT)) PY_PREREQ_BUILD ?= $(shell $(proj_query_cmd) pkg-requires --subsections jw -d ' ' -p --no-version build $(PROJECT))
PY_PREREQ_BUILD_DIRS ?= $(shell $(proj_query_cmd) proj-dir $(PY_PREREQ_BUILD)) PY_PREREQ_BUILD_DIRS ?= $(shell $(proj_query_cmd) proj-dir $(PY_PREREQ_BUILD))
PY_PROJ_MODULE_DIRS ?= $(wildcard $(foreach subdir,/tools/python /src/python,$(addsuffix $(subdir),$(TOPDIR) $(PY_PREREQ_BUILD_DIRS)))) PY_PROJ_MODULE_DIRS ?= $(wildcard $(foreach subdir,/tools/python /src/python,$(addsuffix $(subdir),$(TOPDIR) $(PY_PREREQ_BUILD_DIRS))))
PY_MODULE_DIRS ?= $(PY_PROJ_MODULE_DIRS) PY_MODULE_DIRS ?= $(PY_PROJ_MODULE_DIRS)
PY_PROJ_MODULES += $(dir $(wildcard $(PY_MODULE_DIRS)/*/__init__.py)) PY_PROJ_MODULES += $(dir $(wildcard $(PY_MODULE_DIRS)/*/__init__.py))
PY_MODULES ?= $(PY_PROJ_MODULES) PY_MODULES ?= $(PY_PROJ_MODULES)
PY_SRC_PY ?= $(wildcard *.py) PY_SRC_PY ?= $(wildcard *.py)
PY_ALL_PY = $(sort $(PY_SRC_PY) __init__.py) PY_ALL_PY = $(sort $(PY_SRC_PY) __init__.py)
PY_PYC = $(patsubst %.py,%.pyc,$(PY_ALL_PY)) PY_PYC = $(patsubst %.py,%.pyc,$(PY_ALL_PY))
PY_INSTALL_PKG_MOD ?= $(shell $(PWD) | sed 's%.*/python/%%; s%/.*%%') PY_INSTALL_PKG_MOD ?= $(shell $(PWD) | sed 's%.*/python/%%; s%/.*%%')
PY_INSTALL_SUB_MOD ?= $(shell $(PWD) | sed "s%.*/$(PY_INSTALL_PKG_MOD)\(/\|$$\)%%") PY_INSTALL_SUB_MOD ?= $(shell $(PWD) | sed "s%.*/$(PY_INSTALL_PKG_MOD)\(/\|$$\)%%")
ifneq ($(PY_INSTALL_SUB_MOD),) ifneq ($(PY_INSTALL_SUB_MOD),)
PY_INSTALL_MOD ?= $(PY_INSTALL_PKG_MOD)/$(PY_INSTALL_SUB_MOD) PY_INSTALL_MOD ?= $(PY_INSTALL_PKG_MOD)/$(PY_INSTALL_SUB_MOD)
else else
PY_INSTALL_MOD ?= $(PY_INSTALL_PKG_MOD) PY_INSTALL_MOD ?= $(PY_INSTALL_PKG_MOD)
endif endif
PY_MOD ?= $(subst /,.,$(PY_INSTALL_MOD)) PY_MOD ?= $(subst /,.,$(PY_INSTALL_MOD))
PY_INSTALL_DIR ?= $(ENV_PREFIX)$(PY_SITE_PACKAGES_PATH)/$(patsubst .,/,$(PY_INSTALL_MOD)) PY_INSTALL_DIR ?= $(ENV_PREFIX)$(PY_SITE_PACKAGES_PATH)/$(patsubst .,/,$(PY_INSTALL_MOD))
PY_INSTALLED_REG = $(addprefix $(PY_INSTALL_DIR)/,$(PY_ALL_PY) $(PY_PYC)) PY_INSTALLED_REG = $(addprefix $(PY_INSTALL_DIR)/,$(PY_ALL_PY) $(PY_PYC))
empty := empty :=
space := $(empty) $(empty) space := $(empty) $(empty)
PYTHONPATH ?= $(call proj_query, pythonpath $(PROJECT)) PYTHONPATH ?= $(call proj_query, pythonpath $(PROJECT))
#PYTHONPATH = $(subst $(space),,$(ENV_PYTHONPATH)$(foreach d,$(PY_MODULE_DIRS),:$(d))) #PYTHONPATH = $(subst $(space),,$(ENV_PYTHONPATH)$(foreach d,$(PY_MODULE_DIRS),:$(d)))
export PYTHONPATH export PYTHONPATH
PY_DEFS_MK_INCLUDED := true PY_DEFS_MK_INCLUDED := true
ifneq ($(PY_DEFS_MK_INCLUDED),true) ifneq ($(PY_DEFS_MK_INCLUDED),true)
all: all:
clean: pyc.clean clean: pyc.clean

8
make/py-mod.mk
View file

@ -3,11 +3,11 @@ include $(MODDIR)/make/py-defs.mk
include $(MODDIR)/make/dirs.mk include $(MODDIR)/make/dirs.mk
include $(MODDIR)/make/dev-utils.mk include $(MODDIR)/make/dev-utils.mk
PY_INIT_TMPL = $(wildcard __init__.py.tmpl) PY_INIT_TMPL = $(wildcard __init__.py.tmpl)
PY_SED_EXTRACT_EXPORT ?= /\(class\|def\) ..*\# *export/ !d; s/\(class\|def\) *//; s/[(:].*// PY_SED_EXTRACT_EXPORT ?= /\(class\|def\) ..*\# *export/ !d; s/\(class\|def\) *//; s/[(:].*//
#leftparen:=( #leftparen := (
#PY_EXPORT ?= $(shell sed '/\(class\|def\) ..*\# *export/ !d; s/\(class\|def\) *//; s/[$(leftparen):].*//' $(PY_SRC_PY)) #PY_EXPORT ?= $(shell sed '/\(class\|def\) ..*\# *export/ !d; s/\(class\|def\) *//; s/[$(leftparen):].*//' $(PY_SRC_PY))
all: $(PY_PYC) all: $(PY_PYC)
install: install-dirs.done install-reg.done install: install-dirs.done install-reg.done

64
make/qt-defs.mk
View file

@ -1,14 +1,14 @@
ifeq ($(USE_QT),true) ifeq ($(USE_QT),true)
USE_X = true USE_X = true
CPPFLAGS += -DQT_THREAD_SUPPORT CPPFLAGS += -DQT_THREAD_SUPPORT
#ifeq ($(PKG_FORMAT),rpm) #ifeq ($(PKG_FORMAT),rpm)
#QT_VERSION ?= $(shell rpm -q --queryformat='%{VERSION}' --whatprovides qt) #QT_VERSION ?= $(shell rpm -q --queryformat='%{VERSION}' --whatprovides qt)
#else #else
#QT_VERSION = $(shell dpkg -s libqtcore4 | sed '^CVersion:/ !d; s/Version: *//') #QT_VERSION = $(shell dpkg -s libqtcore4 | sed '^CVersion:/ !d; s/Version: *//')
#endif #endif
#QT_MAJOR_VERSION ?= $(shell echo $(QT_VERSION) | cut -d\. -f1) #QT_MAJOR_VERSION ?= $(shell echo $(QT_VERSION) | cut -d\. -f1)
# #
#ifeq ($(QT_MAJOR_VERSION),2) #ifeq ($(QT_MAJOR_VERSION),2)
# QT_PREFIX ?= $(SYSTEM_LIBDIR)/qt2 # QT_PREFIX ?= $(SYSTEM_LIBDIR)/qt2
@ -42,9 +42,9 @@ CPPFLAGS += -DQT_THREAD_SUPPORT
# endif # endif
#endif #endif
# #
#MOC ?= $(QT_PREFIX)/bin/moc #MOC ?= $(QT_PREFIX)/bin/moc
#UIC ?= $(QT_PREFIX)/bin/uic #UIC ?= $(QT_PREFIX)/bin/uic
#RCC ?= $(QT_PREFIX)/bin/rcc #RCC ?= $(QT_PREFIX)/bin/rcc
# #
#ifdef REENTRANT #ifdef REENTRANT
# ifneq ($(QT_MAJOR_VERSION),4) # ifneq ($(QT_MAJOR_VERSION),4)
@ -67,7 +67,7 @@ CPPFLAGS += -DQT_THREAD_SUPPORT
#Qt5Designer \ #Qt5Designer \
ifeq ($(QT_MAJOR_VERSION),5) ifeq ($(QT_MAJOR_VERSION),5)
QT_MODULES ?= \ QT_MODULES ?= \
Qt5Concurrent \ Qt5Concurrent \
Qt5Core \ Qt5Core \
Qt5DBus \ Qt5DBus \
@ -95,7 +95,7 @@ QT_MODULES ?= \
Qt5XmlPatterns \ Qt5XmlPatterns \
Qt5Xml Qt5Xml
else else
QT_MODULES ?= \ QT_MODULES ?= \
Qt3Support \ Qt3Support \
QtCLucene \ QtCLucene \
QtCore \ QtCore \
@ -120,39 +120,39 @@ QT_MODULES ?= \
endif endif
QT_BIN_PREFIX ?= $(shell pkg-config --variable=host_bins $(QT_MODULES)) QT_BIN_PREFIX ?= $(shell pkg-config --variable=host_bins $(QT_MODULES))
MOC ?= $(QT_BIN_PREFIX)/moc MOC ?= $(QT_BIN_PREFIX)/moc
UIC ?= $(QT_BIN_PREFIX)/uic UIC ?= $(QT_BIN_PREFIX)/uic
RCC ?= $(QT_BIN_PREFIX)/rcc RCC ?= $(QT_BIN_PREFIX)/rcc
LPPFLAGS += $(QT_LDFLAGS) $(shell pkg-config --libs $(QT_MODULES)) LPPFLAGS += $(QT_LDFLAGS) $(shell pkg-config --libs $(QT_MODULES))
INCLUDE += $(QT_LDFLAGS) $(shell pkg-config --cflags $(QT_MODULES)) INCLUDE += $(QT_LDFLAGS) $(shell pkg-config --cflags $(QT_MODULES))
CPPFLAGS += -D_QT_MAJOR_=$(QT_MAJOR_VERSION) CPPFLAGS += -D_QT_MAJOR_=$(QT_MAJOR_VERSION)
# ------------------------------- jw-build defs # ------------------------------- jw-build defs
UIFILES += $(wildcard *.ui) UIFILES += $(wildcard *.ui)
RCCFILES += $(wildcard *.qrc) RCCFILES += $(wildcard *.qrc)
ifneq ($(wildcard *.h),) ifneq ($(wildcard *.h),)
MOC_H_HC += $(shell grep -l Q_OBJECT $(wildcard *.h)) MOC_H_HC += $(shell grep -l Q_OBJECT $(wildcard *.h))
endif endif
MOC_H_UI += $(patsubst %.ui,ui_%.h,$(UIFILES)) MOC_H_UI += $(patsubst %.ui,ui_%.h,$(UIFILES))
MOC_H += $(sort $(MOC_H_HC) $(MOC_H_UI)) MOC_H += $(sort $(MOC_H_HC) $(MOC_H_UI))
MOC_CPP += $(patsubst %.h,moc_%.cpp,$(notdir $(MOC_H_HC))) MOC_CPP += $(patsubst %.h,moc_%.cpp,$(notdir $(MOC_H_HC)))
# $(patsubst %.ui,moc_%.cpp,$(UIFILES)) \ # $(patsubst %.ui,moc_%.cpp,$(UIFILES)) \
RCC_CPP += $(patsubst %.qrc,rcc_%.cpp, $(RCCFILES)) RCC_CPP += $(patsubst %.qrc,rcc_%.cpp, $(RCCFILES))
ifeq ($(QT_MAJOR_VERSION),4) ifeq ($(QT_MAJOR_VERSION),4)
UIC_H += $(patsubst %.ui,ui_%.h, $(UIFILES)) UIC_H += $(patsubst %.ui,ui_%.h, $(UIFILES))
else else
UIC_H += $(patsubst %.ui,%.h, $(UIFILES)) UIC_H += $(patsubst %.ui,%.h, $(UIFILES))
LOCAL_CFLAGS += -fPIC LOCAL_CFLAGS += -fPIC
LOCAL_CPPFLAGS += -fPIC LOCAL_CPPFLAGS += -fPIC
endif endif
UIC_CPP += $(patsubst %.ui,uic_%.cpp, $(UIFILES)) UIC_CPP += $(patsubst %.ui,uic_%.cpp, $(UIFILES))
OBJ += $(patsubst %.cpp,%.o,$(MOC_CPP)) OBJ += $(patsubst %.cpp,%.o,$(MOC_CPP))
OBJ += $(patsubst %.cpp,%.o,$(UIC_CPP)) OBJ += $(patsubst %.cpp,%.o,$(UIC_CPP))
OBJ += $(patsubst %.cpp,%.o,$(RCC_CPP)) OBJ += $(patsubst %.cpp,%.o,$(RCC_CPP))
endif # USE_QT endif # USE_QT

134
make/rpmdist.mk
View file

@ -1,107 +1,107 @@
RPM_PROJECT ?= $(FLAVOUR_PREFIX)$(PROJECT) RPM_PROJECT ?= $(FLAVOUR_PREFIX)$(PROJECT)
ifeq ($(filter pkg-%,$(MAKECMDGOALS)),) ifeq ($(filter pkg-%,$(MAKECMDGOALS)),)
# also to be used from proj.mk, typically # also to be used from proj.mk, typically
BUILD_PROJECT_PACKAGE = false BUILD_PROJECT_PACKAGE = false
endif endif
RPM_VERSION ?= $(DIST_VERSION) RPM_VERSION ?= $(DIST_VERSION)
ifneq ($(BUILD_PROJECT_PACKAGE),false) ifneq ($(BUILD_PROJECT_PACKAGE),false)
UPLOAD_SH = $(MOD_SCRIPT_DIR)/upload.sh UPLOAD_SH = $(MOD_SCRIPT_DIR)/upload.sh
LOCAL_MKSPEC_SH ?= $(TOPDIR)/make/mkspec.sh LOCAL_MKSPEC_SH ?= $(TOPDIR)/make/mkspec.sh
MKSPEC_SH ?= $(MOD_SCRIPT_DIR)/mkspec-wrapper.sh $(LOCAL_MKSPEC_SH) MKSPEC_SH ?= $(MOD_SCRIPT_DIR)/mkspec-wrapper.sh $(LOCAL_MKSPEC_SH)
FTP_SRC_GROUP ?= $(shell id -g) FTP_SRC_GROUP ?= $(shell id -g)
FTP_SRC_USER ?= $(shell whoami) FTP_SRC_USER ?= $(shell whoami)
FTP_RUN_GROUP ?= $(shell id -g) FTP_RUN_GROUP ?= $(shell id -g)
FTP_RUN_USER ?= $(shell whoami) FTP_RUN_USER ?= $(shell whoami)
FTP_DEV_GROUP ?= $(shell id -g) FTP_DEV_GROUP ?= $(shell id -g)
FTP_DEV_USER ?= $(shell whoami) FTP_DEV_USER ?= $(shell whoami)
FTP_HOST ?= pkg.janware.com FTP_HOST ?= pkg.janware.com
FTP_FILE_MODE ?= 644 FTP_FILE_MODE ?= 644
FTP_DIR_MODE ?= 755 FTP_DIR_MODE ?= 755
FTP_HOST_LOGIN ?= root FTP_HOST_LOGIN ?= root
RELEASES_FILE = $(TOPDIR)/RELEASES$(FLAVOUR_SUFFIX) RELEASES_FILE = $(TOPDIR)/RELEASES$(FLAVOUR_SUFFIX)
RELEASES ?= $(shell $(PKG_SH_EXE) version \ RELEASES ?= $(shell $(PKG_SH_EXE) version \
-p $(OS_NAME_VERSION)/$(RPM_ARCH) $(RELEASES_FILE) read | $(SED) 's/-dev//') -p $(OS_NAME_VERSION)/$(RPM_ARCH) $(RELEASES_FILE) read | $(SED) 's/-dev//')
RPMBUILD ?= pkgbuild RPMBUILD ?= pkgbuild
CHECK_CVS_SYNC_BEFORE_RPM_RELEASE ?= true CHECK_CVS_SYNC_BEFORE_RPM_RELEASE?= true
HASH = $(shell $(cvs_files) -z | \ HASH = $(shell $(cvs_files) -z | \
grep -vz "CHANGES\|VERSION\|HASH\|MD5SUMS\|RELEASES" | \ grep -vz "CHANGES\|VERSION\|HASH\|MD5SUMS\|RELEASES" | \
xargs -0 md5sum | md5sum | $(SED) 's/ .*//') xargs -0 md5sum | md5sum | $(SED) 's/ .*//')
LOCAL_REPO ?= /srv/dav/pub/local/packages/suse/$(OS_NAME_VERSION) LOCAL_REPO ?= /srv/dav/pub/local/packages/suse/$(OS_NAME_VERSION)
include $(MODDIR)/make/tag-defs.mk include $(MODDIR)/make/tag-defs.mk
DIST_DIR = dist DIST_DIR = dist
DIST_SRC_DIR = $(DIST_DIR)/src/$(RPM_PROJECT)-$(RPM_VERSION) DIST_SRC_DIR = $(DIST_DIR)/src/$(RPM_PROJECT)-$(RPM_VERSION)
DIST_PCKG_DIR = $(DIST_DIR)/pckg DIST_PCKG_DIR = $(DIST_DIR)/pckg
#DIST_FILE = $(DIST_PCKG_DIR)/$(PROJECT)-$(DIST_VERSION).tar.gz #DIST_FILE = $(DIST_PCKG_DIR)/$(PROJECT)-$(DIST_VERSION).tar.gz
UPLOAD_SRC_DIR = $(DIST_PCKG_DIR) UPLOAD_SRC_DIR = $(DIST_PCKG_DIR)
PCKG_TAR ?= $(RPM_PROJECT)-$(RPM_VERSION).tar.gz PCKG_TAR ?= $(RPM_PROJECT)-$(RPM_VERSION).tar.gz
ifeq ($(PKG_FORMAT),debian) ifeq ($(PKG_FORMAT),debian)
# too bad: debian Requires: somepkg = 1.2.3 isn't satisfied by somepkg-1.2.3-5 # too bad: debian Requires: somepkg = 1.2.3 isn't satisfied by somepkg-1.2.3-5
PROJ_QUERY_PKG_REQUIRES_EXTRA_ARGS = --dont-strip-revision PROJ_QUERY_PKG_REQUIRES_EXTRA_ARGS = --dont-strip-revision
PCKG_RPM_RUN_I386 ?= $(RPM_PROJECT)-run_$(RPM_VERSION)_$(RPM_ARCH).deb PCKG_RPM_RUN_I386 ?= $(RPM_PROJECT)-run_$(RPM_VERSION)_$(RPM_ARCH).deb
ifeq ($(CREATE_DEVEL),true) ifeq ($(CREATE_DEVEL),true)
PCKG_RPM_DEVEL_I386 ?= $(RPM_PROJECT)-devel_$(RPM_VERSION)_$(RPM_ARCH).deb PCKG_RPM_DEVEL_I386 ?= $(RPM_PROJECT)-devel_$(RPM_VERSION)_$(RPM_ARCH).deb
endif endif
PCKG_RPM_SRC ?= $(RPM_PROJECT)-$(RPM_VERSION).src.deb.keinplan PCKG_RPM_SRC ?= $(RPM_PROJECT)-$(RPM_VERSION).src.deb.keinplan
else else
PCKG_RPM_RUN_I386 ?= $(RPM_PROJECT)-run-$(RPM_VERSION).$(RPM_ARCH).rpm PCKG_RPM_RUN_I386 ?= $(RPM_PROJECT)-run-$(RPM_VERSION).$(RPM_ARCH).rpm
ifeq ($(CREATE_DEVEL),true) ifeq ($(CREATE_DEVEL),true)
PCKG_RPM_DEVEL_I386 ?= $(RPM_PROJECT)-devel-$(RPM_VERSION).$(RPM_ARCH).rpm PCKG_RPM_DEVEL_I386 ?= $(RPM_PROJECT)-devel-$(RPM_VERSION).$(RPM_ARCH).rpm
endif endif
PCKG_RPM_SRC ?= $(RPM_PROJECT)-$(RPM_VERSION).src.rpm PCKG_RPM_SRC ?= $(RPM_PROJECT)-$(RPM_VERSION).src.rpm
endif endif
include $(MODDIR)/make/upload-defs-rpm.mk include $(MODDIR)/make/upload-defs-rpm.mk
DIST_FILES = $(shell echo $(REMOTE_TARGETS) | $(SED) 's/\b.*\///g; s/:.*\b//g') DIST_FILES = $(shell echo $(REMOTE_TARGETS) | $(SED) 's/\b.*\///g; s/:.*\b//g')
GENERATED = $(sort $(shell find . -name '*.in' | \ GENERATED = $(sort $(shell find . -name '*.in' | \
$(SED) "s/\.in$$//; s%$(DIST_SRC_DIR)%%; s%^[./]*%%")) $(SED) "s/\.in$$//; s%$(DIST_SRC_DIR)%%; s%^[./]*%%"))
ifeq ($(PKG_FORMAT),debian) ifeq ($(PKG_FORMAT),debian)
RPMS_DIR = $(TOPDIR)/dist/src RPMS_DIR = $(TOPDIR)/dist/src
SRPMS_DIR = $(TOPDIR)/dist/src SRPMS_DIR = $(TOPDIR)/dist/src
else else
ifeq ($(BUILD_USER),root) ifeq ($(BUILD_USER),root)
RPMS_BUILD_DIR = /usr/src/packages RPMS_BUILD_DIR = /usr/src/packages
else else
RPMS_BUILD_DIR = $(HOME)/rpmbuild RPMS_BUILD_DIR = $(HOME)/rpmbuild
endif endif
RPMS_DIR = $(RPMS_BUILD_DIR)/RPMS/$(RPM_ARCH) RPMS_DIR = $(RPMS_BUILD_DIR)/RPMS/$(RPM_ARCH)
SRPMS_DIR = $(RPMS_BUILD_DIR)/SRPMS SRPMS_DIR = $(RPMS_BUILD_DIR)/SRPMS
endif endif
DIST_DIRS = $(DIST_SRC_DIR) $(DIST_PCKG_DIR) DIST_DIRS = $(DIST_SRC_DIR) $(DIST_PCKG_DIR)
BINARY_RPM = $(DIST_PCKG_DIR)/$(PCKG_RPM_RUN_I386) BINARY_RPM = $(DIST_PCKG_DIR)/$(PCKG_RPM_RUN_I386)
ifeq ($(CREATE_DEVEL),true) ifeq ($(CREATE_DEVEL),true)
BINARY_RPM += $(DIST_PCKG_DIR)/$(PCKG_RPM_DEVEL_I386) BINARY_RPM += $(DIST_PCKG_DIR)/$(PCKG_RPM_DEVEL_I386)
endif endif
DIST_PCKG_SRPM = $(BINARY_RPM) $(DIST_PCKG_DIR)/$(PCKG_RPM_SRC) DIST_PCKG_SRPM = $(BINARY_RPM) $(DIST_PCKG_DIR)/$(PCKG_RPM_SRC)
RPM_REQUIRES_DEVEL += $(call proj_query, pkg-requires --dont-expand-version-macros $(PROJ_QUERY_PKG_REQUIRES_EXTRA_ARGS) devel $(PROJECT)) RPM_REQUIRES_DEVEL += $(call proj_query, pkg-requires --dont-expand-version-macros $(PROJ_QUERY_PKG_REQUIRES_EXTRA_ARGS) devel $(PROJECT))
RPM_REQUIRES_RUN += $(call proj_query, pkg-requires --dont-expand-version-macros $(PROJ_QUERY_PKG_REQUIRES_EXTRA_ARGS) run $(PROJECT)) RPM_REQUIRES_RUN += $(call proj_query, pkg-requires --dont-expand-version-macros $(PROJ_QUERY_PKG_REQUIRES_EXTRA_ARGS) run $(PROJECT))
RPM_CONFLICTS_DEVEL += $(call proj_query, pkg-conflicts --dont-expand-version-macros $(PROJ_QUERY_PKG_CONFLICTS_EXTRA_ARGS) devel $(PROJECT)) RPM_CONFLICTS_DEVEL += $(call proj_query, pkg-conflicts --dont-expand-version-macros $(PROJ_QUERY_PKG_CONFLICTS_EXTRA_ARGS) devel $(PROJECT))
RPM_CONFLICTS_RUN += $(call proj_query, pkg-conflicts --dont-expand-version-macros $(PROJ_QUERY_PKG_CONFLICTS_EXTRA_ARGS) run $(PROJECT)) RPM_CONFLICTS_RUN += $(call proj_query, pkg-conflicts --dont-expand-version-macros $(PROJ_QUERY_PKG_CONFLICTS_EXTRA_ARGS) run $(PROJECT))
RPM_PROVIDES_DEVEL += $(call proj_query, pkg-provides --dont-expand-version-macros $(PROJ_QUERY_PKG_PROVIDES_EXTRA_ARGS) devel $(PROJECT)) RPM_PROVIDES_DEVEL += $(call proj_query, pkg-provides --dont-expand-version-macros $(PROJ_QUERY_PKG_PROVIDES_EXTRA_ARGS) devel $(PROJECT))
RPM_PROVIDES_RUN += $(call proj_query, pkg-provides --dont-expand-version-macros $(PROJ_QUERY_PKG_PROVIDES_EXTRA_ARGS) run $(PROJECT)) RPM_PROVIDES_RUN += $(call proj_query, pkg-provides --dont-expand-version-macros $(PROJ_QUERY_PKG_PROVIDES_EXTRA_ARGS) run $(PROJECT))
RPM_UPLOAD_OS_NAME = $(shell echo $(OS_NAME_VERSION) | sed 's/-.*//') RPM_UPLOAD_OS_NAME = $(shell echo $(OS_NAME_VERSION) | sed 's/-.*//')
RPM_UPLOAD_OS_VERSION = $(shell echo $(OS_NAME_VERSION) | sed 's/[^-]\+-//') RPM_UPLOAD_OS_VERSION = $(shell echo $(OS_NAME_VERSION) | sed 's/[^-]\+-//')
RPM_UPLOAD_URLPREFIX ?= rsync_ssh://root@pkg.janware.com:/srv/dav/pub/packages/linux/$(RPM_UPLOAD_OS_NAME)/$(RPM_UPLOAD_OS_VERSION) RPM_UPLOAD_URLPREFIX ?= rsync_ssh://root@pkg.janware.com:/srv/dav/pub/packages/linux/$(RPM_UPLOAD_OS_NAME)/$(RPM_UPLOAD_OS_VERSION)
RPM_UPLOAD_USER ?= $(shell id -un) RPM_UPLOAD_USER ?= $(shell id -un)
RPM_UPLOAD_GROUP ?= $(shell id -gn) RPM_UPLOAD_GROUP ?= $(shell id -gn)
RPM_UPLOAD_FILE_ATTRIB ?= 644:755:$(RPM_UPLOAD_USER).$(RPM_UPLOAD_GROUP) RPM_UPLOAD_FILE_ATTRIB ?= 644:755:$(RPM_UPLOAD_USER).$(RPM_UPLOAD_GROUP)
unexport RPM_VERSION VERSION DIST_SRC_DIR unexport RPM_VERSION VERSION DIST_SRC_DIR
include $(MODDIR)/make/tag-rules.mk include $(MODDIR)/make/tag-rules.mk
include $(MODDIR)/make/upload-rules.mk include $(MODDIR)/make/upload-rules.mk
PKG_SH = $(PKG_SH_EXE) \ PKG_SH = $(PKG_SH_EXE) \
-N $(RPM_PROJECT) -P $(PROJECT) \ -N $(RPM_PROJECT) -P $(PROJECT) \
-R "$(RPM_REQUIRES_RUN)" -D "$(RPM_REQUIRES_DEVEL)" \ -R "$(RPM_REQUIRES_RUN)" -D "$(RPM_REQUIRES_DEVEL)" \
-X "$(RPM_CONFLICTS_RUN)" -Y "$(RPM_CONFLICTS_DEVEL)" \ -X "$(RPM_CONFLICTS_RUN)" -Y "$(RPM_CONFLICTS_DEVEL)" \
@ -229,10 +229,10 @@ update-repo.dist: upload.dist
ifeq ($(wildcard $(TOPDIR)/.git),) ifeq ($(wildcard $(TOPDIR)/.git),)
SCM_COMMIT = cvs commit SCM_COMMIT = cvs commit
SCM_ADD = cvs add SCM_ADD = cvs add
SCM_PUSH = SCM_PUSH =
SCM_PULL = cvs update -dP SCM_PULL = cvs update -dP
define check_scm_sync define check_scm_sync
echo + checking cvs ;\ echo + checking cvs ;\
@ -255,10 +255,10 @@ endef
else else
SCM_COMMIT = git commit SCM_COMMIT = git commit
SCM_ADD = git add SCM_ADD = git add
SCM_PUSH = git push SCM_PUSH = git push
SCM_PULL = git pull SCM_PULL = git pull
define check_scm_sync define check_scm_sync
echo + checking git ;\ echo + checking git ;\

28
make/run.mk
View file

@ -6,43 +6,43 @@
include $(MODDIR)/make/defs.mk include $(MODDIR)/make/defs.mk
include $(MODDIR)/make/defs-cpp.mk include $(MODDIR)/make/defs-cpp.mk
DIR_BASENAME = $(notdir $(shell $(PWD))) DIR_BASENAME = $(notdir $(shell $(PWD)))
ifeq ($(EXE_BASENAME),) ifeq ($(EXE_BASENAME),)
ifneq ($(DIR_BASENAME),test) ifneq ($(DIR_BASENAME),test)
EXE_BASENAME = $(DIR_BASENAME) EXE_BASENAME = $(DIR_BASENAME)
else else
EXE_BASENAME = test-$(notdir $(shell cd ..; $(PWD))) EXE_BASENAME = test-$(notdir $(shell cd ..; $(PWD)))
endif endif
endif endif
ifneq ($(EXE_BASENAME),) ifneq ($(EXE_BASENAME),)
ifneq ($(TARGET),mingw) ifneq ($(TARGET),mingw)
EXE ?= $(EXE_BASENAME) EXE ?= $(EXE_BASENAME)
SHORTCUT_SCRIPT ?= ./run.sh SHORTCUT_SCRIPT ?= ./run.sh
else else
EXE ?= $(EXE_BASENAME).exe EXE ?= $(EXE_BASENAME).exe
SHORTCUT_SCRIPT ?= run.bat SHORTCUT_SCRIPT ?= run.bat
endif endif
endif endif
EXE_PATH ?= ./$(EXE) EXE_PATH ?= ./$(EXE)
CHECK_CONF_EXE ?= $(firstword $(wildcard $(PROJECTS_DIR)/valdi/bin/checkconf) checkconf) CHECK_CONF_EXE ?= $(firstword $(wildcard $(PROJECTS_DIR)/valdi/bin/checkconf) checkconf)
LOCAL_CFLAGS += -DEXE_NAME=\"$(EXE)\" LOCAL_CFLAGS += -DEXE_NAME=\"$(EXE)\"
LOCAL_CPPFLAGS += -DEXE_NAME=\"$(EXE)\" LOCAL_CPPFLAGS += -DEXE_NAME=\"$(EXE)\"
include $(MODDIR)/make/profiler.mk include $(MODDIR)/make/profiler.mk
BUILD_HDR = BUILD_HDR =
include $(MODDIR)/make/rules.mk include $(MODDIR)/make/rules.mk
include $(MODDIR)/make/ldlibpath.mk include $(MODDIR)/make/ldlibpath.mk
include $(MODDIR)/make/path-rules.mk include $(MODDIR)/make/path-rules.mk
include $(MODDIR)/make/debugger.mk include $(MODDIR)/make/debugger.mk
EXE_ARGS += $(LOCAL_EXE_ARGS) EXE_ARGS += $(LOCAL_EXE_ARGS)
ifneq ($(wildcard local.supp),) ifneq ($(wildcard local.supp),)
VALGRIND_OPTS += --suppressions=local.supp VALGRIND_OPTS += --suppressions=local.supp
endif endif
all: all:

16
make/smart-selection.mk
View file

@ -1,14 +1,14 @@
# === variable definitions # === variable definitions
GET_OS_SH = sh $(MOD_SCRIPT_DIR)/get-os.sh GET_OS_SH = sh $(MOD_SCRIPT_DIR)/get-os.sh
GENERATE_SELECTION = sh $(MOD_SCRIPT_DIR)/generate_selection.sh GENERATE_SELECTION = sh $(MOD_SCRIPT_DIR)/generate_selection.sh
UPLOAD_SH = sh $(MOD_SCRIPT_DIR)/upload.sh UPLOAD_SH = sh $(MOD_SCRIPT_DIR)/upload.sh
DISTRIBUTOR = $(shell $(GET_OS_SH) | cut -d- -f1) DISTRIBUTOR = $(shell $(GET_OS_SH) | cut -d- -f1)
DISTRO_RELEASE = $(shell $(GET_OS_SH) | cut -d- -f2-) DISTRO_RELEASE = $(shell $(GET_OS_SH) | cut -d- -f2-)
UPLOAD_URL = root@pkg.janware.com:/srv/ftp/pub/packages/linux/$(DISTRIBUTOR)/$(DISTRO_RELEASE)/setup/descr UPLOAD_URL = root@pkg.janware.com:/srv/ftp/pub/packages/linux/$(DISTRIBUTOR)/$(DISTRO_RELEASE)/setup/descr
SELECTION = $(shell $(GENERATE_SELECTION) -s)-packages.txt SELECTION = $(shell $(GENERATE_SELECTION) -s)-packages.txt
CHANNEL_LIST = $(shell $(GENERATE_SELECTION) -s)-channels.txt CHANNEL_LIST = $(shell $(GENERATE_SELECTION) -s)-channels.txt
# === targets # === targets
all: selection.done channels.done all: selection.done channels.done

10
make/so.mk
View file

@ -6,11 +6,11 @@
include $(MODDIR)/make/defs.mk include $(MODDIR)/make/defs.mk
include $(MODDIR)/make/defs-cpp.mk include $(MODDIR)/make/defs-cpp.mk
LDFLAGS += -shared LDFLAGS += -shared
BUILD_SHOBJS = $(addprefix $(BUILD_LIBDIR)/, $(SHOBJS)) BUILD_SHOBJS = $(addprefix $(BUILD_LIBDIR)/, $(SHOBJS))
SHOBJS = $(patsubst %.cpp,$(SO_PREFIX)%.so,$(patsubst %.cc,$(SO_PREFIX)%.so,$(patsubst %.c,$(SO_PREFIX)%.so,$(SRC_ALL_CPP)))) SHOBJS = $(patsubst %.cpp,$(SO_PREFIX)%.so,$(patsubst %.cc,$(SO_PREFIX)%.so,$(patsubst %.c,$(SO_PREFIX)%.so,$(SRC_ALL_CPP))))
INSTALLED_SHOBJS += $(addprefix $(INSTALL_LIBDIR)/,$(SHOBJS)) INSTALLED_SHOBJS += $(addprefix $(INSTALL_LIBDIR)/,$(SHOBJS))
INSTALLED_ALL_LIBS += $(INSTALLED_SHOBJS) INSTALLED_ALL_LIBS += $(INSTALLED_SHOBJS)
include $(MODDIR)/make/ldlibpath.mk include $(MODDIR)/make/ldlibpath.mk
include $(MODDIR)/make/debugger.mk include $(MODDIR)/make/debugger.mk

8
make/song.mk
View file

@ -1,7 +1,7 @@
CHORD := $(firstword $(shell which chordpro chordii chord)) CHORD := $(firstword $(shell which chordpro chordii chord))
CHOPRO = $(wildcard *.chopro *.cho *.CHOPRO) CHOPRO = $(wildcard *.chopro *.cho *.CHOPRO)
CHOPRO_PDF = $(addsuffix .pdf,$(basename $(CHOPRO))) CHOPRO_PDF = $(addsuffix .pdf,$(basename $(CHOPRO)))
CHOPRO_PS = $(addsuffix .ps,$(basename $(CHOPRO))) CHOPRO_PS = $(addsuffix .ps,$(basename $(CHOPRO)))
all: $(CHOPRO_PDF) all: $(CHOPRO_PDF)
install: install:

20
make/srcdist.mk
View file

@ -1,19 +1,19 @@
ifeq ($(VCS),cvs) ifeq ($(VCS),cvs)
WD_PKG_VCS_SUFFIX = -cvs WD_PKG_VCS_SUFFIX = -cvs
WD_PKG_VCS_FILES = $(shell find . -name CVS) WD_PKG_VCS_FILES = $(shell find . -name CVS)
else ifeq ($(VCS),git) else ifeq ($(VCS),git)
WD_PKG_VCS_SUFFIX = -git WD_PKG_VCS_SUFFIX = -git
WD_PKG_VCS_FILES = .git WD_PKG_VCS_FILES = .git
endif endif
WD_PKG_DIR = dist/wd WD_PKG_DIR = dist/wd
WD_PKG_BASE_NAME = $(RPM_PROJECT)$(WD_PKG_VCS_SUFFIX)-$(RPM_VERSION) WD_PKG_BASE_NAME = $(RPM_PROJECT)$(WD_PKG_VCS_SUFFIX)-$(RPM_VERSION)
WD_PKG = $(WD_PKG_BASE_NAME).tar.bz2 WD_PKG = $(WD_PKG_BASE_NAME).tar.bz2
WD_PKG_PATH = $(WD_PKG_DIR)/$(WD_PKG) WD_PKG_PATH = $(WD_PKG_DIR)/$(WD_PKG)
# -- upload-defs.mk variables # -- upload-defs.mk variables
UPLOAD_FILES += $(WD_PKG_PATH) UPLOAD_FILES += $(WD_PKG_PATH)
UPLOAD_SRC_DIR = $(WD_PKG_DIR) UPLOAD_SRC_DIR = $(WD_PKG_DIR)
include $(MODDIR)/make/upload-defs.mk include $(MODDIR)/make/upload-defs.mk

16
make/standalone-exe.mk
View file

@ -3,19 +3,19 @@
# contact@jannet.de # contact@jannet.de
# $Id$ # $Id$
VERSION ?= 0.0.0.0-dev VERSION ?= 0.0.0.0-dev
DIST_VERSION ?= $(VERSION) DIST_VERSION ?= $(VERSION)
#USE_CFG_XXX_MK ?= false #USE_CFG_XXX_MK ?= false
USE_PROJECT_LIB ?= false USE_PROJECT_LIB ?= false
DEVELOPMENT ?= true DEVELOPMENT ?= true
PROJECTS_DIR := $(dir $(lastword $(MAKEFILE_LIST)))/../.. PROJECTS_DIR := $(dir $(lastword $(MAKEFILE_LIST)))/../..
ifeq ($(PROJECT),) ifeq ($(PROJECT),)
PROJECT = $(notdir $(shell $(PWD))) PROJECT = $(notdir $(shell $(PWD)))
endif endif
ifeq ($(PREFIX),) ifeq ($(PREFIX),)
PREFIX = $(HOME)/opt/$(PROJECT) PREFIX = $(HOME)/opt/$(PROJECT)
endif endif
include $(MODDIR)/make/run.mk include $(MODDIR)/make/run.mk

36
make/subtree.mk
View file

@ -1,29 +1,29 @@
ifeq ($(DEVELOPMENT),false) ifeq ($(DEVELOPMENT),false)
SUBTREE_OWNER ?= root SUBTREE_OWNER ?= root
SUBTREE_GROUP ?= root SUBTREE_GROUP ?= root
SUBTREE_MODE ?= 0644 SUBTREE_MODE ?= 0644
SUBTREE_DIROWNER ?= root SUBTREE_DIROWNER ?= root
SUBTREE_DIRGROUP ?= root SUBTREE_DIRGROUP ?= root
SUBTREE_DIRMODE ?= 0755 SUBTREE_DIRMODE ?= 0755
else else
SUBTREE_OWNER ?= $(shell id -un) SUBTREE_OWNER ?= $(shell id -un)
SUBTREE_GROUP ?= $(shell id -gn) SUBTREE_GROUP ?= $(shell id -gn)
SUBTREE_MODE ?= 0644 SUBTREE_MODE ?= 0644
SUBTREE_DIROWNER ?= $(shell id -un) SUBTREE_DIROWNER ?= $(shell id -un)
SUBTREE_DIRGROUP ?= $(shell id -gn) SUBTREE_DIRGROUP ?= $(shell id -gn)
SUBTREE_DIRMODE ?= 0755 SUBTREE_DIRMODE ?= 0755
SUBTREE_INSTALL_PREFIX ?= /srv/www/proj/$(PROJECT) SUBTREE_INSTALL_PREFIX ?= /srv/www/proj/$(PROJECT)
endif endif
#ifeq ($(SUBTREE_SRC),) #ifeq ($(SUBTREE_SRC),)
#SUBTREE_SRC = $(shell find .) #SUBTREE_SRC = $(shell find .)
#endif #endif
SUBTREE_DIRS += $(shell for f in `git ls-files . 2>/dev/null || find | sed 's%/[^/]\+$$%%' | sort -u | grep -v "Makefile\|GNUmakefile"`; do if [ -d "$$f" ]; then echo $$f; fi; done) SUBTREE_DIRS += $(shell for f in `git ls-files . 2>/dev/null || find | sed 's%/[^/]\+$$%%' | sort -u | grep -v "Makefile\|GNUmakefile"`; do if [ -d "$$f" ]; then echo $$f; fi; done)
SUBTREE_FILES += $(shell for f in `git ls-files . 2>/dev/null || find | grep -v "Makefile\|GNUmakefile"`; do if [ -f "$$f" ]; then echo $$f; fi; done) SUBTREE_FILES += $(shell for f in `git ls-files . 2>/dev/null || find | grep -v "Makefile\|GNUmakefile"`; do if [ -f "$$f" ]; then echo $$f; fi; done)
INSTALLED_SUBTREE_DIRS = $(addprefix $(ENV_PREFIX)$(SUBTREE_INSTALL_PREFIX)/,$(SUBTREE_DIRS)) INSTALLED_SUBTREE_DIRS = $(addprefix $(ENV_PREFIX)$(SUBTREE_INSTALL_PREFIX)/,$(SUBTREE_DIRS))
INSTALLED_SUBTREE_FILES = $(addprefix $(ENV_PREFIX)$(SUBTREE_INSTALL_PREFIX)/,$(SUBTREE_FILES)) INSTALLED_SUBTREE_FILES = $(addprefix $(ENV_PREFIX)$(SUBTREE_INSTALL_PREFIX)/,$(SUBTREE_FILES))
include $(MODDIR)/make/defs.mk include $(MODDIR)/make/defs.mk

12
make/suse-selection.mk
View file

@ -1,12 +1,12 @@
MODDIR = $(HOME)/local/src/cvs.main/proj/jw-build MODDIR = $(HOME)/local/src/cvs.main/proj/jw-build
include $(MODDIR)/make/defs.mk include $(MODDIR)/make/defs.mk
GENERATE_SELECTION = $(MOD_SCRIPT_DIR)/generate_selection.sh GENERATE_SELECTION = $(MOD_SCRIPT_DIR)/generate_selection.sh
SUSE_RELEASE = 10.1 SUSE_RELEASE = 10.1
UPLOAD_URL = root@pkg.janware.com:/srv/dav/pub/packages/linux/suse/$(SUSE_RELEASE)/setup/descr UPLOAD_URL = root@pkg.janware.com:/srv/dav/pub/packages/linux/suse/$(SUSE_RELEASE)/setup/descr
UPLOAD_SH = $(MOD_SCRIPT_DIR)/upload.sh UPLOAD_SH = $(MOD_SCRIPT_DIR)/upload.sh
SELECTION = $(shell sh $(GENERATE_SELECTION) -s).sel SELECTION = $(shell sh $(GENERATE_SELECTION) -s).sel
all: $(SELECTION) all: $(SELECTION)
upload: upload.done upload: upload.done

28
make/svg.mk
View file

@ -1,31 +1,31 @@
SVG_GENERATE_FORMATS ?= png svg SVG_GENERATE_FORMATS ?= png svg
SVG ?= $(filter-out copied-%,$(wildcard *.svg)) SVG ?= $(filter-out copied-%,$(wildcard *.svg))
COPIED_SVG = $(addprefix copied-,$(notdir $(SVG))) COPIED_SVG = $(addprefix copied-,$(notdir $(SVG)))
GENERATED_ICON_WIDTHS += 16 32 48 64 72 96 128 144 168 192 GENERATED_ICON_WIDTHS += 16 32 48 64 72 96 128 144 168 192
GENERATED_WIDTHS ?= $(GENERATED_ICON_WIDTHS) $(GENERATED_EXTRA_WIDTHS) GENERATED_WIDTHS ?= $(GENERATED_ICON_WIDTHS) $(GENERATED_EXTRA_WIDTHS)
ifneq ($(filter png,$(SVG_GENERATE_FORMATS)),) ifneq ($(filter png,$(SVG_GENERATE_FORMATS)),)
GENERATED_WIDTHS_PNG ?= $(GENERATED_WIDTHS) GENERATED_WIDTHS_PNG ?= $(GENERATED_WIDTHS)
GENERATED_PNG ?= \ GENERATED_PNG ?= \
$(foreach w, $(GENERATED_WIDTHS_PNG),$(patsubst %.svg,%-$w.png,$(notdir $(SVG)))) $(foreach w, $(GENERATED_WIDTHS_PNG),$(patsubst %.svg,%-$w.png,$(notdir $(SVG))))
GENERATED_IMAGES += $(GENERATED_PNG) GENERATED_IMAGES += $(GENERATED_PNG)
endif endif
ifneq ($(filter ico,$(SVG_GENERATE_FORMATS)),) ifneq ($(filter ico,$(SVG_GENERATE_FORMATS)),)
GENERATED_WIDTHS_ICO ?= 16 32 GENERATED_WIDTHS_ICO ?= 16 32
GENERATED_ICO ?= \ GENERATED_ICO ?= \
$(foreach w, $(GENERATED_WIDTHS_ICO),$(patsubst %.svg,%-$w.ico,$(notdir $(SVG)))) $(foreach w, $(GENERATED_WIDTHS_ICO),$(patsubst %.svg,%-$w.ico,$(notdir $(SVG))))
GENERATED_IMAGES += $(GENERATED_ICO) GENERATED_IMAGES += $(GENERATED_ICO)
endif endif
ifneq ($(filter pdf,$(SVG_GENERATE_FORMATS)),) ifneq ($(filter pdf,$(SVG_GENERATE_FORMATS)),)
GENERATED_PDF ?= $(patsubst %.svg,%.pdf,$(notdir $(SVG))) GENERATED_PDF ?= $(patsubst %.svg,%.pdf,$(notdir $(SVG)))
GENERATED_IMAGES += $(GENERATED_PDF) GENERATED_IMAGES += $(GENERATED_PDF)
endif endif
ifneq ($(filter svg,$(SVG_GENERATE_FORMATS)),) ifneq ($(filter svg,$(SVG_GENERATE_FORMATS)),)
IMAGES += $(notdir $(SVG)) IMAGES += $(notdir $(SVG))
endif endif
all: $(GENERATED_IMAGES) all: $(GENERATED_IMAGES)

184
make/swig.mk
View file

@ -4,35 +4,35 @@ include $(MODDIR)/make/dev-utils.mk
ifeq ($(SWIG_TARGET),php) ifeq ($(SWIG_TARGET),php)
SWIG_LANG ?= php SWIG_LANG ?= php
SWIG_TARGET_EXT ?= php SWIG_TARGET_EXT ?= php
ifeq ($(OS_NAME),ubuntu) ifeq ($(OS_NAME),ubuntu)
PHP_MAJOR ?= 5 PHP_MAJOR ?= 5
else else
PHP_MAJOR ?= $(shell php-config --version | cut -d. -f1) PHP_MAJOR ?= $(shell php-config --version | cut -d. -f1)
endif endif
PHP ?= php$(PHP_MAJOR) PHP ?= php$(PHP_MAJOR)
#PHP ?= $(firstword $(notdir $(wildcard /usr/share/php*))) #PHP ?= $(firstword $(notdir $(wildcard /usr/share/php*)))
SWIG_OPTS ?= -$(PHP) -DJW_PHP_MAJOR=$(PHP_MAJOR) SWIG_OPTS ?= -$(PHP) -DJW_PHP_MAJOR=$(PHP_MAJOR)
SWIG_MODULE_TARGET_DIR = $(ENV_PREFIX)/usr/share/$(PHP) SWIG_MODULE_TARGET_DIR = $(ENV_PREFIX)/usr/share/$(PHP)
#SWIG_PHP_INCLUDE_DIR = /usr/include/$(PHP) #SWIG_PHP_INCLUDE_DIR = /usr/include/$(PHP)
#SWIG_PHP_INCLUDE_SUBDIRS = . main TSRM Zend #SWIG_PHP_INCLUDE_SUBDIRS = . main TSRM Zend
SWIG_PHP_MODULE_INI = $(SWIG_MODULE).ini SWIG_PHP_MODULE_INI = $(SWIG_MODULE).ini
SWIG_PHP_MODULE_INI_DIR = $(ENV_PREFIX)/etc/$(PHP)/conf.d SWIG_PHP_MODULE_INI_DIR = $(ENV_PREFIX)/etc/$(PHP)/conf.d
#SWIG_PHP_NAMESPACE ?= $(SWIG_MODULE) #SWIG_PHP_NAMESPACE ?= $(SWIG_MODULE)
SWIG_GENERATED_EXTRA += $(SWIG_PHP_MODULE_INI) SWIG_GENERATED_EXTRA += $(SWIG_PHP_MODULE_INI)
SWIG_INSTALLED_EXTRA = $(SWIG_PHP_MODULE_INI_DIR)/$(SWIG_PHP_MODULE_INI) SWIG_INSTALLED_EXTRA = $(SWIG_PHP_MODULE_INI_DIR)/$(SWIG_PHP_MODULE_INI)
ifneq ($(SWIG_PHP_NAMESPECE),) ifneq ($(SWIG_PHP_NAMESPECE),)
SWIG_POSTPROCESS += sed -i -e "s/^<?php/<?php namespace $(SWIG_PHP_NAMESPACE);/" $(SWIG_MODULE_TARGET) SWIG_POSTPROCESS += sed -i -e "s/^<?php/<?php namespace $(SWIG_PHP_NAMESPACE);/" $(SWIG_MODULE_TARGET)
endif endif
SWIG_CLEAN += php_$(SWIG_MODULE_H) $(SWIG_PHP_MODULE_INI) SWIG_CLEAN += php_$(SWIG_MODULE_H) $(SWIG_PHP_MODULE_INI)
INCLUDE += $(shell php-config --includes) INCLUDE += $(shell php-config --includes)
INSTALL_LIBDIR = $(ENV_PREFIX)/usr/$(SYSTEM_LIBDIR_NAME)/$(PHP)/extensions INSTALL_LIBDIR = $(ENV_PREFIX)/usr/$(SYSTEM_LIBDIR_NAME)/$(PHP)/extensions
LOCAL_CFLAGS += -Wno-unused-label -Wno-unused-function LOCAL_CFLAGS += -Wno-unused-label -Wno-unused-function
LOCAL_CPPFLAGS += -Wno-unused-label -Wno-unused-function LOCAL_CPPFLAGS += -Wno-unused-label -Wno-unused-function
all: all:
@ -45,31 +45,31 @@ $(SWIG_PHP_MODULE_INI_DIR)/%.ini: %.ini
else ifeq ($(SWIG_TARGET),android) else ifeq ($(SWIG_TARGET),android)
SWIG_LANG ?= android SWIG_LANG ?= android
SWIG_TARGET_EXT ?= java SWIG_TARGET_EXT ?= java
SWIG_OPTS ?= -android SWIG_OPTS ?= -android
else ifeq ($(SWIG_TARGET),python) else ifeq ($(SWIG_TARGET),python)
PYTHON_VERSION ?= $(basename $(lastword $(shell python2 --version 2>&1))) PYTHON_VERSION ?= $(basename $(lastword $(shell python2 --version 2>&1)))
PYTHON_MAJOR_VERSION ?= $(basename $(PYTHON_VERSION)) PYTHON_MAJOR_VERSION ?= $(basename $(PYTHON_VERSION))
PYTHON_MINOR_VERSION ?= $(patsubst .%,%,$(suffix $(PYTHON_VERSION))) PYTHON_MINOR_VERSION ?= $(patsubst .%,%,$(suffix $(PYTHON_VERSION)))
SWIG_LANG ?= python SWIG_LANG ?= python
SWIG_TARGET_EXT ?= py SWIG_TARGET_EXT ?= py
SWIG_OPTS ?= -python SWIG_OPTS ?= -python
SWIG_MODULE_TARGET_DIR = $(ENV_PREFIX)$(SYSTEM_LIBDIR)/python$(PYTHON_MAJOR_VERSION).$(PYTHON_MINOR_VERSION)/site-packages SWIG_MODULE_TARGET_DIR = $(ENV_PREFIX)$(SYSTEM_LIBDIR)/python$(PYTHON_MAJOR_VERSION).$(PYTHON_MINOR_VERSION)/site-packages
SWIG_MODULE_SO ?= _$(SWIG_MODULE).so SWIG_MODULE_SO ?= _$(SWIG_MODULE).so
SWIG_CLEAN += $(wildcard *.pyc) SWIG_CLEAN += $(wildcard *.pyc)
SWIG_PY_MODULE_PYC ?= $(patsubst %.py,%.pyc,$(SWIG_MODULE_TARGET)) SWIG_PY_MODULE_PYC ?= $(patsubst %.py,%.pyc,$(SWIG_MODULE_TARGET))
SWIG_GENERATED_EXTRA += $(SWIG_PY_MODULE_PYC) SWIG_GENERATED_EXTRA += $(SWIG_PY_MODULE_PYC)
SWIG_INSTALLED_EXTRA += $(SWIG_MODULE_TARGET_DIR)/$(SWIG_PY_MODULE_PYC) SWIG_INSTALLED_EXTRA += $(SWIG_MODULE_TARGET_DIR)/$(SWIG_PY_MODULE_PYC)
INCLUDE += $(shell pkg-config --cflags python2) INCLUDE += $(shell pkg-config --cflags python2)
BUILD_LDFLAGS += $(shell pkg-config --libs python2) $(shell php-config --ldflags --libs) BUILD_LDFLAGS += $(shell pkg-config --libs python2) $(shell php-config --ldflags --libs)
INSTALL_LIBDIR = $(SWIG_MODULE_TARGET_DIR) INSTALL_LIBDIR = $(SWIG_MODULE_TARGET_DIR)
all: all:
@ -78,39 +78,39 @@ all:
else ifeq ($(SWIG_TARGET),java) else ifeq ($(SWIG_TARGET),java)
JAVA_VERSION ?= $(basename $(lastword $(shell java -version 2>&1 | sed '/version/ !d'))) JAVA_VERSION ?= $(basename $(lastword $(shell java -version 2>&1 | sed '/version/ !d')))
JAVA_MAJOR_VERSION ?= $(basename $(JAVA_VERSION)) JAVA_MAJOR_VERSION ?= $(basename $(JAVA_VERSION))
JAVA_MINOR_VERSION ?= $(patsubst .%,%,$(suffix $(JAVA_VERSION))) JAVA_MINOR_VERSION ?= $(patsubst .%,%,$(suffix $(JAVA_VERSION)))
SWIG_LANG ?= java SWIG_LANG ?= java
SWIG_TARGET_EXT ?= java SWIG_TARGET_EXT ?= java
SWIG_OPTS ?= -java SWIG_OPTS ?= -java
SWIG_MODULE_TARGET_DIR = /usr/share/java SWIG_MODULE_TARGET_DIR = /usr/share/java
SWIG_MODULE_SO ?= $(SWIG_MODULE).so SWIG_MODULE_SO ?= $(SWIG_MODULE).so
SWIG_CLEAN += $(wildcard *.java) SWIG_CLEAN += $(wildcard *.java)
#SWIG_PY_MODULE_PYC ?= $(patsubst %.py,%.pyc,$(SWIG_MODULE_TARGET)) #SWIG_PY_MODULE_PYC ?= $(patsubst %.py,%.pyc,$(SWIG_MODULE_TARGET))
#SWIG_GENERATED_EXTRA += $(SWIG_PY_MODULE_PYC) #SWIG_GENERATED_EXTRA += $(SWIG_PY_MODULE_PYC)
#SWIG_INSTALLED_EXTRA += $(SWIG_MODULE_TARGET_DIR)/$(SWIG_PY_MODULE_PYC) #SWIG_INSTALLED_EXTRA += $(SWIG_MODULE_TARGET_DIR)/$(SWIG_PY_MODULE_PYC)
INCLUDE += -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux INCLUDE += -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
#BUILD_LDFLAGS += #BUILD_LDFLAGS +=
INSTALL_LIBDIR = $(SWIG_MODULE_TARGET_DIR) INSTALL_LIBDIR = $(SWIG_MODULE_TARGET_DIR)
else ifeq ($(SWIG_TARGET),perl) else ifeq ($(SWIG_TARGET),perl)
SWIG_LANG ?= perl SWIG_LANG ?= perl
SWIG_TARGET_EXT ?= pm SWIG_TARGET_EXT ?= pm
SWIG_OPTS ?= -perl SWIG_OPTS ?= -perl
PERL_VERSION ?= $(patsubst v%,%,$(shell perl -e 'print $$^V;')) PERL_VERSION ?= $(patsubst v%,%,$(shell perl -e 'print $$^V;'))
PERL_BASE_DIR ?= $(ENV_PREFIX)$(firstword $(wildcard /usr/lib64/perl5 /usr/lib/perl5)) PERL_BASE_DIR ?= $(ENV_PREFIX)$(firstword $(wildcard /usr/lib64/perl5 /usr/lib/perl5))
PERL_CORE_DIR ?= $(firstword $(wildcard $(PERL_BASE_DIR)/$(PERL_VERSION)/$(ARCH)-linux-thread-multi/CORE/ $(PERL_BASE_DIR)/CORE)) PERL_CORE_DIR ?= $(firstword $(wildcard $(PERL_BASE_DIR)/$(PERL_VERSION)/$(ARCH)-linux-thread-multi/CORE/ $(PERL_BASE_DIR)/CORE))
PERL_VENDOR_DIR ?= $(PERL_BASE_DIR)/vendor_perl/$(PERL_VERSION)/$(ARCH)-linux-thread-multi PERL_VENDOR_DIR ?= $(PERL_BASE_DIR)/vendor_perl/$(PERL_VERSION)/$(ARCH)-linux-thread-multi
INCLUDE += -I$(PERL_CORE_DIR) INCLUDE += -I$(PERL_CORE_DIR)
SWIG_CLEAN += $(wildcard *.$(SWIG_TARGET_EXT)) SWIG_CLEAN += $(wildcard *.$(SWIG_TARGET_EXT))
INSTALL_LIBDIR = $(PERL_VENDOR_DIR)/auto/$(SWIG_MODULE) INSTALL_LIBDIR = $(PERL_VENDOR_DIR)/auto/$(SWIG_MODULE)
SWIG_MODULE_TARGET_DIR = $(PERL_VENDOR_DIR) SWIG_MODULE_TARGET_DIR = $(PERL_VENDOR_DIR)
else else
@ -118,41 +118,41 @@ else
endif endif
SWIG_INCLUDE ?= $(filter-out -iquote .,$(INCLUDE)) SWIG_INCLUDE ?= $(filter-out -iquote .,$(INCLUDE))
SWIG_USE_CPP ?= true SWIG_USE_CPP ?= true
ifeq ($(SWIG_USE_CPP),true) ifeq ($(SWIG_USE_CPP),true)
SWIG_SOURCE_EXT ?= cpp SWIG_SOURCE_EXT ?= cpp
SWIG_OPTS += -c++ SWIG_OPTS += -c++
else else
SWIG_SOURCE_EXT ?= c SWIG_SOURCE_EXT ?= c
endif endif
SWIG ?= swig SWIG ?= swig
SWIG_INTERFACE_I ?= $(wildcard *.i) SWIG_INTERFACE_I ?= $(wildcard *.i)
#SWIG_MODULE ?= $(SWIG_TARGET_EXT)_$(firstword $(shell sed '/^%module/ !d; s/^ *%module *//' $(SWIG_INTERFACE_I))) #SWIG_MODULE ?= $(SWIG_TARGET_EXT)_$(firstword $(shell sed '/^%module/ !d; s/^ *%module *//' $(SWIG_INTERFACE_I)))
SWIG_MODULE ?= $(firstword $(shell sed '/^%module/ !d; s/^ *%module *//' $(SWIG_INTERFACE_I))) SWIG_MODULE ?= $(firstword $(shell sed '/^%module/ !d; s/^ *%module *//' $(SWIG_INTERFACE_I)))
SWIG_MODULE_SO ?= $(SWIG_MODULE).so SWIG_MODULE_SO ?= $(SWIG_MODULE).so
SWIG_MODULE_H ?= $(SWIG_MODULE).h SWIG_MODULE_H ?= $(SWIG_MODULE).h
SWIG_MODULE_WRAP_C ?= $(SWIG_MODULE)_wrap.$(SWIG_SOURCE_EXT) SWIG_MODULE_WRAP_C ?= $(SWIG_MODULE)_wrap.$(SWIG_SOURCE_EXT)
SWIG_MODULE_TARGET ?= $(SWIG_MODULE).$(SWIG_TARGET_EXT) SWIG_MODULE_TARGET ?= $(SWIG_MODULE).$(SWIG_TARGET_EXT)
SWIG_SRC_C ?= $(sort $(SWIG_MODULE_WRAP_C) $(wildcard *.c *.cpp)) SWIG_SRC_C ?= $(sort $(SWIG_MODULE_WRAP_C) $(wildcard *.c *.cpp))
SWIG_OBJ ?= $(patsubst %.cpp,%.o,$(patsubst %.c,%.o,$(sort $(SWIG_SRC_C)))) SWIG_OBJ ?= $(patsubst %.cpp,%.o,$(patsubst %.c,%.o,$(sort $(SWIG_SRC_C))))
SWIG_TARGETOWNER ?= root SWIG_TARGETOWNER ?= root
SWIG_TARGETGROUP ?= root SWIG_TARGETGROUP ?= root
SWIG_TARGETMODE ?= 0644 SWIG_TARGETMODE ?= 0644
SWIG_WRAPPER_DEP_MK = swig.dep.mk SWIG_WRAPPER_DEP_MK = swig.dep.mk
SWIG_INSTALLED_SO = $(addprefix $(INSTALL_LIBDIR)/,$(SWIG_MODULE_SO)) SWIG_INSTALLED_SO = $(addprefix $(INSTALL_LIBDIR)/,$(SWIG_MODULE_SO))
SWIG_INSTALLED_MODULE_TARGET = $(addprefix $(SWIG_MODULE_TARGET_DIR)/,$(SWIG_MODULE_TARGET)) SWIG_INSTALLED_MODULE_TARGET = $(addprefix $(SWIG_MODULE_TARGET_DIR)/,$(SWIG_MODULE_TARGET))
SWIG_DEFINES += -DNON_C_BINDING SWIG_DEFINES += -DNON_C_BINDING
SWIG_OPTS += $(SWIG_DEFINES) SWIG_OPTS += $(SWIG_DEFINES)
LOCAL_CFLAGS += $(SWIG_DEFINES) LOCAL_CFLAGS += $(SWIG_DEFINES)
LOCAL_CPPFLAGS += $(SWIG_DEFINES) LOCAL_CPPFLAGS += $(SWIG_DEFINES)
# for depend.mk # for depend.mk
OBJ = $(SWIG_OBJ) OBJ = $(SWIG_OBJ)
DEPEND_MK += $(SWIG_WRAPPER_DEP_MK) DEPEND_MK += $(SWIG_WRAPPER_DEP_MK)
all: $(SWIG_MODULE_SO) $(SWIG_GENERATED_EXTRA) all: $(SWIG_MODULE_SO) $(SWIG_GENERATED_EXTRA)
install: $(SWIG_INSTALLED_SO) $(SWIG_INSTALLED_MODULE_TARGET) $(SWIG_INSTALLED_EXTRA) install: $(SWIG_INSTALLED_SO) $(SWIG_INSTALLED_MODULE_TARGET) $(SWIG_INSTALLED_EXTRA)

200
make/tex.mk
View file

@ -4,61 +4,61 @@
# $Id$ # $Id$
# -- project data # -- project data
CUSTOMER ?= jannet CUSTOMER ?= jannet
PROJECT ?= legal PROJECT ?= legal
TOPIC ?= $(notdir $(shell $(PWD))) TOPIC ?= $(notdir $(shell $(PWD)))
VERSION ?= $(shell sed "s/-dev$$//" VERSION) VERSION ?= $(shell sed "s/-dev$$//" VERSION)
AUTHORS ?= AUTHORS ?=
#TITLE ?= Allgemeine Bedingungen für #TITLE ?= Allgemeine Bedingungen für
#SUBTITLE ?= Dienstgüte-Vereinbarungen #SUBTITLE ?= Dienstgüte-Vereinbarungen
DATE ?= $(shell date +'%Y/%m/%d') DATE ?= $(shell date +'%Y/%m/%d')
#CONFIDENTIAL_REMARK ?= Vertraulich #CONFIDENTIAL_REMARK ?= Vertraulich
BEAMER_HANDOUT ?= false BEAMER_HANDOUT ?= false
BEAMER_ASPECTRATIO ?= 169 BEAMER_ASPECTRATIO ?= 169
# -- files # -- files
MAIN ?= main MAIN ?= main
HEADER ?= header HEADER ?= header
FRONTPAGE ?= frontpage FRONTPAGE ?= frontpage
OUTPUT ?= $(patsubst %-dev,%,$(TOPIC)-$(VERSION)) OUTPUT ?= $(patsubst %-dev,%,$(TOPIC)-$(VERSION))
DISTDIR ?= dist DISTDIR ?= dist
# -- dependencies # -- dependencies
LOCAL_PREREQ ?= Makefile cfg.mk main.tex.tmpl \ LOCAL_PREREQ ?= Makefile cfg.mk main.tex.tmpl \
$(wildcard *.tex) $(wildcard *.tex)
# -- formatting # -- formatting
#DOCUMENT_CLASS ?= book #DOCUMENT_CLASS ?= book
ifneq ($(MAKECMDGOALS),html) ifneq ($(MAKECMDGOALS),html)
DOCUMENT_CLASS ?= article DOCUMENT_CLASS ?= article
else else
DOCUMENT_CLASS ?= article DOCUMENT_CLASS ?= article
endif endif
TEX_TMPL_BASE_DIR ?= $(MODDIR)/tmpl/tex TEX_TMPL_BASE_DIR ?= $(MODDIR)/tmpl/tex
TEX_TMPL_STYLE ?= de_technical TEX_TMPL_STYLE ?= de_technical
TEX_TMPL_DIR ?= $(TEX_TMPL_BASE_DIR)/$(TEX_TMPL_STYLE) TEX_TMPL_DIR ?= $(TEX_TMPL_BASE_DIR)/$(TEX_TMPL_STYLE)
IMPORTED_TEMPLATES ?= $(shell ls $(TEX_TMPL_DIR)/*.tmpl) IMPORTED_TEMPLATES ?= $(shell ls $(TEX_TMPL_DIR)/*.tmpl)
WWW_IMAGEDIR ?= $(PROJECTS_DIR)/jw-build/htdocs/images/logo-janware/ WWW_IMAGEDIR ?= $(PROJECTS_DIR)/jw-build/htdocs/images/logo-janware/
FRONTLOGO_PDF ?= logo-janware.pdf FRONTLOGO_PDF ?= logo-janware.pdf
FRONTLOGO_EPS ?= janware-frontpage-top-right.png FRONTLOGO_EPS ?= janware-frontpage-top-right.png
FRONTLOGO_WEB ?= janware-frontpage-top-right.png FRONTLOGO_WEB ?= janware-frontpage-top-right.png
ICON_UP ?= up.png ICON_UP ?= up.png
ICON_PREV ?= prev.png ICON_PREV ?= prev.png
ICON_NEXT ?= next.png ICON_NEXT ?= next.png
ICON_INDEX ?= index.png ICON_INDEX ?= index.png
ICON_CONTENTS ?= contents.png ICON_CONTENTS ?= contents.png
# -- web publishing # -- web publishing
HTMLDIR ?= $(TOPIC) HTMLDIR ?= $(TOPIC)
TARGET_HOST ?= cvs.jannet.de TARGET_HOST ?= cvs.jannet.de
TARGET_DIR ?= /home/wwwrun/dat/htdocs/jannet.de_443/upload/$(CUSTOMER)/projects/$(PROJECT)/doc/$(TOPIC) TARGET_DIR ?= /home/wwwrun/dat/htdocs/jannet.de_443/upload/$(CUSTOMER)/projects/$(PROJECT)/doc/$(TOPIC)
TARGET_DIR_MODE ?= 755 TARGET_DIR_MODE ?= 755
TARGET_FILE_MODE ?= 644 TARGET_FILE_MODE ?= 644
TARGET_USER ?= root TARGET_USER ?= root
UPLOAD_MODULE ?= doc/$(TOPIC) UPLOAD_MODULE ?= doc/$(TOPIC)
UPLOAD_FILE_MODE ?= 644 UPLOAD_FILE_MODE ?= 644
UPLOAD_DIR_MODE ?= 755 UPLOAD_DIR_MODE ?= 755
include $(MODDIR)/make/tag-defs.mk include $(MODDIR)/make/tag-defs.mk
include $(MODDIR)/make/tag-rules.mk include $(MODDIR)/make/tag-rules.mk
@ -66,57 +66,57 @@ include $(MODDIR)/make/tag-rules.mk
ifeq ($(TEX_TMPL_DIR), "") ifeq ($(TEX_TMPL_DIR), "")
TEX_TMPL_DIR = thisisnotadirectory TEX_TMPL_DIR = thisisnotadirectory
endif endif
latex = latex latex = latex
PDFLATEX ?= pdflatex PDFLATEX ?= pdflatex
PDF_VIEWER ?= $(firstword $(shell which okular kpdf acroread)) PDF_VIEWER ?= $(firstword $(shell which okular kpdf acroread))
CAT ?= cat CAT ?= cat
SED ?= sed SED ?= sed
COMPILATION_RUN_NAMES ?= 1 2 3 COMPILATION_RUN_NAMES ?= 1 2 3
# this is what is there already # this is what is there already
PRE_FIG_LOCAL = $(wildcard *.fig) PRE_FIG_LOCAL = $(wildcard *.fig)
PRE_TEX_LOCAL = $(wildcard *.tex) PRE_TEX_LOCAL = $(wildcard *.tex)
PRE_TMPL_LOCAL = $(wildcard *.tmpl *.ger) PRE_TMPL_LOCAL = $(wildcard *.tmpl *.ger)
PRE_HTML_LOCAL = $(wildcard *.html) PRE_HTML_LOCAL = $(wildcard *.html)
PRE_FIG_REMOTE = $(foreach dir,$(TEX_TMPL_DIR),$(wildcard $(dir)/*.fig)) PRE_FIG_REMOTE = $(foreach dir,$(TEX_TMPL_DIR),$(wildcard $(dir)/*.fig))
PRE_TEX_REMOTE = $(foreach dir,$(TEX_TMPL_DIR),$(wildcard $(dir)/*.tex)) PRE_TEX_REMOTE = $(foreach dir,$(TEX_TMPL_DIR),$(wildcard $(dir)/*.tex))
PRE_TMPL_REMOTE = $(foreach dir,$(TEX_TMPL_DIR),$(wildcard $(dir)/*.tmpl $(dir)/*.ger)) PRE_TMPL_REMOTE = $(foreach dir,$(TEX_TMPL_DIR),$(wildcard $(dir)/*.tmpl $(dir)/*.ger))
PRE_HTML_REMOTE = $(foreach dir,$(TEX_TMPL_DIR),$(wildcard $(dir)/*.html)) PRE_HTML_REMOTE = $(foreach dir,$(TEX_TMPL_DIR),$(wildcard $(dir)/*.html))
# this is what should be there # this is what should be there
FILES_FROM_TMPL = $(notdir $(patsubst %.ger,%.tex,$(patsubst %.tmpl,%,$(PRE_TMPL_REMOTE) $(PRE_TMPL_LOCAL)))) FILES_FROM_TMPL = $(notdir $(patsubst %.ger,%.tex,$(patsubst %.tmpl,%,$(PRE_TMPL_REMOTE) $(PRE_TMPL_LOCAL))))
EPS_FROM_FIG = $(notdir $(patsubst %.fig,%.png,$(PRE_FIG_REMOTE) $(PRE_FIG_LOCAL))) EPS_FROM_FIG = $(notdir $(patsubst %.fig,%.png,$(PRE_FIG_REMOTE) $(PRE_FIG_LOCAL)))
FILES_COPIED = $(notdir $(wildcard $(TEX_TMPL_DIR)/*.html $(TEX_TMPL_DIR)/*.tex)) FILES_COPIED = $(notdir $(wildcard $(TEX_TMPL_DIR)/*.html $(TEX_TMPL_DIR)/*.tex))
GENERATED += $(FILES_FROM_TMPL) $(EPS_FROM_FIG) $(FILES_COPIED) $(FRONTLOGO_PDF) GENERATED += $(FILES_FROM_TMPL) $(EPS_FROM_FIG) $(FILES_COPIED) $(FRONTLOGO_PDF)
GENERATED_TEX = $(filter %.tex,$(GENERATED)) GENERATED_TEX = $(filter %.tex,$(GENERATED))
GENERATED_EPS = $(filter %.png,$(GENERATED)) GENERATED_EPS = $(filter %.png,$(GENERATED))
GENERATED_HTML = $(filter %.html,$(GENERATED)) GENERATED_HTML = $(filter %.html,$(GENERATED))
CMD_PARSE_GRAPHICS = $(SED) '/includegraphics/ !d; s/[^{]*{\([^}]*\).*/\1/; /^\.\./ d; s/^.\///' *.tex *.tmpl | sort -u CMD_PARSE_GRAPHICS = $(SED) '/includegraphics/ !d; s/[^{]*{\([^}]*\).*/\1/; /^\.\./ d; s/^.\///' *.tex *.tmpl | sort -u
CONTACT_EMAIL ?= contact@janware.com CONTACT_EMAIL ?= contact@janware.com
ifeq ($(DIST_VERSION),) ifeq ($(DIST_VERSION),)
DIST_VERSION = $(VERSION) DIST_VERSION = $(VERSION)
endif endif
# all # all
TEX = $(PRE_TEX_LOCAL) $(GENERATED_TEX) TEX = $(PRE_TEX_LOCAL) $(GENERATED_TEX)
EPS = $(GENERATED_EPS) EPS = $(GENERATED_EPS)
HTML = $(PRE_HTML_LOCAL) $(GENERATED_HTML) HTML = $(PRE_HTML_LOCAL) $(GENERATED_HTML)
LATEX_INPUT = $(TEX) $(EPS) LATEX_INPUT = $(TEX) $(EPS)
HTML_INPUT = $(HTML) $(IMAGES) HTML_INPUT = $(HTML) $(IMAGES)
# this comes in handy # this comes in handy
DATE_FORMAT ?= '%b, %d, %Y' DATE_FORMAT ?= '%b, %d, %Y'
DATE := $(if $(DATE),$(shell date +$(DATE_FORMAT) --date $(DATE)),$(shell date +$(DATE_FORMAT))) DATE := $(if $(DATE),$(shell date +$(DATE_FORMAT) --date $(DATE)),$(shell date +$(DATE_FORMAT)))
TEX_WARN_DONT_EDIT = "\ TEX_WARN_DONT_EDIT = "\
%+---------------------------------------------------+\n\ %+---------------------------------------------------+\n\
%| DO NOT EDIT THIS FILE! |\n\ %| DO NOT EDIT THIS FILE! |\n\
%| It was automatically created during the build |\n\ %| It was automatically created during the build |\n\
%| process! |\n\ %| process! |\n\
%+---------------------------------------------------+\n" %+---------------------------------------------------+\n"
HTML_WARN_DONT_EDIT = "\ HTML_WARN_DONT_EDIT = "\
<!--\n\ <!--\n\
+---------------------------------------------------+\n\ +---------------------------------------------------+\n\
| DO NOT EDIT THIS FILE! |\n\ | DO NOT EDIT THIS FILE! |\n\
@ -124,46 +124,46 @@ HTML_WARN_DONT_EDIT = "\
| process! |\n\ | process! |\n\
+---------------------------------------------------+\n\ +---------------------------------------------------+\n\
-->" -->"
WD = $(shell $(PWD)) WD = $(shell $(PWD))
IMAGES = $(patsubst %,$(IMAGEDIR)/%,$(FRONTLOGO_EPS) $(FRONTLOGO_WEB) $(FRONTLOGO_PDF) \ IMAGES = $(patsubst %,$(IMAGEDIR)/%,$(FRONTLOGO_EPS) $(FRONTLOGO_WEB) $(FRONTLOGO_PDF) \
$(ICON_UP) $(ICON_PREV) $(ICON_NEXT) $(ICON_INDEX) $(ICON_CONTENTS)) \ $(ICON_UP) $(ICON_PREV) $(ICON_NEXT) $(ICON_INDEX) $(ICON_CONTENTS)) \
#LOCAL_IMPORTED_TEMPLATES = $(notdir $(IMPORTED_TEMPLATES)) #LOCAL_IMPORTED_TEMPLATES = $(notdir $(IMPORTED_TEMPLATES))
#FMT_OFFLINE = tex dvi ps pdf txt #FMT_OFFLINE = tex dvi ps pdf txt
FMT_OFFLINE = tex pdf # txt FMT_OFFLINE = tex pdf # txt
FMT = $(FMT_OFFLINE) html FMT = $(FMT_OFFLINE) html
OUT = $(DISTDIR)/$(OUTPUT) OUT = $(DISTDIR)/$(OUTPUT)
FMT_OUT = $(patsubst %,$(OUT).%.zip,$(FMT)) FMT_OUT = $(patsubst %,$(OUT).%.zip,$(FMT))
FMT_OFFLINE_OUT = $(patsubst %,$(OUT).%.zip,$(FMT_OFFLINE)) FMT_OFFLINE_OUT = $(patsubst %,$(OUT).%.zip,$(FMT_OFFLINE))
ALL = $(FMT_OUT) html_install ALL = $(FMT_OUT) html_install
#PRE_HTML = $(patsubst %.tmpl,%,$(wildcard *.html.tmpl)) #PRE_HTML = $(patsubst %.tmpl,%,$(wildcard *.html.tmpl))
#LINETMPL=$(wildcard *.linetmpl) #LINETMPL = $(wildcard *.linetmpl)
#TEXFROMGER=$(patsubst %.ger,%.tex,$(wildcard *.ger)) #TEXFROMGER = $(patsubst %.ger,%.tex,$(wildcard *.ger))
#TMPL=$(wildcard *.tmpl) #TMPL = $(wildcard *.tmpl)
#FILEFROMTMPL = $(patsubst %.tmpl,%,$(TMPL)) #FILEFROMTMPL = $(patsubst %.tmpl,%,$(TMPL))
#GERFROMLINETMPL=$(patsubst %.linetmpl,%,$(wildcard *.linetmpl)) #GERFROMLINETMPL = $(patsubst %.linetmpl,%,$(wildcard *.linetmpl))
#PRE_TEX = $(patsubst %.ger,%.tex,\ #PRE_TEX = $(patsubst %.ger,%.tex,\
# $(patsubst %.tmpl,%,$(wildcard *.tex.tmpl *.ger.tmpl) $(LOCAL_IMPORTED_TEMPLATES)) \ # $(patsubst %.tmpl,%,$(wildcard *.tex.tmpl *.ger.tmpl) $(LOCAL_IMPORTED_TEMPLATES)) \
# $(GERFROMLINETMPL)) $(TEXFROMGER) # $(GERFROMLINETMPL)) $(TEXFROMGER)
NEWDIRS = $(DISTDIR) $(HTMLDIR) $(DVIDIR) NEWDIRS = $(DISTDIR) $(HTMLDIR) $(DVIDIR)
ifeq ($(DOCUMENT_CLASS),) ifeq ($(DOCUMENT_CLASS),)
DOCUMENT_CLASS = article DOCUMENT_CLASS = article
endif endif
ifeq ($(BEAMER_HANDOUT),true) ifeq ($(BEAMER_HANDOUT),true)
DOCUMENT_CLASS_OPTIONS += ,handout DOCUMENT_CLASS_OPTIONS += ,handout
endif endif
ifneq ($(BEAMER_ASPECTRATIO),) ifneq ($(BEAMER_ASPECTRATIO),)
DOCUMENT_CLASS_OPTIONS += ,aspectratio=$(BEAMER_ASPECTRATIO) DOCUMENT_CLASS_OPTIONS += ,aspectratio=$(BEAMER_ASPECTRATIO)
endif endif
ifneq ($(BEAMER_HANDOUT),true) ifneq ($(BEAMER_HANDOUT),true)
BEAMER_ANIMATION_FRAMES ?= 36 BEAMER_ANIMATION_FRAMES ?= 36
else else
BEAMER_ANIMATION_FRAMES ?= 1 BEAMER_ANIMATION_FRAMES ?= 1
endif endif
define mangle_tmpl define mangle_tmpl
@ -347,7 +347,7 @@ $(OUT).tex.zip: cfgtest $(LATEX_INPUT)
#$(OUT).txt.zip: $(OUTPUT).txt #$(OUT).txt.zip: $(OUTPUT).txt
# zip $@ $< # zip $@ $<
TEX4HT_FIRST_LATEX_LINE = \ TEX4HT_FIRST_LATEX_LINE = \
'\makeatletter\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"\#\#1"{\Link\#\#1}\expandafter\HCode\else\expandafter\Link\fi}\def\Link\#1.a.b.c.{\g@addto@macro\@documentclasshook{\RequirePackage[\#1,html,3,sections+]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{\#1,html,3}\def\HCode\#\#\#\#1{\documentstyle[tex4ht,3}\@ifnextchar[{\HCode}{\documentstyle[tex4ht]}}}\makeatother\HCode .a.b.c.\input' '\makeatletter\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"\#\#1"{\Link\#\#1}\expandafter\HCode\else\expandafter\Link\fi}\def\Link\#1.a.b.c.{\g@addto@macro\@documentclasshook{\RequirePackage[\#1,html,3,sections+]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{\#1,html,3}\def\HCode\#\#\#\#1{\documentstyle[tex4ht,3}\@ifnextchar[{\HCode}{\documentstyle[tex4ht]}}}\makeatother\HCode .a.b.c.\input'
$(HTMLDIR): $(LATEX_INPUT) $(HTML_INPUT) $(HTMLDIR): $(LATEX_INPUT) $(HTML_INPUT)
@ -428,7 +428,7 @@ unzip:
%-handout: %-handout:
BEAMER_HANDOUT=true make $* BEAMER_HANDOUT=true make $*
UPLOAD_FILES = $(OUTPUT).pdf UPLOAD_FILES = $(OUTPUT).pdf
include $(MODDIR)/make/upload.mk include $(MODDIR)/make/upload.mk

16
make/textest.mk
View file

@ -1,11 +1,11 @@
SOURCES = $(wildcard *.tex) SOURCES = $(wildcard *.tex)
PDF_VIEWER ?= $(firstword $(shell which okular acroread)) PDF_VIEWER ?= $(firstword $(shell which okular acroread))
PNG_VIEWER ?= $(firstword $(shell which qiv gimp)) PNG_VIEWER ?= $(firstword $(shell which qiv gimp))
MAIN_TEX ?= $(firstword $(wildcard main.tex *.tex)) MAIN_TEX ?= $(firstword $(wildcard main.tex *.tex))
MAIN ?= $(patsubst %.tex,$(MAIN_TEX)) MAIN ?= $(patsubst %.tex,$(MAIN_TEX))
OUT_PDF ?= $(notdir $(shell $(PWD))).pdf OUT_PDF ?= $(notdir $(shell $(PWD))).pdf
OUT_PNG ?= $(patsubst %.pdf,%.png,$(OUT_PDF)) OUT_PNG ?= $(patsubst %.pdf,%.png,$(OUT_PDF))
PNG_WIDTH ?= 200 PNG_WIDTH ?= 200
all: pdf all: pdf
clean: clean.files clean: clean.files

14
make/tmpl.mk
View file

@ -1,18 +1,18 @@
include $(MODDIR)/make/defs.mk include $(MODDIR)/make/defs.mk
# -- TMPL # -- TMPL
INSTALLATION_FILE_TYPES += TMPL INSTALLATION_FILE_TYPES += TMPL
BUILD_TMPLDIR = $(TOPDIR)/tmpl BUILD_TMPLDIR = $(TOPDIR)/tmpl
LOCAL_TMPL += $(filter-out $(DONT_INSTALL),$(wildcard *.tmpl)) LOCAL_TMPL += $(filter-out $(DONT_INSTALL),$(wildcard *.tmpl))
ifndef TMPL_SUBDIR ifndef TMPL_SUBDIR
TMPL_SUBDIR := $(shell $(PWD) | $(SED) '/.*\/tmpl\(\/\|$$\)/!d; s%.*/tmpl\(/\|$$\)%%') TMPL_SUBDIR := $(shell $(PWD) | $(SED) '/.*\/tmpl\(\/\|$$\)/!d; s%.*/tmpl\(/\|$$\)%%')
endif endif
ifeq ($(TMPL_SUBDIR),) ifeq ($(TMPL_SUBDIR),)
INSTALL_TMPLDIR = $(PROJECT_TMPLDIR) INSTALL_TMPLDIR = $(PROJECT_TMPLDIR)
else else
INSTALL_TMPLDIR = $(PROJECT_TMPLDIR)/$(TMPL_SUBDIR) INSTALL_TMPLDIR = $(PROJECT_TMPLDIR)/$(TMPL_SUBDIR)
endif endif
INSTALLED_TMPL += $(addprefix $(INSTALL_TMPLDIR)/,$(LOCAL_TMPL)) INSTALLED_TMPL += $(addprefix $(INSTALL_TMPLDIR)/,$(LOCAL_TMPL))
include $(MODDIR)/make/rules.mk include $(MODDIR)/make/rules.mk

34
make/topdir.mk
View file

@ -6,22 +6,22 @@ config:
mrproper:distclean topdir.mrproper mrproper:distclean topdir.mrproper
ifeq ($(ORDERED_SUBDIRS),) ifeq ($(ORDERED_SUBDIRS),)
SUBDIRS ?= $(wildcard inst/pre make scripts contrib src libsrc \ SUBDIRS ?= $(wildcard inst/pre make scripts contrib src libsrc \
tools include lib bin util plugins conf config cfg \ tools include lib bin util plugins conf config cfg \
images htdocs tmpl doc test inst/post) images htdocs tmpl doc test inst/post)
endif endif
PROJECT_DESCR = $(TOPDIR)/make/project.conf PROJECT_DESCR = $(TOPDIR)/make/project.conf
GIT_DESCR = $(TOPDIR)/.git/description GIT_DESCR = $(TOPDIR)/.git/description
LIST_VCS_FILES = /bin/bash $(MOD_SCRIPT_DIR)/scm.sh ls-files LIST_VCS_FILES = /bin/bash $(MOD_SCRIPT_DIR)/scm.sh ls-files
OPT_JANWARE_PROJECT ?= -j OPT_JANWARE_PROJECT ?= -j
ifeq ($(OPT_JANWARE_PROJECT),-j) ifeq ($(OPT_JANWARE_PROJECT),-j)
REMOTE_GIT_FLAVOUR ?= proj REMOTE_GIT_FLAVOUR ?= proj
else else
OPT_JANWARE_PROJECT = OPT_JANWARE_PROJECT =
REMOTE_GIT_FLAVOUR ?= priv REMOTE_GIT_FLAVOUR ?= priv
endif endif
ifneq ($(wildcard $(TOPDIR)/make/defs.mk),) ifneq ($(wildcard $(TOPDIR)/make/defs.mk),)
@ -30,27 +30,27 @@ endif
include $(MODDIR)/make/defs.mk include $(MODDIR)/make/defs.mk
REMOTE_GIT_DIR = /srv/git/$(JANWARE_USER)/$(REMOTE_GIT_FLAVOUR)/$(RPM_PROJECT) REMOTE_GIT_DIR = /srv/git/$(JANWARE_USER)/$(REMOTE_GIT_FLAVOUR)/$(RPM_PROJECT)
REMOTE_GIT_URL = ssh://$(JANWARE_USER)@git.janware.com$(REMOTE_GIT_DIR) REMOTE_GIT_URL = ssh://$(JANWARE_USER)@git.janware.com$(REMOTE_GIT_DIR)
include $(MODDIR)/make/dirs.mk include $(MODDIR)/make/dirs.mk
ifneq ($(DONT_CHECK_PREREQ_DONE),true) ifneq ($(DONT_CHECK_PREREQ_DONE),true)
ifndef PREREQ ifndef PREREQ
PREREQ := $(call proj_query,pkg-requires --no-version --no-subpackages --subsections=jw --delimiter=' ' build $(PROJECT)) PREREQ := $(call proj_query,pkg-requires --no-version --no-subpackages --subsections=jw --delimiter=' ' build $(PROJECT))
endif endif
ifndef PREREQ_DIRS ifndef PREREQ_DIRS
PREREQ_DIRS := $(call proj_query,proj-dir $(PREREQ)) PREREQ_DIRS := $(call proj_query,proj-dir $(PREREQ))
endif endif
PREREQ_DIRS_DONE := $(addsuffix /dirs-all.done,$(filter-out $(TOPDIR) /opt/%,$(PREREQ_DIRS))) PREREQ_DIRS_DONE := $(addsuffix /dirs-all.done,$(filter-out $(TOPDIR) /opt/%,$(PREREQ_DIRS)))
endif endif
ifneq ($(SUBDIRS_TO_ITERATE),) ifneq ($(SUBDIRS_TO_ITERATE),)
ifeq ($(MAKECMDGOALS),) ifeq ($(MAKECMDGOALS),)
SUBDIR_TARGETS = all SUBDIR_TARGETS = all
else else
SUBDIR_TARGETS = $(filter $(ALLOWED_SUBDIR_TARGETS),$(MAKECMDGOALS)) SUBDIR_TARGETS = $(filter $(ALLOWED_SUBDIR_TARGETS),$(MAKECMDGOALS))
endif endif
endif endif
@ -59,9 +59,9 @@ include $(MODDIR)/make/rpmdist.mk
include $(MODDIR)/make/rules.mk include $(MODDIR)/make/rules.mk
include $(MODDIR)/make/doc-rules.mk include $(MODDIR)/make/doc-rules.mk
STREAMLINE_PROJECT ?= bash $(MOD_SCRIPT_DIR)/streamline-project.sh STREAMLINE_PROJECT ?= bash $(MOD_SCRIPT_DIR)/streamline-project.sh
INSTALLED_TOPDIR_FILES = $(addprefix $(INSTALL_DOCDIR)/, $(DOCS)) INSTALLED_TOPDIR_FILES = $(addprefix $(INSTALL_DOCDIR)/, $(DOCS))
local-%: local-%:
find . -name $@.mk | \ find . -name $@.mk | \

48
make/upload-defs-rpm.mk
View file

@ -3,39 +3,39 @@
# VERSION # VERSION
# MOD_SCRIPT_DIR # MOD_SCRIPT_DIR
#UPLOAD_SH = $(MOD_SCRIPT_DIR)/upload.sh #UPLOAD_SH = $(MOD_SCRIPT_DIR)/upload.sh
#MKSPEC_SH = $(MOD_SCRIPT_DIR)/mkspec-wrapper.sh $(TOPDIR)/make/mkspec.sh #MKSPEC_SH = $(MOD_SCRIPT_DIR)/mkspec-wrapper.sh $(TOPDIR)/make/mkspec.sh
#FTP_FILE_MODE ?= 640 #FTP_FILE_MODE ?= 640
#FTP_DIR_MODE ?= 750 #FTP_DIR_MODE ?= 750
#FTP_SRC_GROUP ?= spidsrc #FTP_SRC_GROUP ?= spidsrc
#FTP_SRC_USER ?= $(shell whoami) #FTP_SRC_USER ?= $(shell whoami)
#FTP_RUN_GROUP ?= spidrun #FTP_RUN_GROUP ?= spidrun
#FTP_RUN_USER ?= $(shell whoami) #FTP_RUN_USER ?= $(shell whoami)
#FTP_DEV_GROUP ?= spiddev #FTP_DEV_GROUP ?= spiddev
#FTP_DEV_USER ?= $(shell whoami) #FTP_DEV_USER ?= $(shell whoami)
#FTP_HOST ?= pkg.janware.com #FTP_HOST ?= pkg.janware.com
#FTP_HOST_LOGIN ?= root #FTP_HOST_LOGIN ?= root
# #
#OS_NAME = $(shell echo $(OS_NAME_VERSION) | sed 's/-.*//') #OS_NAME = $(shell echo $(OS_NAME_VERSION) | sed 's/-.*//')
#OS_VERSION = $(shell echo $(OS_NAME_VERSION) | sed 's/[^-]\+-//') #OS_VERSION = $(shell echo $(OS_NAME_VERSION) | sed 's/[^-]\+-//')
# #
## $(FTP_PCKG_DIR)/linux/$(OS_NAME)/$(OS_VERSION)/rpm/src ## $(FTP_PCKG_DIR)/linux/$(OS_NAME)/$(OS_VERSION)/rpm/src
#FTP_PCKG_DIR ?= /pub/packages #FTP_PCKG_DIR ?= /pub/packages
#PCKG_ROOT ?= $(FTP_PCKG_DIR)/linux/$(OS_NAME)/$(OS_VERSION) #PCKG_ROOT ?= $(FTP_PCKG_DIR)/linux/$(OS_NAME)/$(OS_VERSION)
##PCKG_ROOT = $(FTP_PCKG_DIR)/$(RPM_PROJECT) ##PCKG_ROOT = $(FTP_PCKG_DIR)/$(RPM_PROJECT)
#CURRENT_SRC = $(warning PCKG_ROOT=$(PCKG_ROOT))$(PCKG_ROOT)/tgz/$(PCKG_TAR) #CURRENT_SRC = $(warning PCKG_ROOT=$(PCKG_ROOT))$(PCKG_ROOT)/tgz/$(PCKG_TAR)
#CURRENT_RPM_RUN_I386 = $(PCKG_ROOT)/$(RPM_ARCH)/$(PCKG_RPM_RUN_I386) #CURRENT_RPM_RUN_I386 = $(PCKG_ROOT)/$(RPM_ARCH)/$(PCKG_RPM_RUN_I386)
#CURRENT_RPM_DEVEL_I386 = $(PCKG_ROOT)/$(RPM_ARCH)/$(PCKG_RPM_DEVEL_I386) #CURRENT_RPM_DEVEL_I386 = $(PCKG_ROOT)/$(RPM_ARCH)/$(PCKG_RPM_DEVEL_I386)
#CURRENT_RPM_SRC = $(PCKG_ROOT)/src/$(PCKG_RPM_SRC) #CURRENT_RPM_SRC = $(PCKG_ROOT)/src/$(PCKG_RPM_SRC)
#REMOTE_TARGET_PREFIX = rsync_ssh://$(FTP_HOST_LOGIN)@$(FTP_HOST):/srv/ftp #REMOTE_TARGET_PREFIX = rsync_ssh://$(FTP_HOST_LOGIN)@$(FTP_HOST):/srv/ftp
#REMOTE_TARGETS = \ #REMOTE_TARGETS = \
# $(REMOTE_TARGET_PREFIX)$(CURRENT_SRC):$(FTP_FILE_MODE):$(FTP_DIR_MODE):$(FTP_SRC_USER).$(FTP_SRC_GROUP) \ # $(REMOTE_TARGET_PREFIX)$(CURRENT_SRC):$(FTP_FILE_MODE):$(FTP_DIR_MODE):$(FTP_SRC_USER).$(FTP_SRC_GROUP) \
# $(REMOTE_TARGET_PREFIX)$(CURRENT_RPM_RUN_I386):$(FTP_FILE_MODE):$(FTP_DIR_MODE):$(FTP_RUN_USER).$(FTP_RUN_GROUP)\ # $(REMOTE_TARGET_PREFIX)$(CURRENT_RPM_RUN_I386):$(FTP_FILE_MODE):$(FTP_DIR_MODE):$(FTP_RUN_USER).$(FTP_RUN_GROUP)\
# $(REMOTE_TARGET_PREFIX)$(CURRENT_RPM_SRC):$(FTP_FILE_MODE):$(FTP_DIR_MODE):$(FTP_SRC_USER).$(FTP_SRC_GROUP) # $(REMOTE_TARGET_PREFIX)$(CURRENT_RPM_SRC):$(FTP_FILE_MODE):$(FTP_DIR_MODE):$(FTP_SRC_USER).$(FTP_SRC_GROUP)
# #
#ifeq ($(CREATE_DEVEL),true) #ifeq ($(CREATE_DEVEL),true)
#REMOTE_TARGETS += \ #REMOTE_TARGETS += \
# $(REMOTE_TARGET_PREFIX)$(CURRENT_RPM_DEVEL_I386):$(FTP_FILE_MODE):$(FTP_DIR_MODE):$(FTP_DEV_USER).$(FTP_DEV_GROUP) # $(REMOTE_TARGET_PREFIX)$(CURRENT_RPM_DEVEL_I386):$(FTP_FILE_MODE):$(FTP_DIR_MODE):$(FTP_DEV_USER).$(FTP_DEV_GROUP)
#endif #endif

38
make/upload-defs.mk
View file

@ -1,26 +1,26 @@
UPLOAD_SH ?= /bin/bash $(MOD_SCRIPT_DIR)/upload.sh UPLOAD_SH ?= /bin/bash $(MOD_SCRIPT_DIR)/upload.sh
UPLOAD_PROJECT ?= $(PROJECT) UPLOAD_PROJECT ?= $(PROJECT)
UPLOAD_MODULE ?= $(UPLOAD_PROJECT) UPLOAD_MODULE ?= $(UPLOAD_PROJECT)
UPLOAD_FILE_MODE ?= 640 UPLOAD_FILE_MODE ?= 640
UPLOAD_DIR_MODE ?= 750 UPLOAD_DIR_MODE ?= 750
UPLOAD_GROUP ?= $(shell id -ng) UPLOAD_GROUP ?= $(shell id -ng)
UPLOAD_USER ?= $(shell id -nu) UPLOAD_USER ?= $(shell id -nu)
UPLOAD_HOST_LOGIN ?= root UPLOAD_HOST_LOGIN ?= root
UPLOAD_HOST ?= files.janware.com UPLOAD_HOST ?= files.janware.com
UPLOAD_FILES_ROOT ?= /srv/dav/pub/clients/$(JANWARE_CLIENT) UPLOAD_FILES_ROOT ?= /srv/dav/pub/clients/$(JANWARE_CLIENT)
#UPLOAD_TEST_PREFIX ?= #UPLOAD_TEST_PREFIX ?=
UPLOAD_MODULE_PATH ?= $(UPLOAD_TEST_PREFIX)proj/$(UPLOAD_MODULE) UPLOAD_MODULE_PATH ?= $(UPLOAD_TEST_PREFIX)proj/$(UPLOAD_MODULE)
UPLOAD_MODULE_ROOT ?= $(UPLOAD_FILES_ROOT)/$(UPLOAD_MODULE_PATH) UPLOAD_MODULE_ROOT ?= $(UPLOAD_FILES_ROOT)/$(UPLOAD_MODULE_PATH)
UPLOAD_TARGET_PREFIX ?= rsync_ssh://$(UPLOAD_HOST_LOGIN)@$(UPLOAD_HOST):$(UPLOAD_MODULE_ROOT)/ UPLOAD_TARGET_PREFIX ?= rsync_ssh://$(UPLOAD_HOST_LOGIN)@$(UPLOAD_HOST):$(UPLOAD_MODULE_ROOT)/
#UPLOAD_FILES ?= #UPLOAD_FILES ?=
REMOTE_TARGETS ?= \ REMOTE_TARGETS ?= \
$(foreach f,$(notdir $(UPLOAD_FILES)),$(UPLOAD_TARGET_PREFIX)$f:$(UPLOAD_FILE_MODE):$(UPLOAD_DIR_MODE):$(UPLOAD_USER).$(UPLOAD_GROUP)) $(foreach f,$(notdir $(UPLOAD_FILES)),$(UPLOAD_TARGET_PREFIX)$f:$(UPLOAD_FILE_MODE):$(UPLOAD_DIR_MODE):$(UPLOAD_USER).$(UPLOAD_GROUP))
UPLOAD_SRC_DIR ?= . UPLOAD_SRC_DIR ?= .
ifneq ($(wildcard CVS),) ifneq ($(wildcard CVS),)
UPLOAD_SCM = cvs UPLOAD_SCM = cvs
else else
UPLOAD_SCM = git UPLOAD_SCM = git
endif endif
all: all:

14
make/wt-defs.mk
View file

@ -1,22 +1,22 @@
ifeq ($(USE_WT),true) ifeq ($(USE_WT),true)
# WT_VERSION = $(shell $(RPM) -q wt-devel | sed 's/wt-devel-\([0-9]\+\.[0-9]\+\.[0-9]\+\).*/\1/;') # WT_VERSION = $(shell $(RPM) -q wt-devel | sed 's/wt-devel-\([0-9]\+\.[0-9]\+\.[0-9]\+\).*/\1/;')
ifeq ($(USE_WT_FASTCGI),true) ifeq ($(USE_WT_FASTCGI),true)
PROJECT_LDFLAGS += -lwtfcgi PROJECT_LDFLAGS += -lwtfcgi
endif endif
ifeq ($(USE_WT_HTTPD),true) ifeq ($(USE_WT_HTTPD),true)
PROJECT_LDFLAGS += -lwthttp PROJECT_LDFLAGS += -lwthttp
PROJECT_CFLAGS += -DCONNECTOR_HTTP=YES PROJECT_CFLAGS += -DCONNECTOR_HTTP=YES
PROJECT_CPPFLAGS+= -DCONNECTOR_HTTP=YES PROJECT_CPPFLAGS += -DCONNECTOR_HTTP=YES
endif endif
ifeq ($(USE_WT_DBO),true) ifeq ($(USE_WT_DBO),true)
PROJECT_LDFLAGS += -lwtdbopostgres -lwtdbosqlite3 -lwtdbo PROJECT_LDFLAGS += -lwtdbopostgres -lwtdbosqlite3 -lwtdbo
endif endif
PROJECT_LDFLAGS += -lwt PROJECT_LDFLAGS += -lwt
endif endif

12
make/yapp.mk
View file

@ -1,13 +1,13 @@
SRC_ALL_CPP += main.cpp SRC_ALL_CPP += main.cpp
YAPP_INCLUDE_DIR ?= . YAPP_INCLUDE_DIR ?= .
YAPP_CLASS ?= $(firstword $(basename $(notdir $(wildcard $(addprefix \ YAPP_CLASS ?= $(firstword $(basename $(notdir $(wildcard $(addprefix \
$(YAPP_INCLUDE_DIR)/, YApp*.h App*.h Y*.h *.h))))) $(YAPP_INCLUDE_DIR)/, YApp*.h App*.h Y*.h *.h)))))
YAPP_CLASS_H ?= $(firstword $(wildcard $(addsuffix /$(YAPP_CLASS).h,\ YAPP_CLASS_H ?= $(firstword $(wildcard $(addsuffix /$(YAPP_CLASS).h,\
$(YAPP_INCLUDE_DIR) $(subst -I,,$(INCLUDE)))) $(YAPP_CLASS).h) $(YAPP_INCLUDE_DIR) $(subst -I,,$(INCLUDE)))) $(YAPP_CLASS).h)
YAPP_NAMESPACE ?= YAPP_NAMESPACE ?=
ifneq ($(TARGET),mingw) ifneq ($(TARGET),mingw)
LOCAL_LDFLAGS += -rdynamic LOCAL_LDFLAGS += -rdynamic
endif endif
include $(MODDIR)/make/exe.mk include $(MODDIR)/make/exe.mk

12
tmpl/doxygen/Makefile
View file

@ -1,16 +1,16 @@
TOPDIR = ../.. TOPDIR = ../..
TMPL_SUBDIR = doxygen TMPL_SUBDIR = doxygen
SVG = $(TOPDIR)/htdocs/images/logo-janware/logo-janware.svg SVG = $(TOPDIR)/htdocs/images/logo-janware/logo-janware.svg
GENERATED_WIDTHS_PNG = 400 GENERATED_WIDTHS_PNG = 400
LOGO = logo.png LOGO = logo.png
include $(TOPDIR)/make/proj.mk include $(TOPDIR)/make/proj.mk
include $(MODDIR)/make/svg.mk include $(MODDIR)/make/svg.mk
LOCAL_TMPL = $(wildcard *.html *.tmpl $(LOGO)) LOCAL_TMPL = $(wildcard *.html *.tmpl $(LOGO))
include $(MODDIR)/make/tmpl.mk include $(MODDIR)/make/tmpl.mk