From 0eaef0c3265da38aac1bce0e15a348470030815c Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Sun, 3 Mar 2019 18:12:28 +0000 Subject: [PATCH] conf/jcs, make, tmpl/doxygen: Align equal signs in makefiles to column 30 Signed-off-by: Jan Lindemann --- conf/jcs/jcs.mk | 28 +-- make/Makefile | 14 +- make/autoconf.mk | 12 +- make/backup.mk | 10 +- make/cleandirs.mk | 10 +- make/dav.mk | 28 +-- make/debugger.mk | 10 +- make/defs-cpp.mk | 522 +++++++++++++++++++------------------- make/defs-dev.mk | 546 ++++++++++++++++++++-------------------- make/defs-dirs.mk | 12 +- make/defs-dist.mk | 544 +++++++++++++++++++-------------------- make/defs.mk | 498 ++++++++++++++++++------------------ make/depend.mk | 8 +- make/dev-utils.mk | 8 +- make/dist.mk | 36 +-- make/doxygen.mk | 44 ++-- make/gettext.mk | 24 +- make/git-submod.mk | 12 +- make/htdocs.mk | 20 +- make/install-files.mk | 26 +- make/isolinux.mk | 28 +-- make/java.mk | 8 +- make/js.mk | 26 +- make/ldlibpath.mk | 14 +- make/linux-rpm-build.mk | 84 +++---- make/linux-rpm.mk | 32 +-- make/lo.mk | 42 ++-- make/make.mk | 24 +- make/mcu-defs.mk | 52 ++-- make/platform.mk | 161 +++++++----- make/plugin-defs.mk | 32 +-- make/profile.mk | 8 +- make/profiler-defs.mk | 24 +- make/proj.mk | 34 +-- make/projects-dir.mk | 90 +++---- make/projects.mk | 22 +- make/py-defs.mk | 52 ++-- make/py-mod.mk | 8 +- make/qt-defs.mk | 64 ++--- make/rpmdist.mk | 134 +++++----- make/run.mk | 28 +-- make/smart-selection.mk | 16 +- make/so.mk | 10 +- make/song.mk | 8 +- make/srcdist.mk | 20 +- make/standalone-exe.mk | 16 +- make/subtree.mk | 36 +-- make/suse-selection.mk | 12 +- make/svg.mk | 28 +-- make/swig.mk | 184 +++++++------- make/tex.mk | 200 +++++++-------- make/textest.mk | 16 +- make/tmpl.mk | 14 +- make/topdir.mk | 34 +-- make/upload-defs-rpm.mk | 48 ++-- make/upload-defs.mk | 38 +-- make/wt-defs.mk | 14 +- make/yapp.mk | 12 +- tmpl/doxygen/Makefile | 12 +- 59 files changed, 2065 insertions(+), 2032 deletions(-) diff --git a/conf/jcs/jcs.mk b/conf/jcs/jcs.mk index 3e6f13f2..ea05c144 100644 --- a/conf/jcs/jcs.mk +++ b/conf/jcs/jcs.mk @@ -1,18 +1,18 @@ -SHELL = /bin/sh +SHELL = /bin/sh -WD := $(shell pwd) -MOD := $(shell pwd | xargs basename) -LOG_DIR := $(shell . /etc/jcs/jcs.conf; echo $$jcs_log_dir) -INSTALL_LOG := $(LOG_DIR)/install.log -SETUP_LOG := $(LOG_DIR)/setup.log -TEE := /usr/bin/tee -BINDIR := /usr/local/bin -SBINDIR := /usr/local/bin -INF := $(wildcard *.inf) -INF_DONE := $(addsuffix .done,$(basename $(INF))) -INF_SU_DONE := $(addsuffix .su_done,$(basename $(INF))) -JCS_HTTP_PATH := $(shell . /etc/jcs/jcs.conf; echo $$jcs_http_path) -JCS = /opt/jw-build/bin/jcs +WD := $(shell pwd) +MOD := $(shell pwd | xargs basename) +LOG_DIR := $(shell . /etc/jcs/jcs.conf; echo $$jcs_log_dir) +INSTALL_LOG := $(LOG_DIR)/install.log +SETUP_LOG := $(LOG_DIR)/setup.log +TEE := /usr/bin/tee +BINDIR := /usr/local/bin +SBINDIR := /usr/local/bin +INF := $(wildcard *.inf) +INF_DONE := $(addsuffix .done,$(basename $(INF))) +INF_SU_DONE := $(addsuffix .su_done,$(basename $(INF))) +JCS_HTTP_PATH := $(shell . /etc/jcs/jcs.conf; echo $$jcs_http_path) +JCS = /opt/jw-build/bin/jcs export SETUP_LOG INSTALL_LOG TEE BINDIR SBINDIR diff --git a/make/Makefile b/make/Makefile index ee4672f1..b7a352aa 100644 --- a/make/Makefile +++ b/make/Makefile @@ -3,14 +3,14 @@ # contact@jannet.de # $Id$ -TOPDIR = .. +TOPDIR = .. -CACHED_FILES := defs.mk projects.mk platform.mk Makefile -#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 += TARGET_ARCH RPM_ARCH -CACHED_VARS += TARGET_ARCH -#CACHED_VARS += DEVELOPMENT +CACHED_FILES := defs.mk projects.mk platform.mk Makefile +#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 += TARGET_ARCH RPM_ARCH +#CACHED_VARS += TARGET_ARCH +#CACHED_VARS += DEVELOPMENT include $(TOPDIR)/make/proj.mk include $(MODDIR)/make/make.mk diff --git a/make/autoconf.mk b/make/autoconf.mk index 9c23ad15..815b9ee7 100644 --- a/make/autoconf.mk +++ b/make/autoconf.mk @@ -3,12 +3,12 @@ # contact@jannet.de # $Id$ -CONFIG_ACDONE := $(wildcard config.acdone) -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 = $(basename $(AC_FILES_IN)) -CAT ?= /bin/cat -SED ?= $(firstword $(wildcard /usr/bin/sed /bin/sed)) +CONFIG_ACDONE := $(wildcard config.acdone) +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 = $(basename $(AC_FILES_IN)) +CAT ?= /bin/cat +SED ?= $(firstword $(wildcard /usr/bin/sed /bin/sed)) all: config.acdone make_all config: config.acdone $(AC_FILES) diff --git a/make/backup.mk b/make/backup.mk index 4fe5af92..a5861230 100644 --- a/make/backup.mk +++ b/make/backup.mk @@ -1,11 +1,11 @@ -BACKUP_SOURCE ?= . -BACKUP_TARGET ?= .. -BACKUP_DATE ?= $(shell date +'%y%m%d-%H%M%S') +BACKUP_SOURCE ?= . +BACKUP_TARGET ?= .. +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 -BACKUP_MK_INCLUDED = true +BACKUP_MK_INCLUDED = true backup: distclean tar -C .. $(_BACKUP_SOURCE) -cjf $(BACKUP_TARGET)/$(_BACKUP_SOURCE)-$(BACKUP_DATE).tar.bz2 diff --git a/make/cleandirs.mk b/make/cleandirs.mk index ef17deac..e4cd85dd 100644 --- a/make/cleandirs.mk +++ b/make/cleandirs.mk @@ -7,14 +7,14 @@ distclean: do.distclean include $(MODDIR)/make/defs.mk -SUBDIRS ?= $(FIND_SUBDIRS) +SUBDIRS ?= $(FIND_SUBDIRS) ifeq ($(FORCE_REBUILD_CLEANDIRS),true) - SUBDIRS_ALL = $(SUBDIRS) - SUBDIRS_INSTALL = $(SUBDIRS) + SUBDIRS_ALL = $(SUBDIRS) + SUBDIRS_INSTALL = $(SUBDIRS) else - SUBDIRS_ALL ?= - SUBDIRS_INSTALL ?= + SUBDIRS_ALL ?= + SUBDIRS_INSTALL ?= endif do.all: diff --git a/make/dav.mk b/make/dav.mk index 896dbfa4..66bc1055 100644 --- a/make/dav.mk +++ b/make/dav.mk @@ -1,17 +1,17 @@ -DAV_GROUP ?= jannet -DAV_GROUP_PROJECT ?= $(PROJECT_DIRNAME) -DAV_GROUP_PROJECT_GROUP ?= $(shell id -gn) -DAV_GROUP_PROJECT_USER ?= $(shell id -un) -DAV_SERVER ?= cvs.jannet.de -DAV_RSYNC_SERVER ?= $(DAV_SERVER) -DAV_RSYNC_DIR ?= /srv/dav/pub/groups/$(DAV_GROUP)/$(DAV_GROUP_PROJECT) -DAV_RSYNC_URL = $(DAV_RSYNC_SERVER):$(DAV_RSYNC_DIR) -DAV_RSYNC_EXCLUDE ?= $(shell bash $(MOD_SCRIPT_DIR)/scm.sh ls-files) -DAV_RSYNC_EXCLUDE_OPTS = $(addprefix --exclude , $(DAV_RSYNC_EXCLUDE) '*.done') -DAV_RSYNC_EXTRA_OPTS ?= -DAV_RSYNC ?= rsync $(DAV_RSYNC_EXCLUDE_OPTS) -DAV_RSYNC_MODE ?= 664 -DAV_RSYNC_DIRMODE ?= 775 +DAV_GROUP ?= jannet +DAV_GROUP_PROJECT ?= $(PROJECT_DIRNAME) +DAV_GROUP_PROJECT_GROUP ?= $(shell id -gn) +DAV_GROUP_PROJECT_USER ?= $(shell id -un) +DAV_SERVER ?= cvs.jannet.de +DAV_RSYNC_SERVER ?= $(DAV_SERVER) +DAV_RSYNC_DIR ?= /srv/dav/pub/groups/$(DAV_GROUP)/$(DAV_GROUP_PROJECT) +DAV_RSYNC_URL = $(DAV_RSYNC_SERVER):$(DAV_RSYNC_DIR) +DAV_RSYNC_EXCLUDE ?= $(shell bash $(MOD_SCRIPT_DIR)/scm.sh ls-files) +DAV_RSYNC_EXCLUDE_OPTS = $(addprefix --exclude , $(DAV_RSYNC_EXCLUDE) '*.done') +DAV_RSYNC_EXTRA_OPTS ?= +DAV_RSYNC ?= rsync $(DAV_RSYNC_EXCLUDE_OPTS) +DAV_RSYNC_MODE ?= 664 +DAV_RSYNC_DIRMODE ?= 775 include $(MODDIR)/make/defs.mk diff --git a/make/debugger.mk b/make/debugger.mk index 7fc427af..a5e09f26 100644 --- a/make/debugger.mk +++ b/make/debugger.mk @@ -1,19 +1,19 @@ ifeq "$(COMPILER_SUITE)" "gcc" -DEBUGGER = gdb +DEBUGGER = gdb endif ifeq "$(COMPILER_SUITE)" "clang" -DEBUGGER = lldb +DEBUGGER = lldb 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/ .*//') ifeq ($(CORE_DUMPER),) -CORE_DUMPER = $(EXE_PATH) +CORE_DUMPER = $(EXE_PATH) endif -PID = $(shell pidof $(EXE_PATH)) +PID = $(shell pidof $(EXE_PATH)) all: diff --git a/make/defs-cpp.mk b/make/defs-cpp.mk index 36276ec7..fa96d337 100644 --- a/make/defs-cpp.mk +++ b/make/defs-cpp.mk @@ -1,163 +1,163 @@ # ----- compilation options -CREATE_DEVEL ?= true -#COMPILER_SUITE ?= clang -COMPILER_SUITE ?= gcc +CREATE_DEVEL ?= true +#COMPILER_SUITE ?= clang +COMPILER_SUITE ?= gcc ifeq ($(TARGET_ARCH),$(ARCH_32)) - PROJECT_CFLAGS += -m32 - PROJECT_CPPFLAGS += -m32 - PROJECT_LDFLAGS += -m32 + PROJECT_CFLAGS += -m32 + PROJECT_CPPFLAGS += -m32 + PROJECT_LDFLAGS += -m32 endif ifeq ($(TARGET_ARCH),armv7hl) - PROJECT_CFLAGS += -fPIC - PROJECT_CPPFLAGS += -fPIC - PROJECT_LDFLAGS += + PROJECT_CFLAGS += -fPIC + PROJECT_CPPFLAGS += -fPIC + PROJECT_LDFLAGS += else ifeq ($(TARGET_ARCH),aarch64) - PROJECT_CFLAGS += -fPIC - PROJECT_CPPFLAGS += -fPIC - PROJECT_LDFLAGS += + PROJECT_CFLAGS += -fPIC + PROJECT_CPPFLAGS += -fPIC + PROJECT_LDFLAGS += endif ifeq ($(findstring $(TARGET_OS),linux),) - USE_SYSTEMD := false + USE_SYSTEMD := false endif ifeq ($(DEVELOPMENT),true) - export G_SLICE=always-malloc - export G_DEBUG=gc-friendly,resident-modules - export MALLOC_CHECK_=2 + export G_SLICE = always-malloc + export G_DEBUG = gc-friendly,resident-modules + export MALLOC_CHECK_ = 2 endif -USE_PROJECT_LIB ?= true -EXPORT_PROJECT_LIB ?= $(USE_PROJECT_LIB) -USE_JW_BUILD ?= true -USE_EXCEPTIONS_IN_C ?= true +USE_PROJECT_LIB ?= true +EXPORT_PROJECT_LIB ?= $(USE_PROJECT_LIB) +USE_JW_BUILD ?= true +USE_EXCEPTIONS_IN_C ?= true USE_COMPILER_OPTIMIZATION_OPTS = false -USE_COMPILER_DEBUG_OPTS = true -COMPILE_DEBUG_CODE = true +USE_COMPILER_DEBUG_OPTS = true +COMPILE_DEBUG_CODE = true -BUILD_CFLAGS += $(CFLAGS) -BUILD_CPPFLAGS += $(CPPFLAGS) -BUILD_LDFLAGS += $(LDFLAGS) +BUILD_CFLAGS += $(CFLAGS) +BUILD_CPPFLAGS += $(CPPFLAGS) +BUILD_LDFLAGS += $(LDFLAGS) -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_LDFLAGS += -Wall +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_LDFLAGS += -Wall -LOG_QUAL_PREFIX ?= $(LOGID): +LOG_QUAL_PREFIX ?= $(LOGID): ifneq ($(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_CFLAGS += -DKEEP_FILES_OPEN -DLOG_QUAL_PREFIX=\"$(LOG_QUAL_PREFIX)\" + PROJECT_CPPFLAGS += -DKEEP_FILES_OPEN -DLOG_QUAL_PREFIX=\"$(LOG_QUAL_PREFIX)\" endif ifeq ($(CATCH_ONLY_YERROR),true) - BUILD_CFLAGS += -DCATCH_ONLY_YERROR - BUILD_CPPFLAGS += -DCATCH_ONLY_YERROR + BUILD_CFLAGS += -DCATCH_ONLY_YERROR + BUILD_CPPFLAGS += -DCATCH_ONLY_YERROR endif -SYSCFG_DIR ?= /etc/sysconfig -SYSCFG_FILE ?= $(SYSCFG_DIR)/$(PROJECT) -OPTS_PID_FILE ?= $(PIDDIR)/$(PROJECT).pid +SYSCFG_DIR ?= /etc/sysconfig +SYSCFG_FILE ?= $(SYSCFG_DIR)/$(PROJECT) +OPTS_PID_FILE ?= $(PIDDIR)/$(PROJECT).pid -USE_VERSION_MACROS ?= true +USE_VERSION_MACROS ?= true ifeq ($(USE_VERSION_MACROS),true) - BUILD_CFLAGS += -DVERSION=$(HEX_VERSION) -DVERSION_STR=\"$(VERSION)\" - BUILD_CPPFLAGS += -DVERSION=$(HEX_VERSION) -DVERSION_STR=\"$(VERSION)\" + BUILD_CFLAGS += -DVERSION=$(HEX_VERSION) -DVERSION_STR=\"$(VERSION)\" + BUILD_CPPFLAGS += -DVERSION=$(HEX_VERSION) -DVERSION_STR=\"$(VERSION)\" endif # ----- tool chain ifneq ($(TARGET_TRIPLET),$(HOST_TRIPLET)) # we're cross-compiling - TC_BIN_PREFIX ?= $(TARGET_TRIPLET)- - TC_SYS_ROOT ?= /usr/$(TARGET_TRIPLET) + TC_BIN_PREFIX ?= $(TARGET_TRIPLET)- + TC_SYS_ROOT ?= /usr/$(TARGET_TRIPLET) ifeq ($(TARGET),mingw) ifneq ($(wildcard $(TC_BIN_PREFIX)gcc),) - CROSS_TOOL_DIR ?= - TC_SYS_ROOT ?= /usr/$(TARGET_TRIPLET)/sys-root/mingw + CROSS_TOOL_DIR ?= + TC_SYS_ROOT ?= /usr/$(TARGET_TRIPLET)/sys-root/mingw else - CROSS_TOOL_DIR ?= /opt/cross-tools - TC_BIN_PREFIX ?= $(CROSS_TOOL_DIR)/bin/i686-pc-mingw32- + CROSS_TOOL_DIR ?= /opt/cross-tools + TC_BIN_PREFIX ?= $(CROSS_TOOL_DIR)/bin/i686-pc-mingw32- endif - PROJECT_CFLAGS += -D_WINDOWS - PROJECT_CPPFLAGS += -D_WINDOWS - BUILD_LDFLAGS += -lws2_32 - WINDRES ?= $(TC_BIN_PREFIX)windres - USE_GFILTER ?= false - MS_LD ?= wine $(HOME)/local/mingw/packages/msvcpp/bin/LIB.EXE + PROJECT_CFLAGS += -D_WINDOWS + PROJECT_CPPFLAGS += -D_WINDOWS + BUILD_LDFLAGS += -lws2_32 + WINDRES ?= $(TC_BIN_PREFIX)windres + USE_GFILTER ?= false + MS_LD ?= wine $(HOME)/local/mingw/packages/msvcpp/bin/LIB.EXE endif - PROJECT_CFLAGS += -I$(TC_SYS_ROOT)/include - PROJECT_CPPFLAGS += -I$(TC_SYS_ROOT)/include - PROJECT_LDFLAGS += -L$(TC_SYS_ROOT)/lib + PROJECT_CFLAGS += -I$(TC_SYS_ROOT)/include + PROJECT_CPPFLAGS += -I$(TC_SYS_ROOT)/include + PROJECT_LDFLAGS += -L$(TC_SYS_ROOT)/lib else # we're not cross-compiling - TC_SYS_ROOT ?= /usr - LIBFLAGS += -ldl -lpthread + TC_SYS_ROOT ?= /usr + LIBFLAGS += -ldl -lpthread endif ifeq ($(TARGET_ARCH),x86_64) - BUILD_CFLAGS += -fPIC - BUILD_CPPFLAGS += -fPIC - LIBFLAGS += + BUILD_CFLAGS += -fPIC + BUILD_CPPFLAGS += -fPIC + LIBFLAGS += endif ifeq ($(TARGET_TRIPLET),arm-none-eabi) - BUILD_CFLAGS += -mcpu=cortex-m3 -mthumb - BUILD_CPPFLAGS += -mcpu=cortex-m3 -mthumb + BUILD_CFLAGS += -mcpu=cortex-m3 -mthumb + BUILD_CPPFLAGS += -mcpu=cortex-m3 -mthumb endif ifeq ($(COMPILER_SUITE),gcc) - GCC ?= $(TC_BIN_PREFIX)gcc - GPP ?= $(TC_BIN_PREFIX)g++ - CPP ?= $(GPP) - GNU_LD ?= $(TC_BIN_PREFIX)ld - CLANG ?= $(TC_BIN_PREFIX)clang - CLANGPP ?= $(TC_BIN_PREFIX)clang++ - STRIP ?= $(TC_BIN_PREFIX)strip - RANLIB ?= $(TC_BIN_PREFIX)ranlib - AR ?= $(TC_BIN_PREFIX)ar - PKG_CONFIG ?= $(TC_BIN_PREFIX)pkg-config + GCC ?= $(TC_BIN_PREFIX)gcc + GPP ?= $(TC_BIN_PREFIX)g++ + CPP ?= $(GPP) + GNU_LD ?= $(TC_BIN_PREFIX)ld + CLANG ?= $(TC_BIN_PREFIX)clang + CLANGPP ?= $(TC_BIN_PREFIX)clang++ + STRIP ?= $(TC_BIN_PREFIX)strip + RANLIB ?= $(TC_BIN_PREFIX)ranlib + AR ?= $(TC_BIN_PREFIX)ar + PKG_CONFIG_EXE ?= $(TC_BIN_PREFIX)pkg-config # compiler and linker # gcc - GCC_VERSION := $(shell $(GCC) -v 2>&1 | $(SED) '/gcc.version/I !d; s/.*version *//I; s/ \+.*//') - GCC_VERSION_NUMBERS := $(subst ., ,$(GCC_VERSION)) - GCC_MAJOR := $(word 1,$(GCC_VERSION_NUMBERS)) - GCC_MINOR := $(word 2,$(GCC_VERSION_NUMBERS)) - GCC_REV := $(word 3,$(GCC_VERSION_NUMBERS)) + GCC_VERSION := $(shell $(GCC) -v 2>&1 | $(SED) '/gcc.version/I !d; s/.*version *//I; s/ \+.*//') + GCC_VERSION_NUMBERS := $(subst ., ,$(GCC_VERSION)) + GCC_MAJOR := $(word 1,$(GCC_VERSION_NUMBERS)) + GCC_MINOR := $(word 2,$(GCC_VERSION_NUMBERS)) + GCC_REV := $(word 3,$(GCC_VERSION_NUMBERS)) # Not needed anywhere - #GNU_LD_VERSION := $(shell $(LD) -V | $(SED) '/GNU ld/ !d; s/(.*)//; s/[^0-9.-]*//') - #GNU_LD_VERSION_NUMBERS:= $(subst ., ,$(GNU_LD_VERSION)) - #GNU_LD_MAJOR := $(word 1,$(GNU_LD_VERSION_NUMBERS)) - #GNU_LD_MINOR := $(word 2,$(GNU_LD_VERSION_NUMBERS)) - #GNU_LD_REV := $(word 3,$(GNU_LD_VERSION_NUMBERS)) + #GNU_LD_VERSION := $(shell $(LD) -V | $(SED) '/GNU ld/ !d; s/(.*)//; s/[^0-9.-]*//') + #GNU_LD_VERSION_NUMBERS := $(subst ., ,$(GNU_LD_VERSION)) + #GNU_LD_MAJOR := $(word 1,$(GNU_LD_VERSION_NUMBERS)) + #GNU_LD_MINOR := $(word 2,$(GNU_LD_VERSION_NUMBERS)) + #GNU_LD_REV := $(word 3,$(GNU_LD_VERSION_NUMBERS)) - CC = $(GCC) - CPP = $(GPP) - LD = $(GPP) + CC = $(GCC) + CPP = $(GPP) + LD = $(GPP) ifneq ($(GCC_VERSION),4.1.0) ifneq ($(GCC_VERSION),4.5.1) BUILD_CFLAGS += -std=gnu11 BUILD_CPPFLAGS += -std=c++11 - #BUILD_CPPFLAGS += -Wsuggest-override + #BUILD_CPPFLAGS += -Wsuggest-override endif endif ifeq ($(shell $(TEST) $(GCC_MAJOR) -ge 5; $(ECHO) $$?),0) ifeq ($(USE_CPP_FORCE_OVERRIDE),true) - GCC_CPPFLAGS += -Werror=suggest-override + GCC_CPPFLAGS += -Werror=suggest-override endif endif @@ -165,62 +165,62 @@ else ifeq ($(COMPILER_SUITE),clang) # clang CLANG_CPPFLAGS += -Wno-unused-private-field -Wno-self-assign-field -Wno-overloaded-virtual - CC = $(CLANG) - CPP = $(CLANGPP) - LD = $(CLANGPP) + CC = $(CLANG) + CPP = $(CLANGPP) + LD = $(CLANGPP) ifeq ($(USE_CPP_WARN_INCONSISTENT_OVERRIDE),true) - CLANG_CPPFLAGS += -Winconsistent-missing-override + CLANG_CPPFLAGS += -Winconsistent-missing-override endif endif # COMPILER_SUITE # -- target files and dirs -SRC_SUFFIX += $(sort $(suffix $(wildcard $(TOPDIR)/hdr/*))) -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_UNHEADERED += $(filter-out $(SRC_HEADERED),$(LOCAL_SRC)) -LOCAL_C ?= $(wildcard *.c) -LOCAL_CPP ?= $(wildcard *.cc *.cpp *.C) -LOCAL_H ?= $(wildcard *.h *.H *.hpp) -SFILES ?= $(wildcard *.S) -#PREREQ_H += $(foreach dir,$(PREREQ_DIR),$(wildcard $(dir)/*.h)) -ALL_H += $(LOCAL_H) $(PREREQ_H) -SRC_ALL_CPP += $(LOCAL_C) $(LOCAL_CPP) $(LOCAL_H) -SRC_C += $(filter %.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 %.S,%.o,$(SFILES))) +SRC_SUFFIX += $(sort $(suffix $(wildcard $(TOPDIR)/hdr/*))) +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_UNHEADERED += $(filter-out $(SRC_HEADERED),$(LOCAL_SRC)) +LOCAL_C ?= $(wildcard *.c) +LOCAL_CPP ?= $(wildcard *.cc *.cpp *.C) +LOCAL_H ?= $(wildcard *.h *.H *.hpp) +SFILES ?= $(wildcard *.S) +#PREREQ_H += $(foreach dir,$(PREREQ_DIR),$(wildcard $(dir)/*.h)) +ALL_H += $(LOCAL_H) $(PREREQ_H) +SRC_ALL_CPP += $(LOCAL_C) $(LOCAL_CPP) $(LOCAL_H) +SRC_C += $(filter %.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 %.S,%.o,$(SFILES))) -#PREREQ_C += $(foreach dir,$(PREREQ_DIR),$(wildcard $(dir)/*.c)) -#PREREQ_CPP += $(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)) \ # $(foreach dir,$(PREREQ_DIR),$(wildcard $(dir)/*.cpp)) -#PREREQ_CSRC += $(PREREQ_H) $(PREREQ_C) $(PREREQ_CPP) -REQUIRED_DIR += $(patsubst %,$(MODDIR)/%,$(REQUIRED)) -REQUIRED_DONE += $(patsubst %,%/all.done,$(REQUIRED_DIR)) -REQUIRED_H += $(foreach dir,$(REQUIRED_DIR),$(wildcard $(dir)/*.h)) -REQUIRED_C += $(foreach dir,$(REQUIRED_DIR),$(wildcard $(dir)/*.c)) -REQUIRED_CPP += $(foreach dir,$(REQUIRED_DIR),$(wildcard $(dir)/*.cpp)) \ +#PREREQ_CSRC += $(PREREQ_H) $(PREREQ_C) $(PREREQ_CPP) +REQUIRED_DIR += $(patsubst %,$(MODDIR)/%,$(REQUIRED)) +REQUIRED_DONE += $(patsubst %,%/all.done,$(REQUIRED_DIR)) +REQUIRED_H += $(foreach dir,$(REQUIRED_DIR),$(wildcard $(dir)/*.h)) +REQUIRED_C += $(foreach dir,$(REQUIRED_DIR),$(wildcard $(dir)/*.c)) +REQUIRED_CPP += $(foreach dir,$(REQUIRED_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_CPP += $(LOCAL_CPP) $(PREREQ_CPP) -ALL_CSRC += $(LOCAL_CSRC) $(PREREQ_CSRC) +ALL_C += $(LOCAL_C) $(PREREQ_CPP) +ALL_CPP += $(LOCAL_CPP) $(PREREQ_CPP) +ALL_CSRC += $(LOCAL_CSRC) $(PREREQ_CSRC) # == ifeq ($(DEVELOPMENT),true) - BUILD_CFLAGS += -D_DEVELOPMENT_ - BUILD_CPPFLAGS+= -D_DEVELOPMENT_ + BUILD_CFLAGS += -D_DEVELOPMENT_ + BUILD_CPPFLAGS += -D_DEVELOPMENT_ 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) - BUILD_CFLAGS += -DGCC_HASCLASSVISIBILITY - BUILD_CPPFLAGS+= -DGCC_HASCLASSVISIBILITY + BUILD_CFLAGS += -DGCC_HASCLASSVISIBILITY + BUILD_CPPFLAGS += -DGCC_HASCLASSVISIBILITY endif ifeq ($(USE_QT),true) @@ -229,44 +229,44 @@ ifeq ($(USE_QT),true) endif 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 -LPPFLAGS += -lstdc++ +LPPFLAGS += -lstdc++ ifeq ($(GCC_MAJOR),2) - LPPFLAGS += -lm - BUILD_CFLAGS += -I/usr/local/include - BUILD_CPPFLAGS += -I/usr/local/include + LPPFLAGS += -lm + BUILD_CFLAGS += -I/usr/local/include + BUILD_CPPFLAGS += -I/usr/local/include else ifeq ($(GCC_MAJOR),3) ifeq ($(GCC_MINOR),3) - LPPFLAGS += -lgcc_s - # LPPFLAGS += -L/usr/local/gcc3.3/lib + LPPFLAGS += -lgcc_s + # LPPFLAGS += -L/usr/local/gcc3.3/lib endif endif endif ifeq ($(TARGET),mingw) - BUILD_CFLAGS += -DWIN32 - BUILD_CPPFLAGS += -DWIN32 + BUILD_CFLAGS += -DWIN32 + BUILD_CPPFLAGS += -DWIN32 # see https://stackoverflow.com/questions/4492799 - BUILD_LDFLAGS += -fstack-protector + BUILD_LDFLAGS += -fstack-protector endif ifeq ($(LIBTYPE),shared) ifneq ($(TARGET),mingw) - BUILD_LDFLAGS += -rdynamic + BUILD_LDFLAGS += -rdynamic endif endif # TODO: this shoud be only conditional, but breaks, because not all headers # do a conditional include of timer headers, yet -GENERATE_FUNC_TIMERS = $(MODDIR)/YStopWatchThreadList/generate_func_timers.sh +GENERATE_FUNC_TIMERS = $(MODDIR)/YStopWatchThreadList/generate_func_timers.sh ifeq ($(LOG_THREAD_NAMES), true) - BUILD_CFLAGS += -DSLOG_THREAD_NAMES - BUILD_CPPFLAGS+= -DSLOG_THREAD_NAMES + BUILD_CFLAGS += -DSLOG_THREAD_NAMES + BUILD_CPPFLAGS += -DSLOG_THREAD_NAMES endif # ----- standard features, switched on with USE_XXX = true @@ -274,160 +274,160 @@ endif #include $(MODDIR)/make/lib-deps.mk 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) - GPP = $(GFILT) + GPP = $(GFILT) endif endif ifeq ($(USE_PROJECT_LIB),true) - PROJECTLIB_LDFLAGS += -L$(TOPDIR)/lib -l$(LIBNAME) + PROJECTLIB_LDFLAGS += -L$(TOPDIR)/lib -l$(LIBNAME) endif ifneq ($(filter jw-build,$(PREREQ_BUILD)),) ifeq ($(TARGET),mingw) - JW_BUILD_LDFLAGS += -lglib-2.0 -lws2_32 -lstdc++ + JW_BUILD_LDFLAGS += -lglib-2.0 -lws2_32 -lstdc++ endif endif ifeq ($(USE_SYSTEMD),true) - BUILD_CFLAGS += -D_USE_SYSTEMD_ $(shell $(PKG_CONFIG) --cflags libsystemd) - BUILD_CPPFLAGS += -D_USE_SYSTEMD_ $(shell $(PKG_CONFIG) --cflags libsystemd) - BUILD_LDFLAGS += $(shell $(PKG_CONFIG) --libs libsystemd) + BUILD_CFLAGS += -D_USE_SYSTEMD_ $(shell $(PKG_CONFIG_EXE) --cflags libsystemd) + BUILD_CPPFLAGS += -D_USE_SYSTEMD_ $(shell $(PKG_CONFIG_EXE) --cflags libsystemd) + BUILD_LDFLAGS += $(shell $(PKG_CONFIG_EXE) --libs libsystemd) endif ifeq ($(USE_TIMER),true) - BUILD_CFLAGS += -D_USE_TIMER_ - BUILD_CPPFLAGS += -D_USE_TIMER_ + BUILD_CFLAGS += -D_USE_TIMER_ + BUILD_CPPFLAGS += -D_USE_TIMER_ endif ifeq ($(USE_FAST_LOG),false) - BUILD_CFLAGS +=-D_USE_FAST_LOG_=0 - BUILD_CPPFLAGS +=-D_USE_FAST_LOG_=0 + BUILD_CFLAGS += -D_USE_FAST_LOG_=0 + BUILD_CPPFLAGS += -D_USE_FAST_LOG_=0 endif ifeq ($(USE_YAMD),true) - CC = yamd-gcc + CC = yamd-gcc endif ifeq ($(USE_MPATROL),true) - BUILD_CFLAGS += -include /usr/include/mpatrol.h - #BUILD_CPPFLAGS += -include /usr/include/mpatrol.h - BUILD_LDFLAGS += -lmpatrolmt -lbfd -liberty + BUILD_CFLAGS += -include /usr/include/mpatrol.h + #BUILD_CPPFLAGS += -include /usr/include/mpatrol.h + BUILD_LDFLAGS += -lmpatrolmt -lbfd -liberty endif ifeq ($(USE_VALGRIND),true) - BUILD_CFLAGS += -include /usr/include/valgrind/memcheck.h -D_VALGRIND_ - BUILD_CPPFLAGS += -include /usr/include/valgrind/memcheck.h -D_VALGRIND_ - # BUILD_LDFLAGS += + BUILD_CFLAGS += -include /usr/include/valgrind/memcheck.h -D_VALGRIND_ + BUILD_CPPFLAGS += -include /usr/include/valgrind/memcheck.h -D_VALGRIND_ + # BUILD_LDFLAGS += endif ifeq ($(USE_MCHECK),true) - BUILD_LDFLAGS += -lmcheck + BUILD_LDFLAGS += -lmcheck endif ifeq ($(USE_STACK_PROTECTOR),true) - BUILD_CFLAGS += -fstack-protector-all - BUILD_CPPFLAGS += -fstack-protector-all - #BUILD_CFLAGS += -fstack-protector + BUILD_CFLAGS += -fstack-protector-all + BUILD_CPPFLAGS += -fstack-protector-all + #BUILD_CFLAGS += -fstack-protector endif ifeq ($(USE_STACK_CHECKER),true) ifeq "$(COMPILER_SUITE)" "clang" - BUILD_CFLAGS += -fsanitize=address -fno-omit-frame-pointer - BUILD_CPPFLAGS += -fsanitize=address -fno-omit-frame-pointer - BUILD_LDFLAGS += -fsanitize=address + BUILD_CFLAGS += -fsanitize=address -fno-omit-frame-pointer + BUILD_CPPFLAGS += -fsanitize=address -fno-omit-frame-pointer + BUILD_LDFLAGS += -fsanitize=address endif endif ifeq ($(USE_DBMALLOC),true) - CONTRIB_LIBS += dbmalloc - BUILD_CFLAGS += -DDBMALLOC -DEXITFUN=_exit -I$(TOPDIR)/contrib/dbmalloc - BUILD_CPPFLAGS += -DDBMALLOC -DEXITFUN=_exit -I$(TOPDIR)/contrib/dbmalloc - BUILD_LDFLAGS += -ldbmalloc + CONTRIB_LIBS += dbmalloc + BUILD_CFLAGS += -DDBMALLOC -DEXITFUN=_exit -I$(TOPDIR)/contrib/dbmalloc + BUILD_CPPFLAGS += -DDBMALLOC -DEXITFUN=_exit -I$(TOPDIR)/contrib/dbmalloc + BUILD_LDFLAGS += -ldbmalloc endif ifeq ($(USE_DMALLOC),true) - BUILD_CFLAGS += -DDMALLOC -DDMALLOC_FUNC_CHECK -DSTORE_SEEN_COUNT - BUILD_CPPFLAGS += -DDMALLOC -DDMALLOC_FUNC_CHECK -DSTORE_SEEN_COUNT - BUILD_LDFLAGS += -ldmallocthcxx -ldmallocth + BUILD_CFLAGS += -DDMALLOC -DDMALLOC_FUNC_CHECK -DSTORE_SEEN_COUNT + BUILD_CPPFLAGS += -DDMALLOC -DDMALLOC_FUNC_CHECK -DSTORE_SEEN_COUNT + BUILD_LDFLAGS += -ldmallocthcxx -ldmallocth endif ifeq ($(USE_MEMWATCH),true) - BUILD_CFLAGS += -DMEMWATCH -DMW_STDIO - BUILD_CPPFLAGS += -DMEMWATCH -DMW_STDIO + BUILD_CFLAGS += -DMEMWATCH -DMW_STDIO + BUILD_CPPFLAGS += -DMEMWATCH -DMW_STDIO endif ifeq ($(USE_EFENCE),true) - BUILD_CFLAGS += -DEFENCE - BUILD_CPPFLAGS += -DEFENCE - BUILD_LDFLAGS += -lefence + BUILD_CFLAGS += -DEFENCE + BUILD_CPPFLAGS += -DEFENCE + BUILD_LDFLAGS += -lefence endif ifeq ($(USE_TRACING),true) - BUILD_CFLAGS += -D_DO_TRACE_ - BUILD_CPPFLAGS += -D_DO_TRACE_ + BUILD_CFLAGS += -D_DO_TRACE_ + BUILD_CPPFLAGS += -D_DO_TRACE_ endif ifeq ($(USE_ASSERTIONS),false) - BUILD_CFLAGS += -DNDEBUG - BUILD_CPPFLAGS += -DNDEBUG + BUILD_CFLAGS += -DNDEBUG + BUILD_CPPFLAGS += -DNDEBUG endif ifeq ($(COMPILE_DEBUG_CODE),true) - BUILD_CFLAGS += -D_DEBUG_ - BUILD_CPPFLAGS += -D_DEBUG_ + BUILD_CFLAGS += -D_DEBUG_ + BUILD_CPPFLAGS += -D_DEBUG_ endif ifeq ($(COMPILE_DEBUG_LOG),true) - BUILD_CFLAGS += -D_LOG_DEBUG_ - BUILD_CPPFLAGS += -D_LOG_DEBUG_ + BUILD_CFLAGS += -D_LOG_DEBUG_ + BUILD_CPPFLAGS += -D_LOG_DEBUG_ endif ifeq ($(USE_MPATROL),true) - BUILD_CFLAGS += -include $(MODDIR)/include/mpatrol.h - BUILD_CPPFLAGS += -include $(MODDIR)/include/mpatrol.h - BUILD_LDFLAGS += -lmpatrolmt -lbfd -liberty + BUILD_CFLAGS += -include $(MODDIR)/include/mpatrol.h + BUILD_CPPFLAGS += -include $(MODDIR)/include/mpatrol.h + BUILD_LDFLAGS += -lmpatrolmt -lbfd -liberty endif ifeq ($(BREAK_ABI),true) - BUILD_CFLAGS += -D_BREAK_ABI_ - BUILD_CPPFLAGS += -D_BREAK_ABI_ + BUILD_CFLAGS += -D_BREAK_ABI_ + BUILD_CPPFLAGS += -D_BREAK_ABI_ endif ifeq ($(USE_STACK_CHECK),true) - BUILD_CFLAGS += -fstack-check - BUILD_CPPFLAGS += -fstack-check + BUILD_CFLAGS += -fstack-check + BUILD_CPPFLAGS += -fstack-check endif ifeq ($(USE_COMPILER_DEBUG_OPTS),true) - BUILD_CFLAGS += -gdwarf-2 -g3 -ggdb - BUILD_CPPFLAGS += -gdwarf-2 -g3 -ggdb - BUILD_LDFLAGS += -gdwarf-2 -g3 -ggdb + BUILD_CFLAGS += -gdwarf-2 -g3 -ggdb + BUILD_CPPFLAGS += -gdwarf-2 -g3 -ggdb + BUILD_LDFLAGS += -gdwarf-2 -g3 -ggdb endif ifeq ($(CC),$(GCC)) - GCC_NO_OPT_FLAGS = \ + GCC_NO_OPT_FLAGS = \ -fno-inline-functions-called-once \ -fno-tree-loop-optimize \ -fno-early-inlining \ -fno-default-inline else ifeq ($(CC),$(CLANG)) - BUILD_CFLAGS += -Werror - BUILD_CPPFLAGS += -Werror + BUILD_CFLAGS += -Werror + BUILD_CPPFLAGS += -Werror endif ifeq ($(USE_COMPILER_OPTIMIZATION_OPTS),true) - BUILD_CFLAGS += -funroll-loops -O3 - BUILD_CPPFLAGS += -funroll-loops -O3 + BUILD_CFLAGS += -funroll-loops -O3 + BUILD_CPPFLAGS += -funroll-loops -O3 else - NO_OPT_FLAGS = \ + NO_OPT_FLAGS = \ -O0 -g -fno-inline -fno-omit-frame-pointer \ -fno-builtin -fno-optimize-sibling-calls \ $(GCC_NO_OPT_FLAGS) # -fconserve-stack - _NO_OPT_FLAGS = \ + _NO_OPT_FLAGS = \ -O0 \ -fno-implicit-inline-templates \ -fno-implement-inlines \ @@ -438,44 +438,44 @@ else -fno-inline-functions \ $(GCC_NO_OPT_FLAGS) - BUILD_CFLAGS += $(NO_OPT_FLAGS) - BUILD_CPPFLAGS += $(NO_OPT_FLAGS) - BUILD_LDFLAGS += $(NO_OPT_FLAGS) + BUILD_CFLAGS += $(NO_OPT_FLAGS) + BUILD_CPPFLAGS += $(NO_OPT_FLAGS) + BUILD_LDFLAGS += $(NO_OPT_FLAGS) endif ifeq ($(USE_EXCEPTIONS_IN_C),true) - BUILD_CFLAGS += -fexceptions - GCC_LDFLAGS += -shared-libgcc + BUILD_CFLAGS += -fexceptions + GCC_LDFLAGS += -shared-libgcc endif ifeq ($(STRIP_SYMBOLS),true) - STRIP_DONE ?= strip.done + STRIP_DONE ?= strip.done endif -INCLUDE += $(LOCAL_INCLUDE) +INCLUDE += $(LOCAL_INCLUDE) # force use of double quotes, allow header namespaces ifeq ($(HDRDIR_SCOPE_SUFFIX),) - INCLUDE += -I. + INCLUDE += -I. else - INCLUDE += -iquote . + INCLUDE += -iquote . endif ifeq ($(USE_PROJECT_LIB),true) - INCLUDE += $(PROJECT_INCLUDE) -I$(TOPDIR)/include + INCLUDE += $(PROJECT_INCLUDE) -I$(TOPDIR)/include LIBFLAGS += -L$(BUILD_LIBDIR) endif -INCLUDE += $(call proj_query, cflags $(PREREQ_BUILD) $(PROJECT)) +INCLUDE += $(call proj_query, cflags $(PREREQ_BUILD) $(PROJECT)) -LDFLAGS_QUERY_ARGS = $(addprefix --exclude ,$(LDFLAGS_EXCLUDE)) -LIBFLAGS += $(call proj_query, ldflags $(LDFLAGS_QUERY_ARGS) --add-self $(PREREQ_BUILD)) +LDFLAGS_QUERY_ARGS = $(addprefix --exclude ,$(LDFLAGS_EXCLUDE)) +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 ifeq ($(USE_PROJECT_LIB),true) - LDFLAGS_QUERY_ARGS_SELF = --add-self + LDFLAGS_QUERY_ARGS_SELF = --add-self 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) LIBFLAGS += -lsndfile @@ -486,9 +486,9 @@ ifeq ($(USE_FFTW),true) endif ifeq ($(USE_GLIB),true) - PROJECT_CFLAGS += $(shell $(PKG_CONFIG) --cflags glib-2.0) - PROJECT_CPPFLAGS += $(shell $(PKG_CONFIG) --cflags glib-2.0) - LIBFLAGS += $(shell $(PKG_CONFIG) --libs glib-2.0) + PROJECT_CFLAGS += $(shell $(PKG_CONFIG_EXE) --cflags glib-2.0) + PROJECT_CPPFLAGS += $(shell $(PKG_CONFIG_EXE) --cflags glib-2.0) + LIBFLAGS += $(shell $(PKG_CONFIG_EXE) --libs glib-2.0) endif ifeq ($(CC),$(CLANG)) @@ -503,69 +503,69 @@ ifeq ($(CC),$(GCC)) COMPILER_LDFLAGS += $(GCC_LDFLAGS) endif -BUILD_CFLAGS += $(LOCAL_CFLAGS) $(PROJECT_CFLAGS) $(COMPLILER_CFLAGS) $(INCLUDE) -BUILD_CPPFLAGS += $(LOCAL_CPPFLAGS) $(PROJECT_CPPFLAGS) $(COMPILER_CPPFLAGS) $(INCLUDE) -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 += $(RPM_REQUIRES_RUN) $(RPM_REQUIRES_DEVEL) +BUILD_CFLAGS += $(LOCAL_CFLAGS) $(PROJECT_CFLAGS) $(COMPLILER_CFLAGS) $(INCLUDE) +BUILD_CPPFLAGS += $(LOCAL_CPPFLAGS) $(PROJECT_CPPFLAGS) $(COMPILER_CPPFLAGS) $(INCLUDE) +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 += $(RPM_REQUIRES_RUN) $(RPM_REQUIRES_DEVEL) # -- LIB -INSTALLATION_FILE_TYPES += LIB -#BUILD_PIDIR = $(BUILD_LIBDIR) -#BUILD_PI = $(addprefix $(BUILD_PIDIR)/,$(PLUGIN)) -#INSTALL_PIDIR = $(INSTALL_LIBDIR) -#INSTALLED_PI = $(addprefix $(INSTALL_PIDIR)/,$(PLUGIN)) +INSTALLATION_FILE_TYPES += LIB +#BUILD_PIDIR = $(BUILD_LIBDIR) +#BUILD_PI = $(addprefix $(BUILD_PIDIR)/,$(PLUGIN)) +#INSTALL_PIDIR = $(INSTALL_LIBDIR) +#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 ($(TC_SYS_ROOT),) - CONTRIB_LIBS_PATH += $(CROSS_TOOL_DIR)/bin + CONTRIB_LIBS_PATH += $(CROSS_TOOL_DIR)/bin else - CONTRIB_LIBS_PATH += $(TC_SYS_ROOT)/lib + CONTRIB_LIBS_PATH += $(TC_SYS_ROOT)/lib endif endif -LIBTYPE ?= shared -INSTALL_LIBDIR ?= $(EXE_PREFIX)/lib +LIBTYPE ?= shared +INSTALL_LIBDIR ?= $(EXE_PREFIX)/lib ifeq ($(USE_PROJECT_LIB),true) - LIBNAME ?= $(PROJECT) - MEMBERS += $(LIB_A)($(OBJ)) - VERSION_SCRIPT = $(BUILD_LIBDIR)/version.ldscript + LIBNAME ?= $(PROJECT) + MEMBERS += $(LIB_A)($(OBJ)) + VERSION_SCRIPT = $(BUILD_LIBDIR)/version.ldscript # TODO: use something like this as unifying variable, there are far too many # lib-related variables - LOCAL_LIBS += + LOCAL_LIBS += ifneq ($(TARGET),mingw) - LIB_A = $(BUILD_LIBDIR)/lib$(LIBNAME).a - SO_SUFFIX = so.$(MAJOR_MINOR_RELEASE) - SO_PREFIX ?= lib - LIB_SO = $(BUILD_LIBDIR)/lib$(LIBNAME).$(SO_SUFFIX) - 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_LIB_A = $(INSTALL_LIBDIR)/lib$(LIBNAME).a + LIB_A = $(BUILD_LIBDIR)/lib$(LIBNAME).a + SO_SUFFIX = so.$(MAJOR_MINOR_RELEASE) + SO_PREFIX ?= lib + LIB_SO = $(BUILD_LIBDIR)/lib$(LIBNAME).$(SO_SUFFIX) + 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_LIB_A = $(INSTALL_LIBDIR)/lib$(LIBNAME).a else - LIB_A = $(BUILD_LIBDIR)/lib$(LIBNAME)-static.a - #WINRES_RC_TMPL = $(MODDIR)/make/winres-minimal.rc.tmpl - WINRES_RC_TMPL = $(MODDIR)/make/winres.rc.tmpl - WINRES_RC = $(BUILD_LIBDIR)/$(PROJECT).rc - WINRES_O = $(WINRES_RC).o - SO_SUFFIX = dll - SO_PREFIX ?= - LIB_DEF = $(BUILD_LIBDIR)/$(LIBNAME).def - MSVCPP_IMPLIB = $(BUILD_LIBDIR)/$(LIBNAME).lib - LIB_SO = $(BUILD_LIBDIR)/$(LIBNAME).dll - INSTALLED_LIB_A = $(INSTALL_LIBDIR)/lib$(LIBNAME).a + LIB_A = $(BUILD_LIBDIR)/lib$(LIBNAME)-static.a + #WINRES_RC_TMPL = $(MODDIR)/make/winres-minimal.rc.tmpl + WINRES_RC_TMPL = $(MODDIR)/make/winres.rc.tmpl + WINRES_RC = $(BUILD_LIBDIR)/$(PROJECT).rc + WINRES_O = $(WINRES_RC).o + SO_SUFFIX = dll + SO_PREFIX ?= + LIB_DEF = $(BUILD_LIBDIR)/$(LIBNAME).def + MSVCPP_IMPLIB = $(BUILD_LIBDIR)/$(LIBNAME).lib + LIB_SO = $(BUILD_LIBDIR)/$(LIBNAME).dll + INSTALLED_LIB_A = $(INSTALL_LIBDIR)/lib$(LIBNAME).a endif # mingw - BUILD_LIB += $(LIB_SO) + BUILD_LIB += $(LIB_SO) endif # USE_PROJECT_LIB -INSTALLED_LIB_SO = $(addprefix $(INSTALL_LIBDIR)/,$(notdir $(LIB_SO))) -INSTALLED_DEF = $(addprefix $(INSTALL_LIBDIR)/,$(wildcard *.lib *.exp)) -INSTALLED_LIB += $(addprefix $(INSTALL_LIBDIR)/,$(LOCAL_LIBS)) -BUILD_LIB += $(addprefix $(BUILD_LIBDIR)/,$(LOCAL_LIBS)) -INSTALLED_ALL_LIBS = $(addprefix $(INSTALL_LIBDIR)/,$(wildcard *.a)) -INSTALLED_LIB += $(INSTALLED_LIB_SO) $(INSTALLED_SHOBJS) \ +INSTALLED_LIB_SO = $(addprefix $(INSTALL_LIBDIR)/,$(notdir $(LIB_SO))) +INSTALLED_DEF = $(addprefix $(INSTALL_LIBDIR)/,$(wildcard *.lib *.exp)) +INSTALLED_LIB += $(addprefix $(INSTALL_LIBDIR)/,$(LOCAL_LIBS)) +BUILD_LIB += $(addprefix $(BUILD_LIBDIR)/,$(LOCAL_LIBS)) +INSTALLED_ALL_LIBS = $(addprefix $(INSTALL_LIBDIR)/,$(wildcard *.a)) +INSTALLED_LIB += $(INSTALLED_LIB_SO) $(INSTALLED_SHOBJS) \ $(INSTALLED_LINKS_SO) $(sort $(INSTALLED_LIB_A) $(INSTALLED_ALL_LIBS)) \ $(INSTALLED_DEF) diff --git a/make/defs-dev.mk b/make/defs-dev.mk index 3ab172a2..3753fd5c 100644 --- a/make/defs-dev.mk +++ b/make/defs-dev.mk @@ -4,250 +4,250 @@ # $Id$ # -- files -#CONTRIBDIR ?= $(TOPDIR)/contrib -PROJECT_DIRNAME ?= $(PROJECT) -PROJECT_DIRPATH ?= $(shell readlink -f $(TOPDIR)) -PREFIX ?= $(ENV_PREFIX)$(HOME)/dat/test/$(FLAVOUR_PREFIX)$(PROJECT_DIRNAME)-$(VERSION) -ROOT_PREFIX ?= $(ENV_PREFIX)$(HOME)/dat/test -VAR_PREFIX ?= $(PREFIX)/var -DOC_PREFIX ?= $(PREFIX)/doc/$(PROJECT) -EXE_PREFIX ?= $(PREFIX) -INIT_PREFIX ?= $(EXE_PREFIX) -HTDOCS_PREFIX ?= $(PREFIX)/srv/www -SYSTEMD_DIR ?= $(PREFIX)/usr/lib/systemd/system -JS_PREFIX ?= $(PREFIX)/usr/share/javascript -JS_DIR ?= $(JS_PREFIX)/$(PROJECT_DIRNAME) -SYSCFG_DIR ?= $(PREFIX)/sysconfig -CONFIG_DIR ?= $(ENV_PREFIX)$(HOME)/etc/$(FLAVOUR_PATH_PREFIX)$(PROJECT_DIRNAME) -LD_CONF_DIR ?= $(ENV_PREFIX)$(HOME)/etc/ld.so.conf.d -LOGROT_DIR ?= $(ENV_PREFIX)$(HOME)/etc/logrotate.d -APACHE_CONF_DIR ?= $(ENV_PREFIX)$(HOME)/etc/apache/conf.d -APACHE_VHOSTS_DIR?= $(ENV_PREFIX)$(HOME)/etc/apache/vhosts.d -APACHE_SNIPPETS_DIR?= $(ENV_PREFIX)$(HOME)/etc/apache/snippets.d -RSYSLOG_DIR ?= $(ENV_PREFIX)$(HOME)/etc/rsyslog.d -IMG_PREFIX ?= $(PREFIX) -LOG_PREFIX ?= $(PREFIX)/log -JAVA_PREFIX ?= $(PREFIX) -HDR_SCOPE_PREFIX ?= +#CONTRIBDIR ?= $(TOPDIR)/contrib +PROJECT_DIRNAME ?= $(PROJECT) +PROJECT_DIRPATH ?= $(shell readlink -f $(TOPDIR)) +PREFIX ?= $(ENV_PREFIX)$(HOME)/dat/test/$(FLAVOUR_PREFIX)$(PROJECT_DIRNAME)-$(VERSION) +ROOT_PREFIX ?= $(ENV_PREFIX)$(HOME)/dat/test +VAR_PREFIX ?= $(PREFIX)/var +DOC_PREFIX ?= $(PREFIX)/doc/$(PROJECT) +EXE_PREFIX ?= $(PREFIX) +INIT_PREFIX ?= $(EXE_PREFIX) +HTDOCS_PREFIX ?= $(PREFIX)/srv/www +SYSTEMD_DIR ?= $(PREFIX)/usr/lib/systemd/system +JS_PREFIX ?= $(PREFIX)/usr/share/javascript +JS_DIR ?= $(JS_PREFIX)/$(PROJECT_DIRNAME) +SYSCFG_DIR ?= $(PREFIX)/sysconfig +CONFIG_DIR ?= $(ENV_PREFIX)$(HOME)/etc/$(FLAVOUR_PATH_PREFIX)$(PROJECT_DIRNAME) +LD_CONF_DIR ?= $(ENV_PREFIX)$(HOME)/etc/ld.so.conf.d +LOGROT_DIR ?= $(ENV_PREFIX)$(HOME)/etc/logrotate.d +APACHE_CONF_DIR ?= $(ENV_PREFIX)$(HOME)/etc/apache/conf.d +APACHE_VHOSTS_DIR ?= $(ENV_PREFIX)$(HOME)/etc/apache/vhosts.d +APACHE_SNIPPETS_DIR ?= $(ENV_PREFIX)$(HOME)/etc/apache/snippets.d +RSYSLOG_DIR ?= $(ENV_PREFIX)$(HOME)/etc/rsyslog.d +IMG_PREFIX ?= $(PREFIX) +LOG_PREFIX ?= $(PREFIX)/log +JAVA_PREFIX ?= $(PREFIX) +HDR_SCOPE_PREFIX ?= -IMAGEDIR ?= $(MODDIR)/../../images -CTRLDIR ?= $(ENV_PREFIX)$(HOME)/bin$(FLAVOUR_PATH_SUFFIX) -DAEMON_RUN_DIR ?= $(ENV_PREFIX)$(HOME) -PROFILE_DIR ?= $(ENV_PREFIX)$(HOME)/.profile.d$(FLAVOUR_PATH_SUFFIX) -INSTALL_CRONTABDIR ?= $(ENV_PREFIX)$(HOME)/etc/$(FLAVOUR_PATH_PREFIX)cron.d -INSTALL_PKG_CONFIGDIR ?= $(CONFIG_DIR)/pkgconfig -PIDDIR ?= $(VAR_PREFIX)$(FLAVOUR_PATH_PREFIX)run -DOWNLOADDIRS ?= root@cvs.jannet.de:/usr/local/httpd/htdocs/www.jannet.de_443/$(CUSTOMER)/projects/$(PROJECT) -WORKING_DIR ?= $(ENV_PREFIX)$(HOME) -WORKING_DIR ?= $(VAR_PREFIX)/lock -JAVADIR ?= $(JAVA_PREFIX)/share/java -HTML_PROJECT ?= $(patsubst www-%,%,$(PROJECT_DIRNAME)) -PROJECT_HTML_BASE_DIR ?= $(HTDOCS_PREFIX)/proj -PROJECT_HTMLDIR ?= $(PROJECT_HTML_BASE_DIR)/$(HTML_PROJECT) -PROJECT_HTML_THEMES_DIR ?= $(PROJECT_HTML_BASE_DIR)/themes -PROJECT_TMPLDIR ?= $(PREFIX)/tmpl -SITE_MODULES_DIR ?= $(HTDOCS_PREFIX)/proj/site/modules.d -CGI_DIR ?= $(PROJECT_HTMLDIR)/cgi-bin +IMAGEDIR ?= $(MODDIR)/../../images +CTRLDIR ?= $(ENV_PREFIX)$(HOME)/bin$(FLAVOUR_PATH_SUFFIX) +DAEMON_RUN_DIR ?= $(ENV_PREFIX)$(HOME) +PROFILE_DIR ?= $(ENV_PREFIX)$(HOME)/.profile.d$(FLAVOUR_PATH_SUFFIX) +INSTALL_CRONTABDIR ?= $(ENV_PREFIX)$(HOME)/etc/$(FLAVOUR_PATH_PREFIX)cron.d +INSTALL_PKG_CONFIGDIR ?= $(CONFIG_DIR)/pkgconfig +PIDDIR ?= $(VAR_PREFIX)$(FLAVOUR_PATH_PREFIX)run +DOWNLOADDIRS ?= root@cvs.jannet.de:/usr/local/httpd/htdocs/www.jannet.de_443/$(CUSTOMER)/projects/$(PROJECT) +WORKING_DIR ?= $(ENV_PREFIX)$(HOME) +WORKING_DIR ?= $(VAR_PREFIX)/lock +JAVADIR ?= $(JAVA_PREFIX)/share/java +HTML_PROJECT ?= $(patsubst www-%,%,$(PROJECT_DIRNAME)) +PROJECT_HTML_BASE_DIR ?= $(HTDOCS_PREFIX)/proj +PROJECT_HTMLDIR ?= $(PROJECT_HTML_BASE_DIR)/$(HTML_PROJECT) +PROJECT_HTML_THEMES_DIR ?= $(PROJECT_HTML_BASE_DIR)/themes +PROJECT_TMPLDIR ?= $(PREFIX)/tmpl +SITE_MODULES_DIR ?= $(HTDOCS_PREFIX)/proj/site/modules.d +CGI_DIR ?= $(PROJECT_HTMLDIR)/cgi-bin # -- misc -LOGID ?= $(shell $(ECHO) $(BUILD_USER) | cut -c1-2)-$(PROJECT) -DAEMON_RUN_USER ?= $(BUILD_USER) -DAEMON_RUN_GROUP ?= $(BUILD_GROUP) -CATCH_ONLY_YERROR?= true +LOGID ?= $(shell $(ECHO) $(BUILD_USER) | cut -c1-2)-$(PROJECT) +DAEMON_RUN_USER ?= $(BUILD_USER) +DAEMON_RUN_GROUP ?= $(BUILD_GROUP) +CATCH_ONLY_YERROR ?= true # -- file attributes -EXEOWNER ?= $(BUILD_USER) -EXEGROUP ?= $(BUILD_GROUP) -EXEMODE ?= 770 -EXEDIROWNER ?= $(BUILD_USER) -EXEDIRGROUP ?= $(BUILD_GROUP) -EXEDIRMODE ?= 755 -CFGOWNER ?= $(BUILD_USER) -CFGGROUP ?= $(BUILD_GROUP) -CFGMODE ?= 660 -CFGDIROWNER ?= $(EXEDIROWNER) -CFGDIRGROUP ?= $(EXEDIRGROUP) -CFGDIRMODE ?= $(EXEDIRMODE) -SYSCFGOWNER ?= $(CFGOWNER) -SYSCFGGROUP ?= $(CFGGROUP) -SYSCFGMODE ?= $(CFGMODE) -SYSCFGDIROWNER ?= $(CFGDIROWNER) -SYSCFGDIRGROUP ?= $(CFGDIRGROUP) -SYSCFGDIRMODE ?= $(CFGDIRMODE) -HDROWNER ?= $(BUILD_USER) -HDRGROUP ?= $(BUILD_GROUP) -HDRMODE ?= 644 -HDRDIROWNER ?= $(EXEDIROWNER) -HDRDIRGROUP ?= $(EXEDIRGROUP) -HDRDIRMODE ?= $(EXEDIRMODE) -CTRLOWNER ?= $(EXEOWNER) -CTRLGROUP ?= $(EXEGROUP) -CTRLMODE ?= $(EXEMODE) -CTRLDIROWNER ?= $(EXEDIROWNER) -CTRLDIRGROUP ?= $(EXEDIRGROUP) -CTRLDIRMODE ?= $(EXEDIRMODE) -SCRIPTOWNER ?= $(EXEOWNER) -SCRIPTGROUP ?= $(EXEGROUP) -SCRIPTMODE ?= $(EXEMODE) -SCRIPTDIROWNER ?= $(EXEDIROWNER) -SCRIPTDIRGROUP ?= $(EXEDIRGROUP) -SCRIPTDIRMODE ?= $(EXEDIRMODE) -PYMODOWNER ?= $(BUILD_USER) -PYMODGROUP ?= $(BUILD_GROUP) -PYMODMODE ?= 644 -PYMODDIROWNER ?= $(BUILD_USER) -PYMODDIRGROUP ?= $(BUILD_GROUP) -PYMODDIRMODE ?= 755 -INITOWNER ?= $(EXEOWNER) -INITGROUP ?= $(EXEGROUP) -INITMODE ?= $(EXEMODE) -INITDIROWNER ?= $(EXEDIROWNER) -INITDIRGROUP ?= $(EXEDIRGROUP) -INITDIRMODE ?= $(EXEDIRMODE) -CGIOWNER ?= $(EXEOWNER) -CGIGROUP ?= $(EXEGROUP) -CGIMODE ?= $(EXEMODE) -CGIDIROWNER ?= $(EXEDIROWNER) -CGIDIRGROUP ?= $(EXEDIRGROUP) -CGIDIRMODE ?= $(EXEDIRMODE) -HTMLOWNER ?= $(BUILD_USER) -HTMLGROUP ?= $(BUILD_GROUP) -HTMLMODE ?= 644 -HTMLDIROWNER ?= $(BUILD_USER) -HTMLDIRGROUP ?= $(BUILD_GROUP) -HTMLDIRMODE ?= 755 -SYSTEMDOWNER ?= $(BUILD_USER) -SYSTEMDGROUP ?= $(BUILD_GROUP) -SYSTEMDMODE ?= 644 -SYSTEMDDIROWNER ?= $(BUILD_USER) -SYSTEMDDIRGROUP ?= $(BUILD_GROUP) -SYSTEMDDIRMODE ?= 755 -LIBOWNER ?= $(EXEOWNER) -LIBGROUP ?= $(EXEGROUP) -LIBMODE ?= $(EXEMODE) -LIBDIROWNER ?= $(EXEDIROWNER) -LIBDIRGROUP ?= $(EXEDIRGROUP) -LIBDIRMODE ?= $(EXEDIRMODE) -PIOWNER ?= $(LIBOWNER) -PIGROUP ?= $(LIBGROUP) -PIMODE ?= $(LIBMODE) -PIDIROWNER ?= $(LIBDIROWNER) -PIDIRGROUP ?= $(LIBDIRGROUP) -PIDIRMODE ?= $(LIBDIRMODE) -MAKEOWNER ?= $(HDROWNER) -MAKEGROUP ?= $(HDRGROUP) -MAKEMODE ?= $(HDRMODE) -MAKEDIROWNER ?= $(HDRDIROWNER) -MAKEDIRGROUP ?= $(HDRDIRGROUP) -MAKEDIRMODE ?= $(HDRDIRMODE) -PROFILEOWNER ?= $(EXEOWNER) -PROFILEGROUP ?= $(EXEGROUP) -PROFILEMODE ?= $(EXEMODE) -PROFILEDIROWNER ?= $(BUILD_USER) -PROFILEDIRGROUP ?= $(BUILD_GROUP) -PROFILEDIRMODE ?= 770 -ROOTOWNER ?= $(BUILD_USER) -ROOTGROUP ?= $(BUILD_GROUP) -ROOTMODE ?= 770 -ROOTDIROWNER ?= $(BUILD_USER) -ROOTDIRGROUP ?= $(BUILD_GROUP) -ROOTDIRMODE ?= 750 -DOCOWNER ?= $(HDROWNER) -DOCGROUP ?= $(HDRGROUP) -DOCMODE ?= $(HDRMODE) -DOCDIROWNER ?= $(HDRDIROWNER) -DOCDIRGROUP ?= $(HDRDIRGROUP) -DOCDIRMODE ?= $(HDRDIRMODE) -TMPLOWNER ?= $(DOCOWNER) -TMPLGROUP ?= $(DOCGROUP) -TMPLMODE ?= $(DOCMODE) -TMPLDIROWNER ?= $(DOCDIROWNER) -TMPLDIRGROUP ?= $(DOCDIRGROUP) -TMPLDIRMODE ?= $(DOCDIRMODE) -VAROWNER ?= $(BUILD_USER) -VARGROUP ?= $(BUILD_GROUP) -VARMODE ?= 666 -VARDIROWNER ?= $(BUILD_USER) -VARDIRGROUP ?= $(BUILD_GROUP) -VARDIRMODE ?= 770 -PREFIXOWNER ?= $(EXEOWNER) -PREFIXGROUP ?= $(EXEGROUP) -PREFIXMODE ?= 770 -PREFIXDIROWNER ?= $(EXEDIROWNER) -PREFIXDIRGROUP ?= $(EXEDIRGROUP) -PREFIXDIRMODE ?= 770 -IMGOWNER ?= $(BUILD_USER) -IMGGROUP ?= $(BUILD_GROUP) -IMGMODE ?= 666 -IMGDIROWNER ?= $(BUILD_USER) -IMGDIRGROUP ?= $(BUILD_GROUP) -IMGDIRMODE ?= 770 -MOOWNER ?= $(BUILD_USER) -MOGROUP ?= $(BUILD_GROUP) -MOMODE ?= 666 -MODIROWNER ?= $(BUILD_USER) -MODIRGROUP ?= $(BUILD_GROUP) -MODIRMODE ?= 775 -LOGOWNER ?= $(DOCOWNER) -LOGGROUP ?= $(DOCGROUP) -LOGMODE ?= $(DOCMODE) -LOGDIROWNER ?= $(DOCDIROWNER) -LOGDIRGROUP ?= $(DOCDIROWNER) -LOGDIRMODE ?= $(DOCDIRMODE) -JAVAOWNER ?= $(LIBOWNER) -JAVAGROUP ?= $(LIBGROUP) -JAVAMODE ?= $(LIBMODE) -JAVADIROWNER ?= $(LIBDIROWNER) -JAVADIRGROUP ?= $(LIBDIRGROUP) -JAVADIRMODE ?= $(LIBDIRMODE) -LD_CONFOWNER ?= $(CFGOWNER) -LD_CONFGROUP ?= $(CFGGROUP) -LD_CONFMODE ?= 664 -LD_CONFDIROWNER ?= $(CFGDIROWNER) -LD_CONFDIRGROUP ?= $(CFGDIROWNER) -LD_CONFDIRMODE ?= $(CFGDIRMODE) -LOGROTOWNER ?= $(CFGOWNER) -LOGROTGROUP ?= $(CFGGROUP) -LOGROTMODE ?= 644 # group writable files are ignored by logrotate -LOGROTDIROWNER ?= $(CFGDIROWNER) -LOGROTDIRGROUP ?= $(CFGDIRGROUP) -LOGROTDIRMODE ?= $(CFGDIRMODE) -APACHE_CONFOWNER ?= $(CFGOWNER) -APACHE_CONFGROUP ?= $(CFGGROUP) -APACHE_CONFMODE ?= $(CFGDIRMODE) -APACHE_CONFDIROWNER ?= $(CFGDIROWNER) -APACHE_CONFDIRGROUP ?= $(CFGDIROWNER) -APACHE_CONFDIRMODE ?= $(CFGDIRMODE) -SITEOWNER ?= $(APACHE_CONFOWNER) -SITEGROUP ?= $(APACHE_CONFGROUP) -SITEMODE ?= $(APACHE_CONFMODE) -SITEDIROWNER ?= $(APACHE_CONFDIROWNER) -SITEDIRGROUP ?= $(APACHE_CONFDIROWNER) -SITEDIRMODE ?= $(APACHE_CONFDIRMODE) -RSYSLOGOWNER ?= $(CFGOWNER) -RSYSLOGGROUP ?= $(CFGGROUP) -RSYSLOGMODE ?= $(CFGMODE) -RSYSLOGDIROWNER ?= $(CFGDIROWNER) -RSYSLOGDIRGROUP ?= $(CFGDIROWNER) -RSYSLOGDIRMODE ?= $(CFGDIRMODE) -CRONTABOWNER ?= $(CFGOWNER) -CRONTABGROUP ?= $(CFGGROUP) -CRONTABMODE ?= 600 -CRONTABDIROWNER ?= $(CFGDIROWNER) -CRONTABDIRGROUP ?= $(CFGDIROWNER) -CRONTABDIRMODE ?= $(CFGDIRMODE) -KIO_PROTOCOLOWNER ?= $(CFGOWNER) -KIO_PROTOCOLGROUP ?= $(CFGGROUP) -KIO_PROTOCOLMODE ?= 664 -KIO_PROTOCOLDIROWNER ?= $(CFGDIROWNER) -KIO_PROTOCOLDIRGROUP ?= $(CFGDIROWNER) -KIO_PROTOCOLDIRMODE ?= $(CFGDIRMODE) -PKG_CONFIGOWNER ?= $(CFGOWNER) -PKG_CONFIGGROUP ?= $(CFGGROUP) -PKG_CONFIGMODE ?= 664 -PKG_CONFIGDIROWNER ?= $(CFGDIROWNER) -PKG_CONFIGDIRGROUP ?= $(CFGDIROWNER) -PKG_CONFIGDIRMODE ?= $(CFGDIRMODE) +EXEOWNER ?= $(BUILD_USER) +EXEGROUP ?= $(BUILD_GROUP) +EXEMODE ?= 770 +EXEDIROWNER ?= $(BUILD_USER) +EXEDIRGROUP ?= $(BUILD_GROUP) +EXEDIRMODE ?= 755 +CFGOWNER ?= $(BUILD_USER) +CFGGROUP ?= $(BUILD_GROUP) +CFGMODE ?= 660 +CFGDIROWNER ?= $(EXEDIROWNER) +CFGDIRGROUP ?= $(EXEDIRGROUP) +CFGDIRMODE ?= $(EXEDIRMODE) +SYSCFGOWNER ?= $(CFGOWNER) +SYSCFGGROUP ?= $(CFGGROUP) +SYSCFGMODE ?= $(CFGMODE) +SYSCFGDIROWNER ?= $(CFGDIROWNER) +SYSCFGDIRGROUP ?= $(CFGDIRGROUP) +SYSCFGDIRMODE ?= $(CFGDIRMODE) +HDROWNER ?= $(BUILD_USER) +HDRGROUP ?= $(BUILD_GROUP) +HDRMODE ?= 644 +HDRDIROWNER ?= $(EXEDIROWNER) +HDRDIRGROUP ?= $(EXEDIRGROUP) +HDRDIRMODE ?= $(EXEDIRMODE) +CTRLOWNER ?= $(EXEOWNER) +CTRLGROUP ?= $(EXEGROUP) +CTRLMODE ?= $(EXEMODE) +CTRLDIROWNER ?= $(EXEDIROWNER) +CTRLDIRGROUP ?= $(EXEDIRGROUP) +CTRLDIRMODE ?= $(EXEDIRMODE) +SCRIPTOWNER ?= $(EXEOWNER) +SCRIPTGROUP ?= $(EXEGROUP) +SCRIPTMODE ?= $(EXEMODE) +SCRIPTDIROWNER ?= $(EXEDIROWNER) +SCRIPTDIRGROUP ?= $(EXEDIRGROUP) +SCRIPTDIRMODE ?= $(EXEDIRMODE) +PYMODOWNER ?= $(BUILD_USER) +PYMODGROUP ?= $(BUILD_GROUP) +PYMODMODE ?= 644 +PYMODDIROWNER ?= $(BUILD_USER) +PYMODDIRGROUP ?= $(BUILD_GROUP) +PYMODDIRMODE ?= 755 +INITOWNER ?= $(EXEOWNER) +INITGROUP ?= $(EXEGROUP) +INITMODE ?= $(EXEMODE) +INITDIROWNER ?= $(EXEDIROWNER) +INITDIRGROUP ?= $(EXEDIRGROUP) +INITDIRMODE ?= $(EXEDIRMODE) +CGIOWNER ?= $(EXEOWNER) +CGIGROUP ?= $(EXEGROUP) +CGIMODE ?= $(EXEMODE) +CGIDIROWNER ?= $(EXEDIROWNER) +CGIDIRGROUP ?= $(EXEDIRGROUP) +CGIDIRMODE ?= $(EXEDIRMODE) +HTMLOWNER ?= $(BUILD_USER) +HTMLGROUP ?= $(BUILD_GROUP) +HTMLMODE ?= 644 +HTMLDIROWNER ?= $(BUILD_USER) +HTMLDIRGROUP ?= $(BUILD_GROUP) +HTMLDIRMODE ?= 755 +SYSTEMDOWNER ?= $(BUILD_USER) +SYSTEMDGROUP ?= $(BUILD_GROUP) +SYSTEMDMODE ?= 644 +SYSTEMDDIROWNER ?= $(BUILD_USER) +SYSTEMDDIRGROUP ?= $(BUILD_GROUP) +SYSTEMDDIRMODE ?= 755 +LIBOWNER ?= $(EXEOWNER) +LIBGROUP ?= $(EXEGROUP) +LIBMODE ?= $(EXEMODE) +LIBDIROWNER ?= $(EXEDIROWNER) +LIBDIRGROUP ?= $(EXEDIRGROUP) +LIBDIRMODE ?= $(EXEDIRMODE) +PIOWNER ?= $(LIBOWNER) +PIGROUP ?= $(LIBGROUP) +PIMODE ?= $(LIBMODE) +PIDIROWNER ?= $(LIBDIROWNER) +PIDIRGROUP ?= $(LIBDIRGROUP) +PIDIRMODE ?= $(LIBDIRMODE) +MAKEOWNER ?= $(HDROWNER) +MAKEGROUP ?= $(HDRGROUP) +MAKEMODE ?= $(HDRMODE) +MAKEDIROWNER ?= $(HDRDIROWNER) +MAKEDIRGROUP ?= $(HDRDIRGROUP) +MAKEDIRMODE ?= $(HDRDIRMODE) +PROFILEOWNER ?= $(EXEOWNER) +PROFILEGROUP ?= $(EXEGROUP) +PROFILEMODE ?= $(EXEMODE) +PROFILEDIROWNER ?= $(BUILD_USER) +PROFILEDIRGROUP ?= $(BUILD_GROUP) +PROFILEDIRMODE ?= 770 +ROOTOWNER ?= $(BUILD_USER) +ROOTGROUP ?= $(BUILD_GROUP) +ROOTMODE ?= 770 +ROOTDIROWNER ?= $(BUILD_USER) +ROOTDIRGROUP ?= $(BUILD_GROUP) +ROOTDIRMODE ?= 750 +DOCOWNER ?= $(HDROWNER) +DOCGROUP ?= $(HDRGROUP) +DOCMODE ?= $(HDRMODE) +DOCDIROWNER ?= $(HDRDIROWNER) +DOCDIRGROUP ?= $(HDRDIRGROUP) +DOCDIRMODE ?= $(HDRDIRMODE) +TMPLOWNER ?= $(DOCOWNER) +TMPLGROUP ?= $(DOCGROUP) +TMPLMODE ?= $(DOCMODE) +TMPLDIROWNER ?= $(DOCDIROWNER) +TMPLDIRGROUP ?= $(DOCDIRGROUP) +TMPLDIRMODE ?= $(DOCDIRMODE) +VAROWNER ?= $(BUILD_USER) +VARGROUP ?= $(BUILD_GROUP) +VARMODE ?= 666 +VARDIROWNER ?= $(BUILD_USER) +VARDIRGROUP ?= $(BUILD_GROUP) +VARDIRMODE ?= 770 +PREFIXOWNER ?= $(EXEOWNER) +PREFIXGROUP ?= $(EXEGROUP) +PREFIXMODE ?= 770 +PREFIXDIROWNER ?= $(EXEDIROWNER) +PREFIXDIRGROUP ?= $(EXEDIRGROUP) +PREFIXDIRMODE ?= 770 +IMGOWNER ?= $(BUILD_USER) +IMGGROUP ?= $(BUILD_GROUP) +IMGMODE ?= 666 +IMGDIROWNER ?= $(BUILD_USER) +IMGDIRGROUP ?= $(BUILD_GROUP) +IMGDIRMODE ?= 770 +MOOWNER ?= $(BUILD_USER) +MOGROUP ?= $(BUILD_GROUP) +MOMODE ?= 666 +MODIROWNER ?= $(BUILD_USER) +MODIRGROUP ?= $(BUILD_GROUP) +MODIRMODE ?= 775 +LOGOWNER ?= $(DOCOWNER) +LOGGROUP ?= $(DOCGROUP) +LOGMODE ?= $(DOCMODE) +LOGDIROWNER ?= $(DOCDIROWNER) +LOGDIRGROUP ?= $(DOCDIROWNER) +LOGDIRMODE ?= $(DOCDIRMODE) +JAVAOWNER ?= $(LIBOWNER) +JAVAGROUP ?= $(LIBGROUP) +JAVAMODE ?= $(LIBMODE) +JAVADIROWNER ?= $(LIBDIROWNER) +JAVADIRGROUP ?= $(LIBDIRGROUP) +JAVADIRMODE ?= $(LIBDIRMODE) +LD_CONFOWNER ?= $(CFGOWNER) +LD_CONFGROUP ?= $(CFGGROUP) +LD_CONFMODE ?= 664 +LD_CONFDIROWNER ?= $(CFGDIROWNER) +LD_CONFDIRGROUP ?= $(CFGDIROWNER) +LD_CONFDIRMODE ?= $(CFGDIRMODE) +LOGROTOWNER ?= $(CFGOWNER) +LOGROTGROUP ?= $(CFGGROUP) +LOGROTMODE ?= 644 # group writable files are ignored by logrotate +LOGROTDIROWNER ?= $(CFGDIROWNER) +LOGROTDIRGROUP ?= $(CFGDIRGROUP) +LOGROTDIRMODE ?= $(CFGDIRMODE) +APACHE_CONFOWNER ?= $(CFGOWNER) +APACHE_CONFGROUP ?= $(CFGGROUP) +APACHE_CONFMODE ?= $(CFGDIRMODE) +APACHE_CONFDIROWNER ?= $(CFGDIROWNER) +APACHE_CONFDIRGROUP ?= $(CFGDIROWNER) +APACHE_CONFDIRMODE ?= $(CFGDIRMODE) +SITEOWNER ?= $(APACHE_CONFOWNER) +SITEGROUP ?= $(APACHE_CONFGROUP) +SITEMODE ?= $(APACHE_CONFMODE) +SITEDIROWNER ?= $(APACHE_CONFDIROWNER) +SITEDIRGROUP ?= $(APACHE_CONFDIROWNER) +SITEDIRMODE ?= $(APACHE_CONFDIRMODE) +RSYSLOGOWNER ?= $(CFGOWNER) +RSYSLOGGROUP ?= $(CFGGROUP) +RSYSLOGMODE ?= $(CFGMODE) +RSYSLOGDIROWNER ?= $(CFGDIROWNER) +RSYSLOGDIRGROUP ?= $(CFGDIROWNER) +RSYSLOGDIRMODE ?= $(CFGDIRMODE) +CRONTABOWNER ?= $(CFGOWNER) +CRONTABGROUP ?= $(CFGGROUP) +CRONTABMODE ?= 600 +CRONTABDIROWNER ?= $(CFGDIROWNER) +CRONTABDIRGROUP ?= $(CFGDIROWNER) +CRONTABDIRMODE ?= $(CFGDIRMODE) +KIO_PROTOCOLOWNER ?= $(CFGOWNER) +KIO_PROTOCOLGROUP ?= $(CFGGROUP) +KIO_PROTOCOLMODE ?= 664 +KIO_PROTOCOLDIROWNER ?= $(CFGDIROWNER) +KIO_PROTOCOLDIRGROUP ?= $(CFGDIROWNER) +KIO_PROTOCOLDIRMODE ?= $(CFGDIRMODE) +PKG_CONFIGOWNER ?= $(CFGOWNER) +PKG_CONFIGGROUP ?= $(CFGGROUP) +PKG_CONFIGMODE ?= 664 +PKG_CONFIGDIROWNER ?= $(CFGDIROWNER) +PKG_CONFIGDIRGROUP ?= $(CFGDIROWNER) +PKG_CONFIGDIRMODE ?= $(CFGDIRMODE) # -- options @@ -255,47 +255,47 @@ PKG_CONFIGDIRMODE ?= $(CFGDIRMODE) # for using the dbmalloc lib, before you will need to do: # cd $(MODDIR)/contrib/dbmalloc; tar -xzf dbmalloc-ver.sion.tar.gz -#USE_BTOOLS ?= true -#USE_DSPFS ?= true +#USE_BTOOLS ?= true +#USE_DSPFS ?= true -#USE_ENGINE_BENNO ?= true -#USE_ENGINE_JAN ?= true +#USE_ENGINE_BENNO ?= true +#USE_ENGINE_JAN ?= true -#USE_JACK ?= true -#USE_JACKDUMMY ?= true -#USE_JACKJART ?= true -#USE_JACKRTAI ?= true -#USE_JACK ?= true +#USE_JACK ?= true +#USE_JACKDUMMY ?= true +#USE_JACKJART ?= true +#USE_JACKRTAI ?= true +#USE_JACK ?= true -#USE_DBMALLOC ?= true -#USE_DMALLOC ?= true -#USE_EFENCE ?= true -#USE_VALGRIND ?= true -#USE_MCHECK ?= true # not thread-safe -#USE_MEMWATCH ?= true -#USE_MPATROL ?= true -#USE_TRACING ?= true -#USE_TIMER ?= true -LOG_THREAD_NAMES ?= true +#USE_DBMALLOC ?= true +#USE_DMALLOC ?= true +#USE_EFENCE ?= true +#USE_VALGRIND ?= true +#USE_MCHECK ?= true # not thread-safe +#USE_MEMWATCH ?= true +#USE_MPATROL ?= true +#USE_TRACING ?= true +#USE_TIMER ?= true +LOG_THREAD_NAMES ?= true -#STRIP_SYMBOLS ?= true -COMPILE_DEBUG_CODE ?= true -#COMPILE_DEBUG_LOG ?= true -USE_COMPILER_DEBUG_OPTS ?= true -#USE_COMPILER_OPTIMIZATION_OPTS ?= true +#STRIP_SYMBOLS ?= true +COMPILE_DEBUG_CODE ?= true +#COMPILE_DEBUG_LOG ?= true +USE_COMPILER_DEBUG_OPTS ?= true +#USE_COMPILER_OPTIMIZATION_OPTS?= true ifeq ($(TARGET),mingw) -USE_STACK_PROTECTOR ?= false +USE_STACK_PROTECTOR ?= false else -USE_STACK_PROTECTOR ?= true +USE_STACK_PROTECTOR ?= true endif -#USE_STACK_CHECKER ?= true +#USE_STACK_CHECKER ?= true -#USE_FUSE ?= true -#USE_SNDFILE ?= true -#USE_GLIB ?= true -#USE_ASSERTIONS ?= false -BREAK_ABI ?= true -#INSTALL_HOME_BIN_WRAPPERS ?= true +#USE_FUSE ?= true +#USE_SNDFILE ?= true +#USE_GLIB ?= true +#USE_ASSERTIONS ?= false +BREAK_ABI ?= true +#INSTALL_HOME_BIN_WRAPPERS ?= true -#export MALLOC_CHECK_ = 3 +#export MALLOC_CHECK_ = 3 diff --git a/make/defs-dirs.mk b/make/defs-dirs.mk index 95d67823..8ece8cd3 100644 --- a/make/defs-dirs.mk +++ b/make/defs-dirs.mk @@ -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 \)))))) -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 ?= $(filter-out $(ORDERED_SUBDIRS),$(FIND_SUBDIRS)) -#SUBDIRS ?= $(FIND_SUBDIRS) +SUBDIRS ?= $(ORDERED_SUBDIRS) $(filter-out $(ORDERED_SUBDIRS),$(FIND_SUBDIRS)) +#SUBDIRS ?= $(filter-out $(ORDERED_SUBDIRS),$(FIND_SUBDIRS)) +#SUBDIRS ?= $(FIND_SUBDIRS) diff --git a/make/defs-dist.mk b/make/defs-dist.mk index 1c30b0f4..bd8e9777 100644 --- a/make/defs-dist.mk +++ b/make/defs-dist.mk @@ -4,291 +4,291 @@ # $Id$ # -- files -#CONTRIBDIR ?= $(TOPDIR)/contrib -PROJECT_DIRNAME ?= $(PROJECT) -PROJECT_DIRPATH ?= /opt/$(FLAVOUR_PATH_PREFIX)$(PROJECT_DIRNAME) -PREFIX ?= $(ENV_PREFIX)$(PROJECT_DIRPATH) -ROOT_PREFIX ?= $(ENV_PREFIX) -VAR_PREFIX ?= $(ENV_PREFIX)/var/$(FLAVOUR_PATH_PREFIX)lib -DOC_PREFIX ?= $(ENV_PREFIX)/usr/share/doc/packages/$(FLAVOUR_PREFIX)$(PROJECT_DIRNAME) -EXE_PREFIX ?= $(PREFIX) -INIT_PREFIX ?= $(ENV_PREFIX)/etc$(FLAVOUR_PATH_SUFFIX) -HTDOCS_PREFIX ?= $(ENV_PREFIX)/srv/www -SYSTEMD_DIR ?= $(ENV_PREFIX)/usr/lib/systemd/system -JS_PREFIX ?= $(ENV_PREFIX)/usr/share/javascript -JS_DIR ?= $(JS_PREFIX)/$(PROJECT_DIRNAME) -SYSCFG_DIR ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)sysconfig -CONFIG_DIR ?= $(ENV_PREFIX)/etc/opt/$(FLAVOUR_PATH_PREFIX)$(PROJECT_DIRNAME) -LD_CONF_DIR ?= $(ENV_PREFIX)/etc/ld.so.conf.d -LOGROT_DIR ?= $(ENV_PREFIX)/etc/logrotate.d -APACHE_CONF_DIR ?= $(ENV_PREFIX)/etc/jw-apache/conf.d -APACHE_VHOSTS_DIR?= $(ENV_PREFIX)/etc/jw-apache/vhosts.d -APACHE_SNIPPETS_DIR?= $(ENV_PREFIX)/etc/jw-apache/snippets.d -RSYSLOG_DIR ?= $(ENV_PREFIX)/etc/rsyslog.d -IMG_PREFIX ?= $(PREFIX) -LOG_PREFIX ?= $(ENV_PREFIX)/var/log -JAVA_PREFIX ?= $(PREFIX) -HDR_SCOPE_PREFIX ?= +#CONTRIBDIR ?= $(TOPDIR)/contrib +PROJECT_DIRNAME ?= $(PROJECT) +PROJECT_DIRPATH ?= /opt/$(FLAVOUR_PATH_PREFIX)$(PROJECT_DIRNAME) +PREFIX ?= $(ENV_PREFIX)$(PROJECT_DIRPATH) +ROOT_PREFIX ?= $(ENV_PREFIX) +VAR_PREFIX ?= $(ENV_PREFIX)/var/$(FLAVOUR_PATH_PREFIX)lib +DOC_PREFIX ?= $(ENV_PREFIX)/usr/share/doc/packages/$(FLAVOUR_PREFIX)$(PROJECT_DIRNAME) +EXE_PREFIX ?= $(PREFIX) +INIT_PREFIX ?= $(ENV_PREFIX)/etc$(FLAVOUR_PATH_SUFFIX) +HTDOCS_PREFIX ?= $(ENV_PREFIX)/srv/www +SYSTEMD_DIR ?= $(ENV_PREFIX)/usr/lib/systemd/system +JS_PREFIX ?= $(ENV_PREFIX)/usr/share/javascript +JS_DIR ?= $(JS_PREFIX)/$(PROJECT_DIRNAME) +SYSCFG_DIR ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)sysconfig +CONFIG_DIR ?= $(ENV_PREFIX)/etc/opt/$(FLAVOUR_PATH_PREFIX)$(PROJECT_DIRNAME) +LD_CONF_DIR ?= $(ENV_PREFIX)/etc/ld.so.conf.d +LOGROT_DIR ?= $(ENV_PREFIX)/etc/logrotate.d +APACHE_CONF_DIR ?= $(ENV_PREFIX)/etc/jw-apache/conf.d +APACHE_VHOSTS_DIR ?= $(ENV_PREFIX)/etc/jw-apache/vhosts.d +APACHE_SNIPPETS_DIR ?= $(ENV_PREFIX)/etc/jw-apache/snippets.d +RSYSLOG_DIR ?= $(ENV_PREFIX)/etc/rsyslog.d +IMG_PREFIX ?= $(PREFIX) +LOG_PREFIX ?= $(ENV_PREFIX)/var/log +JAVA_PREFIX ?= $(PREFIX) +HDR_SCOPE_PREFIX ?= -IMAGEDIR ?= $(FLAVOUR_PATH_PREFIX)$(PREFIX)/images -CTRLDIR ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)init.d -DAEMON_RUN_DIR ?= $(VAR_PREFIX)/corefiles -PROFILE_DIR ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)profile.d -INSTALL_CRONTABDIR ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)cron.d -INSTALL_PKG_CONFIGDIR ?= $(ENV_PREFIX)$(SYSTEM_LIBDIR)/pkgconfig -PIDDIR ?= $(VAR_PREFIX)/run -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)/lock -JAVADIR ?= $(JAVA_PREFIX)/share/java -HTML_PROJECT ?= $(patsubst www-%,%,$(PROJECT_DIRNAME)) -PROJECT_HTML_BASE_DIR ?= $(HTDOCS_PREFIX)/proj -PROJECT_HTMLDIR ?= $(PROJECT_HTML_BASE_DIR)/$(HTML_PROJECT) -PROJECT_HTML_THEMES_DIR ?= $(PROJECT_HTML_BASE_DIR)/themes -PROJECT_TMPLDIR ?= $(PREFIX)/share/tmpl -SITE_MODULES_DIR ?= $(HTDOCS_PREFIX)/proj/site/modules.d -CGI_DIR ?= $(PROJECT_HTMLDIR)/cgi-bin +IMAGEDIR ?= $(FLAVOUR_PATH_PREFIX)$(PREFIX)/images +CTRLDIR ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)init.d +DAEMON_RUN_DIR ?= $(VAR_PREFIX)/corefiles +PROFILE_DIR ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)profile.d +INSTALL_CRONTABDIR ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)cron.d +INSTALL_PKG_CONFIGDIR ?= $(ENV_PREFIX)$(SYSTEM_LIBDIR)/pkgconfig +PIDDIR ?= $(VAR_PREFIX)/run +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)/lock +JAVADIR ?= $(JAVA_PREFIX)/share/java +HTML_PROJECT ?= $(patsubst www-%,%,$(PROJECT_DIRNAME)) +PROJECT_HTML_BASE_DIR ?= $(HTDOCS_PREFIX)/proj +PROJECT_HTMLDIR ?= $(PROJECT_HTML_BASE_DIR)/$(HTML_PROJECT) +PROJECT_HTML_THEMES_DIR ?= $(PROJECT_HTML_BASE_DIR)/themes +PROJECT_TMPLDIR ?= $(PREFIX)/share/tmpl +SITE_MODULES_DIR ?= $(HTDOCS_PREFIX)/proj/site/modules.d +CGI_DIR ?= $(PROJECT_HTMLDIR)/cgi-bin # -- misc -LOGID ?= $(PROJECT) -DAEMON_RUN_USER ?= root -DAEMON_RUN_GROUP ?= root -CATCH_ONLY_YERROR?= false +LOGID ?= $(PROJECT) +DAEMON_RUN_USER ?= root +DAEMON_RUN_GROUP ?= root +CATCH_ONLY_YERROR ?= false # -- file attributes -EXEOWNER ?= root -EXEGROUP ?= root -EXEMODE ?= 755 -EXEDIROWNER ?= root -EXEDIRGROUP ?= root -EXEDIRMODE ?= 755 -CFGOWNER ?= root -CFGGROUP ?= root -CFGMODE ?= 664 -CFGDIROWNER ?= $(EXEDIROWNER) -CFGDIRGROUP ?= $(EXEDIRGROUP) -CFGDIRMODE ?= $(EXEDIRMODE) -SYSCFGOWNER ?= $(CFGOWNER) -SYSCFGGROUP ?= $(CFGGROUP) -SYSCFGMODE ?= $(CFGMODE) -SYSCFGDIROWNER ?= $(CFGDIROWNER) -SYSCFGDIRGROUP ?= $(CFGDIRGROUP) -SYSCFGDIRMODE ?= $(CFGDIRMODE) -HDROWNER ?= root -HDRGROUP ?= root -HDRMODE ?= 644 -HDRDIROWNER ?= $(EXEDIROWNER) -HDRDIRGROUP ?= $(EXEDIRGROUP) -HDRDIRMODE ?= $(EXEDIRMODE) -CTRLOWNER ?= $(EXEOWNER) -CTRLGROUP ?= $(EXEGROUP) -CTRLMODE ?= $(EXEMODE) -CTRLDIROWNER ?= $(EXEDIROWNER) -CTRLDIRGROUP ?= $(EXEDIRGROUP) -CTRLDIRMODE ?= $(EXEDIRMODE) -SCRIPTOWNER ?= $(EXEOWNER) -SCRIPTGROUP ?= $(EXEGROUP) -SCRIPTMODE ?= $(EXEMODE) -SCRIPTDIROWNER ?= $(EXEDIROWNER) -SCRIPTDIRGROUP ?= $(EXEDIRGROUP) -SCRIPTDIRMODE ?= $(EXEDIRMODE) -PYMODOWNER ?= root -PYMODGROUP ?= root -PYMODMODE ?= 644 -PYMODDIROWNER ?= root -PYMODDIRGROUP ?= root -PYMODDIRMODE ?= 755 -INITDIRMODE ?= $(EXEDIRMODE) -INITOWNER ?= $(EXEOWNER) -INITGROUP ?= $(EXEGROUP) -INITMODE ?= $(EXEMODE) -INITDIROWNER ?= $(EXEDIROWNER) -INITDIRGROUP ?= $(EXEDIRGROUP) -INITDIRMODE ?= $(EXEDIRMODE) -CGIOWNER ?= $(EXEOWNER) -CGIGROUP ?= $(EXEGROUP) -CGIMODE ?= $(EXEMODE) -CGIDIROWNER ?= $(EXEDIROWNER) -CGIDIRGROUP ?= $(EXEDIRGROUP) -CGIDIRMODE ?= $(EXEDIRMODE) -HTMLOWNER ?= wwwrun -HTMLGROUP ?= www -HTMLMODE ?= 644 -HTMLDIROWNER ?= wwwrun -HTMLDIRGROUP ?= www -HTMLDIRMODE ?= 755 -SYSTEMDOWNER ?= root -SYSTEMDGROUP ?= root -SYSTEMDMODE ?= 644 -SYSTEMDDIROWNER ?= root -SYSTEMDDIRGROUP ?= root -SYSTEMDDIRMODE ?= 755 -LIBOWNER ?= $(EXEOWNER) -LIBGROUP ?= $(EXEGROUP) -LIBMODE ?= $(EXEMODE) -LIBDIROWNER ?= $(EXEDIROWNER) -LIBDIRGROUP ?= $(EXEDIRGROUP) -LIBDIRMODE ?= $(EXEDIRMODE) -PIOWNER ?= $(LIBOWNER) -PIGROUP ?= $(LIBGROUP) -PIMODE ?= $(LIBMODE) -PIDIROWNER ?= $(LIBDIROWNER) -PIDIRGROUP ?= $(LIBDIRGROUP) -PIDIRMODE ?= $(LIBDIRMODE) -MAKEOWNER ?= $(HDROWNER) -MAKEGROUP ?= $(HDRGROUP) -MAKEMODE ?= $(HDRMODE) -MAKEDIROWNER ?= $(HDRDIROWNER) -MAKEDIRGROUP ?= $(HDRDIRGROUP) -MAKEDIRMODE ?= $(HDRDIRMODE) -PROFILEOWNER ?= $(EXEOWNER) -PROFILEGROUP ?= $(EXEGROUP) -PROFILEMODE ?= $(EXEMODE) -PROFILEDIROWNER ?= root -PROFILEDIRGROUP ?= root -PROFILEDIRMODE ?= 755 -ROOTOWNER ?= root -ROOTGROUP ?= root -ROOTMODE ?= 600 -ROOTDIROWNER ?= root -ROOTDIRGROUP ?= root -ROOTDIRMODE ?= 750 -DOCOWNER ?= $(HDROWNER) -DOCGROUP ?= $(HDRGROUP) -DOCMODE ?= $(HDRMODE) -DOCDIROWNER ?= $(HDRDIROWNER) -DOCDIRGROUP ?= $(HDRDIROWNER) -DOCDIRMODE ?= $(HDRDIRMODE) -TMPLOWNER ?= $(DOCOWNER) -TMPLGROUP ?= $(DOCGROUP) -TMPLMODE ?= $(DOCMODE) -TMPLDIROWNER ?= $(DOCDIROWNER) -TMPLDIRGROUP ?= $(DOCDIRGROUP) -TMPLDIRMODE ?= $(DOCDIRMODE) -VAROWNER ?= nogroup -VARGROUP ?= nobody -VARMODE ?= 666 -VARDIROWNER ?= root -VARDIRGROUP ?= root -VARDIRMODE ?= 775 -PREFIXOWNER ?= $(EXEOWNER) -PREFIXGROUP ?= $(EXEGROUP) -PREFIXMODE ?= 644 -PREFIXDIROWNER ?= $(EXEOWNER) -PREFIXDIRGROUP ?= $(EXEGROUP) -PREFIXDIRMODE ?= 755 -IMGOWNER ?= $(DOCOWNER) -IMGGROUP ?= $(DOCGROUP) -IMGMODE ?= $(DOCMODE) -IMGDIROWNER ?= $(DOCDIROWNER) -IMGDIRGROUP ?= $(DOCDIROWNER) -IMGDIRMODE ?= $(DOCDIRMODE) -MOOWNER ?= $(EXEOWNER) -MOGROUP ?= $(EXEGROUP) -MOMODE ?= 644 -MODIROWNER ?= $(EXEDIROWNER) -MODIRGROUP ?= $(EXEDIROWNER) -MODIRMODE ?= $(EXEDIRMODE) -LOGOWNER ?= $(DOCOWNER) -LOGGROUP ?= $(DOCGROUP) -LOGMODE ?= $(DOCMODE) -LOGDIROWNER ?= $(DOCDIROWNER) -LOGDIRGROUP ?= $(DOCDIROWNER) -LOGDIRMODE ?= $(DOCDIRMODE) -JAVAOWNER ?= $(LIBOWNER) -JAVAGROUP ?= $(LIBGROUP) -JAVAMODE ?= $(LIBMODE) -JAVADIROWNER ?= $(LIBDIROWNER) -JAVADIRGROUP ?= $(LIBDIRGROUP) -JAVADIRMODE ?= $(LIBDIRMODE) -LD_CONFOWNER ?= $(CFGOWNER) -LD_CONFGROUP ?= $(CFGGROUP) -LD_CONFMODE ?= 664 -LD_CONFDIROWNER ?= $(CFGDIROWNER) -LD_CONFDIRGROUP ?= $(CFGDIROWNER) -LD_CONFDIRMODE ?= $(CFGDIRMODE) -LOGROTOWNER ?= $(CFGOWNER) -LOGROTGROUP ?= $(CFGGROUP) -LOGROTMODE ?= 644 # group writable files are ignored by logrotate -LOGROTDIROWNER ?= $(CFGDIROWNER) -LOGROTDIRGROUP ?= $(CFGDIROWNER) -LOGROTDIRMODE ?= $(CFGDIRMODE) -APACHE_CONFOWNER ?= $(CFGOWNER) -APACHE_CONFGROUP ?= $(CFGGROUP) -APACHE_CONFMODE ?= $(CFGMODE) -APACHE_CONFDIROWNER ?= $(CFGDIROWNER) -APACHE_CONFDIRGROUP ?= $(CFGDIROWNER) -APACHE_CONFDIRMODE ?= $(CFGDIRMODE) -SITEOWNER ?= $(APACHE_CONFOWNER) -SITEGROUP ?= $(APACHE_CONFGROUP) -SITEMODE ?= $(APACHE_CONFMODE) -SITEDIROWNER ?= $(APACHE_CONFDIROWNER) -SITEDIRGROUP ?= $(APACHE_CONFDIROWNER) -SITEDIRMODE ?= $(APACHE_CONFDIRMODE) -RSYSLOGOWNER ?= $(CFGOWNER) -RSYSLOGGROUP ?= $(CFGGROUP) -RSYSLOGMODE ?= $(CFGMODE) -RSYSLOGDIROWNER ?= $(CFGDIROWNER) -RSYSLOGDIRGROUP ?= $(CFGDIROWNER) -RSYSLOGDIRMODE ?= $(CFGDIRMODE) -CRONTABOWNER ?= $(CFGOWNER) -CRONTABGROUP ?= $(CFGGROUP) -CRONTABMODE ?= 600 -CRONTABDIROWNER ?= $(CFGDIROWNER) -CRONTABDIRGROUP ?= $(CFGDIROWNER) -CRONTABDIRMODE ?= $(CFGDIRMODE) -KIO_PROTOCOLOWNER ?= $(CFGOWNER) -KIO_PROTOCOLGROUP ?= $(CFGGROUP) -KIO_PROTOCOLMODE ?= 664 -KIO_PROTOCOLDIROWNER ?= $(CFGDIROWNER) -KIO_PROTOCOLDIRGROUP ?= $(CFGDIROWNER) -KIO_PROTOCOLDIRMODE ?= $(CFGDIRMODE) -PKG_CONFIGOWNER ?= $(CFGOWNER) -PKG_CONFIGGROUP ?= $(CFGGROUP) -PKG_CONFIGMODE ?= 664 -PKG_CONFIGDIROWNER ?= $(CFGDIROWNER) -PKG_CONFIGDIRGROUP ?= $(CFGDIROWNER) -PKG_CONFIGDIRMODE ?= $(CFGDIRMODE) +EXEOWNER ?= root +EXEGROUP ?= root +EXEMODE ?= 755 +EXEDIROWNER ?= root +EXEDIRGROUP ?= root +EXEDIRMODE ?= 755 +CFGOWNER ?= root +CFGGROUP ?= root +CFGMODE ?= 664 +CFGDIROWNER ?= $(EXEDIROWNER) +CFGDIRGROUP ?= $(EXEDIRGROUP) +CFGDIRMODE ?= $(EXEDIRMODE) +SYSCFGOWNER ?= $(CFGOWNER) +SYSCFGGROUP ?= $(CFGGROUP) +SYSCFGMODE ?= $(CFGMODE) +SYSCFGDIROWNER ?= $(CFGDIROWNER) +SYSCFGDIRGROUP ?= $(CFGDIRGROUP) +SYSCFGDIRMODE ?= $(CFGDIRMODE) +HDROWNER ?= root +HDRGROUP ?= root +HDRMODE ?= 644 +HDRDIROWNER ?= $(EXEDIROWNER) +HDRDIRGROUP ?= $(EXEDIRGROUP) +HDRDIRMODE ?= $(EXEDIRMODE) +CTRLOWNER ?= $(EXEOWNER) +CTRLGROUP ?= $(EXEGROUP) +CTRLMODE ?= $(EXEMODE) +CTRLDIROWNER ?= $(EXEDIROWNER) +CTRLDIRGROUP ?= $(EXEDIRGROUP) +CTRLDIRMODE ?= $(EXEDIRMODE) +SCRIPTOWNER ?= $(EXEOWNER) +SCRIPTGROUP ?= $(EXEGROUP) +SCRIPTMODE ?= $(EXEMODE) +SCRIPTDIROWNER ?= $(EXEDIROWNER) +SCRIPTDIRGROUP ?= $(EXEDIRGROUP) +SCRIPTDIRMODE ?= $(EXEDIRMODE) +PYMODOWNER ?= root +PYMODGROUP ?= root +PYMODMODE ?= 644 +PYMODDIROWNER ?= root +PYMODDIRGROUP ?= root +PYMODDIRMODE ?= 755 +INITDIRMODE ?= $(EXEDIRMODE) +INITOWNER ?= $(EXEOWNER) +INITGROUP ?= $(EXEGROUP) +INITMODE ?= $(EXEMODE) +INITDIROWNER ?= $(EXEDIROWNER) +INITDIRGROUP ?= $(EXEDIRGROUP) +INITDIRMODE ?= $(EXEDIRMODE) +CGIOWNER ?= $(EXEOWNER) +CGIGROUP ?= $(EXEGROUP) +CGIMODE ?= $(EXEMODE) +CGIDIROWNER ?= $(EXEDIROWNER) +CGIDIRGROUP ?= $(EXEDIRGROUP) +CGIDIRMODE ?= $(EXEDIRMODE) +HTMLOWNER ?= wwwrun +HTMLGROUP ?= www +HTMLMODE ?= 644 +HTMLDIROWNER ?= wwwrun +HTMLDIRGROUP ?= www +HTMLDIRMODE ?= 755 +SYSTEMDOWNER ?= root +SYSTEMDGROUP ?= root +SYSTEMDMODE ?= 644 +SYSTEMDDIROWNER ?= root +SYSTEMDDIRGROUP ?= root +SYSTEMDDIRMODE ?= 755 +LIBOWNER ?= $(EXEOWNER) +LIBGROUP ?= $(EXEGROUP) +LIBMODE ?= $(EXEMODE) +LIBDIROWNER ?= $(EXEDIROWNER) +LIBDIRGROUP ?= $(EXEDIRGROUP) +LIBDIRMODE ?= $(EXEDIRMODE) +PIOWNER ?= $(LIBOWNER) +PIGROUP ?= $(LIBGROUP) +PIMODE ?= $(LIBMODE) +PIDIROWNER ?= $(LIBDIROWNER) +PIDIRGROUP ?= $(LIBDIRGROUP) +PIDIRMODE ?= $(LIBDIRMODE) +MAKEOWNER ?= $(HDROWNER) +MAKEGROUP ?= $(HDRGROUP) +MAKEMODE ?= $(HDRMODE) +MAKEDIROWNER ?= $(HDRDIROWNER) +MAKEDIRGROUP ?= $(HDRDIRGROUP) +MAKEDIRMODE ?= $(HDRDIRMODE) +PROFILEOWNER ?= $(EXEOWNER) +PROFILEGROUP ?= $(EXEGROUP) +PROFILEMODE ?= $(EXEMODE) +PROFILEDIROWNER ?= root +PROFILEDIRGROUP ?= root +PROFILEDIRMODE ?= 755 +ROOTOWNER ?= root +ROOTGROUP ?= root +ROOTMODE ?= 600 +ROOTDIROWNER ?= root +ROOTDIRGROUP ?= root +ROOTDIRMODE ?= 750 +DOCOWNER ?= $(HDROWNER) +DOCGROUP ?= $(HDRGROUP) +DOCMODE ?= $(HDRMODE) +DOCDIROWNER ?= $(HDRDIROWNER) +DOCDIRGROUP ?= $(HDRDIROWNER) +DOCDIRMODE ?= $(HDRDIRMODE) +TMPLOWNER ?= $(DOCOWNER) +TMPLGROUP ?= $(DOCGROUP) +TMPLMODE ?= $(DOCMODE) +TMPLDIROWNER ?= $(DOCDIROWNER) +TMPLDIRGROUP ?= $(DOCDIRGROUP) +TMPLDIRMODE ?= $(DOCDIRMODE) +VAROWNER ?= nogroup +VARGROUP ?= nobody +VARMODE ?= 666 +VARDIROWNER ?= root +VARDIRGROUP ?= root +VARDIRMODE ?= 775 +PREFIXOWNER ?= $(EXEOWNER) +PREFIXGROUP ?= $(EXEGROUP) +PREFIXMODE ?= 644 +PREFIXDIROWNER ?= $(EXEOWNER) +PREFIXDIRGROUP ?= $(EXEGROUP) +PREFIXDIRMODE ?= 755 +IMGOWNER ?= $(DOCOWNER) +IMGGROUP ?= $(DOCGROUP) +IMGMODE ?= $(DOCMODE) +IMGDIROWNER ?= $(DOCDIROWNER) +IMGDIRGROUP ?= $(DOCDIROWNER) +IMGDIRMODE ?= $(DOCDIRMODE) +MOOWNER ?= $(EXEOWNER) +MOGROUP ?= $(EXEGROUP) +MOMODE ?= 644 +MODIROWNER ?= $(EXEDIROWNER) +MODIRGROUP ?= $(EXEDIROWNER) +MODIRMODE ?= $(EXEDIRMODE) +LOGOWNER ?= $(DOCOWNER) +LOGGROUP ?= $(DOCGROUP) +LOGMODE ?= $(DOCMODE) +LOGDIROWNER ?= $(DOCDIROWNER) +LOGDIRGROUP ?= $(DOCDIROWNER) +LOGDIRMODE ?= $(DOCDIRMODE) +JAVAOWNER ?= $(LIBOWNER) +JAVAGROUP ?= $(LIBGROUP) +JAVAMODE ?= $(LIBMODE) +JAVADIROWNER ?= $(LIBDIROWNER) +JAVADIRGROUP ?= $(LIBDIRGROUP) +JAVADIRMODE ?= $(LIBDIRMODE) +LD_CONFOWNER ?= $(CFGOWNER) +LD_CONFGROUP ?= $(CFGGROUP) +LD_CONFMODE ?= 664 +LD_CONFDIROWNER ?= $(CFGDIROWNER) +LD_CONFDIRGROUP ?= $(CFGDIROWNER) +LD_CONFDIRMODE ?= $(CFGDIRMODE) +LOGROTOWNER ?= $(CFGOWNER) +LOGROTGROUP ?= $(CFGGROUP) +LOGROTMODE ?= 644 # group writable files are ignored by logrotate +LOGROTDIROWNER ?= $(CFGDIROWNER) +LOGROTDIRGROUP ?= $(CFGDIROWNER) +LOGROTDIRMODE ?= $(CFGDIRMODE) +APACHE_CONFOWNER ?= $(CFGOWNER) +APACHE_CONFGROUP ?= $(CFGGROUP) +APACHE_CONFMODE ?= $(CFGMODE) +APACHE_CONFDIROWNER ?= $(CFGDIROWNER) +APACHE_CONFDIRGROUP ?= $(CFGDIROWNER) +APACHE_CONFDIRMODE ?= $(CFGDIRMODE) +SITEOWNER ?= $(APACHE_CONFOWNER) +SITEGROUP ?= $(APACHE_CONFGROUP) +SITEMODE ?= $(APACHE_CONFMODE) +SITEDIROWNER ?= $(APACHE_CONFDIROWNER) +SITEDIRGROUP ?= $(APACHE_CONFDIROWNER) +SITEDIRMODE ?= $(APACHE_CONFDIRMODE) +RSYSLOGOWNER ?= $(CFGOWNER) +RSYSLOGGROUP ?= $(CFGGROUP) +RSYSLOGMODE ?= $(CFGMODE) +RSYSLOGDIROWNER ?= $(CFGDIROWNER) +RSYSLOGDIRGROUP ?= $(CFGDIROWNER) +RSYSLOGDIRMODE ?= $(CFGDIRMODE) +CRONTABOWNER ?= $(CFGOWNER) +CRONTABGROUP ?= $(CFGGROUP) +CRONTABMODE ?= 600 +CRONTABDIROWNER ?= $(CFGDIROWNER) +CRONTABDIRGROUP ?= $(CFGDIROWNER) +CRONTABDIRMODE ?= $(CFGDIRMODE) +KIO_PROTOCOLOWNER ?= $(CFGOWNER) +KIO_PROTOCOLGROUP ?= $(CFGGROUP) +KIO_PROTOCOLMODE ?= 664 +KIO_PROTOCOLDIROWNER ?= $(CFGDIROWNER) +KIO_PROTOCOLDIRGROUP ?= $(CFGDIROWNER) +KIO_PROTOCOLDIRMODE ?= $(CFGDIRMODE) +PKG_CONFIGOWNER ?= $(CFGOWNER) +PKG_CONFIGGROUP ?= $(CFGGROUP) +PKG_CONFIGMODE ?= 664 +PKG_CONFIGDIROWNER ?= $(CFGDIROWNER) +PKG_CONFIGDIRGROUP ?= $(CFGDIROWNER) +PKG_CONFIGDIRMODE ?= $(CFGDIRMODE) # -- options # for using the dbmalloc lib, before you will need to do: # cd $(MODDIR)/contrib/dbmalloc; tar -xzf dbmalloc-ver.sion.tar.gz -#USE_BTOOLS ?= true -#USE_DSPFS ?= true +#USE_BTOOLS ?= true +#USE_DSPFS ?= true -#USE_ENGINE_BENNO ?= true -#USE_ENGINE_JAN ?= true +#USE_ENGINE_BENNO ?= true +#USE_ENGINE_JAN ?= true -#USE_JACK ?= true -#USE_JACKDUMMY ?= true -#USE_JACKJART ?= true -#USE_JACKRTAI ?= true -#USE_JACK ?= true +#USE_JACK ?= true +#USE_JACKDUMMY ?= true +#USE_JACKJART ?= true +#USE_JACKRTAI ?= true +#USE_JACK ?= true -#USE_DBMALLOC ?= true -#USE_DMALLOC ?= true -#USE_EFENCE ?= true -#USE_VALGRIND ?= true -#USE_MCHECK ?= true -#USE_MEMWATCH ?= true -#USE_MPATROL ?= true -#USE_TRACING ?= true -#USE_TIMER ?= true -LOG_THREAD_NAMES ?= true +#USE_DBMALLOC ?= true +#USE_DMALLOC ?= true +#USE_EFENCE ?= true +#USE_VALGRIND ?= true +#USE_MCHECK ?= true +#USE_MEMWATCH ?= true +#USE_MPATROL ?= true +#USE_TRACING ?= true +#USE_TIMER ?= true +LOG_THREAD_NAMES ?= true -#STRIP_SYMBOLS ?= true -#COMPILE_DEBUG_CODE ?= true -#COMPILE_DEBUG_LOG ?= true -USE_COMPILER_DEBUG_OPTS ?= true -USE_COMPILER_OPTIMIZATION_OPTS ?= true -USE_STACK_PROTECTOR ?= true -#USE_STACK_CHECKER ?= true +#STRIP_SYMBOLS ?= true +#COMPILE_DEBUG_CODE ?= true +#COMPILE_DEBUG_LOG ?= true +USE_COMPILER_DEBUG_OPTS ?= true +USE_COMPILER_OPTIMIZATION_OPTS?= true +USE_STACK_PROTECTOR ?= true +#USE_STACK_CHECKER ?= true -#USE_FUSE ?= true -#USE_SNDFILE ?= true -#USE_GLIB ?= true -USE_ASSERTIONS ?= false -BREAK_ABI ?= false -INSTALL_HOME_BIN_WRAPPERS ?= false +#USE_FUSE ?= true +#USE_SNDFILE ?= true +#USE_GLIB ?= true +USE_ASSERTIONS ?= false +BREAK_ABI ?= false +INSTALL_HOME_BIN_WRAPPERS ?= false diff --git a/make/defs.mk b/make/defs.mk index fd59d7f5..6e53646c 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -3,113 +3,113 @@ # $Id$ 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 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 - export SHELL := /bin/bash + export SHELL := /bin/bash endif # ----- executables ifndef WHICH - WHICH := $(firstword $(wildcard /usr/bin/which) $(shell which which)) + WHICH := $(firstword $(wildcard /usr/bin/which) $(shell which which)) endif ifndef GREP - GREP := $(shell $(WHICH) grep) + GREP := $(shell $(WHICH) grep) endif ifndef ECHO - ECHO := $(shell $(WHICH) echo) + ECHO := $(shell $(WHICH) echo) endif ifndef TEST - TEST := $(shell $(WHICH) test) + TEST := $(shell $(WHICH) test) endif ifndef SED - SED := $(shell $(WHICH) sed) + SED := $(shell $(WHICH) sed) endif ifndef CAT - CAT := $(shell $(WHICH) cat) + CAT := $(shell $(WHICH) cat) endif ifndef BROWSER - BROWSER := $(shell $(WHICH) xdg-open) + BROWSER := $(shell $(WHICH) xdg-open) endif ifeq ($(origin RM),default) - RM := $(shell $(WHICH) rm) + RM := $(shell $(WHICH) rm) endif ifndef AR - AR = $(shell $(WHICH) ar) + AR = $(shell $(WHICH) ar) endif #ifndef PWD - PWD := $(shell $(WHICH) pwd) + PWD := $(shell $(WHICH) pwd) #endif ifndef CWD - CWD := $(shell $(PWD)) + CWD := $(shell $(PWD)) endif ifndef BIN_INSTALL - BIN_INSTALL := $(shell $(WHICH) install) + BIN_INSTALL := $(shell $(WHICH) install) endif ifndef SUDO - SUDO := $(shell $(WHICH) sudo) + SUDO := $(shell $(WHICH) sudo) endif ifndef MY_SHELL - MY_SHELL := /bin/bash + MY_SHELL := /bin/bash endif ifndef ID - ID := $(shell $(WHICH) id) + ID := $(shell $(WHICH) id) endif ifndef CUT - CUT := $(shell $(WHICH) cut) + CUT := $(shell $(WHICH) cut) endif ifndef TR - TR := $(shell $(WHICH) tr) + TR := $(shell $(WHICH) tr) endif ifndef AWK - AWK := $(shell $(WHICH) awk) + AWK := $(shell $(WHICH) awk) endif ifndef GETENT - GETENT := $(shell $(WHICH) getent) + GETENT := $(shell $(WHICH) getent) endif ifndef XARGS - XARGS := $(shell $(WHICH) xargs) + XARGS := $(shell $(WHICH) xargs) endif ifndef FIND - FIND := $(shell $(WHICH) find) + FIND := $(shell $(WHICH) find) endif ifndef PRINTF - PRINTF := $(shell $(WHICH) printf) + PRINTF := $(shell $(WHICH) printf) endif -PKG_SH_EXE := /bin/bash $(MOD_SCRIPT_DIR)/pkg.sh -LOG_INSTALL_SH := $(PKG_SH_EXE) log-install -UPDATE_REPO_SH := /opt/packager-server/bin/packager-server schedule-rebuild +PKG_SH_EXE := /bin/bash $(MOD_SCRIPT_DIR)/pkg.sh +LOG_INSTALL_SH := $(PKG_SH_EXE) log-install +UPDATE_REPO_SH := /opt/packager-server/bin/packager-server schedule-rebuild ifdef INSTALL_LINK - INSTALL = $(SUDO) $(LOG_INSTALL_SH) -WA $(LOG_INSTALL_EXTRA_OPTS) - LINK_LIB = $(SUDO) $(LOG_INSTALL_SH) -LA $(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) else ifdef INSTALL_SYMLINK - INSTALL = $(SUDO) $(LOG_INSTALL_SH) -LA $(LOG_INSTALL_EXTRA_OPTS) - LINK_LIB = $(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) else ifdef INSTALL_LOG - 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) + 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) else ifndef INSTALL - INSTALL = install + INSTALL = install endif ifndef LINK_LIB - LINK_LIB = $(LOG_INSTALL_SH) -L + LINK_LIB = $(LOG_INSTALL_SH) -L endif endif endif # ----- 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 set -e; for D in $(SUBDIRS) ; do make -C $$D ; done @@ -136,9 +136,9 @@ define beautify_lib_path endef 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 - version = $(shell $(CAT) $1/VERSION | $(SED) 's/-.*//; s/[ ]*//g') + version = $(shell $(CAT) $1/VERSION | $(SED) 's/-.*//; s/[ ]*//g') endif define install_links @@ -155,120 +155,120 @@ endef # ----- standard variables 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 ifneq ($(wildcard $(TOPDIR)/.git),) - VCS ?= git + VCS ?= git else ifneq ($(wildcard $(TOPDIR)/CVS),) - VCS ?= cvs + VCS ?= cvs endif # ----- user and organization ifndef BUILD_USER - BUILD_USER := $(shell $(ID) -un) + BUILD_USER := $(shell $(ID) -un) endif ifndef BUILD_GROUP - BUILD_GROUP := $(shell $(ID) -gn) + BUILD_GROUP := $(shell $(ID) -gn) endif -JANWARE_USER ?= $(BUILD_USER) +JANWARE_USER ?= $(BUILD_USER) export JANWARE_USER 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 -JANWARE_CLIENT ?= jw -CUSTOMER ?= $(JANWARE_CLIENT) +JANWARE_CLIENT ?= jw +CUSTOMER ?= $(JANWARE_CLIENT) ifeq ($(JANWARE_CLIENT),jw) - JANWARE_WIKI ?= priv + JANWARE_WIKI ?= priv else - JANWARE_WIKI ?= $(JANWARE_CLIENT) + JANWARE_WIKI ?= $(JANWARE_CLIENT) endif -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 -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) -PKG_VENDOR ?= janware GmbH +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 +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) +PKG_VENDOR ?= janware GmbH # ----- packaging variables ifneq ($(filter debian%,$(OS_NAME_VERSION)),) - PKG_FORMAT ?= debian + PKG_FORMAT ?= debian else - PKG_FORMAT ?= rpm + PKG_FORMAT ?= rpm endif ifeq ($(PKG_FORMAT),debian) - RPM ?= /bin/bash $(MOD_SCRIPT_DIR)/dpm.sh - RPM_ARCH := $(shell dpkg --print-architecture) - RPM_SUFFIX ?= deb + RPM ?= /bin/bash $(MOD_SCRIPT_DIR)/dpm.sh + RPM_ARCH := $(shell dpkg --print-architecture) + RPM_SUFFIX ?= deb else - RPM ?= /bin/rpm - RPM_ARCH ?= $(TARGET_ARCH) - RPM_SUFFIX ?= rpm + RPM ?= /bin/rpm + RPM_ARCH ?= $(TARGET_ARCH) + RPM_SUFFIX ?= rpm endif ifeq ($(PKG_FORMAT),debian) export INCLUDE_REV_IN_VERSIONS = true endif -PROJECT_DESCR_FILE ?= $(wildcard $(TOPDIR)/make/project.conf) -PROJECT_SHORT_NAME ?= $(PROJECT) -PROJECT_CAPNAME := $(shell $(ECHO) $(PROJECT) | tr [a-z] [A-Z] | $(SED) 's/-/_/g') -PROJECT_DESCR ?= $(call proj_query, summary $(PROJECT)) -PROJECT_SUMMARY ?= $(PROJECT_DESCR) +PROJECT_DESCR_FILE ?= $(wildcard $(TOPDIR)/make/project.conf) +PROJECT_SHORT_NAME ?= $(PROJECT) +PROJECT_CAPNAME := $(shell $(ECHO) $(PROJECT) | tr [a-z] [A-Z] | $(SED) 's/-/_/g') +PROJECT_DESCR ?= $(call proj_query, summary $(PROJECT)) +PROJECT_SUMMARY ?= $(PROJECT_DESCR) ifneq ($(PROJECT_DESCR_FILE),) - ifeq ($(shell $(GREP) "^ *subpackages *=.*devel" $(PROJECT_DESCR_FILE)),) - CREATE_DEVEL = false + ifeq ($(shell $(GREP) "^ *subpackages * = .*devel" $(PROJECT_DESCR_FILE)),) + CREATE_DEVEL = false endif endif ifeq ($(VERSION),) ifneq ($(wildcard $(VERSION_FILE)),) - VERSION := $(shell $(CAT) $(VERSION_FILE)) + VERSION := $(shell $(CAT) $(VERSION_FILE)) endif endif -DIST_VERSION ?= $(patsubst %-dev,%,$(VERSION)) -HEX_VERSION := $(shell $(ECHO) $(DIST_VERSION) | \ +DIST_VERSION ?= $(patsubst %-dev,%,$(VERSION)) +HEX_VERSION := $(shell $(ECHO) $(DIST_VERSION) | \ $(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') -WINVERSION = $(subst .,_,$(VERSION)) -LOCAL_VERSION = $(VERSION) -LOCAL_WINVERSION = $(subst .,_,$(VERSION)) -DIST_VERSION = $(patsubst %-dev,%,$(VERSION)) -DIST_WINVERSION = $(patsubst %-dev,%,$(WINVERSION)) -LOCAL_DIST_VERSION = $(patsubst %-dev,%,$(LOCAL_VERSION)) -LOCAL_DIST_WINVERSION = $(patsubst %-dev,%,$(LOCAL_WINVERSION)) -DIST_VERSION_WORDS = $(subst ., ,$(subst -, ,$(DIST_VERSION))) -MAJOR_VERSION = $(word 1,$(DIST_VERSION_WORDS)) -MINOR_VERSION = $(word 2,$(DIST_VERSION_WORDS)) -RELEASE_VERSION = $(word 2,$(DIST_VERSION_WORDS)) -BUILD_NUMBER = $(word 4,$(DIST_VERSION_WORDS)) -MAJOR_MINOR_RELEASE = $(MAJOR_VERSION).$(MINOR_VERSION).$(RELEASE_VERSION) -CVS_RSH ?= /usr/bin/ssh +BINARY_VERSION := $(shell $(ECHO) $(PROJECT)_$(DIST_VERSION) | tr [a-z] [A-Z] | $(SED) 's/-[^-]*$$//; s/-/_/g') +WINVERSION = $(subst .,_,$(VERSION)) +LOCAL_VERSION = $(VERSION) +LOCAL_WINVERSION = $(subst .,_,$(VERSION)) +DIST_VERSION = $(patsubst %-dev,%,$(VERSION)) +DIST_WINVERSION = $(patsubst %-dev,%,$(WINVERSION)) +LOCAL_DIST_VERSION = $(patsubst %-dev,%,$(LOCAL_VERSION)) +LOCAL_DIST_WINVERSION = $(patsubst %-dev,%,$(LOCAL_WINVERSION)) +DIST_VERSION_WORDS = $(subst ., ,$(subst -, ,$(DIST_VERSION))) +MAJOR_VERSION = $(word 1,$(DIST_VERSION_WORDS)) +MINOR_VERSION = $(word 2,$(DIST_VERSION_WORDS)) +RELEASE_VERSION = $(word 2,$(DIST_VERSION_WORDS)) +BUILD_NUMBER = $(word 4,$(DIST_VERSION_WORDS)) +MAJOR_MINOR_RELEASE = $(MAJOR_VERSION).$(MINOR_VERSION).$(RELEASE_VERSION) +CVS_RSH ?= /usr/bin/ssh # ----- input dirs -JW_BUILD_DIR = $(MODDIR) -PROJECT_STEM = $(PROJECT)-$(DIST_VERSION) +JW_BUILD_DIR = $(MODDIR) +PROJECT_STEM = $(PROJECT)-$(DIST_VERSION) # only works if checked out true to CVS, i.e. below proj ifeq ($(VCS),cvs) - CVS_MODULE = $(shell $(SED) "s%/$$%%" CVS/Repository) - CVS_ROOT_DIR = $(patsubst %/$(CVS_MODULE),%,$(CWD)) + CVS_MODULE = $(shell $(SED) "s%/$$%%" CVS/Repository) + CVS_ROOT_DIR = $(patsubst %/$(CVS_MODULE),%,$(CWD)) endif -REV_SUBDIRS = $(call reverse $(SUBDIRS)) -FRESH_CVSDIR = $(HOME)/local/src/cvs.fresh -IMAGE_DIR ?= $(CVS_ROOT_DIR)/images -PCKG_DEPS_DIR = $(MODDIR)/make/deps.d -PCKG_DEFS_DIR = $(MODDIR)/make/defs.d -HDRDIR_SCOPE_SUFFIX ?= $(PROJECT) +REV_SUBDIRS = $(call reverse $(SUBDIRS)) +FRESH_CVSDIR = $(HOME)/local/src/cvs.fresh +IMAGE_DIR ?= $(CVS_ROOT_DIR)/images +PCKG_DEPS_DIR = $(MODDIR)/make/deps.d +PCKG_DEFS_DIR = $(MODDIR)/make/defs.d +HDRDIR_SCOPE_SUFFIX ?= $(PROJECT) -CONTRIB_MOD += $(addprefix contrib/,$(CONTRIB_LIBS)) -REQUIRED := $(CONTRIB_MOD) $(REQUIRED) +CONTRIB_MOD += $(addprefix contrib/,$(CONTRIB_LIBS)) +REQUIRED := $(CONTRIB_MOD) $(REQUIRED) ifeq ($(DEVELOPMENT),true) -include $(MODDIR)/make/defs-dev.mk @@ -282,211 +282,211 @@ else endif endif -IMAGES += $(wildcard *.png *.jpg *.bmp *.gif *.ico *.svg) -FONTS += $(wildcard *.woff *.svg) -LOCAL_MKFILES ?= $(wildcard GNUmakefile makefile Makefile *.mk) +IMAGES += $(wildcard *.png *.jpg *.bmp *.gif *.ico *.svg) +FONTS += $(wildcard *.woff *.svg) +LOCAL_MKFILES ?= $(wildcard GNUmakefile makefile Makefile *.mk) # -- standard dirs and files for build and install # -- CFG -INSTALLATION_FILE_TYPES += CFG -CONFIG_FILE ?= $(CONFIG_DIR)/$(PROJECT).conf -SYSCFG_FILE ?= $(SYSCFG_DIR)/$(PROJECT) -BUILD_CFGDIR = $(TOPDIR)/conf +INSTALLATION_FILE_TYPES += CFG +CONFIG_FILE ?= $(CONFIG_DIR)/$(PROJECT).conf +SYSCFG_FILE ?= $(SYSCFG_DIR)/$(PROJECT) +BUILD_CFGDIR = $(TOPDIR)/conf ifeq ($(CONFIG_SUBDIR),) - INSTALL_CFGDIR ?= $(CONFIG_DIR) + INSTALL_CFGDIR ?= $(CONFIG_DIR) else - INSTALL_CFGDIR ?= $(CONFIG_DIR)/$(CONFIG_SUBDIR) + INSTALL_CFGDIR ?= $(CONFIG_DIR)/$(CONFIG_SUBDIR) endif -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)) +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)) # -- SYSCFG -INSTALLATION_FILE_TYPES += SYSCFG -SYSCFG_FILES += $(basename $(wildcard *.sysconf)) -BUILD_SYSCFG = $(TOPDIR)/conf -BUILD_SYSCFGDIR = $(BUILD_SYSCFG) -INSTALL_SYSCFGDIR ?= $(SYSCFG_DIR) -INSTALLED_SYSCFG ?= $(addprefix $(INSTALL_SYSCFGDIR)/,$(SYSCFG_FILES)) +INSTALLATION_FILE_TYPES += SYSCFG +SYSCFG_FILES += $(basename $(wildcard *.sysconf)) +BUILD_SYSCFG = $(TOPDIR)/conf +BUILD_SYSCFGDIR = $(BUILD_SYSCFG) +INSTALL_SYSCFGDIR ?= $(SYSCFG_DIR) +INSTALLED_SYSCFG ?= $(addprefix $(INSTALL_SYSCFGDIR)/,$(SYSCFG_FILES)) # -- HDR -INSTALLATION_FILE_TYPES += HDR -BUILD_HDRDIR_BASE ?= $(TOPDIR)/include -BUILD_HDRDIR ?= $(BUILD_HDRDIR_BASE)/$(HDRDIR_SCOPE_SUFFIX) -SRC_H += $(filter %.h %.H %.hpp, $(SRC_ALL_CPP)) -BUILD_H = $(addprefix $(BUILD_HDRDIR)/,$(SRC_H)) -BUILD_HDR += $(addprefix $(BUILD_HDRDIR)/,$(SRC_H)) -INSTALL_HDRDIR ?= $(PREFIX)/include -INSTALLED_HDR += $(addprefix $(INSTALL_HDRDIR)/,$(SRC_H)) +INSTALLATION_FILE_TYPES += HDR +BUILD_HDRDIR_BASE ?= $(TOPDIR)/include +BUILD_HDRDIR ?= $(BUILD_HDRDIR_BASE)/$(HDRDIR_SCOPE_SUFFIX) +SRC_H += $(filter %.h %.H %.hpp, $(SRC_ALL_CPP)) +BUILD_H = $(addprefix $(BUILD_HDRDIR)/,$(SRC_H)) +BUILD_HDR += $(addprefix $(BUILD_HDRDIR)/,$(SRC_H)) +INSTALL_HDRDIR ?= $(PREFIX)/include +INSTALLED_HDR += $(addprefix $(INSTALL_HDRDIR)/,$(SRC_H)) # -- DOC -INSTALLATION_FILE_TYPES += DOC -DOCS += $(wildcard VERSION README* CHANGES TODO* LICENSE AUTHORS CREDITS RELEASES *.pdf *.txt *.html) -DOCSUBDIRS += $(wildcard html tex info examples src) +INSTALLATION_FILE_TYPES += DOC +DOCS += $(wildcard VERSION README* CHANGES TODO* LICENSE AUTHORS CREDITS RELEASES *.pdf *.txt *.html) +DOCSUBDIRS += $(wildcard html tex info examples src) -BUILD_DOCDIR ?= $(TOPDIR)/doc -BUILD_DOC ?= $(DOC_PREFIX) -INSTALL_DOCDIR ?= $(DOC_PREFIX) -INSTALLED_DOC ?= $(addprefix $(INSTALL_DOCDIR)/,$(DOCS)) +BUILD_DOCDIR ?= $(TOPDIR)/doc +BUILD_DOC ?= $(DOC_PREFIX) +INSTALL_DOCDIR ?= $(DOC_PREFIX) +INSTALLED_DOC ?= $(addprefix $(INSTALL_DOCDIR)/,$(DOCS)) ## -- PI -#BUILD_PIDIR = $(BUILD_LIBDIR) -#BUILD_PI = $(addprefix $(BUILD_PIDIR)/,$(PLUGIN)) -#INSTALL_PIDIR = $(INSTALL_LIBDIR) -#INSTALLED_PI = $(addprefix $(INSTALL_PIDIR)/,$(PLUGIN)) +#BUILD_PIDIR = $(BUILD_LIBDIR) +#BUILD_PI = $(addprefix $(BUILD_PIDIR)/,$(PLUGIN)) +#INSTALL_PIDIR = $(INSTALL_LIBDIR) +#INSTALLED_PI = $(addprefix $(INSTALL_PIDIR)/,$(PLUGIN)) # -- EXE -INSTALLATION_FILE_TYPES += EXE -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))) +INSTALLATION_FILE_TYPES += EXE +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_ALL += $(EXE) $(wildcard *.a *.dll *.so *.so.*) -BUILD_EXE_BIN += $(addprefix $(BUILD_EXEDIR)/,$(EXE) $(EXE_SH)) -INSTALLED_EXE_BIN += $(addprefix $(INSTALL_EXEDIR)/,$(EXE_BIN)) +#EXE_ALL += $(EXE) $(wildcard *.a *.dll *.so *.so.*) +BUILD_EXE_BIN += $(addprefix $(BUILD_EXEDIR)/,$(EXE) $(EXE_SH)) +INSTALLED_EXE_BIN += $(addprefix $(INSTALL_EXEDIR)/,$(EXE_BIN)) -BUILD_EXEDIR = $(TOPDIR)/bin -INSTALL_EXEDIR ?= $(EXE_PREFIX)/bin -BUILD_EXE += $(BUILD_EXE_BIN) -INSTALLED_EXE += $(addprefix $(INSTALL_EXEDIR)/,$(EXE) $(EXE_SH)) $(INSTALLED_EXE_BIN) +BUILD_EXEDIR = $(TOPDIR)/bin +INSTALL_EXEDIR ?= $(EXE_PREFIX)/bin +BUILD_EXE += $(BUILD_EXE_BIN) +INSTALLED_EXE += $(addprefix $(INSTALL_EXEDIR)/,$(EXE) $(EXE_SH)) $(INSTALLED_EXE_BIN) # -- SCRIPT -#INSTALLATION_FILE_TYPES += SCRIPT -#BUILD_SCRIPTDIR = $(TOPDIR)/bin -#INSTALL_SCRIPTDIR ?= $(EXE_PREFIX)/bin -#BUILD_SCRIPT += $(addprefix $(BUILD_SCRIPTDIR)/,$(EXE_SH)) -#INSTALLED_SCRIPT += $(addprefix $(INSTALL_SCRIPTDIR)/,$(EXE_SH)) +#INSTALLATION_FILE_TYPES += SCRIPT +#BUILD_SCRIPTDIR = $(TOPDIR)/bin +#INSTALL_SCRIPTDIR ?= $(EXE_PREFIX)/bin +#BUILD_SCRIPT += $(addprefix $(BUILD_SCRIPTDIR)/,$(EXE_SH)) +#INSTALLED_SCRIPT += $(addprefix $(INSTALL_SCRIPTDIR)/,$(EXE_SH)) # -- CGI -INSTALLATION_FILE_TYPES += CGI -EXE_CGI += $(filter-out $(DONT_INSTALL),$(wildcard *.cgi)) -EXE_CGI += $(patsubst %.cgi.tmpl,%.cgi,$(filter-out $(DONT_INSTALL),$(wildcard *.cgi.tmpl))) +INSTALLATION_FILE_TYPES += CGI +EXE_CGI += $(filter-out $(DONT_INSTALL),$(wildcard *.cgi)) +EXE_CGI += $(patsubst %.cgi.tmpl,%.cgi,$(filter-out $(DONT_INSTALL),$(wildcard *.cgi.tmpl))) -BUILD_CGIDIR = $(TOPDIR)/bin -INSTALL_CGIDIR = $(CGI_DIR) -BUILD_CGI += $(addprefix $(BUILD_CGIDIR)/,$(EXE_CGI)) -INSTALLED_CGI += $(addprefix $(INSTALL_CGIDIR)/,$(EXE_CGI)) +BUILD_CGIDIR = $(TOPDIR)/bin +INSTALL_CGIDIR = $(CGI_DIR) +BUILD_CGI += $(addprefix $(BUILD_CGIDIR)/,$(EXE_CGI)) +INSTALLED_CGI += $(addprefix $(INSTALL_CGIDIR)/,$(EXE_CGI)) # -- SYSTEMD -INSTALLATION_FILE_TYPES += SYSTEMD -BUILD_SYSTEMDDIR = $(TOPDIR)/bin/systemd -LOCAL_SYSTEMD += $(filter-out $(DONT_INSTALL),$(wildcard *.service)) -INSTALL_SYSTEMDDIR = $(SYSTEMD_DIR) -INSTALLED_SYSTEMD += $(addprefix $(INSTALL_SYSTEMDDIR)/,$(LOCAL_SYSTEMD)) +INSTALLATION_FILE_TYPES += SYSTEMD +BUILD_SYSTEMDDIR = $(TOPDIR)/bin/systemd +LOCAL_SYSTEMD += $(filter-out $(DONT_INSTALL),$(wildcard *.service)) +INSTALL_SYSTEMDDIR = $(SYSTEMD_DIR) +INSTALLED_SYSTEMD += $(addprefix $(INSTALL_SYSTEMDDIR)/,$(LOCAL_SYSTEMD)) # -- INIT -INSTALLATION_FILE_TYPES += INIT -BUILD_INITDIR = $(TOPDIR)/bin -INSTALL_INITDIR = $(INIT_PREFIX)/init.d -_INIT_SCRIPTS = $(basename $(filter-out $(DONT_INSTALL),$(wildcard *.init))) -INIT_SCRIPTS += $(_INIT_SCRIPTS) -BUILD_INIT += $(addprefix $(BUILD_INITDIR)/,$(INIT_SCRIPTS)) -INSTALLED_INIT += $(addprefix $(INSTALL_INITDIR)/,$(INIT_SCRIPTS)) +INSTALLATION_FILE_TYPES += INIT +BUILD_INITDIR = $(TOPDIR)/bin +INSTALL_INITDIR = $(INIT_PREFIX)/init.d +_INIT_SCRIPTS = $(basename $(filter-out $(DONT_INSTALL),$(wildcard *.init))) +INIT_SCRIPTS += $(_INIT_SCRIPTS) +BUILD_INIT += $(addprefix $(BUILD_INITDIR)/,$(INIT_SCRIPTS)) +INSTALLED_INIT += $(addprefix $(INSTALL_INITDIR)/,$(INIT_SCRIPTS)) # -- MAKE -INSTALLATION_FILE_TYPES += MAKE -BUILD_MAKEDIR = $(TOPDIR)/make -MKFILES += $(filter-out pckg-defs.mk pckg-deps.mk local.mk,$(filter-out $(DONT_INSTALL),$(wildcard *.mk))) -INSTALL_MAKEDIR ?= $(PREFIX)/make -INSTALLED_MAKE += $(addprefix $(INSTALL_MAKEDIR)/,$(MKFILES)) +INSTALLATION_FILE_TYPES += MAKE +BUILD_MAKEDIR = $(TOPDIR)/make +MKFILES += $(filter-out pckg-defs.mk pckg-deps.mk local.mk,$(filter-out $(DONT_INSTALL),$(wildcard *.mk))) +INSTALL_MAKEDIR ?= $(PREFIX)/make +INSTALLED_MAKE += $(addprefix $(INSTALL_MAKEDIR)/,$(MKFILES)) # -- IMG -INSTALLATION_FILE_TYPES += IMG -BUILD_IMG ?= -BUILD_IMGDIR ?= $(TOPDIR)/images -INSTALL_IMGDIR ?= $(IMG_PREFIX)/images -INSTALLED_IMG ?= $(addprefix $(INSTALL_IMGDIR)/,$(IMAGES)) +INSTALLATION_FILE_TYPES += IMG +BUILD_IMG ?= +BUILD_IMGDIR ?= $(TOPDIR)/images +INSTALL_IMGDIR ?= $(IMG_PREFIX)/images +INSTALLED_IMG ?= $(addprefix $(INSTALL_IMGDIR)/,$(IMAGES)) # -- MO -INSTALLATION_FILE_TYPES += MO -BUILD_MO ?= -BUILD_MODIR ?= $(CWD) -INSTALL_MODIR ?= $(ENV_PREFIX)/usr/share/locale/$(GETTEXT_LOCALE)/LC_MESSAGES -INSTALLED_MO ?= $(addprefix $(INSTALL_MODIR)/,$(wildcard *.mo)) +INSTALLATION_FILE_TYPES += MO +BUILD_MO ?= +BUILD_MODIR ?= $(CWD) +INSTALL_MODIR ?= $(ENV_PREFIX)/usr/share/locale/$(GETTEXT_LOCALE)/LC_MESSAGES +INSTALLED_MO ?= $(addprefix $(INSTALL_MODIR)/,$(wildcard *.mo)) # -- LOG -INSTALLATION_FILE_TYPES += LOG -BUILD_LOGDIR ?= $(TOPDIR)/log -BUILD_LOG ?= -INSTALL_LOGDIR ?= $(LOG_PREFIX)/$(PROJECT) -INSTALLED_LOG ?= +INSTALLATION_FILE_TYPES += LOG +BUILD_LOGDIR ?= $(TOPDIR)/log +BUILD_LOG ?= +INSTALL_LOGDIR ?= $(LOG_PREFIX)/$(PROJECT) +INSTALLED_LOG ?= # -- PROFILE -INSTALLATION_FILE_TYPES += PROFILE +INSTALLATION_FILE_TYPES += PROFILE # TODO: path_ file is omnipresent -BUILD_PROFILEDIR = $(TOPDIR)/profile.d -#PROFILE += path_$(PROJECT).sh -INSTALL_PROFILEDIR ?= $(PROFILE_DIR) -INSTALLED_PROFILE ?= $(addprefix $(INSTALL_PROFILEDIR)/,$(PROFILE)) +BUILD_PROFILEDIR = $(TOPDIR)/profile.d +#PROFILE += path_$(PROJECT).sh +INSTALL_PROFILEDIR ?= $(PROFILE_DIR) +INSTALLED_PROFILE ?= $(addprefix $(INSTALL_PROFILEDIR)/,$(PROFILE)) # -- JAVA -INSTALLATION_FILE_TYPES += JAVA -BUILD_JAVADIR = $(TOPDIR)/share/java -BUILD_JAVADIR_CLASSES = classes -JAVA_JARS ?= $(filter-out $(DONT_INSTALL),$(wildcard *.jar)) -INSTALL_JAVADIR ?= $(JAVADIR) -INSTALLED_JAVA ?= $(addprefix $(INSTALL_JAVADIR)/,$(JAVA_JARS)) +INSTALLATION_FILE_TYPES += JAVA +BUILD_JAVADIR = $(TOPDIR)/share/java +BUILD_JAVADIR_CLASSES = classes +JAVA_JARS ?= $(filter-out $(DONT_INSTALL),$(wildcard *.jar)) +INSTALL_JAVADIR ?= $(JAVADIR) +INSTALLED_JAVA ?= $(addprefix $(INSTALL_JAVADIR)/,$(JAVA_JARS)) # -- LD_CONF ifneq ($(findstring $(TARGET_OS),linux),) - INSTALLATION_FILE_TYPES += LD_CONF - LD_CONF += $(filter-out $(DONT_INSTALL),ld-$(PROJECT).conf) - BUILD_LD_CONFDIR = $(TOPDIR)/lib/ld.so.conf.d - INSTALL_LD_CONFDIR = $(LD_CONF_DIR) - INSTALLED_LD_CONF = $(addprefix $(INSTALL_LD_CONFDIR)/,$(LD_CONF)) + INSTALLATION_FILE_TYPES += LD_CONF + LD_CONF += $(filter-out $(DONT_INSTALL),ld-$(PROJECT).conf) + BUILD_LD_CONFDIR = $(TOPDIR)/lib/ld.so.conf.d + INSTALL_LD_CONFDIR = $(LD_CONF_DIR) + INSTALLED_LD_CONF = $(addprefix $(INSTALL_LD_CONFDIR)/,$(LD_CONF)) endif # -- LOGROT ifneq ($(findstring $(TARGET_OS),linux),) - INSTALLATION_FILE_TYPES += LOGROT - LOGROT += $(basename $(filter-out $(DONT_INSTALL),$(wildcard *.logrotate))) - BUILD_LOGROTDIR = $(TOPDIR)/bin/logrotate.d - INSTALL_LOGROTDIR = $(LOGROT_DIR) - INSTALLED_LOGROT = $(addprefix $(INSTALL_LOGROTDIR)/,$(LOGROT)) + INSTALLATION_FILE_TYPES += LOGROT + LOGROT += $(basename $(filter-out $(DONT_INSTALL),$(wildcard *.logrotate))) + BUILD_LOGROTDIR = $(TOPDIR)/bin/logrotate.d + INSTALL_LOGROTDIR = $(LOGROT_DIR) + INSTALLED_LOGROT = $(addprefix $(INSTALL_LOGROTDIR)/,$(LOGROT)) endif # -- APACHE_CONF ifneq ($(findstring $(TARGET_OS),linux),) - INSTALLATION_FILE_TYPES += APACHE_CONF - APACHE_CONF += $(filter-out $(DONT_INSTALL),$(wildcard *.apache-conf)) - BUILD_APACHE_CONFDIR = $(TOPDIR)/bin/apache/conf.d - INSTALL_APACHE_CONFDIR = $(APACHE_CONF_DIR) - INSTALLED_APACHE_CONF = $(addprefix $(INSTALL_APACHE_CONFDIR)/,$(patsubst %.apache-conf,%.conf,$(APACHE_CONF))) + INSTALLATION_FILE_TYPES += APACHE_CONF + APACHE_CONF += $(filter-out $(DONT_INSTALL),$(wildcard *.apache-conf)) + BUILD_APACHE_CONFDIR = $(TOPDIR)/bin/apache/conf.d + INSTALL_APACHE_CONFDIR = $(APACHE_CONF_DIR) + INSTALLED_APACHE_CONF = $(addprefix $(INSTALL_APACHE_CONFDIR)/,$(patsubst %.apache-conf,%.conf,$(APACHE_CONF))) endif # -- RSYSLOG ifneq ($(findstring $(TARGET_OS),linux),) - INSTALLATION_FILE_TYPES += RSYSLOG - RSYSLOG += $(filter-out $(DONT_INSTALL),$(wildcard *.rsyslog rsyslog-*.bprof)) - BUILD_RSYSLOGDIR = $(TOPDIR)/bin/rsyslog.d - INSTALL_RSYSLOGDIR = $(RSYSLOG_DIR) - INSTALLED_RSYSLOG = $(addprefix $(INSTALL_RSYSLOGDIR)/,$(subst rsyslog-,,$(RSYSLOG))) - INSTALLED_RSYSLOG += $(addprefix $(INSTALL_RSYSLOGDIR)/,$(patsubst %.rsyslog,%.conf,$(RSYSLOG))) + INSTALLATION_FILE_TYPES += RSYSLOG + RSYSLOG += $(filter-out $(DONT_INSTALL),$(wildcard *.rsyslog rsyslog-*.bprof)) + BUILD_RSYSLOGDIR = $(TOPDIR)/bin/rsyslog.d + INSTALL_RSYSLOGDIR = $(RSYSLOG_DIR) + INSTALLED_RSYSLOG = $(addprefix $(INSTALL_RSYSLOGDIR)/,$(subst rsyslog-,,$(RSYSLOG))) + INSTALLED_RSYSLOG += $(addprefix $(INSTALL_RSYSLOGDIR)/,$(patsubst %.rsyslog,%.conf,$(RSYSLOG))) endif # -- CRONTAB ifneq ($(findstring $(TARGET_OS),linux),) - INSTALLATION_FILE_TYPES += CRONTAB - CRONTAB += $(filter-out $(DONT_INSTALL),$(wildcard *.crontab)) - BUILD_CRONTABDIR = $(TOPDIR)/cron.d - INSTALLED_CRONTAB = $(addprefix $(INSTALL_CRONTABDIR)/,$(CRONTAB)) + INSTALLATION_FILE_TYPES += CRONTAB + CRONTAB += $(filter-out $(DONT_INSTALL),$(wildcard *.crontab)) + BUILD_CRONTABDIR = $(TOPDIR)/cron.d + INSTALLED_CRONTAB = $(addprefix $(INSTALL_CRONTABDIR)/,$(CRONTAB)) endif # -- PKG_CONFIG ifneq ($(findstring $(TARGET_OS),linux),) - INSTALLATION_FILE_TYPES += PKG_CONFIG - PKG_CONFIG += $(sort $(filter-out $(DONT_INSTALL),$(wildcard *.pc) $(LOCAL_PKG_CONFIG))) + INSTALLATION_FILE_TYPES += PKG_CONFIG + PKG_CONFIG += $(sort $(filter-out $(DONT_INSTALL),$(wildcard *.pc) $(LOCAL_PKG_CONFIG))) ifeq ($(DEVELOPMENT),true) - BUILD_PKG_CONFIGDIR = $(MODDIR)/pkgconfig + BUILD_PKG_CONFIGDIR = $(MODDIR)/pkgconfig else - BUILD_PKG_CONFIGDIR = $(TOPDIR)/make + BUILD_PKG_CONFIGDIR = $(TOPDIR)/make endif - LOCAL_PKG_CONFIG = $(PROJECT).pc - BUILD_PKG_CONFIG = $(BUILD_PKG_CONFIGDIR)/$(LOCAL_PKG_CONFIG) - INSTALLED_PKG_CONFIG = $(addprefix $(INSTALL_PKG_CONFIGDIR)/,$(PKG_CONFIG)) + LOCAL_PKG_CONFIG = $(PROJECT).pc + BUILD_PKG_CONFIG = $(BUILD_PKG_CONFIGDIR)/$(LOCAL_PKG_CONFIG) + INSTALLED_PKG_CONFIG = $(addprefix $(INSTALL_PKG_CONFIGDIR)/,$(PKG_CONFIG)) endif -INSTALL_FILE ?= $(INSTALL) -INSTALL_DIR ?= $(INSTALL) +INSTALL_FILE ?= $(INSTALL) +INSTALL_DIR ?= $(INSTALL) # ----- 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,local.mk)) -BTOOLS_DIR ?= $(call proj_dir, dspider-btools) -#DSPCD_DIR ?= $(call proj_dir, dspcd) -#DSPCD_EC_DIR ?= $(call proj_dir, dspcd-ec) -FEEDFSD_DIR ?= $(call proj_dir, feedfsd) -FEEDFS_DIR := $(call proj_dir, feedfs) -FEEDFS_GUI_DIR ?= $(call proj_dir, feedfs-gui) -FEEDFS_OBJECTS_DIR ?= $(call proj_dir, feedfs-objects) -FEEDFS_UTILS_DIR ?= $(call proj_dir, feedfs-utils) -FEEDFS_WT_DIR ?= $(call proj_dir, feedfs-wt) -JUX_SHARED_DIR ?= $(call proj_dir, jux-shared) -SITE_DIR ?= $(call proj_dir, site) -VALDI_DIR ?= $(call proj_dir, valdi) -XCHANGE_DIR ?= $(call proj_dir, xchange) +BTOOLS_DIR ?= $(call proj_dir, dspider-btools) +#DSPCD_DIR ?= $(call proj_dir, dspcd) +#DSPCD_EC_DIR ?= $(call proj_dir, dspcd-ec) +FEEDFSD_DIR ?= $(call proj_dir, feedfsd) +FEEDFS_DIR := $(call proj_dir, feedfs) +FEEDFS_GUI_DIR ?= $(call proj_dir, feedfs-gui) +FEEDFS_OBJECTS_DIR ?= $(call proj_dir, feedfs-objects) +FEEDFS_UTILS_DIR ?= $(call proj_dir, feedfs-utils) +FEEDFS_WT_DIR ?= $(call proj_dir, feedfs-wt) +JUX_SHARED_DIR ?= $(call proj_dir, jux-shared) +SITE_DIR ?= $(call proj_dir, site) +VALDI_DIR ?= $(call proj_dir, valdi) +XCHANGE_DIR ?= $(call proj_dir, xchange) all: diff --git a/make/depend.mk b/make/depend.mk index d2f80dcf..89fea930 100644 --- a/make/depend.mk +++ b/make/depend.mk @@ -1,7 +1,7 @@ # variables -DEPEND_CFLAGS += -D__MAKEDEPEND__ -DEPEND_CPPFLAGS += -D__MAKEDEPEND__ -DEPEND_MK += $(addprefix .,$(addsuffix .dep.mk, $(OBJ))) +DEPEND_CFLAGS += -D__MAKEDEPEND__ +DEPEND_CPPFLAGS += -D__MAKEDEPEND__ +DEPEND_MK += $(addprefix .,$(addsuffix .dep.mk, $(OBJ))) ifeq ($(DEPEND_MK_INCLUDED),) @@ -41,4 +41,4 @@ show-vars-depend-mk: @echo BUILD_HDR = $(BUILD_HDR) endif # DEPEND_MK_INCLUDED -DEPEND_MK_INCLUDED := true +DEPEND_MK_INCLUDED := true diff --git a/make/dev-utils.mk b/make/dev-utils.mk index 8c68fc27..c72f719b 100644 --- a/make/dev-utils.mk +++ b/make/dev-utils.mk @@ -1,9 +1,9 @@ ifndef DEV_UTILS_MK_INCLUDED -DEV_UTILS_MK_INCLUDED = true +DEV_UTILS_MK_INCLUDED = true -MAKEFILE_INDENT_EQUAL_POS ?= 35 -MAKEFILE_INDENT_NAME_REGEX ?= (\.mk$$|makefile$$|Makefile$$|GNUmakefile$$) -MAKEFILE_INDENT_ROOT ?= . +MAKEFILE_INDENT_EQUAL_POS ?= 30 +MAKEFILE_INDENT_NAME_REGEX ?= (\.mk$$|makefile$$|Makefile$$|GNUmakefile$$) +MAKEFILE_INDENT_ROOT ?= . all: install: diff --git a/make/dist.mk b/make/dist.mk index 2d261425..4b87a828 100644 --- a/make/dist.mk +++ b/make/dist.mk @@ -1,27 +1,27 @@ # -- general, and important -LOCAL_PROJECT = $(PROJECT) +LOCAL_PROJECT = $(PROJECT) -TARGET_HOST = cvs.jannet.de -UPLOAD_DOCUMENT_ROOT = /usr/local/httpd/htdocs -UPLOAD_VIRTUAL_SERVER_ROOT = www.jannet.de_443 -TARGET_USER = root -TARGET_GROUP = root -TARGET_FILE_MODE = 755 -TARGET_DIR_MODE = 755 -DOWNLOAD_SERVER = https://www.jannet.de:443 -URL_RELATIVE_PATH = $(CUSTOMER)/projects/$(LOCAL_PROJECT)/download -SSI_DOWNLOAD_TMPL = $(MODDIR)/doctmpl/html/ssi/ssi_download.html.tmpl -DOWNLOAD_REFERRER_DIRS = $(addprefix $(UPLOAD_DOCUMENT_ROOT)/, \ +TARGET_HOST = cvs.jannet.de +UPLOAD_DOCUMENT_ROOT = /usr/local/httpd/htdocs +UPLOAD_VIRTUAL_SERVER_ROOT = www.jannet.de_443 +TARGET_USER = root +TARGET_GROUP = root +TARGET_FILE_MODE = 755 +TARGET_DIR_MODE = 755 +DOWNLOAD_SERVER = https://www.jannet.de:443 +URL_RELATIVE_PATH = $(CUSTOMER)/projects/$(LOCAL_PROJECT)/download +SSI_DOWNLOAD_TMPL = $(MODDIR)/doctmpl/html/ssi/ssi_download.html.tmpl +DOWNLOAD_REFERRER_DIRS = $(addprefix $(UPLOAD_DOCUMENT_ROOT)/, \ $(UPLOAD_VIRTUAL_SERVER_ROOT)/$(URL_RELATIVE_PATH) \ ) # -- general, and less important -DISTDIR = $(TOPDIR)/dist -DIST_FILE = $(DISTDIR)/$(PROJECT)-$(VERSION).tar.gz -TMPHTML=$(DISTDIR)/html -DOWNLOAD_URLDIR=$(DOWNLOAD_SERVER)/$(URL_RELATIVE_PATH) -TARGET_DIR ?= $(UPLOAD_DOCUMENT_ROOT)/$(UPLOAD_VIRTUAL_SERVER_ROOT)/$(URL_RELATIVE_PATH) -SSI_PREFIX = $(TMPHTML)/ssi_download_ +DISTDIR = $(TOPDIR)/dist +DIST_FILE = $(DISTDIR)/$(PROJECT)-$(VERSION).tar.gz +TMPHTML = $(DISTDIR)/html +DOWNLOAD_URLDIR = $(DOWNLOAD_SERVER)/$(URL_RELATIVE_PATH) +TARGET_DIR ?= $(UPLOAD_DOCUMENT_ROOT)/$(UPLOAD_VIRTUAL_SERVER_ROOT)/$(URL_RELATIVE_PATH) +SSI_PREFIX = $(TMPHTML)/ssi_download_ $(TMPHTML): mkdir -p $(TMPHTML) diff --git a/make/doxygen.mk b/make/doxygen.mk index 266f0a75..fa262078 100644 --- a/make/doxygen.mk +++ b/make/doxygen.mk @@ -3,40 +3,40 @@ include $(MODDIR)/make/defs.mk # broken by IMAGEDIR in rpmbuild ifeq ($(DEVELOPMENT),true) -GENERATE_DOXYGEN ?= true +GENERATE_DOXYGEN ?= true endif ifneq ($(GENERATE_DOXYGEN),true) include $(MODDIR)/make/dummy.mk else -UPLOAD_FILE_MODE ?= 644 -UPLOAD_DIR_MODE ?= 755 +UPLOAD_FILE_MODE ?= 644 +UPLOAD_DIR_MODE ?= 755 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_UNTEMPLATED = $(patsubst %.tmpl,%,$(wildcard *.tmpl)) -DX_OUTPUT_DIR ?= html -DX_INSTALL_DIR ?= $(DOC_PREFIX)/devel -DX_DOC_FILES = $(DX_INCLUDE) -DX_DOXYGEN_CONF ?= doxygen.conf -DX_INCLUDE_TMPL_DIR ?= $(MODDIR)/tmpl/doxygen -DX_FALLBACK_CONF_TMPL ?= $(DX_INCLUDE_TMPL_DIR)/doxygen.conf.tmpl -DX_BROWSER ?= $(BROWSER) +DX_INCLUDE ?= header.html footer.html styles.css logo.png +DX_UNTEMPLATED = $(patsubst %.tmpl,%,$(wildcard *.tmpl)) +DX_OUTPUT_DIR ?= html +DX_INSTALL_DIR ?= $(DOC_PREFIX)/devel +DX_DOC_FILES = $(DX_INCLUDE) +DX_DOXYGEN_CONF ?= doxygen.conf +DX_INCLUDE_TMPL_DIR ?= $(MODDIR)/tmpl/doxygen +DX_FALLBACK_CONF_TMPL ?= $(DX_INCLUDE_TMPL_DIR)/doxygen.conf.tmpl +DX_BROWSER ?= $(BROWSER) # replaced pattern defaults -DX_FILE_PATTERNS ?= *.h *.c *.cpp -DX_INPUT_DIRS ?= $(TOPDIR)/include -DX_SRC_IS_JAVA ?= NO -DX_EXCLUDE_FILES ?= -DX_INCLUDE_PATH ?= -DX_RECURSIVE ?= YES -DX_EXTRACT_STATIC ?= NO -DX_INLINE_SOURCES ?= NO -DX_SOURCE_BROWSER ?= NO +DX_FILE_PATTERNS ?= *.h *.c *.cpp +DX_INPUT_DIRS ?= $(TOPDIR)/include +DX_SRC_IS_JAVA ?= NO +DX_EXCLUDE_FILES ?= +DX_INCLUDE_PATH ?= +DX_RECURSIVE ?= YES +DX_EXTRACT_STATIC ?= NO +DX_INLINE_SOURCES ?= NO +DX_SOURCE_BROWSER ?= NO all: html install: install.done diff --git a/make/gettext.mk b/make/gettext.mk index 45a604f7..e6befd59 100644 --- a/make/gettext.mk +++ b/make/gettext.mk @@ -1,19 +1,19 @@ -GETTEXT_LOCALE ?= $(notdir $(shell $(PWD))) +GETTEXT_LOCALE ?= $(notdir $(shell $(PWD))) include $(MODDIR)/make/defs.mk include $(MODDIR)/make/rules.mk include $(MODDIR)/make/dev-utils.mk -GETTEXT_PROJECT_PO ?= $(PROJECT).po -GETTEXT_PROJECT_POT ?= $(PROJECT).pot +GETTEXT_PROJECT_PO ?= $(PROJECT).po +GETTEXT_PROJECT_POT ?= $(PROJECT).pot -GETTEXT_PO ?= $(wildcard *.po) -GETTEXT_POT ?= $(patsubst %.po,%.pot,$(GETTEXT_PO)) -GETTEXT_MO ?= $(patsubst %.po,%.mo,$(GETTEXT_PO)) -GETTEXT_INPUT_DIRS ?= $(wildcard $(TOPDIR)/tools $(TOPDIR)/src $(TOPDIR)/conf) -GETTEXT_INPUT_FILES ?= $(foreach d,$(GETTEXT_INPUT_DIRS),\ +GETTEXT_PO ?= $(wildcard *.po) +GETTEXT_POT ?= $(patsubst %.po,%.pot,$(GETTEXT_PO)) +GETTEXT_MO ?= $(patsubst %.po,%.mo,$(GETTEXT_PO)) +GETTEXT_INPUT_DIRS ?= $(wildcard $(TOPDIR)/tools $(TOPDIR)/src $(TOPDIR)/conf) +GETTEXT_INPUT_FILES ?= $(foreach d,$(GETTEXT_INPUT_DIRS),\ $(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) clean: clean-mo @@ -50,12 +50,12 @@ edit: merge $(GETTEXT_PROJECT_POT) mv $@.tmp $@ #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 #msgfmt --check --verbose --output-file ./es_MX.utf8/LC_MESSAGES/$(PROJECT).mo $(PROJECT)_spanish.po -GETTEXT_TMP = $(patsubst %.php,%.htr,$(GETTEXT_PREPROCESS)) -GETTEXT_INPUT_FILES += $(GETTEXT_TMP) +GETTEXT_TMP = $(patsubst %.php,%.htr,$(GETTEXT_PREPROCESS)) +GETTEXT_INPUT_FILES += $(GETTEXT_TMP) all: htr clean: htr-tmp-clean diff --git a/make/git-submod.mk b/make/git-submod.mk index 2dd529a1..0c48e81f 100644 --- a/make/git-submod.mk +++ b/make/git-submod.mk @@ -5,14 +5,14 @@ # - run git-init-submod-remote ifeq ($(USE_USER_URL),) - JANWARE_USER_PREFIX = $(JANWARE_USER)@ + JANWARE_USER_PREFIX = $(JANWARE_USER)@ endif -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) -SUBMOD_PATH = $(patsubst $(abspath $(TOPDIR))/%,%,$(abspath $(shell $(CWD))/$(SUBMOD_SRC_DIR))) -SUBMOD_SRC_DIR ?= . -SUB_GIT = git -C $(SUBMOD_SRC_DIR) +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) +SUBMOD_PATH = $(patsubst $(abspath $(TOPDIR))/%,%,$(abspath $(shell $(CWD))/$(SUBMOD_SRC_DIR))) +SUBMOD_SRC_DIR ?= . +SUB_GIT = git -C $(SUBMOD_SRC_DIR) all: install: diff --git a/make/htdocs.mk b/make/htdocs.mk index 54f4644f..2793ae97 100644 --- a/make/htdocs.mk +++ b/make/htdocs.mk @@ -1,22 +1,22 @@ -LESS_SRC ?= $(wildcard *.less) -LESS_GENERATED_CSS ?= $(patsubst %.less,%.css,$(LESS_SRC)) -LESS_CPY ?= lesscpy +LESS_SRC ?= $(wildcard *.less) +LESS_GENERATED_CSS ?= $(patsubst %.less,%.css,$(LESS_SRC)) +LESS_CPY ?= lesscpy include $(MODDIR)/make/defs.mk # -- HTML -INSTALLATION_FILE_TYPES += HTML -BUILD_HTMLDIR = $(TOPDIR)/htdocs -LOCAL_HTML += $(filter-out $(DONT_INSTALL),$(wildcard *.html *.css *.php *.js) $(FONTS) $(IMAGES)) +INSTALLATION_FILE_TYPES += HTML +BUILD_HTMLDIR = $(TOPDIR)/htdocs +LOCAL_HTML += $(filter-out $(DONT_INSTALL),$(wildcard *.html *.css *.php *.js) $(FONTS) $(IMAGES)) ifeq ($(HTML_SUBDIR),) - HTML_SUBDIR := $(shell $(PWD) | $(SED) '/.*\/htdocs\(\/\|$$\)/!d; s%.*/htdocs\(/\|$$\)%%') + HTML_SUBDIR := $(shell $(PWD) | $(SED) '/.*\/htdocs\(\/\|$$\)/!d; s%.*/htdocs\(/\|$$\)%%') endif ifeq ($(HTML_SUBDIR),) - INSTALL_HTMLDIR ?= $(PROJECT_HTMLDIR) + INSTALL_HTMLDIR ?= $(PROJECT_HTMLDIR) else - INSTALL_HTMLDIR ?= $(PROJECT_HTMLDIR)/$(HTML_SUBDIR) + INSTALL_HTMLDIR ?= $(PROJECT_HTMLDIR)/$(HTML_SUBDIR) endif -INSTALLED_HTML += $(addprefix $(INSTALL_HTMLDIR)/,$(LOCAL_HTML)) +INSTALLED_HTML += $(addprefix $(INSTALL_HTMLDIR)/,$(LOCAL_HTML)) include $(MODDIR)/make/js.mk diff --git a/make/install-files.mk b/make/install-files.mk index 670a2d2c..58c66660 100644 --- a/make/install-files.mk +++ b/make/install-files.mk @@ -1,25 +1,25 @@ -SOURCE_FILES ?= $(filter-out CVS .git $(LOCAL_MKFILES) %.done, $(wildcard *)) -TARGET_DIR ?= $(PREFIX)/share +SOURCE_FILES ?= $(filter-out CVS .git $(LOCAL_MKFILES) %.done, $(wildcard *)) +TARGET_DIR ?= $(PREFIX)/share -SOURCE_BASE ?= . +SOURCE_BASE ?= . -RELPATHS = $(foreach f,$(SOURCE_FILES),$(shell realpath -s --relative-to "$(SOURCE_BASE)" "$f")) -INSTALLED_FILES = $(addprefix $(TARGET_DIR)/,$(RELPATHS)) +RELPATHS = $(foreach f,$(SOURCE_FILES),$(shell realpath -s --relative-to "$(SOURCE_BASE)" "$f")) +INSTALLED_FILES = $(addprefix $(TARGET_DIR)/,$(RELPATHS)) include $(MODDIR)/make/defs.mk include $(MODDIR)/make/dev-utils.mk ifeq ($(DEVELOPMENT),true) - TARGET_OWNER ?= $(shell id -un) - TARGET_GROUP ?= $(shell id -gn) + TARGET_OWNER ?= $(shell id -un) + TARGET_GROUP ?= $(shell id -gn) else - TARGET_OWNER ?= root - TARGET_GROUP ?= root + TARGET_OWNER ?= root + TARGET_GROUP ?= root endif -TARGET_DIR_OWNER ?= $(TARGET_OWNER) -TARGET_DIR_GROUP ?= $(TARGET_GROUP) -TARGET_MODE ?= 440 -TARGET_DIR_MODE ?= 770 +TARGET_DIR_OWNER ?= $(TARGET_OWNER) +TARGET_DIR_GROUP ?= $(TARGET_GROUP) +TARGET_MODE ?= 440 +TARGET_DIR_MODE ?= 770 all: install: install.done diff --git a/make/isolinux.mk b/make/isolinux.mk index 84e3a989..32dc0023 100644 --- a/make/isolinux.mk +++ b/make/isolinux.mk @@ -1,18 +1,18 @@ # == defs -URL_BASE = http://www.kernel.org/pub/linux/utils/boot/syslinux -URL_FILE = SYSLINUX_URL -URL = $(shell $(CAT) $(URL_FILE)) -DLOAD_DIR = /home/samba/dat/share/exe/linux/syslinux -BUILD_DIR = cd_root -DIRS = $(DLOAD_DIR) $(BUILD_DIR) -UNPACK_DIR = isolinux -ISO_IMAGE ?= image.iso -ISOLINUX_BIN = $(UNPACK_DIR)/isolinux.bin -MENU_32 = $(UNPACK_DIR)/com32/menu/menu.c32 -INITRD = /boot/initrd +URL_BASE = http://www.kernel.org/pub/linux/utils/boot/syslinux +URL_FILE = SYSLINUX_URL +URL = $(shell $(CAT) $(URL_FILE)) +DLOAD_DIR = /home/samba/dat/share/exe/linux/syslinux +BUILD_DIR = cd_root +DIRS = $(DLOAD_DIR) $(BUILD_DIR) +UNPACK_DIR = isolinux +ISO_IMAGE ?= image.iso +ISOLINUX_BIN = $(UNPACK_DIR)/isolinux.bin +MENU_32 = $(UNPACK_DIR)/com32/menu/menu.c32 +INITRD = /boot/initrd -CD_FILES = \ +CD_FILES = \ $(MENU_32) \ $(ISOLINUX_BIN) @@ -55,8 +55,8 @@ unpack.done: $(URL_FILE) dload.done mv $(SYSLINUX_BASE) $(UNPACK_DIR) touch $@ -GENERATE = /bin/bash $(MOD_SCRIPT_DIR)/generate-boot-medium.sh -BOOT_CONF = boot.conf +GENERATE = /bin/bash $(MOD_SCRIPT_DIR)/generate-boot-medium.sh +BOOT_CONF = boot.conf $(ISO_IMAGE): $(BOOT_CONF) dirs.done $(CD_FILES) $(GENERATE) -o $@ -d $(BUILD_DIR) -f $< $(CD_FILES) diff --git a/make/java.mk b/make/java.mk index d72f4853..9b977239 100644 --- a/make/java.mk +++ b/make/java.mk @@ -1,7 +1,7 @@ -JAVA_SRC_DIR ?= . -JAVA_SRC ?= $(wildcard $(JAVA_SRC_DIR)/*.java) -JAVA_CLASSFILES += $(patsubst %.java,%.class,$(JAVA_SRC)) -JAVA_CLASSPATH = $(shell echo $(CLASSPATH) | sed 's/ */:/g') +JAVA_SRC_DIR ?= . +JAVA_SRC ?= $(wildcard $(JAVA_SRC_DIR)/*.java) +JAVA_CLASSFILES += $(patsubst %.java,%.class,$(JAVA_SRC)) +JAVA_CLASSPATH = $(shell echo $(CLASSPATH) | sed 's/ */:/g') include $(MODDIR)/make/defs.mk diff --git a/make/js.mk b/make/js.mk index 5c71ee21..63ef5ed7 100644 --- a/make/js.mk +++ b/make/js.mk @@ -1,23 +1,23 @@ -JAVA ?= /usr/bin/java -JS_MINIFY_FILTER_IN ?= sed 's/console\.[a-z]\+([^)]\+) *;//g' -JS_SRC ?= $(filter-out %.min.js,$(wildcard *.js)) -JS_GENERATED ?= $(patsubst %.js,%.min.js,$(JS_SRC)) -JS_EXTRA_EXTERNS ?= -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 ?= $(sort $(JS_EXTRA_EXTERNS) jquery-3.3.js) -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_EXE ?= $(JAVA) -jar $(firstword $(wildcard \ +JAVA ?= /usr/bin/java +JS_MINIFY_FILTER_IN ?= sed 's/console\.[a-z]\+([^)]\+) *;//g' +JS_SRC ?= $(filter-out %.min.js,$(wildcard *.js)) +JS_GENERATED ?= $(patsubst %.js,%.min.js,$(JS_SRC)) +JS_EXTRA_EXTERNS ?= +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 ?= $(sort $(JS_EXTRA_EXTERNS) jquery-3.3.js) +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_EXE ?= $(JAVA) -jar $(firstword $(wildcard \ $(JS_CC_BUILD_ROOT)/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, # which is not obvious. OTOH, if it isn't, SOURCE_FILES doesn't do any harm, # either. -SOURCE_FILES += $(JS_GENERATED) +SOURCE_FILES += $(JS_GENERATED) all: $(JS_GENERATED) clean: minify.clean diff --git a/make/ldlibpath.mk b/make/ldlibpath.mk index 33385ee1..c8e14fc6 100644 --- a/make/ldlibpath.mk +++ b/make/ldlibpath.mk @@ -3,15 +3,15 @@ # contact@jannet.de # $Id$ -LD_LIB_PATH_ENV := $(LD_LIBRARY_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_ENV := $(LD_LIBRARY_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') 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 -#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)) +#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)) 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) diff --git a/make/linux-rpm-build.mk b/make/linux-rpm-build.mk index 662febfb..de44a81e 100644 --- a/make/linux-rpm-build.mk +++ b/make/linux-rpm-build.mk @@ -6,21 +6,21 @@ define COMPLETE_VERSION $(shell $(CAT) COMPLETE_VERSION) endef -HOST ?= $(HOSTNAME) -KERNEL_BASE ?= lx-$(HOST) -BOOT_LABEL ?= lx-$(KERNEL_VERSION)-$(RPM_RELEASE) -KERNEL_PKG_SUFFIX ?= .tar.gz -CUSTOMER ?= jannet -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) -UPLOAD_HOST ?= pkg.janware.com -UPLOAD_PATH ?= /srv/dav/pub/packages/$(CUSTOMER)/$(KERNEL_BASE) -UPLOAD_OWNER ?= $(shell whoami) +HOST ?= $(HOSTNAME) +KERNEL_BASE ?= lx-$(HOST) +BOOT_LABEL ?= lx-$(KERNEL_VERSION)-$(RPM_RELEASE) +KERNEL_PKG_SUFFIX ?= .tar.gz +CUSTOMER ?= jannet +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) +UPLOAD_HOST ?= pkg.janware.com +UPLOAD_PATH ?= /srv/dav/pub/packages/$(CUSTOMER)/$(KERNEL_BASE) +UPLOAD_OWNER ?= $(shell whoami) -KERNEL_MAJOR = $(shell echo $(KERNEL_VERSION) | cut -d\. -f1) -KERNEL_MINOR = $(shell echo $(KERNEL_VERSION) | cut -d\. -f2) -KERNEL_RELEASE = $(shell echo $(KERNEL_VERSION) | cut -d\. -f3) -KERNEL_PKG_BASE = $(KERNEL_DLOAD_DIR)/$(KERNEL_MAJOR).$(KERNEL_MINOR)/linux-$(KERNEL_VERSION).tar +KERNEL_MAJOR = $(shell echo $(KERNEL_VERSION) | cut -d\. -f1) +KERNEL_MINOR = $(shell echo $(KERNEL_VERSION) | cut -d\. -f2) +KERNEL_RELEASE = $(shell echo $(KERNEL_VERSION) | cut -d\. -f3) +KERNEL_PKG_BASE = $(KERNEL_DLOAD_DIR)/$(KERNEL_MAJOR).$(KERNEL_MINOR)/linux-$(KERNEL_VERSION).tar ifneq ($(wildcard $(KERNEL_PKG_BASE).*),) ifneq ($(wildcard $(KERNEL_PKG_BASE).gz),) KERNEL_PKG = $(KERNEL_PKG_BASE).gz @@ -34,56 +34,56 @@ else KERNEL_PKG = $(KERNEL_PKG_BASE).bz2 KERNEL_SRC_DIR = linux-$(KERNEL_VERSION) endif -#HOST = $(shell cd ../..; $(PWD) | xargs basename) -WD := $(shell $(PWD)) -TAG = $(shell echo V_$(KERNEL_VERSION)_$(RPM_RELEASE) | $(SED) 's/\./_/g') -ARCH = $(shell $(RPMBUILD) --showrc | $(SED) '/build arch / !d; s/.*build arch *://; s/ //g') +#HOST = $(shell cd ../..; $(PWD) | xargs basename) +WD := $(shell $(PWD)) +TAG = $(shell echo V_$(KERNEL_VERSION)_$(RPM_RELEASE) | $(SED) '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),) -RPMBUILD = $(shell which rpm 2>/dev/null) +RPMBUILD = $(shell which rpm 2>/dev/null) endif #ifeq ($(wildcard RELEASE-$(KERNEL_VERSION)),) -#RPM_RELEASE := $(shell make newrelease; exit 1) +#RPM_RELEASE := $(shell make newrelease; exit 1) #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),) -#RPM_RELEASE = $(RPM_RELEASE_NUM) +#RPM_RELEASE = $(RPM_RELEASE_NUM) #else -#RPM_RELEASE = $(UNAME_SUFFIX)$(RPM_RELEASE_NUM) +#RPM_RELEASE = $(UNAME_SUFFIX)$(RPM_RELEASE_NUM) #endif #endif -BASE = $(KERNEL_BASE)-$(COMPLETE_VERSION) -TMP_INSTALL = $(KERNEL_BASE)-$(COMPLETE_VERSION) -BASE_RUN = $(KERNEL_BASE)-run-$(COMPLETE_VERSION) -BASE_DEVEL = $(KERNEL_BASE)-devel-$(COMPLETE_VERSION) +BASE = $(KERNEL_BASE)-$(COMPLETE_VERSION) +TMP_INSTALL = $(KERNEL_BASE)-$(COMPLETE_VERSION) +BASE_RUN = $(KERNEL_BASE)-run-$(COMPLETE_VERSION) +BASE_DEVEL = $(KERNEL_BASE)-devel-$(COMPLETE_VERSION) ifeq ($(BOOT_LABEL),) -BOOT_LABEL = lx-$(COMPLETE_VERSION) +BOOT_LABEL = lx-$(COMPLETE_VERSION) endif -KERNEL_TGZ = $(notdir $(KERNEL_PKG)) -F_SPEC = $(BASE).spec -F_TGZ = $(BASE).tar.gz -F_SPM = $(BASE).src.rpm -F_RPM_RUN = $(BASE_RUN).$(ARCH).rpm -F_RPM_DEVEL = $(BASE_DEVEL).$(ARCH).rpm -F_RPMS = $(F_RPM_RUN) $(F_RPM_DEVEL) -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_ULDONE = $(addsuffix .uldone,$(F_RPMS) $(F_TGZ) $(F_SPM) current) +KERNEL_TGZ = $(notdir $(KERNEL_PKG)) +F_SPEC = $(BASE).spec +F_TGZ = $(BASE).tar.gz +F_SPM = $(BASE).src.rpm +F_RPM_RUN = $(BASE_RUN).$(ARCH).rpm +F_RPM_DEVEL = $(BASE_DEVEL).$(ARCH).rpm +F_RPMS = $(F_RPM_RUN) $(F_RPM_DEVEL) +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_ULDONE = $(addsuffix .uldone,$(F_RPMS) $(F_TGZ) $(F_SPM) current) # 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) \ -t $(HOST) \ -b $(WD) \ -a i386 \ -s $(KERNEL_SRC_DIR) \ -i $(TMP_INSTALL) -MKSPEC := $(MODDIR)/devutil/jcs/mkspec-linux.sh +MKSPEC := $(MODDIR)/devutil/jcs/mkspec-linux.sh # exports export KERNEL_VERSION diff --git a/make/linux-rpm.mk b/make/linux-rpm.mk index 9e171fa7..39cfc95a 100644 --- a/make/linux-rpm.mk +++ b/make/linux-rpm.mk @@ -6,13 +6,13 @@ define COMPLETE_VERSION $(shell $(CAT) COMPLETE_VERSION) endef -KERNEL_MAJOR = $(shell echo $(KERNEL_VERSION) | cut -d\. -f1) -KERNEL_MINOR = $(shell echo $(KERNEL_VERSION) | cut -d\. -f2) -KERNEL_RELEASE = $(shell echo $(KERNEL_VERSION) | cut -d\. -f3) -KERNEL_DLOAD_DIR ?= /home/samba/dat/share/exe/linux/os -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 -HOST ?= $(HOSTNAME) +KERNEL_MAJOR = $(shell echo $(KERNEL_VERSION) | cut -d\. -f1) +KERNEL_MINOR = $(shell echo $(KERNEL_VERSION) | cut -d\. -f2) +KERNEL_RELEASE = $(shell echo $(KERNEL_VERSION) | cut -d\. -f3) +KERNEL_DLOAD_DIR ?= /home/samba/dat/share/exe/linux/os +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 +HOST ?= $(HOSTNAME) ifneq ($(wildcard $(KERNEL_PKG_BASE).*),) ifneq ($(wildcard $(KERNEL_PKG_BASE).gz),) @@ -27,17 +27,17 @@ else KERNEL_PKG = $(KERNEL_PKG_BASE).bz2 KERNEL_SRC_DIR = linux-$(KERNEL_VERSION) endif -WD := $(shell $(PWD)) -TAG = $(shell echo V_$(KERNEL_VERSION)_$(RPM_RELEASE) | $(SED) 's/\./_/g') -ARCH = $(shell $(RPMBUILD) --showrc | $(SED) '/build arch / !d; s/.*build arch *://; s/ //g') +WD := $(shell $(PWD)) +TAG = $(shell echo V_$(KERNEL_VERSION)_$(RPM_RELEASE) | $(SED) '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) -LOCAL_PATCHES = $(notdir $(PATCHES)) -SUBMAKEFILE = $(MODDIR)/make/linux-rpm-build.mk +LOCAL_PATCHES = $(notdir $(PATCHES)) +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_TGZ = $(notdir $(KERNEL_URL)) +KERNEL_URL = ftp.kernel.org:/pub/linux/kernel/v$(KERNEL_MAJOR).$(KERNEL_MINOR)/linux-$(KERNEL_VERSION).tar.bz2 +KERNEL_TGZ = $(notdir $(KERNEL_URL)) # exports export KERNEL_VERSION @@ -155,7 +155,7 @@ patch: patches.done prepare: unpack patch EXTRAVERSION COMPLETE_VERSION install: all -DEFERRED_TARGETS = \ +DEFERRED_TARGETS = \ current.uldone ping ssh build \ tgz spm rpm upload tag copy-run copy-devel copy \ shutdown reboot update-rpm erase-rpm diff --git a/make/lo.mk b/make/lo.mk index b796e68c..b28993d4 100644 --- a/make/lo.mk +++ b/make/lo.mk @@ -1,10 +1,10 @@ # === change this > -TOOLS_DIR ?= $(TOPDIR)/tools -TOOLS_INCLUDE_DIR ?= $(TOOLS_DIR) -CPP_PREFIX ?= YLo -CPP_SUFFIX ?= -SO_PREFIX ?= lo_ -LOADABLE_OBJ_HOOK ?= LOADABLE_OBJECT_HOOK +TOOLS_DIR ?= $(TOPDIR)/tools +TOOLS_INCLUDE_DIR ?= $(TOOLS_DIR) +CPP_PREFIX ?= YLo +CPP_SUFFIX ?= +SO_PREFIX ?= lo_ +LOADABLE_OBJ_HOOK ?= LOADABLE_OBJECT_HOOK # === change this < include $(MODDIR)/make/defs.mk @@ -13,28 +13,28 @@ include $(MODDIR)/make/profiler-defs.mk include $(MODDIR)/make/dev-utils.mk .PRECIOUS: %.cpp %.o -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 = $(filter-out $(LOADABLE_OBJ_IGNORE),$(LOADABLE_OBJS_BASE)) -LOADABLE_OBJ_CPP = $(patsubst %,%.cpp,$(LOADABLE_OBJS)) -LOADABLE_OBJS_O = $(patsubst %,%.o,$(LOADABLE_OBJS)) +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 = $(filter-out $(LOADABLE_OBJ_IGNORE),$(LOADABLE_OBJS_BASE)) +LOADABLE_OBJ_CPP = $(patsubst %,%.cpp,$(LOADABLE_OBJS)) +LOADABLE_OBJS_O = $(patsubst %,%.o,$(LOADABLE_OBJS)) -OTHER_CPP_IGNORE = $(patsubst %,$(CPP_PREFIX)%.cpp,$(LOADABLE_OBJ_IGNORE)) -OTHER_CPP ?= $(filter-out $(LOADABLE_OBJ_CPP) $(OTHER_CPP_IGNORE),$(wildcard *.cpp)) +OTHER_CPP_IGNORE = $(patsubst %,$(CPP_PREFIX)%.cpp,$(LOADABLE_OBJ_IGNORE)) +OTHER_CPP ?= $(filter-out $(LOADABLE_OBJ_CPP) $(OTHER_CPP_IGNORE),$(wildcard *.cpp)) ifneq ($(OTHER_CPP),) -OTHER_O = $(patsubst %.cpp,%.o,$(OTHER_CPP)) -OTHER_LIB = liblocal.a -OTHER_LIB_LDFLAGS = -L. -llocal -OTHER_MEMBERS_O = $(OTHER_LIB)($(OTHER_O)) +OTHER_O = $(patsubst %.cpp,%.o,$(OTHER_CPP)) +OTHER_LIB = liblocal.a +OTHER_LIB_LDFLAGS = -L. -llocal +OTHER_MEMBERS_O = $(OTHER_LIB)($(OTHER_O)) endif ifneq ($(TARGET),mingw) -LOADABLE_OBJ_LIBS = $(addprefix $(SO_PREFIX), $(addsuffix .so, $(LOADABLE_OBJS))) +LOADABLE_OBJ_LIBS = $(addprefix $(SO_PREFIX), $(addsuffix .so, $(LOADABLE_OBJS))) else -LOADABLE_OBJ_LIBS = $(addprefix $(SO_PREFIX), $(addsuffix .dll, $(LOADABLE_OBJS))) +LOADABLE_OBJ_LIBS = $(addprefix $(SO_PREFIX), $(addsuffix .dll, $(LOADABLE_OBJS))) endif -BUILD_LOADABLE_OBJ_LIBS = $(addprefix $(BUILD_LIBDIR)/, $(LOADABLE_OBJ_LIBS)) -INSTALLED_LOADABLE_OBJ_LIBS = $(addprefix $(INSTALL_LIBDIR)/, $(LOADABLE_OBJ_LIBS)) +BUILD_LOADABLE_OBJ_LIBS = $(addprefix $(BUILD_LIBDIR)/, $(LOADABLE_OBJ_LIBS)) +INSTALLED_LOADABLE_OBJ_LIBS = $(addprefix $(INSTALL_LIBDIR)/, $(LOADABLE_OBJ_LIBS)) all: $(LOADABLE_OBJ_LIBS) $(BUILD_LOADABLE_OBJ_LIBS) install: $(INSTALLED_LOADABLE_OBJ_LIBS) diff --git a/make/make.mk b/make/make.mk index 9272f4d5..6ae6b16a 100644 --- a/make/make.mk +++ b/make/make.mk @@ -7,29 +7,29 @@ include $(MODDIR)/make/defs.mk include $(MODDIR)/make/defs-dirs.mk include $(MODDIR)/make/dev-utils.mk -CACHED_FILES ?= $(VERSION_FILE) $(wildcard $(TOPDIR)/make/project.conf) -CACHED_VARS ?= PROJECT PREREQ VERSION HEX_VERSION FULL_NAME +CACHED_FILES ?= $(VERSION_FILE) $(wildcard $(TOPDIR)/make/project.conf) +CACHED_VARS ?= PROJECT PREREQ VERSION HEX_VERSION FULL_NAME include $(MODDIR)/make/cache.mk ifneq ($(CREATE_DEVEL),false) -MKFILES += $(wildcard project.conf) -DEVEL_TARGETS += install_MAKE $(INSTALLED_PKG_MK) install_PKG_CONFIG +MKFILES += $(wildcard project.conf) +DEVEL_TARGETS += install_MAKE $(INSTALLED_PKG_MK) install_PKG_CONFIG endif include $(MODDIR)/make/rules.mk -#LOCAL_PKG_CONFIG = $(PROJECT).pc -# BUILD_PKG_CONFIG = $(MODDIR)/pkgconfig/$(LOCAL_PKG_CONFIG) +#LOCAL_PKG_CONFIG = $(PROJECT).pc +# 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),) -INSTALLED_PKG_MK += $(INSTALL_PCKG_DEPS_DIR)/$(PROJECT).mk +INSTALLED_PKG_MK += $(INSTALL_PCKG_DEPS_DIR)/$(PROJECT).mk endif -INSTALL_PCKG_DEFS_DIR = $(MODDIR)/make/defs.d +INSTALL_PCKG_DEFS_DIR = $(MODDIR)/make/defs.d ifneq ($(wildcard pckg-defs.mk),) -INSTALLED_PKG_MK += $(INSTALL_PCKG_DEFS_DIR)/$(PROJECT).mk +INSTALLED_PKG_MK += $(INSTALL_PCKG_DEFS_DIR)/$(PROJECT).mk endif #all: $(BUILD_PKG_CONFIG) @@ -55,8 +55,8 @@ do-install-links: @$(call install_links,MAKE) ifeq ($(EXPORT_PROJECT_LIB),true) -CREATE_PKG_CONFIG_OPTS += -c "-I$(PROJECT_DIRPATH)/include" -CREATE_PKG_CONFIG_OPTS += -l "-L$(PROJECT_DIRPATH)/lib -l$(PROJECT)" +CREATE_PKG_CONFIG_OPTS += -c "-I$(PROJECT_DIRPATH)/include" +CREATE_PKG_CONFIG_OPTS += -l "-L$(PROJECT_DIRPATH)/lib -l$(PROJECT)" endif $(LOCAL_PKG_CONFIG): $(PROJECT_DESCR_FILE) $(MODDIR)/make/make.mk $(MOD_SCRIPT_DIR)/create-pkg-config.sh diff --git a/make/mcu-defs.mk b/make/mcu-defs.mk index 6c575043..427925ed 100644 --- a/make/mcu-defs.mk +++ b/make/mcu-defs.mk @@ -1,4 +1,4 @@ -#PROJECT ?= $(shell cd $(TOPDIR); /bin/pwd | xargs notdir) +#PROJECT ?= $(shell cd $(TOPDIR); /bin/pwd | xargs notdir) #define mcu_check_var # ifeq ($($(1)),) @@ -18,35 +18,35 @@ ifeq ($(MCU_FLASH_SIZE),) error MCU_FLASH_SIZE not specified endif -MCU_BOARD_MODEL_LC ?= $(shell echo $(MCU_BOARD_MODEL) | tr '[A-Z]' '[a-z]') -MCU_BOARD ?= $(MCU_BOARD_MODEL) -MCU_BOARD_LC ?= $(shell echo $(MCU_BOARD) | 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_LC ?= $(shell echo $(MCU_BOARD) | tr '[A-Z]' '[a-z]') -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_BIN ?= openocd -MCU_OPENOCD ?= $(MCU_OPENOCD_BIN) $(MCU_OPENOCD_OPTS) +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_BIN ?= openocd +MCU_OPENOCD ?= $(MCU_OPENOCD_BIN) $(MCU_OPENOCD_OPTS) -MCU_FLASH_FETCH_BANK ?= $(MCU_FLASH_BANK) -MCU_FLASH_FETCH_FILE_BIN ?= $(MCU_FLASH_FILE_BIN) -MCU_FLASH_FETCH_FILE_HEX ?= $(MCU_FLASH_FILE_HEX) -MCU_FLASH_FETCH_OFFSET ?= $(MCU_FLASH_OFFSET) -MCU_FLASH_FETCH_SIZE ?= $(MCU_FLASH_SIZE) +MCU_FLASH_FETCH_BANK ?= $(MCU_FLASH_BANK) +MCU_FLASH_FETCH_FILE_BIN ?= $(MCU_FLASH_FILE_BIN) +MCU_FLASH_FETCH_FILE_HEX ?= $(MCU_FLASH_FILE_HEX) +MCU_FLASH_FETCH_OFFSET ?= $(MCU_FLASH_OFFSET) +MCU_FLASH_FETCH_SIZE ?= $(MCU_FLASH_SIZE) -MCU_FLASH_PUSH_BANK ?= $(MCU_FLASH_BANK) -MCU_FLASH_PUSH_FILE_BIN ?= $(MCU_FLASH_FILE_BIN) -MCU_FLASH_PUSH_FILE_HEX ?= $(MCU_FLASH_FILE_HEX) -MCU_FLASH_PUSH_OFFSET ?= $(MCU_FLASH_OFFSET) -MCU_FLASH_PUSH_SIZE ?= $(MCU_FLASH_SIZE) +MCU_FLASH_PUSH_BANK ?= $(MCU_FLASH_BANK) +MCU_FLASH_PUSH_FILE_BIN ?= $(MCU_FLASH_FILE_BIN) +MCU_FLASH_PUSH_FILE_HEX ?= $(MCU_FLASH_FILE_HEX) +MCU_FLASH_PUSH_OFFSET ?= $(MCU_FLASH_OFFSET) +MCU_FLASH_PUSH_SIZE ?= $(MCU_FLASH_SIZE) -TOOLCHAIN_PREFIX ?= arm-none-eabi- -MCU_OBJCOPY ?= $(TOOLCHAIN_PREFIX)objcopy -MCU_FLASH_BANK ?= 0 -MCU_FLASH_FILE_BIN ?= $(TOPDIR)/bin/$(MCU_BOARD_LC).bin -MCU_FLASH_FILE_HEX ?= $(TOPDIR)/bin/$(MCU_BOARD_LC).hex -#MCU_FLASH_OFFSET ?= 0x0000000 -#MCU_FLASH_SIZE ?= 0x5000 +TOOLCHAIN_PREFIX ?= arm-none-eabi- +MCU_OBJCOPY ?= $(TOOLCHAIN_PREFIX)objcopy +MCU_FLASH_BANK ?= 0 +MCU_FLASH_FILE_BIN ?= $(TOPDIR)/bin/$(MCU_BOARD_LC).bin +MCU_FLASH_FILE_HEX ?= $(TOPDIR)/bin/$(MCU_BOARD_LC).hex +#MCU_FLASH_OFFSET ?= 0x0000000 +#MCU_FLASH_SIZE ?= 0x5000 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 diff --git a/make/platform.mk b/make/platform.mk index 6afd12f9..febdaa23 100644 --- a/make/platform.mk +++ b/make/platform.mk @@ -1,7 +1,7 @@ # ----- host and target variables ifndef PLATFORM_MK_INCLUDED -PLATFORM_MK_INCLUDED = true +PLATFORM_MK_INCLUDED = true # "-include" tries search path, we don't want that 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,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 ifneq ($(subst mingw,,$(CWD)),$(CWD)) - TARGET := mingw + TARGET := mingw endif endif -MOD_SCRIPT_DIR := $(firstword $(wildcard $(MODDIR)/scripts $(MODDIR)/bin)) -ifndef GET_OS_SH - GET_OS_SH := $(SHELL) $(MOD_SCRIPT_DIR)/get-os.sh +DEFINE_FROM_TARGET := false +ifdef TARGET + 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 ifeq ($(HOST_TUPLE),) - HOST_TUPLE := $(shell $(GET_OS_SH) tuple) - HOST_TUPLE_WORDS := $(subst -, ,$(HOST_TUPLE)) - HOST_ARCH := $(word 1,$(HOST_TUPLE_WORDS)) - HOST_VENDOR := $(word 2,$(HOST_TUPLE_WORDS)) - HOST_OS := $(word 3,$(HOST_TUPLE_WORDS)) - HOST_ABI := $(word 4,$(HOST_TUPLE_WORDS)) - HOST_TRIPLET := $(HOST_ARCH)-$(HOST_OS)-$(HOST_ABI) + HOST_TUPLE := $(shell $(GET_OS_SH) tuple) + HOST_TUPLE_WORDS := $(subst -, ,$(HOST_TUPLE)) + HOST_ARCH := $(word 1,$(HOST_TUPLE_WORDS)) + HOST_VENDOR := $(word 2,$(HOST_TUPLE_WORDS)) + HOST_OS := $(word 3,$(HOST_TUPLE_WORDS)) + HOST_ABI := $(word 4,$(HOST_TUPLE_WORDS)) + HOST_TRIPLET := $(HOST_ARCH)-$(HOST_OS)-$(HOST_ABI) else - HOST_TUPLE_WORDS := $(subst -, ,$(HOST_TUPLE)) - HOST_ARCH := $(word 1,$(HOST_TUPLE_WORDS)) - HOST_VENDOR := $(word 2,$(HOST_TUPLE_WORDS)) - HOST_OS := $(word 3,$(HOST_TUPLE_WORDS)) - HOST_ABI := $(word 4,$(HOST_TUPLE_WORDS)) - HOST_TRIPLET := $(HOST_ARCH)-$(HOST_OS)-$(HOST_ABI) + HOST_TUPLE_WORDS := $(subst -, ,$(HOST_TUPLE)) + HOST_ARCH := $(word 1,$(HOST_TUPLE_WORDS)) + HOST_VENDOR := $(word 2,$(HOST_TUPLE_WORDS)) + HOST_OS := $(word 3,$(HOST_TUPLE_WORDS)) + HOST_ABI := $(word 4,$(HOST_TUPLE_WORDS)) + HOST_TRIPLET := $(HOST_ARCH)-$(HOST_OS)-$(HOST_ABI) endif ifneq ($(TARGET_TUPLE),) - TARGET_TUPLE_WORDS := $(subst -, ,$(TARGET_TUPLE)) - TARGET_ARCH := $(word 1,$(TARGET_TUPLE_WORDS)) - TARGET_VENDOR := $(word 2,$(TARGET_TUPLE_WORDS)) - TARGET_OS := $(word 3,$(TARGET_TUPLE_WORDS)) - TARGET_ABI := $(word 4,$(TARGET_TUPLE_WORDS)) - TARGET_TRIPLET := $(TARGET_ARCH)-$(TARGET_OS)-$(TARGET_ABI) + TARGET_TUPLE_WORDS ?= $(subst -, ,$(TARGET_TUPLE)) + TARGET_ARCH ?= $(word 1,$(TARGET_TUPLE_WORDS)) + TARGET_VENDOR ?= $(word 2,$(TARGET_TUPLE_WORDS)) + TARGET_OS ?= $(word 3,$(TARGET_TUPLE_WORDS)) + TARGET_ABI ?= $(word 4,$(TARGET_TUPLE_WORDS)) + TARGET_TRIPLET ?= $(TARGET_ARCH)-$(TARGET_OS)-$(TARGET_ABI) else ifneq ($(TARGET_TRIPLET),) - TARGET_TRIPLET_WORDS := $(subst -, ,$(TARGET_TRIPLET)) - TARGET_ARCH := $(word 1,$(TARGET_TRIPLET_WORDS)) - TARGET_VENDOR := unknown - TARGET_OS := $(word 2,$(TARGET_TRIPLET_WORDS)) - TARGET_ABI := $(word 3,$(TARGET_TRIPLET_WORDS)) - TARGET_TUPLE := $(TARGET_ARCH)-$(TARGET_VENDOR)-$(TARGET_OS)-$(TARGET_ABI) - TARGET_TUPLE_WORDS := $(subst -, ,$(TARGET_TUPLE)) + TARGET_TRIPLET_WORDS ?= $(subst -, ,$(TARGET_TRIPLET)) + TARGET_ARCH ?= $(word 1,$(TARGET_TRIPLET_WORDS)) + TARGET_VENDOR ?= unknown + TARGET_OS ?= $(word 2,$(TARGET_TRIPLET_WORDS)) + TARGET_ABI ?= $(word 3,$(TARGET_TRIPLET_WORDS)) + TARGET_TUPLE ?= $(TARGET_ARCH)-$(TARGET_VENDOR)-$(TARGET_OS)-$(TARGET_ABI) + TARGET_TUPLE_WORDS ?= $(subst -, ,$(TARGET_TUPLE)) else - TARGET_TUPLE := $(HOST_TUPLE) - TARGET_TUPLE_WORDS := $(subst -, ,$(TARGET_TUPLE)) - TARGET_ARCH := $(word 1,$(TARGET_TUPLE_WORDS)) - TARGET_VENDOR := $(word 2,$(TARGET_TUPLE_WORDS)) - TARGET_OS := $(word 3,$(TARGET_TUPLE_WORDS)) - TARGET_ABI := $(word 4,$(TARGET_TUPLE_WORDS)) - TARGET_TRIPLET := $(TARGET_ARCH)-$(TARGET_OS)-$(TARGET_ABI) - TARGET_TRIPLET_WORDS := $(subst -, ,$(TARGET_TRIPLET)) + TARGET_TUPLE ?= $(HOST_TUPLE) + TARGET_TUPLE_WORDS ?= $(subst -, ,$(TARGET_TUPLE)) + TARGET_ARCH ?= $(word 1,$(TARGET_TUPLE_WORDS)) + TARGET_VENDOR ?= $(word 2,$(TARGET_TUPLE_WORDS)) + TARGET_OS ?= $(word 3,$(TARGET_TUPLE_WORDS)) + TARGET_ABI ?= $(word 4,$(TARGET_TUPLE_WORDS)) + TARGET_TRIPLET ?= $(TARGET_ARCH)-$(TARGET_OS)-$(TARGET_ABI) + TARGET_TRIPLET_WORDS ?= $(subst -, ,$(TARGET_TRIPLET)) endif ifeq ($(TARGET_TUPLE),) @@ -76,54 +109,54 @@ endif # - support legacy jw-build target variables ifneq ($(findstring $(TARGET_ABI),mingw mingw32 mingw64),) - TARGET ?= mingw + TARGET ?= mingw else - TARGET ?= $(TARGET_OS) + TARGET ?= $(TARGET_OS) endif ifeq ($(OS_NAME_VERSION),) - OS_NAME_VERSION := $(shell $(GET_OS_SH)) + OS_NAME_VERSION := $(shell $(GET_OS_SH)) endif ifeq ($(OS_NAME),) - OS_NAME := $(shell $(GET_OS_SH) name) + OS_NAME := $(shell $(GET_OS_SH) name) endif -ARCH ?= $(TARGET_ARCH) +ARCH ?= $(TARGET_ARCH) -ARCH_32 = i586 +ARCH_32 = i586 ifndef ARCH # TODO unreached code, test and fix this ifeq ($(shell uname -m),armv7l) - ARCH = armv7hl - SYSTEM_LIBDIR_NAME = lib + ARCH = armv7hl + SYSTEM_LIBDIR_NAME = lib else ifeq ($(shell uname -m),armv6l) - ARCH = armv6hl - SYSTEM_LIBDIR_NAME = lib + ARCH = armv6hl + SYSTEM_LIBDIR_NAME = lib else ifeq ($(shell uname -m),aarch64) - ARCH = aarch64 - SYSTEM_LIBDIR_NAME = lib + ARCH = aarch64 + SYSTEM_LIBDIR_NAME = lib else ifeq ($(shell uname -m),x86_64) - ARCH = x86_64 - SYSTEM_LIBDIR_NAME = lib64 + ARCH = x86_64 + SYSTEM_LIBDIR_NAME = lib64 else - ARCH = $(ARCH_32) - SYSTEM_LIBDIR_NAME = lib + ARCH = $(ARCH_32) + SYSTEM_LIBDIR_NAME = lib endif - SYSTEM_LIBDIR = /usr/$(SYSTEM_LIBDIR_NAME) + SYSTEM_LIBDIR = /usr/$(SYSTEM_LIBDIR_NAME) endif ifneq ($(TARGET_TRIPLET),$(HOST_TRIPLET)) ifeq ($(TARGET),mingw) - FLAVOUR_PREFIX ?= win32- - FLAVOUR_SUFFIX ?= -win32 - FLAVOUR_PATH_PREFIX ?= win32/ - FLAVOUR_PATH_SUFFIX ?= /win32 + FLAVOUR_PREFIX ?= win32- + FLAVOUR_SUFFIX ?= -win32 + FLAVOUR_PATH_PREFIX ?= win32/ + FLAVOUR_PATH_SUFFIX ?= /win32 else - FLAVOUR_PREFIX ?= $(TARGET_TRIPLET)- - FLAVOUR_SUFFIX ?= -$(TARGET_TRIPLET) - FLAVOUR_PATH_PREFIX ?= $(TARGET_TRIPLET)/ - FLAVOUR_PATH_SUFFIX ?= /$(TARGET_TRIPLET) + FLAVOUR_PREFIX ?= $(TARGET_TRIPLET)- + FLAVOUR_SUFFIX ?= -$(TARGET_TRIPLET) + FLAVOUR_PATH_PREFIX ?= $(TARGET_TRIPLET)/ + FLAVOUR_PATH_SUFFIX ?= /$(TARGET_TRIPLET) endif endif diff --git a/make/plugin-defs.mk b/make/plugin-defs.mk index 8ce587a0..2c591a31 100644 --- a/make/plugin-defs.mk +++ b/make/plugin-defs.mk @@ -1,29 +1,29 @@ -IS_PLUGIN = true -USE_PLUGIN_VERSION_LIB ?= true -PLUGIN_API ?= $(notdir $(shell cd ..; $(PWD))) -PLUGIN_NAME ?= $(notdir $(shell $(PWD))) -PLUGIN_PREFIX ?= feedfs +IS_PLUGIN = true +USE_PLUGIN_VERSION_LIB ?= true +PLUGIN_API ?= $(notdir $(shell cd ..; $(PWD))) +PLUGIN_NAME ?= $(notdir $(shell $(PWD))) +PLUGIN_PREFIX ?= feedfs ifneq ($(TARGET),mingw) -PLUGIN_SUFFIX ?= so +PLUGIN_SUFFIX ?= so else -PLUGIN_SUFFIX ?= dll +PLUGIN_SUFFIX ?= dll endif ifneq ($(PLUGIN_PREFIX),) -PLUGIN_PREFIX_ = $(PLUGIN_PREFIX)_ +PLUGIN_PREFIX_ = $(PLUGIN_PREFIX)_ endif -PLUGIN_PREFIX_AND_API ?= $(PLUGIN_PREFIX_)$(PLUGIN_API) -PLUGIN ?= $(PLUGIN_PREFIX_AND_API)_$(PLUGIN_NAME).$(PLUGIN_SUFFIX) +PLUGIN_PREFIX_AND_API ?= $(PLUGIN_PREFIX_)$(PLUGIN_API) +PLUGIN ?= $(PLUGIN_PREFIX_AND_API)_$(PLUGIN_NAME).$(PLUGIN_SUFFIX) -CFLAGS += -D PLUGIN_NAME=$(PLUGIN_NAME) -D PLUGIN_NAME_STR=\"$(PLUGIN_NAME)\" -CPPFLAGS += -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)\" ifeq ($(USE_PLUGIN_VERSION_LIB),true) -PLUGIN_VERSION_LIB_BASENAME = $(PLUGIN_PREFIX_AND_API)_version -PLUGIN_VERSION_LIB = $(BUILD_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 +PLUGIN_VERSION_LIB_BASENAME = $(PLUGIN_PREFIX_AND_API)_version +PLUGIN_VERSION_LIB = $(BUILD_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 endif diff --git a/make/profile.mk b/make/profile.mk index 63fa43b7..2a60fba1 100644 --- a/make/profile.mk +++ b/make/profile.mk @@ -3,14 +3,14 @@ # contact@jannet.de # $Id$ -PATH_PROFILE ?= path-$(PROJECT).sh -EXE_SH = +PATH_PROFILE ?= path-$(PROJECT).sh +EXE_SH = ifeq ($(PROFILE),) - PROFILE = $(PATH_PROFILE) + PROFILE = $(PATH_PROFILE) endif -PROFILE += $(filter-out $(PATH_PROFILE),$(wildcard *.sh)) +PROFILE += $(filter-out $(PATH_PROFILE),$(wildcard *.sh)) include $(MODDIR)/make/defs.mk include $(MODDIR)/make/rules.mk diff --git a/make/profiler-defs.mk b/make/profiler-defs.mk index 235a9876..c1a289ce 100644 --- a/make/profiler-defs.mk +++ b/make/profiler-defs.mk @@ -1,30 +1,30 @@ all: clean: -PROF_EXE_PATH ?= $(EXE_PATH) -CALLGRIND_OUT ?= callgrind.out -OPROF_OUT_DIR ?= oprofile-data +PROF_EXE_PATH ?= $(EXE_PATH) +CALLGRIND_OUT ?= callgrind.out +OPROF_OUT_DIR ?= oprofile-data ifeq ($(USE_GPROF),true) - PROJECT_CPPFLAGS += -pg - PROJECT_CFLAGS += -pg - PROJECT_LDFLAGS += -pg + PROJECT_CPPFLAGS += -pg + PROJECT_CFLAGS += -pg + PROJECT_LDFLAGS += -pg clean: clean.gprof endif ifeq ($(COMPILER_SUITE),gcc) ifeq ($(USE_GCOV),true) - PROJECT_CPPFLAGS += -fprofile-arcs -ftest-coverage - PROJECT_CFLAGS += -fprofile-arcs -ftest-coverage - PROJECT_LDFLAGS += -fprofile-arcs -ftest-coverage + PROJECT_CPPFLAGS += -fprofile-arcs -ftest-coverage + PROJECT_CFLAGS += -fprofile-arcs -ftest-coverage + PROJECT_LDFLAGS += -fprofile-arcs -ftest-coverage clean: clean.gcov endif endif ifeq ($(COMPILER_SUITE),clang) ifeq ($(USE_XRAY),true) - PROJECT_CPPFLAGS += -fxray-instrument -fxray-instruction-threshold=1 - PROJECT_CFLAGS += -fxray-instrument -fxray-instruction-threshold=1 - #PROJECT_LDFLAGS += -fxray-instrument + PROJECT_CPPFLAGS += -fxray-instrument -fxray-instruction-threshold=1 + PROJECT_CFLAGS += -fxray-instrument -fxray-instruction-threshold=1 + #PROJECT_LDFLAGS += -fxray-instrument endif endif diff --git a/make/proj.mk b/make/proj.mk index 30e97d4b..27a5f12e 100644 --- a/make/proj.mk +++ b/make/proj.mk @@ -3,11 +3,11 @@ # contact@jannet.de # $Id$ -PROJECT = jw-build -MODDIR ?= $(TOPDIR) -JANWARE_WIKI = priv +PROJECT = jw-build +MODDIR ?= $(TOPDIR) +JANWARE_WIKI = priv -REQUIRED = inst/pre \ +REQUIRED = inst/pre \ make \ doc \ debug misc slog platform \ @@ -26,11 +26,11 @@ REQUIRED = inst/pre \ inst/post # rpmdist.mk variable overrides -FTP_SRC_GROUP = ytsrc -FTP_RUN_GROUP = ytrun -FTP_DEV_GROUP = ytdev -FTP_FILE_MODE = 644 -FTP_DIR_MODE = 755 +FTP_SRC_GROUP = ytsrc +FTP_RUN_GROUP = ytrun +FTP_DEV_GROUP = ytdev +FTP_FILE_MODE = 644 +FTP_DIR_MODE = 755 ifeq ($(DEVELOPMENT),true) include $(TOPDIR)/make/cfg_dev.mk @@ -38,13 +38,13 @@ else include $(TOPDIR)/make/cfg_dist.mk endif -PREREQ_BUILD += jw-build -USE_GLIB = true +PREREQ_BUILD += jw-build +USE_GLIB = true -CFLAGS += -D_USRDLL -DJW_BUILD_EXPORTS -CPPFLAGS += -D_USRDLL -DJW_BUILD_EXPORTS +CFLAGS += -D_USRDLL -DJW_BUILD_EXPORTS +CPPFLAGS += -D_USRDLL -DJW_BUILD_EXPORTS -#DEBUG_FORMAT_FLAG ?= -gstabs+ -PROJECT_CFLAGS += $(DEBUG_FORMAT_FLAG) -PROJECT_CPPFLAGS += $(DEBUG_FORMAT_FLAG) -PROJECT_LDFLAGS += $(DEBUG_FORMAT_FLAG) +#DEBUG_FORMAT_FLAG ?= -gstabs+ +PROJECT_CFLAGS += $(DEBUG_FORMAT_FLAG) +PROJECT_CPPFLAGS += $(DEBUG_FORMAT_FLAG) +PROJECT_LDFLAGS += $(DEBUG_FORMAT_FLAG) diff --git a/make/projects-dir.mk b/make/projects-dir.mk index 67f3b6f8..2dc6cf1d 100644 --- a/make/projects-dir.mk +++ b/make/projects-dir.mk @@ -6,7 +6,7 @@ # # 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 -# one, then define the JANWARE_USER= environment variable. +# one, then define the JANWARE_USER = environment variable. # # 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" @@ -17,47 +17,47 @@ -include local.mk -SHELL = /bin/bash -o pipefail -PROJECTS_TXT ?= projects.txt -JW_BUILD_VERBOSE ?= false -BASE_PKGS = git cvs make sudo -PREREQ_RELEASE ?= pull +SHELL = /bin/bash -o pipefail +PROJECTS_TXT ?= projects.txt +JW_BUILD_VERBOSE ?= false +BASE_PKGS = git cvs make sudo +PREREQ_RELEASE ?= pull # ------------ evaluate Makefile and environment variables ifneq ($(wildcard $(PROJECTS_TXT)),) - PROJECTS ?= $(shell cat $(PROJECTS_TXT) | sed '/^ *\#/ d') + PROJECTS ?= $(shell cat $(PROJECTS_TXT) | sed '/^ *\#/ d') 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 ifeq ($(JW_BUILD_VERBOSE),true) - SSH_WRAPPER_TRACE ?= -x + SSH_WRAPPER_TRACE ?= -x endif export JW_BUILD_VERBOSE # ------------ external programs I -CWD := $(dir $(abspath $(lastword $(MAKEFILE_LIST)))) -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) -SSH_WRAPPER_SH := $(CWD)/ssh-wrapper.sh +CWD := $(dir $(abspath $(lastword $(MAKEFILE_LIST)))) +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) +SSH_WRAPPER_SH := $(CWD)/ssh-wrapper.sh -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_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)) ifneq ($(EXCLUDES_FILES),) - EXCLUDE_FROM_BUILD += $(shell sed 's/\#.*//g' $(EXCLUDES_FILES)) + EXCLUDE_FROM_BUILD += $(shell sed 's/\#.*//g' $(EXCLUDES_FILES)) endif -TEXT_FILES_CACHE ?= text-files.txt +TEXT_FILES_CACHE ?= text-files.txt ifndef JANWARE_USER 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) else - JANWARE_USER = $(shell id -un) + JANWARE_USER = $(shell id -un) $(warning Assuming JANWARE_USER=$(JANWARE_USER) from id -un) endif $(warning Explicitly set environment variable JANWARE_USER to turn off this warning!) @@ -65,25 +65,25 @@ ifndef JANWARE_USER endif ifeq ($(JANWARE_USER),) - OFFLINE ?= true + OFFLINE ?= true endif ifeq ($(OFFLINE),true) - UNAVAILABLE_TARGETS ?= pull.done update.done clone.done + UNAVAILABLE_TARGETS ?= pull.done update.done clone.done else - UNAVAILABLE_TARGETS ?= - export CVSROOT = :ext:$(JANWARE_USER)@cvs.janware.com:/srv/cvs + UNAVAILABLE_TARGETS ?= + export CVSROOT = :ext:$(JANWARE_USER)@cvs.janware.com:/srv/cvs endif ifneq ($(JW_BUILD_SSH),) - export CVS_RSH := $(JW_BUILD_SSH) + export CVS_RSH := $(JW_BUILD_SSH) else - export CVS_RSH := $(SSH_WRAPPER_SH) + export CVS_RSH := $(SSH_WRAPPER_SH) endif -export GIT_SSH := $(CVS_RSH) +export GIT_SSH := $(CVS_RSH) 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 ifneq ($(CLONE_FROM_USER),) @@ -93,33 +93,33 @@ else endif ifneq ($(EXCLUDE_FROM_BUILD),) - PROJECTS_PY_EXTRA_BUILD_OPTS += --exclude "$(EXCLUDE_FROM_BUILD)" + PROJECTS_PY_EXTRA_BUILD_OPTS+= --exclude "$(EXCLUDE_FROM_BUILD)" endif # ------------ external programs II -BROWSER ?= xdg-open -EDITOR ?= xdg-open +BROWSER ?= xdg-open +EDITOR ?= xdg-open ifeq ($(TIME),) - TIME = $(shell which time) -p + TIME = $(shell which time) -p endif -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) -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) -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) -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) -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 +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) +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) +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) +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) +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 # ------------ projects to be built -TARGET_PROJECTS = $(filter-out $(EXCLUDE_FROM_BUILD),$(PROJECTS)) -BUILD_PROJECTS = $(shell $(PROJECTS_PY_BUILD) --build-order all $(TARGET_PROJECTS)) -GIT_PROJECTS = $(patsubst %/,%,$(dir $(wildcard $(addsuffix /.git,$(BUILD_PROJECTS))))) -CVS_PROJECTS = $(patsubst %/,%,$(dir $(wildcard $(addsuffix /CVS,$(BUILD_PROJECTS))))) +TARGET_PROJECTS = $(filter-out $(EXCLUDE_FROM_BUILD),$(PROJECTS)) +BUILD_PROJECTS = $(shell $(PROJECTS_PY_BUILD) --build-order all $(TARGET_PROJECTS)) +GIT_PROJECTS = $(patsubst %/,%,$(dir $(wildcard $(addsuffix /.git,$(BUILD_PROJECTS))))) +CVS_PROJECTS = $(patsubst %/,%,$(dir $(wildcard $(addsuffix /CVS,$(BUILD_PROJECTS))))) # ------------ targets diff --git a/make/projects.mk b/make/projects.mk index 264e68b5..c592bb16 100644 --- a/make/projects.mk +++ b/make/projects.mk @@ -3,28 +3,28 @@ include $(MODDIR)/make/platform.mk # -- What do I know about myself? -VERSION_FILE := $(firstword $(wildcard VERSION) $(TOPDIR)/VERSION) +VERSION_FILE := $(firstword $(wildcard VERSION) $(TOPDIR)/VERSION) ifndef DEVELOPMENT ifeq ($(wildcard $(VERSION_FILE)),) - DEVELOPMENT := true + DEVELOPMENT := true else - DEVELOPMENT := $(shell grep -q 'dev' $(VERSION_FILE) && echo true) + DEVELOPMENT := $(shell grep -q 'dev' $(VERSION_FILE) && echo true) endif endif # -- Conclude the build system's location: -PROJECTS_DIR ?= $(TOPDIR)/.. +PROJECTS_DIR ?= $(TOPDIR)/.. ifeq ($(DEVELOPMENT),true) - PRJS_DIR ?= $(PROJECTS_DIR) + PRJS_DIR ?= $(PROJECTS_DIR) else - PRJS_DIR ?= /opt + PRJS_DIR ?= /opt endif # -- Query the build system about other projects: -PYTHON ?= /usr/bin/python2 +PYTHON ?= /usr/bin/python2 ifneq ($(TOPDIR),) - 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_dir = $(call proj_query,proj-dir $(1)) - htdocs_dir = $(call proj_query,htdocs-dir $(1)) + 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_dir = $(call proj_query,proj-dir $(1)) + htdocs_dir = $(call proj_query,htdocs-dir $(1)) endif diff --git a/make/py-defs.mk b/make/py-defs.mk index 72041d06..4d792010 100644 --- a/make/py-defs.mk +++ b/make/py-defs.mk @@ -1,41 +1,41 @@ -ENV_PYTHONPATH := $(PYTHONPATH) -PYTHON ?= python2 -#PYTHON = python3 +ENV_PYTHONPATH := $(PYTHONPATH) +PYTHON ?= python2 +#PYTHON = python3 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 - PY_SITE_PACKAGES_PATH = $(PREFIX)/python2/site-packages + PY_SITE_PACKAGES_PATH = $(PREFIX)/python2/site-packages endif -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_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_PROJ_MODULES += $(dir $(wildcard $(PY_MODULE_DIRS)/*/__init__.py)) -PY_MODULES ?= $(PY_PROJ_MODULES) -PY_SRC_PY ?= $(wildcard *.py) -PY_ALL_PY = $(sort $(PY_SRC_PY) __init__.py) -PY_PYC = $(patsubst %.py,%.pyc,$(PY_ALL_PY)) +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_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_PROJ_MODULES += $(dir $(wildcard $(PY_MODULE_DIRS)/*/__init__.py)) +PY_MODULES ?= $(PY_PROJ_MODULES) +PY_SRC_PY ?= $(wildcard *.py) +PY_ALL_PY = $(sort $(PY_SRC_PY) __init__.py) +PY_PYC = $(patsubst %.py,%.pyc,$(PY_ALL_PY)) -PY_INSTALL_PKG_MOD ?= $(shell $(PWD) | sed 's%.*/python/%%; s%/.*%%') -PY_INSTALL_SUB_MOD ?= $(shell $(PWD) | sed "s%.*/$(PY_INSTALL_PKG_MOD)\(/\|$$\)%%") +PY_INSTALL_PKG_MOD ?= $(shell $(PWD) | sed 's%.*/python/%%; s%/.*%%') +PY_INSTALL_SUB_MOD ?= $(shell $(PWD) | sed "s%.*/$(PY_INSTALL_PKG_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 - PY_INSTALL_MOD ?= $(PY_INSTALL_PKG_MOD) + PY_INSTALL_MOD ?= $(PY_INSTALL_PKG_MOD) endif -PY_MOD ?= $(subst /,.,$(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_MOD ?= $(subst /,.,$(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)) -empty := -space := $(empty) $(empty) -PYTHONPATH ?= $(call proj_query, pythonpath $(PROJECT)) -#PYTHONPATH = $(subst $(space),,$(ENV_PYTHONPATH)$(foreach d,$(PY_MODULE_DIRS),:$(d))) +empty := +space := $(empty) $(empty) +PYTHONPATH ?= $(call proj_query, pythonpath $(PROJECT)) +#PYTHONPATH = $(subst $(space),,$(ENV_PYTHONPATH)$(foreach d,$(PY_MODULE_DIRS),:$(d))) export PYTHONPATH -PY_DEFS_MK_INCLUDED := true +PY_DEFS_MK_INCLUDED := true ifneq ($(PY_DEFS_MK_INCLUDED),true) all: clean: pyc.clean diff --git a/make/py-mod.mk b/make/py-mod.mk index 645afb85..d7e91965 100644 --- a/make/py-mod.mk +++ b/make/py-mod.mk @@ -3,11 +3,11 @@ include $(MODDIR)/make/py-defs.mk include $(MODDIR)/make/dirs.mk include $(MODDIR)/make/dev-utils.mk -PY_INIT_TMPL = $(wildcard __init__.py.tmpl) -PY_SED_EXTRACT_EXPORT ?= /\(class\|def\) ..*\# *export/ !d; s/\(class\|def\) *//; s/[(:].*// +PY_INIT_TMPL = $(wildcard __init__.py.tmpl) +PY_SED_EXTRACT_EXPORT ?= /\(class\|def\) ..*\# *export/ !d; s/\(class\|def\) *//; s/[(:].*// -#leftparen:=( -#PY_EXPORT ?= $(shell sed '/\(class\|def\) ..*\# *export/ !d; s/\(class\|def\) *//; s/[$(leftparen):].*//' $(PY_SRC_PY)) +#leftparen := ( +#PY_EXPORT ?= $(shell sed '/\(class\|def\) ..*\# *export/ !d; s/\(class\|def\) *//; s/[$(leftparen):].*//' $(PY_SRC_PY)) all: $(PY_PYC) install: install-dirs.done install-reg.done diff --git a/make/qt-defs.mk b/make/qt-defs.mk index 0a2c73a5..a0ffe203 100644 --- a/make/qt-defs.mk +++ b/make/qt-defs.mk @@ -1,14 +1,14 @@ ifeq ($(USE_QT),true) -USE_X = true -CPPFLAGS += -DQT_THREAD_SUPPORT +USE_X = true +CPPFLAGS += -DQT_THREAD_SUPPORT #ifeq ($(PKG_FORMAT),rpm) -#QT_VERSION ?= $(shell rpm -q --queryformat='%{VERSION}' --whatprovides qt) +#QT_VERSION ?= $(shell rpm -q --queryformat='%{VERSION}' --whatprovides qt) #else -#QT_VERSION = $(shell dpkg -s libqtcore4 | sed '^CVersion:/ !d; s/Version: *//') +#QT_VERSION = $(shell dpkg -s libqtcore4 | sed '^CVersion:/ !d; s/Version: *//') #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) # QT_PREFIX ?= $(SYSTEM_LIBDIR)/qt2 @@ -42,9 +42,9 @@ CPPFLAGS += -DQT_THREAD_SUPPORT # endif #endif # -#MOC ?= $(QT_PREFIX)/bin/moc -#UIC ?= $(QT_PREFIX)/bin/uic -#RCC ?= $(QT_PREFIX)/bin/rcc +#MOC ?= $(QT_PREFIX)/bin/moc +#UIC ?= $(QT_PREFIX)/bin/uic +#RCC ?= $(QT_PREFIX)/bin/rcc # #ifdef REENTRANT # ifneq ($(QT_MAJOR_VERSION),4) @@ -67,7 +67,7 @@ CPPFLAGS += -DQT_THREAD_SUPPORT #Qt5Designer \ ifeq ($(QT_MAJOR_VERSION),5) -QT_MODULES ?= \ +QT_MODULES ?= \ Qt5Concurrent \ Qt5Core \ Qt5DBus \ @@ -95,7 +95,7 @@ QT_MODULES ?= \ Qt5XmlPatterns \ Qt5Xml else -QT_MODULES ?= \ +QT_MODULES ?= \ Qt3Support \ QtCLucene \ QtCore \ @@ -120,39 +120,39 @@ QT_MODULES ?= \ endif -QT_BIN_PREFIX ?= $(shell pkg-config --variable=host_bins $(QT_MODULES)) -MOC ?= $(QT_BIN_PREFIX)/moc -UIC ?= $(QT_BIN_PREFIX)/uic -RCC ?= $(QT_BIN_PREFIX)/rcc -LPPFLAGS += $(QT_LDFLAGS) $(shell pkg-config --libs $(QT_MODULES)) -INCLUDE += $(QT_LDFLAGS) $(shell pkg-config --cflags $(QT_MODULES)) -CPPFLAGS += -D_QT_MAJOR_=$(QT_MAJOR_VERSION) +QT_BIN_PREFIX ?= $(shell pkg-config --variable=host_bins $(QT_MODULES)) +MOC ?= $(QT_BIN_PREFIX)/moc +UIC ?= $(QT_BIN_PREFIX)/uic +RCC ?= $(QT_BIN_PREFIX)/rcc +LPPFLAGS += $(QT_LDFLAGS) $(shell pkg-config --libs $(QT_MODULES)) +INCLUDE += $(QT_LDFLAGS) $(shell pkg-config --cflags $(QT_MODULES)) +CPPFLAGS += -D_QT_MAJOR_=$(QT_MAJOR_VERSION) # ------------------------------- jw-build defs -UIFILES += $(wildcard *.ui) -RCCFILES += $(wildcard *.qrc) +UIFILES += $(wildcard *.ui) +RCCFILES += $(wildcard *.qrc) ifneq ($(wildcard *.h),) -MOC_H_HC += $(shell grep -l Q_OBJECT $(wildcard *.h)) +MOC_H_HC += $(shell grep -l Q_OBJECT $(wildcard *.h)) endif -MOC_H_UI += $(patsubst %.ui,ui_%.h,$(UIFILES)) -MOC_H += $(sort $(MOC_H_HC) $(MOC_H_UI)) -MOC_CPP += $(patsubst %.h,moc_%.cpp,$(notdir $(MOC_H_HC))) +MOC_H_UI += $(patsubst %.ui,ui_%.h,$(UIFILES)) +MOC_H += $(sort $(MOC_H_HC) $(MOC_H_UI)) +MOC_CPP += $(patsubst %.h,moc_%.cpp,$(notdir $(MOC_H_HC))) # $(patsubst %.ui,moc_%.cpp,$(UIFILES)) \ -RCC_CPP += $(patsubst %.qrc,rcc_%.cpp, $(RCCFILES)) +RCC_CPP += $(patsubst %.qrc,rcc_%.cpp, $(RCCFILES)) ifeq ($(QT_MAJOR_VERSION),4) -UIC_H += $(patsubst %.ui,ui_%.h, $(UIFILES)) +UIC_H += $(patsubst %.ui,ui_%.h, $(UIFILES)) else -UIC_H += $(patsubst %.ui,%.h, $(UIFILES)) -LOCAL_CFLAGS += -fPIC -LOCAL_CPPFLAGS += -fPIC +UIC_H += $(patsubst %.ui,%.h, $(UIFILES)) +LOCAL_CFLAGS += -fPIC +LOCAL_CPPFLAGS += -fPIC 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,$(UIC_CPP)) -OBJ += $(patsubst %.cpp,%.o,$(RCC_CPP)) +OBJ += $(patsubst %.cpp,%.o,$(MOC_CPP)) +OBJ += $(patsubst %.cpp,%.o,$(UIC_CPP)) +OBJ += $(patsubst %.cpp,%.o,$(RCC_CPP)) endif # USE_QT diff --git a/make/rpmdist.mk b/make/rpmdist.mk index 7b40fed2..5e048ad0 100644 --- a/make/rpmdist.mk +++ b/make/rpmdist.mk @@ -1,107 +1,107 @@ -RPM_PROJECT ?= $(FLAVOUR_PREFIX)$(PROJECT) +RPM_PROJECT ?= $(FLAVOUR_PREFIX)$(PROJECT) ifeq ($(filter pkg-%,$(MAKECMDGOALS)),) # also to be used from proj.mk, typically - BUILD_PROJECT_PACKAGE = false + BUILD_PROJECT_PACKAGE = false endif -RPM_VERSION ?= $(DIST_VERSION) +RPM_VERSION ?= $(DIST_VERSION) ifneq ($(BUILD_PROJECT_PACKAGE),false) -UPLOAD_SH = $(MOD_SCRIPT_DIR)/upload.sh -LOCAL_MKSPEC_SH ?= $(TOPDIR)/make/mkspec.sh -MKSPEC_SH ?= $(MOD_SCRIPT_DIR)/mkspec-wrapper.sh $(LOCAL_MKSPEC_SH) -FTP_SRC_GROUP ?= $(shell id -g) -FTP_SRC_USER ?= $(shell whoami) -FTP_RUN_GROUP ?= $(shell id -g) -FTP_RUN_USER ?= $(shell whoami) -FTP_DEV_GROUP ?= $(shell id -g) -FTP_DEV_USER ?= $(shell whoami) -FTP_HOST ?= pkg.janware.com -FTP_FILE_MODE ?= 644 -FTP_DIR_MODE ?= 755 -FTP_HOST_LOGIN ?= root -RELEASES_FILE = $(TOPDIR)/RELEASES$(FLAVOUR_SUFFIX) -RELEASES ?= $(shell $(PKG_SH_EXE) version \ +UPLOAD_SH = $(MOD_SCRIPT_DIR)/upload.sh +LOCAL_MKSPEC_SH ?= $(TOPDIR)/make/mkspec.sh +MKSPEC_SH ?= $(MOD_SCRIPT_DIR)/mkspec-wrapper.sh $(LOCAL_MKSPEC_SH) +FTP_SRC_GROUP ?= $(shell id -g) +FTP_SRC_USER ?= $(shell whoami) +FTP_RUN_GROUP ?= $(shell id -g) +FTP_RUN_USER ?= $(shell whoami) +FTP_DEV_GROUP ?= $(shell id -g) +FTP_DEV_USER ?= $(shell whoami) +FTP_HOST ?= pkg.janware.com +FTP_FILE_MODE ?= 644 +FTP_DIR_MODE ?= 755 +FTP_HOST_LOGIN ?= root +RELEASES_FILE = $(TOPDIR)/RELEASES$(FLAVOUR_SUFFIX) +RELEASES ?= $(shell $(PKG_SH_EXE) version \ -p $(OS_NAME_VERSION)/$(RPM_ARCH) $(RELEASES_FILE) read | $(SED) 's/-dev//') -RPMBUILD ?= pkgbuild -CHECK_CVS_SYNC_BEFORE_RPM_RELEASE ?= true -HASH = $(shell $(cvs_files) -z | \ +RPMBUILD ?= pkgbuild +CHECK_CVS_SYNC_BEFORE_RPM_RELEASE?= true +HASH = $(shell $(cvs_files) -z | \ grep -vz "CHANGES\|VERSION\|HASH\|MD5SUMS\|RELEASES" | \ 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 -DIST_DIR = dist -DIST_SRC_DIR = $(DIST_DIR)/src/$(RPM_PROJECT)-$(RPM_VERSION) -DIST_PCKG_DIR = $(DIST_DIR)/pckg -#DIST_FILE = $(DIST_PCKG_DIR)/$(PROJECT)-$(DIST_VERSION).tar.gz +DIST_DIR = dist +DIST_SRC_DIR = $(DIST_DIR)/src/$(RPM_PROJECT)-$(RPM_VERSION) +DIST_PCKG_DIR = $(DIST_DIR)/pckg +#DIST_FILE = $(DIST_PCKG_DIR)/$(PROJECT)-$(DIST_VERSION).tar.gz -UPLOAD_SRC_DIR = $(DIST_PCKG_DIR) -PCKG_TAR ?= $(RPM_PROJECT)-$(RPM_VERSION).tar.gz +UPLOAD_SRC_DIR = $(DIST_PCKG_DIR) +PCKG_TAR ?= $(RPM_PROJECT)-$(RPM_VERSION).tar.gz ifeq ($(PKG_FORMAT),debian) # 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 - 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) - 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 - PCKG_RPM_SRC ?= $(RPM_PROJECT)-$(RPM_VERSION).src.deb.keinplan + PCKG_RPM_SRC ?= $(RPM_PROJECT)-$(RPM_VERSION).src.deb.keinplan 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) - 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 - PCKG_RPM_SRC ?= $(RPM_PROJECT)-$(RPM_VERSION).src.rpm + PCKG_RPM_SRC ?= $(RPM_PROJECT)-$(RPM_VERSION).src.rpm endif include $(MODDIR)/make/upload-defs-rpm.mk -DIST_FILES = $(shell echo $(REMOTE_TARGETS) | $(SED) 's/\b.*\///g; s/:.*\b//g') -GENERATED = $(sort $(shell find . -name '*.in' | \ +DIST_FILES = $(shell echo $(REMOTE_TARGETS) | $(SED) 's/\b.*\///g; s/:.*\b//g') +GENERATED = $(sort $(shell find . -name '*.in' | \ $(SED) "s/\.in$$//; s%$(DIST_SRC_DIR)%%; s%^[./]*%%")) ifeq ($(PKG_FORMAT),debian) - RPMS_DIR = $(TOPDIR)/dist/src - SRPMS_DIR = $(TOPDIR)/dist/src + RPMS_DIR = $(TOPDIR)/dist/src + SRPMS_DIR = $(TOPDIR)/dist/src else ifeq ($(BUILD_USER),root) - RPMS_BUILD_DIR = /usr/src/packages + RPMS_BUILD_DIR = /usr/src/packages else - RPMS_BUILD_DIR = $(HOME)/rpmbuild + RPMS_BUILD_DIR = $(HOME)/rpmbuild endif - RPMS_DIR = $(RPMS_BUILD_DIR)/RPMS/$(RPM_ARCH) - SRPMS_DIR = $(RPMS_BUILD_DIR)/SRPMS + RPMS_DIR = $(RPMS_BUILD_DIR)/RPMS/$(RPM_ARCH) + SRPMS_DIR = $(RPMS_BUILD_DIR)/SRPMS endif -DIST_DIRS = $(DIST_SRC_DIR) $(DIST_PCKG_DIR) -BINARY_RPM = $(DIST_PCKG_DIR)/$(PCKG_RPM_RUN_I386) +DIST_DIRS = $(DIST_SRC_DIR) $(DIST_PCKG_DIR) +BINARY_RPM = $(DIST_PCKG_DIR)/$(PCKG_RPM_RUN_I386) ifeq ($(CREATE_DEVEL),true) -BINARY_RPM += $(DIST_PCKG_DIR)/$(PCKG_RPM_DEVEL_I386) +BINARY_RPM += $(DIST_PCKG_DIR)/$(PCKG_RPM_DEVEL_I386) 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_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_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_RUN += $(call proj_query, pkg-provides --dont-expand-version-macros $(PROJ_QUERY_PKG_PROVIDES_EXTRA_ARGS) run $(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_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_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_UPLOAD_OS_NAME = $(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_USER ?= $(shell id -un) -RPM_UPLOAD_GROUP ?= $(shell id -gn) -RPM_UPLOAD_FILE_ATTRIB ?= 644:755:$(RPM_UPLOAD_USER).$(RPM_UPLOAD_GROUP) +RPM_UPLOAD_OS_NAME = $(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_USER ?= $(shell id -un) +RPM_UPLOAD_GROUP ?= $(shell id -gn) +RPM_UPLOAD_FILE_ATTRIB ?= 644:755:$(RPM_UPLOAD_USER).$(RPM_UPLOAD_GROUP) unexport RPM_VERSION VERSION DIST_SRC_DIR include $(MODDIR)/make/tag-rules.mk include $(MODDIR)/make/upload-rules.mk -PKG_SH = $(PKG_SH_EXE) \ +PKG_SH = $(PKG_SH_EXE) \ -N $(RPM_PROJECT) -P $(PROJECT) \ -R "$(RPM_REQUIRES_RUN)" -D "$(RPM_REQUIRES_DEVEL)" \ -X "$(RPM_CONFLICTS_RUN)" -Y "$(RPM_CONFLICTS_DEVEL)" \ @@ -229,10 +229,10 @@ update-repo.dist: upload.dist ifeq ($(wildcard $(TOPDIR)/.git),) -SCM_COMMIT = cvs commit -SCM_ADD = cvs add -SCM_PUSH = -SCM_PULL = cvs update -dP +SCM_COMMIT = cvs commit +SCM_ADD = cvs add +SCM_PUSH = +SCM_PULL = cvs update -dP define check_scm_sync echo + checking cvs ;\ @@ -255,10 +255,10 @@ endef else -SCM_COMMIT = git commit -SCM_ADD = git add -SCM_PUSH = git push -SCM_PULL = git pull +SCM_COMMIT = git commit +SCM_ADD = git add +SCM_PUSH = git push +SCM_PULL = git pull define check_scm_sync echo + checking git ;\ diff --git a/make/run.mk b/make/run.mk index 4aaf7723..e603a89e 100644 --- a/make/run.mk +++ b/make/run.mk @@ -6,43 +6,43 @@ include $(MODDIR)/make/defs.mk include $(MODDIR)/make/defs-cpp.mk -DIR_BASENAME = $(notdir $(shell $(PWD))) +DIR_BASENAME = $(notdir $(shell $(PWD))) ifeq ($(EXE_BASENAME),) ifneq ($(DIR_BASENAME),test) - EXE_BASENAME = $(DIR_BASENAME) + EXE_BASENAME = $(DIR_BASENAME) else - EXE_BASENAME = test-$(notdir $(shell cd ..; $(PWD))) + EXE_BASENAME = test-$(notdir $(shell cd ..; $(PWD))) endif endif ifneq ($(EXE_BASENAME),) ifneq ($(TARGET),mingw) -EXE ?= $(EXE_BASENAME) -SHORTCUT_SCRIPT ?= ./run.sh +EXE ?= $(EXE_BASENAME) +SHORTCUT_SCRIPT ?= ./run.sh else -EXE ?= $(EXE_BASENAME).exe -SHORTCUT_SCRIPT ?= run.bat +EXE ?= $(EXE_BASENAME).exe +SHORTCUT_SCRIPT ?= run.bat endif endif -EXE_PATH ?= ./$(EXE) -CHECK_CONF_EXE ?= $(firstword $(wildcard $(PROJECTS_DIR)/valdi/bin/checkconf) checkconf) +EXE_PATH ?= ./$(EXE) +CHECK_CONF_EXE ?= $(firstword $(wildcard $(PROJECTS_DIR)/valdi/bin/checkconf) checkconf) -LOCAL_CFLAGS += -DEXE_NAME=\"$(EXE)\" -LOCAL_CPPFLAGS += -DEXE_NAME=\"$(EXE)\" +LOCAL_CFLAGS += -DEXE_NAME=\"$(EXE)\" +LOCAL_CPPFLAGS += -DEXE_NAME=\"$(EXE)\" include $(MODDIR)/make/profiler.mk -BUILD_HDR = +BUILD_HDR = include $(MODDIR)/make/rules.mk include $(MODDIR)/make/ldlibpath.mk include $(MODDIR)/make/path-rules.mk include $(MODDIR)/make/debugger.mk -EXE_ARGS += $(LOCAL_EXE_ARGS) +EXE_ARGS += $(LOCAL_EXE_ARGS) ifneq ($(wildcard local.supp),) -VALGRIND_OPTS += --suppressions=local.supp +VALGRIND_OPTS += --suppressions=local.supp endif all: diff --git a/make/smart-selection.mk b/make/smart-selection.mk index f627f041..7bfa97e4 100644 --- a/make/smart-selection.mk +++ b/make/smart-selection.mk @@ -1,14 +1,14 @@ # === variable definitions -GET_OS_SH = sh $(MOD_SCRIPT_DIR)/get-os.sh -GENERATE_SELECTION = sh $(MOD_SCRIPT_DIR)/generate_selection.sh -UPLOAD_SH = sh $(MOD_SCRIPT_DIR)/upload.sh +GET_OS_SH = sh $(MOD_SCRIPT_DIR)/get-os.sh +GENERATE_SELECTION = sh $(MOD_SCRIPT_DIR)/generate_selection.sh +UPLOAD_SH = sh $(MOD_SCRIPT_DIR)/upload.sh -DISTRIBUTOR = $(shell $(GET_OS_SH) | cut -d- -f1) -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 +DISTRIBUTOR = $(shell $(GET_OS_SH) | cut -d- -f1) +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 -SELECTION = $(shell $(GENERATE_SELECTION) -s)-packages.txt -CHANNEL_LIST = $(shell $(GENERATE_SELECTION) -s)-channels.txt +SELECTION = $(shell $(GENERATE_SELECTION) -s)-packages.txt +CHANNEL_LIST = $(shell $(GENERATE_SELECTION) -s)-channels.txt # === targets all: selection.done channels.done diff --git a/make/so.mk b/make/so.mk index c7e8f701..f6117fe3 100644 --- a/make/so.mk +++ b/make/so.mk @@ -6,11 +6,11 @@ include $(MODDIR)/make/defs.mk include $(MODDIR)/make/defs-cpp.mk -LDFLAGS += -shared -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)))) -INSTALLED_SHOBJS += $(addprefix $(INSTALL_LIBDIR)/,$(SHOBJS)) -INSTALLED_ALL_LIBS += $(INSTALLED_SHOBJS) +LDFLAGS += -shared +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)))) +INSTALLED_SHOBJS += $(addprefix $(INSTALL_LIBDIR)/,$(SHOBJS)) +INSTALLED_ALL_LIBS += $(INSTALLED_SHOBJS) include $(MODDIR)/make/ldlibpath.mk include $(MODDIR)/make/debugger.mk diff --git a/make/song.mk b/make/song.mk index fa2e7a56..89b5acd1 100644 --- a/make/song.mk +++ b/make/song.mk @@ -1,7 +1,7 @@ -CHORD := $(firstword $(shell which chordpro chordii chord)) -CHOPRO = $(wildcard *.chopro *.cho *.CHOPRO) -CHOPRO_PDF = $(addsuffix .pdf,$(basename $(CHOPRO))) -CHOPRO_PS = $(addsuffix .ps,$(basename $(CHOPRO))) +CHORD := $(firstword $(shell which chordpro chordii chord)) +CHOPRO = $(wildcard *.chopro *.cho *.CHOPRO) +CHOPRO_PDF = $(addsuffix .pdf,$(basename $(CHOPRO))) +CHOPRO_PS = $(addsuffix .ps,$(basename $(CHOPRO))) all: $(CHOPRO_PDF) install: diff --git a/make/srcdist.mk b/make/srcdist.mk index 3e98ec34..11b54215 100644 --- a/make/srcdist.mk +++ b/make/srcdist.mk @@ -1,19 +1,19 @@ ifeq ($(VCS),cvs) - WD_PKG_VCS_SUFFIX = -cvs - WD_PKG_VCS_FILES = $(shell find . -name CVS) + WD_PKG_VCS_SUFFIX = -cvs + WD_PKG_VCS_FILES = $(shell find . -name CVS) else ifeq ($(VCS),git) - WD_PKG_VCS_SUFFIX = -git - WD_PKG_VCS_FILES = .git + WD_PKG_VCS_SUFFIX = -git + WD_PKG_VCS_FILES = .git endif -WD_PKG_DIR = dist/wd -WD_PKG_BASE_NAME = $(RPM_PROJECT)$(WD_PKG_VCS_SUFFIX)-$(RPM_VERSION) -WD_PKG = $(WD_PKG_BASE_NAME).tar.bz2 -WD_PKG_PATH = $(WD_PKG_DIR)/$(WD_PKG) +WD_PKG_DIR = dist/wd +WD_PKG_BASE_NAME = $(RPM_PROJECT)$(WD_PKG_VCS_SUFFIX)-$(RPM_VERSION) +WD_PKG = $(WD_PKG_BASE_NAME).tar.bz2 +WD_PKG_PATH = $(WD_PKG_DIR)/$(WD_PKG) # -- upload-defs.mk variables -UPLOAD_FILES += $(WD_PKG_PATH) -UPLOAD_SRC_DIR = $(WD_PKG_DIR) +UPLOAD_FILES += $(WD_PKG_PATH) +UPLOAD_SRC_DIR = $(WD_PKG_DIR) include $(MODDIR)/make/upload-defs.mk diff --git a/make/standalone-exe.mk b/make/standalone-exe.mk index d3900748..ab0da25e 100644 --- a/make/standalone-exe.mk +++ b/make/standalone-exe.mk @@ -3,19 +3,19 @@ # contact@jannet.de # $Id$ -VERSION ?= 0.0.0.0-dev -DIST_VERSION ?= $(VERSION) -#USE_CFG_XXX_MK ?= false -USE_PROJECT_LIB ?= false -DEVELOPMENT ?= true -PROJECTS_DIR := $(dir $(lastword $(MAKEFILE_LIST)))/../.. +VERSION ?= 0.0.0.0-dev +DIST_VERSION ?= $(VERSION) +#USE_CFG_XXX_MK ?= false +USE_PROJECT_LIB ?= false +DEVELOPMENT ?= true +PROJECTS_DIR := $(dir $(lastword $(MAKEFILE_LIST)))/../.. ifeq ($(PROJECT),) -PROJECT = $(notdir $(shell $(PWD))) +PROJECT = $(notdir $(shell $(PWD))) endif ifeq ($(PREFIX),) -PREFIX = $(HOME)/opt/$(PROJECT) +PREFIX = $(HOME)/opt/$(PROJECT) endif include $(MODDIR)/make/run.mk diff --git a/make/subtree.mk b/make/subtree.mk index 5944dcef..38779faa 100644 --- a/make/subtree.mk +++ b/make/subtree.mk @@ -1,29 +1,29 @@ ifeq ($(DEVELOPMENT),false) -SUBTREE_OWNER ?= root -SUBTREE_GROUP ?= root -SUBTREE_MODE ?= 0644 -SUBTREE_DIROWNER ?= root -SUBTREE_DIRGROUP ?= root -SUBTREE_DIRMODE ?= 0755 +SUBTREE_OWNER ?= root +SUBTREE_GROUP ?= root +SUBTREE_MODE ?= 0644 +SUBTREE_DIROWNER ?= root +SUBTREE_DIRGROUP ?= root +SUBTREE_DIRMODE ?= 0755 else -SUBTREE_OWNER ?= $(shell id -un) -SUBTREE_GROUP ?= $(shell id -gn) -SUBTREE_MODE ?= 0644 -SUBTREE_DIROWNER ?= $(shell id -un) -SUBTREE_DIRGROUP ?= $(shell id -gn) -SUBTREE_DIRMODE ?= 0755 -SUBTREE_INSTALL_PREFIX ?= /srv/www/proj/$(PROJECT) +SUBTREE_OWNER ?= $(shell id -un) +SUBTREE_GROUP ?= $(shell id -gn) +SUBTREE_MODE ?= 0644 +SUBTREE_DIROWNER ?= $(shell id -un) +SUBTREE_DIRGROUP ?= $(shell id -gn) +SUBTREE_DIRMODE ?= 0755 +SUBTREE_INSTALL_PREFIX ?= /srv/www/proj/$(PROJECT) endif #ifeq ($(SUBTREE_SRC),) -#SUBTREE_SRC = $(shell find .) +#SUBTREE_SRC = $(shell find .) #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_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_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) -INSTALLED_SUBTREE_DIRS = $(addprefix $(ENV_PREFIX)$(SUBTREE_INSTALL_PREFIX)/,$(SUBTREE_DIRS)) -INSTALLED_SUBTREE_FILES = $(addprefix $(ENV_PREFIX)$(SUBTREE_INSTALL_PREFIX)/,$(SUBTREE_FILES)) +INSTALLED_SUBTREE_DIRS = $(addprefix $(ENV_PREFIX)$(SUBTREE_INSTALL_PREFIX)/,$(SUBTREE_DIRS)) +INSTALLED_SUBTREE_FILES = $(addprefix $(ENV_PREFIX)$(SUBTREE_INSTALL_PREFIX)/,$(SUBTREE_FILES)) include $(MODDIR)/make/defs.mk diff --git a/make/suse-selection.mk b/make/suse-selection.mk index 2d5383c6..3bf86b84 100644 --- a/make/suse-selection.mk +++ b/make/suse-selection.mk @@ -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 -GENERATE_SELECTION = $(MOD_SCRIPT_DIR)/generate_selection.sh -SUSE_RELEASE = 10.1 -UPLOAD_URL = root@pkg.janware.com:/srv/dav/pub/packages/linux/suse/$(SUSE_RELEASE)/setup/descr -UPLOAD_SH = $(MOD_SCRIPT_DIR)/upload.sh +GENERATE_SELECTION = $(MOD_SCRIPT_DIR)/generate_selection.sh +SUSE_RELEASE = 10.1 +UPLOAD_URL = root@pkg.janware.com:/srv/dav/pub/packages/linux/suse/$(SUSE_RELEASE)/setup/descr +UPLOAD_SH = $(MOD_SCRIPT_DIR)/upload.sh -SELECTION = $(shell sh $(GENERATE_SELECTION) -s).sel +SELECTION = $(shell sh $(GENERATE_SELECTION) -s).sel all: $(SELECTION) upload: upload.done diff --git a/make/svg.mk b/make/svg.mk index c8a4bf65..9b5b7403 100644 --- a/make/svg.mk +++ b/make/svg.mk @@ -1,31 +1,31 @@ -SVG_GENERATE_FORMATS ?= png svg -SVG ?= $(filter-out copied-%,$(wildcard *.svg)) -COPIED_SVG = $(addprefix copied-,$(notdir $(SVG))) +SVG_GENERATE_FORMATS ?= png svg +SVG ?= $(filter-out copied-%,$(wildcard *.svg)) +COPIED_SVG = $(addprefix copied-,$(notdir $(SVG))) -GENERATED_ICON_WIDTHS += 16 32 48 64 72 96 128 144 168 192 -GENERATED_WIDTHS ?= $(GENERATED_ICON_WIDTHS) $(GENERATED_EXTRA_WIDTHS) +GENERATED_ICON_WIDTHS += 16 32 48 64 72 96 128 144 168 192 +GENERATED_WIDTHS ?= $(GENERATED_ICON_WIDTHS) $(GENERATED_EXTRA_WIDTHS) ifneq ($(filter png,$(SVG_GENERATE_FORMATS)),) - GENERATED_WIDTHS_PNG ?= $(GENERATED_WIDTHS) - GENERATED_PNG ?= \ + GENERATED_WIDTHS_PNG ?= $(GENERATED_WIDTHS) + GENERATED_PNG ?= \ $(foreach w, $(GENERATED_WIDTHS_PNG),$(patsubst %.svg,%-$w.png,$(notdir $(SVG)))) - GENERATED_IMAGES += $(GENERATED_PNG) + GENERATED_IMAGES += $(GENERATED_PNG) endif ifneq ($(filter ico,$(SVG_GENERATE_FORMATS)),) - GENERATED_WIDTHS_ICO ?= 16 32 - GENERATED_ICO ?= \ + GENERATED_WIDTHS_ICO ?= 16 32 + GENERATED_ICO ?= \ $(foreach w, $(GENERATED_WIDTHS_ICO),$(patsubst %.svg,%-$w.ico,$(notdir $(SVG)))) - GENERATED_IMAGES += $(GENERATED_ICO) + GENERATED_IMAGES += $(GENERATED_ICO) endif ifneq ($(filter pdf,$(SVG_GENERATE_FORMATS)),) - GENERATED_PDF ?= $(patsubst %.svg,%.pdf,$(notdir $(SVG))) - GENERATED_IMAGES += $(GENERATED_PDF) + GENERATED_PDF ?= $(patsubst %.svg,%.pdf,$(notdir $(SVG))) + GENERATED_IMAGES += $(GENERATED_PDF) endif ifneq ($(filter svg,$(SVG_GENERATE_FORMATS)),) - IMAGES += $(notdir $(SVG)) + IMAGES += $(notdir $(SVG)) endif all: $(GENERATED_IMAGES) diff --git a/make/swig.mk b/make/swig.mk index 2db4e29f..4fa19899 100644 --- a/make/swig.mk +++ b/make/swig.mk @@ -4,35 +4,35 @@ include $(MODDIR)/make/dev-utils.mk ifeq ($(SWIG_TARGET),php) - SWIG_LANG ?= php - SWIG_TARGET_EXT ?= php + SWIG_LANG ?= php + SWIG_TARGET_EXT ?= php ifeq ($(OS_NAME),ubuntu) - PHP_MAJOR ?= 5 + PHP_MAJOR ?= 5 else - PHP_MAJOR ?= $(shell php-config --version | cut -d. -f1) + PHP_MAJOR ?= $(shell php-config --version | cut -d. -f1) endif - PHP ?= php$(PHP_MAJOR) - #PHP ?= $(firstword $(notdir $(wildcard /usr/share/php*))) - SWIG_OPTS ?= -$(PHP) -DJW_PHP_MAJOR=$(PHP_MAJOR) - SWIG_MODULE_TARGET_DIR = $(ENV_PREFIX)/usr/share/$(PHP) + PHP ?= php$(PHP_MAJOR) + #PHP ?= $(firstword $(notdir $(wildcard /usr/share/php*))) + SWIG_OPTS ?= -$(PHP) -DJW_PHP_MAJOR=$(PHP_MAJOR) + SWIG_MODULE_TARGET_DIR = $(ENV_PREFIX)/usr/share/$(PHP) - #SWIG_PHP_INCLUDE_DIR = /usr/include/$(PHP) - #SWIG_PHP_INCLUDE_SUBDIRS = . main TSRM Zend - SWIG_PHP_MODULE_INI = $(SWIG_MODULE).ini - SWIG_PHP_MODULE_INI_DIR = $(ENV_PREFIX)/etc/$(PHP)/conf.d - #SWIG_PHP_NAMESPACE ?= $(SWIG_MODULE) + #SWIG_PHP_INCLUDE_DIR = /usr/include/$(PHP) + #SWIG_PHP_INCLUDE_SUBDIRS = . main TSRM Zend + SWIG_PHP_MODULE_INI = $(SWIG_MODULE).ini + SWIG_PHP_MODULE_INI_DIR = $(ENV_PREFIX)/etc/$(PHP)/conf.d + #SWIG_PHP_NAMESPACE ?= $(SWIG_MODULE) - SWIG_GENERATED_EXTRA += $(SWIG_PHP_MODULE_INI) - SWIG_INSTALLED_EXTRA = $(SWIG_PHP_MODULE_INI_DIR)/$(SWIG_PHP_MODULE_INI) + SWIG_GENERATED_EXTRA += $(SWIG_PHP_MODULE_INI) + SWIG_INSTALLED_EXTRA = $(SWIG_PHP_MODULE_INI_DIR)/$(SWIG_PHP_MODULE_INI) ifneq ($(SWIG_PHP_NAMESPECE),) - SWIG_POSTPROCESS += sed -i -e "s/^&1))) - PYTHON_MAJOR_VERSION ?= $(basename $(PYTHON_VERSION)) - PYTHON_MINOR_VERSION ?= $(patsubst .%,%,$(suffix $(PYTHON_VERSION))) + PYTHON_VERSION ?= $(basename $(lastword $(shell python2 --version 2>&1))) + PYTHON_MAJOR_VERSION ?= $(basename $(PYTHON_VERSION)) + PYTHON_MINOR_VERSION ?= $(patsubst .%,%,$(suffix $(PYTHON_VERSION))) - SWIG_LANG ?= python - SWIG_TARGET_EXT ?= py - SWIG_OPTS ?= -python - SWIG_MODULE_TARGET_DIR = $(ENV_PREFIX)$(SYSTEM_LIBDIR)/python$(PYTHON_MAJOR_VERSION).$(PYTHON_MINOR_VERSION)/site-packages - SWIG_MODULE_SO ?= _$(SWIG_MODULE).so - SWIG_CLEAN += $(wildcard *.pyc) + SWIG_LANG ?= python + SWIG_TARGET_EXT ?= py + SWIG_OPTS ?= -python + SWIG_MODULE_TARGET_DIR = $(ENV_PREFIX)$(SYSTEM_LIBDIR)/python$(PYTHON_MAJOR_VERSION).$(PYTHON_MINOR_VERSION)/site-packages + SWIG_MODULE_SO ?= _$(SWIG_MODULE).so + SWIG_CLEAN += $(wildcard *.pyc) - SWIG_PY_MODULE_PYC ?= $(patsubst %.py,%.pyc,$(SWIG_MODULE_TARGET)) - SWIG_GENERATED_EXTRA += $(SWIG_PY_MODULE_PYC) - SWIG_INSTALLED_EXTRA += $(SWIG_MODULE_TARGET_DIR)/$(SWIG_PY_MODULE_PYC) + SWIG_PY_MODULE_PYC ?= $(patsubst %.py,%.pyc,$(SWIG_MODULE_TARGET)) + SWIG_GENERATED_EXTRA += $(SWIG_PY_MODULE_PYC) + SWIG_INSTALLED_EXTRA += $(SWIG_MODULE_TARGET_DIR)/$(SWIG_PY_MODULE_PYC) - INCLUDE += $(shell pkg-config --cflags python2) - BUILD_LDFLAGS += $(shell pkg-config --libs python2) $(shell php-config --ldflags --libs) + INCLUDE += $(shell pkg-config --cflags python2) + 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: @@ -78,39 +78,39 @@ all: else ifeq ($(SWIG_TARGET),java) - JAVA_VERSION ?= $(basename $(lastword $(shell java -version 2>&1 | sed '/version/ !d'))) - JAVA_MAJOR_VERSION ?= $(basename $(JAVA_VERSION)) - JAVA_MINOR_VERSION ?= $(patsubst .%,%,$(suffix $(JAVA_VERSION))) + JAVA_VERSION ?= $(basename $(lastword $(shell java -version 2>&1 | sed '/version/ !d'))) + JAVA_MAJOR_VERSION ?= $(basename $(JAVA_VERSION)) + JAVA_MINOR_VERSION ?= $(patsubst .%,%,$(suffix $(JAVA_VERSION))) - SWIG_LANG ?= java - SWIG_TARGET_EXT ?= java - SWIG_OPTS ?= -java - SWIG_MODULE_TARGET_DIR = /usr/share/java - SWIG_MODULE_SO ?= $(SWIG_MODULE).so - SWIG_CLEAN += $(wildcard *.java) + SWIG_LANG ?= java + SWIG_TARGET_EXT ?= java + SWIG_OPTS ?= -java + SWIG_MODULE_TARGET_DIR = /usr/share/java + SWIG_MODULE_SO ?= $(SWIG_MODULE).so + SWIG_CLEAN += $(wildcard *.java) - #SWIG_PY_MODULE_PYC ?= $(patsubst %.py,%.pyc,$(SWIG_MODULE_TARGET)) - #SWIG_GENERATED_EXTRA += $(SWIG_PY_MODULE_PYC) - #SWIG_INSTALLED_EXTRA += $(SWIG_MODULE_TARGET_DIR)/$(SWIG_PY_MODULE_PYC) + #SWIG_PY_MODULE_PYC ?= $(patsubst %.py,%.pyc,$(SWIG_MODULE_TARGET)) + #SWIG_GENERATED_EXTRA += $(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 - #BUILD_LDFLAGS += + INCLUDE += -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux + #BUILD_LDFLAGS += - INSTALL_LIBDIR = $(SWIG_MODULE_TARGET_DIR) + INSTALL_LIBDIR = $(SWIG_MODULE_TARGET_DIR) else ifeq ($(SWIG_TARGET),perl) - SWIG_LANG ?= perl - SWIG_TARGET_EXT ?= pm - SWIG_OPTS ?= -perl - PERL_VERSION ?= $(patsubst v%,%,$(shell perl -e 'print $$^V;')) - 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_VENDOR_DIR ?= $(PERL_BASE_DIR)/vendor_perl/$(PERL_VERSION)/$(ARCH)-linux-thread-multi - INCLUDE += -I$(PERL_CORE_DIR) - SWIG_CLEAN += $(wildcard *.$(SWIG_TARGET_EXT)) - INSTALL_LIBDIR = $(PERL_VENDOR_DIR)/auto/$(SWIG_MODULE) - SWIG_MODULE_TARGET_DIR = $(PERL_VENDOR_DIR) + SWIG_LANG ?= perl + SWIG_TARGET_EXT ?= pm + SWIG_OPTS ?= -perl + PERL_VERSION ?= $(patsubst v%,%,$(shell perl -e 'print $$^V;')) + 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_VENDOR_DIR ?= $(PERL_BASE_DIR)/vendor_perl/$(PERL_VERSION)/$(ARCH)-linux-thread-multi + INCLUDE += -I$(PERL_CORE_DIR) + SWIG_CLEAN += $(wildcard *.$(SWIG_TARGET_EXT)) + INSTALL_LIBDIR = $(PERL_VENDOR_DIR)/auto/$(SWIG_MODULE) + SWIG_MODULE_TARGET_DIR = $(PERL_VENDOR_DIR) else @@ -118,41 +118,41 @@ else 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) - SWIG_SOURCE_EXT ?= cpp - SWIG_OPTS += -c++ + SWIG_SOURCE_EXT ?= cpp + SWIG_OPTS += -c++ else - SWIG_SOURCE_EXT ?= c + SWIG_SOURCE_EXT ?= c endif -SWIG ?= swig -SWIG_INTERFACE_I ?= $(wildcard *.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_SO ?= $(SWIG_MODULE).so -SWIG_MODULE_H ?= $(SWIG_MODULE).h -SWIG_MODULE_WRAP_C ?= $(SWIG_MODULE)_wrap.$(SWIG_SOURCE_EXT) -SWIG_MODULE_TARGET ?= $(SWIG_MODULE).$(SWIG_TARGET_EXT) -SWIG_SRC_C ?= $(sort $(SWIG_MODULE_WRAP_C) $(wildcard *.c *.cpp)) -SWIG_OBJ ?= $(patsubst %.cpp,%.o,$(patsubst %.c,%.o,$(sort $(SWIG_SRC_C)))) -SWIG_TARGETOWNER ?= root -SWIG_TARGETGROUP ?= root -SWIG_TARGETMODE ?= 0644 -SWIG_WRAPPER_DEP_MK = swig.dep.mk +SWIG ?= swig +SWIG_INTERFACE_I ?= $(wildcard *.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_SO ?= $(SWIG_MODULE).so +SWIG_MODULE_H ?= $(SWIG_MODULE).h +SWIG_MODULE_WRAP_C ?= $(SWIG_MODULE)_wrap.$(SWIG_SOURCE_EXT) +SWIG_MODULE_TARGET ?= $(SWIG_MODULE).$(SWIG_TARGET_EXT) +SWIG_SRC_C ?= $(sort $(SWIG_MODULE_WRAP_C) $(wildcard *.c *.cpp)) +SWIG_OBJ ?= $(patsubst %.cpp,%.o,$(patsubst %.c,%.o,$(sort $(SWIG_SRC_C)))) +SWIG_TARGETOWNER ?= root +SWIG_TARGETGROUP ?= root +SWIG_TARGETMODE ?= 0644 +SWIG_WRAPPER_DEP_MK = swig.dep.mk -SWIG_INSTALLED_SO = $(addprefix $(INSTALL_LIBDIR)/,$(SWIG_MODULE_SO)) -SWIG_INSTALLED_MODULE_TARGET = $(addprefix $(SWIG_MODULE_TARGET_DIR)/,$(SWIG_MODULE_TARGET)) +SWIG_INSTALLED_SO = $(addprefix $(INSTALL_LIBDIR)/,$(SWIG_MODULE_SO)) +SWIG_INSTALLED_MODULE_TARGET = $(addprefix $(SWIG_MODULE_TARGET_DIR)/,$(SWIG_MODULE_TARGET)) -SWIG_DEFINES += -DNON_C_BINDING -SWIG_OPTS += $(SWIG_DEFINES) -LOCAL_CFLAGS += $(SWIG_DEFINES) -LOCAL_CPPFLAGS += $(SWIG_DEFINES) +SWIG_DEFINES += -DNON_C_BINDING +SWIG_OPTS += $(SWIG_DEFINES) +LOCAL_CFLAGS += $(SWIG_DEFINES) +LOCAL_CPPFLAGS += $(SWIG_DEFINES) # for depend.mk -OBJ = $(SWIG_OBJ) -DEPEND_MK += $(SWIG_WRAPPER_DEP_MK) +OBJ = $(SWIG_OBJ) +DEPEND_MK += $(SWIG_WRAPPER_DEP_MK) all: $(SWIG_MODULE_SO) $(SWIG_GENERATED_EXTRA) install: $(SWIG_INSTALLED_SO) $(SWIG_INSTALLED_MODULE_TARGET) $(SWIG_INSTALLED_EXTRA) diff --git a/make/tex.mk b/make/tex.mk index d9bdb699..6370666c 100644 --- a/make/tex.mk +++ b/make/tex.mk @@ -4,61 +4,61 @@ # $Id$ # -- project data -CUSTOMER ?= jannet -PROJECT ?= legal -TOPIC ?= $(notdir $(shell $(PWD))) -VERSION ?= $(shell sed "s/-dev$$//" VERSION) -AUTHORS ?= -#TITLE ?= Allgemeine Bedingungen für -#SUBTITLE ?= Dienstgüte-Vereinbarungen -DATE ?= $(shell date +'%Y/%m/%d') -#CONFIDENTIAL_REMARK ?= Vertraulich -BEAMER_HANDOUT ?= false -BEAMER_ASPECTRATIO ?= 169 +CUSTOMER ?= jannet +PROJECT ?= legal +TOPIC ?= $(notdir $(shell $(PWD))) +VERSION ?= $(shell sed "s/-dev$$//" VERSION) +AUTHORS ?= +#TITLE ?= Allgemeine Bedingungen für +#SUBTITLE ?= Dienstgüte-Vereinbarungen +DATE ?= $(shell date +'%Y/%m/%d') +#CONFIDENTIAL_REMARK ?= Vertraulich +BEAMER_HANDOUT ?= false +BEAMER_ASPECTRATIO ?= 169 # -- files -MAIN ?= main -HEADER ?= header -FRONTPAGE ?= frontpage -OUTPUT ?= $(patsubst %-dev,%,$(TOPIC)-$(VERSION)) -DISTDIR ?= dist +MAIN ?= main +HEADER ?= header +FRONTPAGE ?= frontpage +OUTPUT ?= $(patsubst %-dev,%,$(TOPIC)-$(VERSION)) +DISTDIR ?= dist # -- dependencies -LOCAL_PREREQ ?= Makefile cfg.mk main.tex.tmpl \ +LOCAL_PREREQ ?= Makefile cfg.mk main.tex.tmpl \ $(wildcard *.tex) # -- formatting -#DOCUMENT_CLASS ?= book +#DOCUMENT_CLASS ?= book ifneq ($(MAKECMDGOALS),html) -DOCUMENT_CLASS ?= article +DOCUMENT_CLASS ?= article else -DOCUMENT_CLASS ?= article +DOCUMENT_CLASS ?= article endif -TEX_TMPL_BASE_DIR ?= $(MODDIR)/tmpl/tex -TEX_TMPL_STYLE ?= de_technical -TEX_TMPL_DIR ?= $(TEX_TMPL_BASE_DIR)/$(TEX_TMPL_STYLE) -IMPORTED_TEMPLATES ?= $(shell ls $(TEX_TMPL_DIR)/*.tmpl) -WWW_IMAGEDIR ?= $(PROJECTS_DIR)/jw-build/htdocs/images/logo-janware/ -FRONTLOGO_PDF ?= logo-janware.pdf -FRONTLOGO_EPS ?= janware-frontpage-top-right.png -FRONTLOGO_WEB ?= janware-frontpage-top-right.png -ICON_UP ?= up.png -ICON_PREV ?= prev.png -ICON_NEXT ?= next.png -ICON_INDEX ?= index.png -ICON_CONTENTS ?= contents.png +TEX_TMPL_BASE_DIR ?= $(MODDIR)/tmpl/tex +TEX_TMPL_STYLE ?= de_technical +TEX_TMPL_DIR ?= $(TEX_TMPL_BASE_DIR)/$(TEX_TMPL_STYLE) +IMPORTED_TEMPLATES ?= $(shell ls $(TEX_TMPL_DIR)/*.tmpl) +WWW_IMAGEDIR ?= $(PROJECTS_DIR)/jw-build/htdocs/images/logo-janware/ +FRONTLOGO_PDF ?= logo-janware.pdf +FRONTLOGO_EPS ?= janware-frontpage-top-right.png +FRONTLOGO_WEB ?= janware-frontpage-top-right.png +ICON_UP ?= up.png +ICON_PREV ?= prev.png +ICON_NEXT ?= next.png +ICON_INDEX ?= index.png +ICON_CONTENTS ?= contents.png # -- web publishing -HTMLDIR ?= $(TOPIC) -TARGET_HOST ?= cvs.jannet.de -TARGET_DIR ?= /home/wwwrun/dat/htdocs/jannet.de_443/upload/$(CUSTOMER)/projects/$(PROJECT)/doc/$(TOPIC) -TARGET_DIR_MODE ?= 755 -TARGET_FILE_MODE ?= 644 -TARGET_USER ?= root +HTMLDIR ?= $(TOPIC) +TARGET_HOST ?= cvs.jannet.de +TARGET_DIR ?= /home/wwwrun/dat/htdocs/jannet.de_443/upload/$(CUSTOMER)/projects/$(PROJECT)/doc/$(TOPIC) +TARGET_DIR_MODE ?= 755 +TARGET_FILE_MODE ?= 644 +TARGET_USER ?= root -UPLOAD_MODULE ?= doc/$(TOPIC) -UPLOAD_FILE_MODE ?= 644 -UPLOAD_DIR_MODE ?= 755 +UPLOAD_MODULE ?= doc/$(TOPIC) +UPLOAD_FILE_MODE ?= 644 +UPLOAD_DIR_MODE ?= 755 include $(MODDIR)/make/tag-defs.mk include $(MODDIR)/make/tag-rules.mk @@ -66,57 +66,57 @@ include $(MODDIR)/make/tag-rules.mk ifeq ($(TEX_TMPL_DIR), "") TEX_TMPL_DIR = thisisnotadirectory endif -latex = latex -PDFLATEX ?= pdflatex -PDF_VIEWER ?= $(firstword $(shell which okular kpdf acroread)) -CAT ?= cat -SED ?= sed -COMPILATION_RUN_NAMES ?= 1 2 3 +latex = latex +PDFLATEX ?= pdflatex +PDF_VIEWER ?= $(firstword $(shell which okular kpdf acroread)) +CAT ?= cat +SED ?= sed +COMPILATION_RUN_NAMES ?= 1 2 3 # this is what is there already -PRE_FIG_LOCAL = $(wildcard *.fig) -PRE_TEX_LOCAL = $(wildcard *.tex) -PRE_TMPL_LOCAL = $(wildcard *.tmpl *.ger) -PRE_HTML_LOCAL = $(wildcard *.html) -PRE_FIG_REMOTE = $(foreach dir,$(TEX_TMPL_DIR),$(wildcard $(dir)/*.fig)) -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_HTML_REMOTE = $(foreach dir,$(TEX_TMPL_DIR),$(wildcard $(dir)/*.html)) +PRE_FIG_LOCAL = $(wildcard *.fig) +PRE_TEX_LOCAL = $(wildcard *.tex) +PRE_TMPL_LOCAL = $(wildcard *.tmpl *.ger) +PRE_HTML_LOCAL = $(wildcard *.html) +PRE_FIG_REMOTE = $(foreach dir,$(TEX_TMPL_DIR),$(wildcard $(dir)/*.fig)) +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_HTML_REMOTE = $(foreach dir,$(TEX_TMPL_DIR),$(wildcard $(dir)/*.html)) # this is what should be there -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))) -FILES_COPIED = $(notdir $(wildcard $(TEX_TMPL_DIR)/*.html $(TEX_TMPL_DIR)/*.tex)) -GENERATED += $(FILES_FROM_TMPL) $(EPS_FROM_FIG) $(FILES_COPIED) $(FRONTLOGO_PDF) -GENERATED_TEX = $(filter %.tex,$(GENERATED)) -GENERATED_EPS = $(filter %.png,$(GENERATED)) -GENERATED_HTML = $(filter %.html,$(GENERATED)) +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))) +FILES_COPIED = $(notdir $(wildcard $(TEX_TMPL_DIR)/*.html $(TEX_TMPL_DIR)/*.tex)) +GENERATED += $(FILES_FROM_TMPL) $(EPS_FROM_FIG) $(FILES_COPIED) $(FRONTLOGO_PDF) +GENERATED_TEX = $(filter %.tex,$(GENERATED)) +GENERATED_EPS = $(filter %.png,$(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),) -DIST_VERSION = $(VERSION) +DIST_VERSION = $(VERSION) endif # all -TEX = $(PRE_TEX_LOCAL) $(GENERATED_TEX) -EPS = $(GENERATED_EPS) -HTML = $(PRE_HTML_LOCAL) $(GENERATED_HTML) +TEX = $(PRE_TEX_LOCAL) $(GENERATED_TEX) +EPS = $(GENERATED_EPS) +HTML = $(PRE_HTML_LOCAL) $(GENERATED_HTML) -LATEX_INPUT = $(TEX) $(EPS) -HTML_INPUT = $(HTML) $(IMAGES) +LATEX_INPUT = $(TEX) $(EPS) +HTML_INPUT = $(HTML) $(IMAGES) # this comes in handy -DATE_FORMAT ?= '%b, %d, %Y' -DATE := $(if $(DATE),$(shell date +$(DATE_FORMAT) --date $(DATE)),$(shell date +$(DATE_FORMAT))) -TEX_WARN_DONT_EDIT = "\ +DATE_FORMAT ?= '%b, %d, %Y' +DATE := $(if $(DATE),$(shell date +$(DATE_FORMAT) --date $(DATE)),$(shell date +$(DATE_FORMAT))) +TEX_WARN_DONT_EDIT = "\ %+---------------------------------------------------+\n\ %| DO NOT EDIT THIS FILE! |\n\ %| It was automatically created during the build |\n\ %| process! |\n\ %+---------------------------------------------------+\n" -HTML_WARN_DONT_EDIT = "\ +HTML_WARN_DONT_EDIT = "\ " -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)) \ -#LOCAL_IMPORTED_TEMPLATES = $(notdir $(IMPORTED_TEMPLATES)) -#FMT_OFFLINE = tex dvi ps pdf txt -FMT_OFFLINE = tex pdf # txt -FMT = $(FMT_OFFLINE) html -OUT = $(DISTDIR)/$(OUTPUT) -FMT_OUT = $(patsubst %,$(OUT).%.zip,$(FMT)) -FMT_OFFLINE_OUT = $(patsubst %,$(OUT).%.zip,$(FMT_OFFLINE)) -ALL = $(FMT_OUT) html_install -#PRE_HTML = $(patsubst %.tmpl,%,$(wildcard *.html.tmpl)) -#LINETMPL=$(wildcard *.linetmpl) -#TEXFROMGER=$(patsubst %.ger,%.tex,$(wildcard *.ger)) -#TMPL=$(wildcard *.tmpl) -#FILEFROMTMPL = $(patsubst %.tmpl,%,$(TMPL)) -#GERFROMLINETMPL=$(patsubst %.linetmpl,%,$(wildcard *.linetmpl)) -#PRE_TEX = $(patsubst %.ger,%.tex,\ +#LOCAL_IMPORTED_TEMPLATES = $(notdir $(IMPORTED_TEMPLATES)) +#FMT_OFFLINE = tex dvi ps pdf txt +FMT_OFFLINE = tex pdf # txt +FMT = $(FMT_OFFLINE) html +OUT = $(DISTDIR)/$(OUTPUT) +FMT_OUT = $(patsubst %,$(OUT).%.zip,$(FMT)) +FMT_OFFLINE_OUT = $(patsubst %,$(OUT).%.zip,$(FMT_OFFLINE)) +ALL = $(FMT_OUT) html_install +#PRE_HTML = $(patsubst %.tmpl,%,$(wildcard *.html.tmpl)) +#LINETMPL = $(wildcard *.linetmpl) +#TEXFROMGER = $(patsubst %.ger,%.tex,$(wildcard *.ger)) +#TMPL = $(wildcard *.tmpl) +#FILEFROMTMPL = $(patsubst %.tmpl,%,$(TMPL)) +#GERFROMLINETMPL = $(patsubst %.linetmpl,%,$(wildcard *.linetmpl)) +#PRE_TEX = $(patsubst %.ger,%.tex,\ # $(patsubst %.tmpl,%,$(wildcard *.tex.tmpl *.ger.tmpl) $(LOCAL_IMPORTED_TEMPLATES)) \ # $(GERFROMLINETMPL)) $(TEXFROMGER) -NEWDIRS = $(DISTDIR) $(HTMLDIR) $(DVIDIR) +NEWDIRS = $(DISTDIR) $(HTMLDIR) $(DVIDIR) ifeq ($(DOCUMENT_CLASS),) -DOCUMENT_CLASS = article +DOCUMENT_CLASS = article endif ifeq ($(BEAMER_HANDOUT),true) -DOCUMENT_CLASS_OPTIONS += ,handout +DOCUMENT_CLASS_OPTIONS += ,handout endif ifneq ($(BEAMER_ASPECTRATIO),) -DOCUMENT_CLASS_OPTIONS += ,aspectratio=$(BEAMER_ASPECTRATIO) +DOCUMENT_CLASS_OPTIONS += ,aspectratio=$(BEAMER_ASPECTRATIO) endif ifneq ($(BEAMER_HANDOUT),true) -BEAMER_ANIMATION_FRAMES ?= 36 +BEAMER_ANIMATION_FRAMES ?= 36 else -BEAMER_ANIMATION_FRAMES ?= 1 +BEAMER_ANIMATION_FRAMES ?= 1 endif define mangle_tmpl @@ -347,7 +347,7 @@ $(OUT).tex.zip: cfgtest $(LATEX_INPUT) #$(OUT).txt.zip: $(OUTPUT).txt # 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' $(HTMLDIR): $(LATEX_INPUT) $(HTML_INPUT) @@ -428,7 +428,7 @@ unzip: %-handout: BEAMER_HANDOUT=true make $* -UPLOAD_FILES = $(OUTPUT).pdf +UPLOAD_FILES = $(OUTPUT).pdf include $(MODDIR)/make/upload.mk diff --git a/make/textest.mk b/make/textest.mk index 99fa934b..bb93cfff 100644 --- a/make/textest.mk +++ b/make/textest.mk @@ -1,11 +1,11 @@ -SOURCES = $(wildcard *.tex) -PDF_VIEWER ?= $(firstword $(shell which okular acroread)) -PNG_VIEWER ?= $(firstword $(shell which qiv gimp)) -MAIN_TEX ?= $(firstword $(wildcard main.tex *.tex)) -MAIN ?= $(patsubst %.tex,$(MAIN_TEX)) -OUT_PDF ?= $(notdir $(shell $(PWD))).pdf -OUT_PNG ?= $(patsubst %.pdf,%.png,$(OUT_PDF)) -PNG_WIDTH ?= 200 +SOURCES = $(wildcard *.tex) +PDF_VIEWER ?= $(firstword $(shell which okular acroread)) +PNG_VIEWER ?= $(firstword $(shell which qiv gimp)) +MAIN_TEX ?= $(firstword $(wildcard main.tex *.tex)) +MAIN ?= $(patsubst %.tex,$(MAIN_TEX)) +OUT_PDF ?= $(notdir $(shell $(PWD))).pdf +OUT_PNG ?= $(patsubst %.pdf,%.png,$(OUT_PDF)) +PNG_WIDTH ?= 200 all: pdf clean: clean.files diff --git a/make/tmpl.mk b/make/tmpl.mk index 94714905..83bb8485 100644 --- a/make/tmpl.mk +++ b/make/tmpl.mk @@ -1,18 +1,18 @@ include $(MODDIR)/make/defs.mk # -- TMPL -INSTALLATION_FILE_TYPES += TMPL -BUILD_TMPLDIR = $(TOPDIR)/tmpl -LOCAL_TMPL += $(filter-out $(DONT_INSTALL),$(wildcard *.tmpl)) +INSTALLATION_FILE_TYPES += TMPL +BUILD_TMPLDIR = $(TOPDIR)/tmpl +LOCAL_TMPL += $(filter-out $(DONT_INSTALL),$(wildcard *.tmpl)) ifndef TMPL_SUBDIR - TMPL_SUBDIR := $(shell $(PWD) | $(SED) '/.*\/tmpl\(\/\|$$\)/!d; s%.*/tmpl\(/\|$$\)%%') + TMPL_SUBDIR := $(shell $(PWD) | $(SED) '/.*\/tmpl\(\/\|$$\)/!d; s%.*/tmpl\(/\|$$\)%%') endif ifeq ($(TMPL_SUBDIR),) - INSTALL_TMPLDIR = $(PROJECT_TMPLDIR) + INSTALL_TMPLDIR = $(PROJECT_TMPLDIR) else - INSTALL_TMPLDIR = $(PROJECT_TMPLDIR)/$(TMPL_SUBDIR) + INSTALL_TMPLDIR = $(PROJECT_TMPLDIR)/$(TMPL_SUBDIR) endif -INSTALLED_TMPL += $(addprefix $(INSTALL_TMPLDIR)/,$(LOCAL_TMPL)) +INSTALLED_TMPL += $(addprefix $(INSTALL_TMPLDIR)/,$(LOCAL_TMPL)) include $(MODDIR)/make/rules.mk diff --git a/make/topdir.mk b/make/topdir.mk index d0b14e05..e8f9b3cc 100644 --- a/make/topdir.mk +++ b/make/topdir.mk @@ -6,22 +6,22 @@ config: mrproper:distclean topdir.mrproper 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 \ images htdocs tmpl doc test inst/post) endif -PROJECT_DESCR = $(TOPDIR)/make/project.conf -GIT_DESCR = $(TOPDIR)/.git/description -LIST_VCS_FILES = /bin/bash $(MOD_SCRIPT_DIR)/scm.sh ls-files +PROJECT_DESCR = $(TOPDIR)/make/project.conf +GIT_DESCR = $(TOPDIR)/.git/description +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) -REMOTE_GIT_FLAVOUR ?= proj +REMOTE_GIT_FLAVOUR ?= proj else -OPT_JANWARE_PROJECT = -REMOTE_GIT_FLAVOUR ?= priv +OPT_JANWARE_PROJECT = +REMOTE_GIT_FLAVOUR ?= priv endif ifneq ($(wildcard $(TOPDIR)/make/defs.mk),) @@ -30,27 +30,27 @@ endif include $(MODDIR)/make/defs.mk -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_DIR = /srv/git/$(JANWARE_USER)/$(REMOTE_GIT_FLAVOUR)/$(RPM_PROJECT) +REMOTE_GIT_URL = ssh://$(JANWARE_USER)@git.janware.com$(REMOTE_GIT_DIR) include $(MODDIR)/make/dirs.mk ifneq ($(DONT_CHECK_PREREQ_DONE),true) 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 ifndef PREREQ_DIRS - PREREQ_DIRS := $(call proj_query,proj-dir $(PREREQ)) + PREREQ_DIRS := $(call proj_query,proj-dir $(PREREQ)) 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 ifneq ($(SUBDIRS_TO_ITERATE),) ifeq ($(MAKECMDGOALS),) - SUBDIR_TARGETS = all + SUBDIR_TARGETS = all else - SUBDIR_TARGETS = $(filter $(ALLOWED_SUBDIR_TARGETS),$(MAKECMDGOALS)) + SUBDIR_TARGETS = $(filter $(ALLOWED_SUBDIR_TARGETS),$(MAKECMDGOALS)) endif endif @@ -59,9 +59,9 @@ include $(MODDIR)/make/rpmdist.mk include $(MODDIR)/make/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-%: find . -name $@.mk | \ diff --git a/make/upload-defs-rpm.mk b/make/upload-defs-rpm.mk index 0190ca43..336e4a18 100644 --- a/make/upload-defs-rpm.mk +++ b/make/upload-defs-rpm.mk @@ -3,39 +3,39 @@ # VERSION # MOD_SCRIPT_DIR -#UPLOAD_SH = $(MOD_SCRIPT_DIR)/upload.sh -#MKSPEC_SH = $(MOD_SCRIPT_DIR)/mkspec-wrapper.sh $(TOPDIR)/make/mkspec.sh +#UPLOAD_SH = $(MOD_SCRIPT_DIR)/upload.sh +#MKSPEC_SH = $(MOD_SCRIPT_DIR)/mkspec-wrapper.sh $(TOPDIR)/make/mkspec.sh -#FTP_FILE_MODE ?= 640 -#FTP_DIR_MODE ?= 750 -#FTP_SRC_GROUP ?= spidsrc -#FTP_SRC_USER ?= $(shell whoami) -#FTP_RUN_GROUP ?= spidrun -#FTP_RUN_USER ?= $(shell whoami) -#FTP_DEV_GROUP ?= spiddev -#FTP_DEV_USER ?= $(shell whoami) -#FTP_HOST ?= pkg.janware.com -#FTP_HOST_LOGIN ?= root +#FTP_FILE_MODE ?= 640 +#FTP_DIR_MODE ?= 750 +#FTP_SRC_GROUP ?= spidsrc +#FTP_SRC_USER ?= $(shell whoami) +#FTP_RUN_GROUP ?= spidrun +#FTP_RUN_USER ?= $(shell whoami) +#FTP_DEV_GROUP ?= spiddev +#FTP_DEV_USER ?= $(shell whoami) +#FTP_HOST ?= pkg.janware.com +#FTP_HOST_LOGIN ?= root # -#OS_NAME = $(shell echo $(OS_NAME_VERSION) | sed 's/-.*//') -#OS_VERSION = $(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/[^-]\+-//') # ## $(FTP_PCKG_DIR)/linux/$(OS_NAME)/$(OS_VERSION)/rpm/src -#FTP_PCKG_DIR ?= /pub/packages -#PCKG_ROOT ?= $(FTP_PCKG_DIR)/linux/$(OS_NAME)/$(OS_VERSION) -##PCKG_ROOT = $(FTP_PCKG_DIR)/$(RPM_PROJECT) -#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_DEVEL_I386 = $(PCKG_ROOT)/$(RPM_ARCH)/$(PCKG_RPM_DEVEL_I386) -#CURRENT_RPM_SRC = $(PCKG_ROOT)/src/$(PCKG_RPM_SRC) -#REMOTE_TARGET_PREFIX = rsync_ssh://$(FTP_HOST_LOGIN)@$(FTP_HOST):/srv/ftp -#REMOTE_TARGETS = \ +#FTP_PCKG_DIR ?= /pub/packages +#PCKG_ROOT ?= $(FTP_PCKG_DIR)/linux/$(OS_NAME)/$(OS_VERSION) +##PCKG_ROOT = $(FTP_PCKG_DIR)/$(RPM_PROJECT) +#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_DEVEL_I386 = $(PCKG_ROOT)/$(RPM_ARCH)/$(PCKG_RPM_DEVEL_I386) +#CURRENT_RPM_SRC = $(PCKG_ROOT)/src/$(PCKG_RPM_SRC) +#REMOTE_TARGET_PREFIX = rsync_ssh://$(FTP_HOST_LOGIN)@$(FTP_HOST):/srv/ftp +#REMOTE_TARGETS = \ # $(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_SRC):$(FTP_FILE_MODE):$(FTP_DIR_MODE):$(FTP_SRC_USER).$(FTP_SRC_GROUP) # #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) #endif diff --git a/make/upload-defs.mk b/make/upload-defs.mk index 6c4fe9f5..5a7c57a0 100644 --- a/make/upload-defs.mk +++ b/make/upload-defs.mk @@ -1,26 +1,26 @@ -UPLOAD_SH ?= /bin/bash $(MOD_SCRIPT_DIR)/upload.sh -UPLOAD_PROJECT ?= $(PROJECT) -UPLOAD_MODULE ?= $(UPLOAD_PROJECT) -UPLOAD_FILE_MODE ?= 640 -UPLOAD_DIR_MODE ?= 750 -UPLOAD_GROUP ?= $(shell id -ng) -UPLOAD_USER ?= $(shell id -nu) -UPLOAD_HOST_LOGIN ?= root -UPLOAD_HOST ?= files.janware.com -UPLOAD_FILES_ROOT ?= /srv/dav/pub/clients/$(JANWARE_CLIENT) -#UPLOAD_TEST_PREFIX ?= -UPLOAD_MODULE_PATH ?= $(UPLOAD_TEST_PREFIX)proj/$(UPLOAD_MODULE) -UPLOAD_MODULE_ROOT ?= $(UPLOAD_FILES_ROOT)/$(UPLOAD_MODULE_PATH) -UPLOAD_TARGET_PREFIX ?= rsync_ssh://$(UPLOAD_HOST_LOGIN)@$(UPLOAD_HOST):$(UPLOAD_MODULE_ROOT)/ -#UPLOAD_FILES ?= -REMOTE_TARGETS ?= \ +UPLOAD_SH ?= /bin/bash $(MOD_SCRIPT_DIR)/upload.sh +UPLOAD_PROJECT ?= $(PROJECT) +UPLOAD_MODULE ?= $(UPLOAD_PROJECT) +UPLOAD_FILE_MODE ?= 640 +UPLOAD_DIR_MODE ?= 750 +UPLOAD_GROUP ?= $(shell id -ng) +UPLOAD_USER ?= $(shell id -nu) +UPLOAD_HOST_LOGIN ?= root +UPLOAD_HOST ?= files.janware.com +UPLOAD_FILES_ROOT ?= /srv/dav/pub/clients/$(JANWARE_CLIENT) +#UPLOAD_TEST_PREFIX ?= +UPLOAD_MODULE_PATH ?= $(UPLOAD_TEST_PREFIX)proj/$(UPLOAD_MODULE) +UPLOAD_MODULE_ROOT ?= $(UPLOAD_FILES_ROOT)/$(UPLOAD_MODULE_PATH) +UPLOAD_TARGET_PREFIX ?= rsync_ssh://$(UPLOAD_HOST_LOGIN)@$(UPLOAD_HOST):$(UPLOAD_MODULE_ROOT)/ +#UPLOAD_FILES ?= +REMOTE_TARGETS ?= \ $(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),) - UPLOAD_SCM = cvs + UPLOAD_SCM = cvs else - UPLOAD_SCM = git + UPLOAD_SCM = git endif all: diff --git a/make/wt-defs.mk b/make/wt-defs.mk index 08053c84..d3d9c0ce 100644 --- a/make/wt-defs.mk +++ b/make/wt-defs.mk @@ -1,22 +1,22 @@ 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) - PROJECT_LDFLAGS += -lwtfcgi + PROJECT_LDFLAGS += -lwtfcgi endif ifeq ($(USE_WT_HTTPD),true) - PROJECT_LDFLAGS += -lwthttp - PROJECT_CFLAGS += -DCONNECTOR_HTTP=YES - PROJECT_CPPFLAGS+= -DCONNECTOR_HTTP=YES + PROJECT_LDFLAGS += -lwthttp + PROJECT_CFLAGS += -DCONNECTOR_HTTP=YES + PROJECT_CPPFLAGS += -DCONNECTOR_HTTP=YES endif ifeq ($(USE_WT_DBO),true) - PROJECT_LDFLAGS += -lwtdbopostgres -lwtdbosqlite3 -lwtdbo + PROJECT_LDFLAGS += -lwtdbopostgres -lwtdbosqlite3 -lwtdbo endif - PROJECT_LDFLAGS += -lwt + PROJECT_LDFLAGS += -lwt endif diff --git a/make/yapp.mk b/make/yapp.mk index 602c1e25..837ac6c8 100644 --- a/make/yapp.mk +++ b/make/yapp.mk @@ -1,13 +1,13 @@ -SRC_ALL_CPP += main.cpp -YAPP_INCLUDE_DIR ?= . -YAPP_CLASS ?= $(firstword $(basename $(notdir $(wildcard $(addprefix \ +SRC_ALL_CPP += main.cpp +YAPP_INCLUDE_DIR ?= . +YAPP_CLASS ?= $(firstword $(basename $(notdir $(wildcard $(addprefix \ $(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_NAMESPACE ?= +YAPP_NAMESPACE ?= ifneq ($(TARGET),mingw) -LOCAL_LDFLAGS += -rdynamic +LOCAL_LDFLAGS += -rdynamic endif include $(MODDIR)/make/exe.mk diff --git a/tmpl/doxygen/Makefile b/tmpl/doxygen/Makefile index ef79ab29..8dc3caa5 100644 --- a/tmpl/doxygen/Makefile +++ b/tmpl/doxygen/Makefile @@ -1,16 +1,16 @@ -TOPDIR = ../.. +TOPDIR = ../.. -TMPL_SUBDIR = doxygen +TMPL_SUBDIR = doxygen -SVG = $(TOPDIR)/htdocs/images/logo-janware/logo-janware.svg -GENERATED_WIDTHS_PNG = 400 +SVG = $(TOPDIR)/htdocs/images/logo-janware/logo-janware.svg +GENERATED_WIDTHS_PNG = 400 -LOGO = logo.png +LOGO = logo.png include $(TOPDIR)/make/proj.mk include $(MODDIR)/make/svg.mk -LOCAL_TMPL = $(wildcard *.html *.tmpl $(LOGO)) +LOCAL_TMPL = $(wildcard *.html *.tmpl $(LOGO)) include $(MODDIR)/make/tmpl.mk