janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 12:03:31 +01:00
Code Activity

defs.mk, make.mk: Fix many package build errors

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2016-02-01 15:05:22 +00:00
commit 37130aa077
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
make/defs.mk
View file

@ -918,11 +918,11 @@ endif
INCLUDE += $(call proj_query, cflags $(PREREQ_BUILD) $(PROJECT)) INCLUDE += $(call proj_query, cflags $(PREREQ_BUILD) $(PROJECT))
ifneq ($(USE_PROJECT_LIB),false) #ifneq ($(USE_PROJECT_LIB),false)
LIBFLAGS += $(call proj_query, ldflags $(PREREQ_BUILD) $(PROJECT)) LIBFLAGS += $(call proj_query, ldflags $(PREREQ_BUILD) $(PROJECT))
else #else
LIBFLAGS += $(call proj_query, ldflags $(PREREQ_BUILD)) #LIBFLAGS += $(call proj_query, ldflags $(PREREQ_BUILD))
endif #endif
#include $(MODDIR)/make/lib-deps.mk #include $(MODDIR)/make/lib-deps.mk

4
make/make.mk
View file

@ -3,14 +3,14 @@
# contact@jannet.de # contact@jannet.de
# $Id$ # $Id$
MKFILES += $(wildcard project.conf)
include $(MODDIR)/make/defs.mk include $(MODDIR)/make/defs.mk
include $(MODDIR)/make/rules.mk include $(MODDIR)/make/rules.mk
#LOCAL_PKG_CONFIG = $(PROJECT).pc #LOCAL_PKG_CONFIG = $(PROJECT).pc
# BUILD_PKG_CONFIG = $(MODDIR)/pkgconfig/$(LOCAL_PKG_CONFIG) # BUILD_PKG_CONFIG = $(MODDIR)/pkgconfig/$(LOCAL_PKG_CONFIG)
MKFILES += $(wildcard $(PROJECT).conf)
INSTALL_PCKG_DEPS_DIR = $(ENV_PREFIX)$(MODDIR)/make/deps.d INSTALL_PCKG_DEPS_DIR = $(ENV_PREFIX)$(MODDIR)/make/deps.d
ifneq ($(wildcard pckg-deps.mk),) ifneq ($(wildcard pckg-deps.mk),)
INSTALLED_PKG_MK += $(INSTALL_PCKG_DEPS_DIR)/$(PROJECT).mk INSTALLED_PKG_MK += $(INSTALL_PCKG_DEPS_DIR)/$(PROJECT).mk