mirror of
ssh://git.janware.com/srv/git/janware/proj/jw-pkg
synced 2026-01-15 03:53:32 +01:00
make.mk: Minor code beautification
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
parent
4a5ae9c734
commit
dcba7d68bd
1 changed files with 6 additions and 6 deletions
12
make/make.mk
12
make/make.mk
|
|
@ -13,8 +13,8 @@ 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
|
||||
|
|
@ -24,12 +24,12 @@ include $(MODDIR)/make/rules.mk
|
|||
|
||||
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
|
||||
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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue