From 37130aa0771884575f33a074c47c8d7a65564f72 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Mon, 1 Feb 2016 15:05:22 +0000 Subject: [PATCH] defs.mk, make.mk: Fix many package build errors Signed-off-by: Jan Lindemann --- make/defs.mk | 8 ++++---- make/make.mk | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/make/defs.mk b/make/defs.mk index 94ae434a..aba4e6fc 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -918,11 +918,11 @@ endif 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)) -else -LIBFLAGS += $(call proj_query, ldflags $(PREREQ_BUILD)) -endif +#else +#LIBFLAGS += $(call proj_query, ldflags $(PREREQ_BUILD)) +#endif #include $(MODDIR)/make/lib-deps.mk diff --git a/make/make.mk b/make/make.mk index d0981c56..b68d07ea 100644 --- a/make/make.mk +++ b/make/make.mk @@ -3,14 +3,14 @@ # contact@jannet.de # $Id$ +MKFILES += $(wildcard project.conf) + include $(MODDIR)/make/defs.mk include $(MODDIR)/make/rules.mk #LOCAL_PKG_CONFIG = $(PROJECT).pc # BUILD_PKG_CONFIG = $(MODDIR)/pkgconfig/$(LOCAL_PKG_CONFIG) -MKFILES += $(wildcard $(PROJECT).conf) - INSTALL_PCKG_DEPS_DIR = $(ENV_PREFIX)$(MODDIR)/make/deps.d ifneq ($(wildcard pckg-deps.mk),) INSTALLED_PKG_MK += $(INSTALL_PCKG_DEPS_DIR)/$(PROJECT).mk