janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-26 07:13:55 +01:00
Code Activity

defs.mk, make.mk, rpmdist.mk: Fix various package build errors

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2016-02-01 22:59:23 +00:00
commit 651cbaf511
3 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
make/defs.mk
View file

@ -40,6 +40,8 @@ endif
OS ?= $(shell sh $(MOD_SCRIPT_DIR)/get_os.sh) OS ?= $(shell sh $(MOD_SCRIPT_DIR)/get_os.sh)
CREATE_DEVEL ?= true
ifeq ($(TARGET),mingw) ifeq ($(TARGET),mingw)
FLAVOUR_PREFIX ?= win32- FLAVOUR_PREFIX ?= win32-
FLAVOUR_SUFFIX ?= -win32 FLAVOUR_SUFFIX ?= -win32
@ -79,6 +81,12 @@ PROJECT_CAPNAME = $(shell echo $(PROJECT) | tr [a-z] [A-Z] | $(SED) 's/-/
PROJECT_DESCR ?= No description PROJECT_DESCR ?= No description
CUSTOMER ?= jannet CUSTOMER ?= jannet
ifneq ($(PROJECT_DESCR_FILE),)
ifeq ($(shell grep "^ *subpackages *=.*devel" $(PROJECT_DESCR_FILE)),)
CREATE_DEVEL = false
endif
endif
VERSION_FILE ?= $(firstword $(wildcard VERSION $(TOPDIR)/VERSION)) VERSION_FILE ?= $(firstword $(wildcard VERSION $(TOPDIR)/VERSION))
VERSION := $(shell $(CAT) $(VERSION_FILE)) VERSION := $(shell $(CAT) $(VERSION_FILE))
DIST_VERSION ?= $(shell $(SED) -e "s/-dev//" $(VERSION_FILE)) DIST_VERSION ?= $(shell $(SED) -e "s/-dev//" $(VERSION_FILE))
@ -926,7 +934,7 @@ LIBFLAGS += $(call proj_query, ldflags $(PREREQ_BUILD) $(PROJEC
#include $(MODDIR)/make/lib-deps.mk #include $(MODDIR)/make/lib-deps.mk
BTOOLS_DIR ?= $(call proj_dir, btools) BTOOLS_DIR ?= $(call proj_dir, dspider-btools)
#DSPCD_DIR ?= $(call proj_dir, dspcd) #DSPCD_DIR ?= $(call proj_dir, dspcd)
#DSPCD_EC_DIR ?= $(call proj_dir, dspcd-ec) #DSPCD_EC_DIR ?= $(call proj_dir, dspcd-ec)
FEEDFSD_DIR ?= $(call proj_dir, feedfsd) FEEDFSD_DIR ?= $(call proj_dir, feedfsd)

10
make/make.mk
View file

@ -3,9 +3,13 @@
# contact@jannet.de # contact@jannet.de
# $Id$ # $Id$
MKFILES += $(wildcard project.conf)
include $(MODDIR)/make/defs.mk include $(MODDIR)/make/defs.mk
ifneq ($(CREATE_DEVEL),false)
MKFILES += $(wildcard project.conf)
DEVEL_TARGETS += install_MAKE $(INSTALLED_PKG_MK) install_PKG_CONFIG
endif
include $(MODDIR)/make/rules.mk include $(MODDIR)/make/rules.mk
#LOCAL_PKG_CONFIG = $(PROJECT).pc #LOCAL_PKG_CONFIG = $(PROJECT).pc
@ -23,7 +27,7 @@ endif
#all: $(BUILD_PKG_CONFIG) #all: $(BUILD_PKG_CONFIG)
all: build_PKG_CONFIG all: build_PKG_CONFIG
install: install_MAKE $(INSTALLED_PKG_MK) install_PKG_CONFIG install: $(DEVEL_TARGETS)
clean: textclean localclean doneclean clean.pkg-config clean: textclean localclean doneclean clean.pkg-config
test: test:

7
make/rpmdist.mk
View file

@ -1,10 +1,3 @@
ifneq ($(PROJECT_DESCR_FILE),)
ifeq ($(shell grep "^ *subpackages *=.*devel" $(PROJECT_DESCR_FILE)),)
CREATE_DEVEL = false
endif
endif
CREATE_DEVEL ?= true
UPLOAD_SH = $(MOD_SCRIPT_DIR)/upload.sh UPLOAD_SH = $(MOD_SCRIPT_DIR)/upload.sh
RPM_PROJECT ?= $(FLAVOUR_PREFIX)$(PROJECT) RPM_PROJECT ?= $(FLAVOUR_PREFIX)$(PROJECT)
LOCAL_MKSPEC_SH ?= $(TOPDIR)/make/mkspec.sh LOCAL_MKSPEC_SH ?= $(TOPDIR)/make/mkspec.sh