From 2ddc0cbf8d719e000cf8564d43ef52b3c683dd82 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Fri, 5 Jun 2009 17:49:32 +0000 Subject: [PATCH] defs.mk: Downgrade BUILD_HDRDIR definition to default - Make BUILD_HDRDIR conditionally defined - Define BUILD_H and BUILD_HDR equally (TODO: remove one, these are redundant) --- make/defs.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/make/defs.mk b/make/defs.mk index 4ae14fda..27dcfdd1 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -224,13 +224,13 @@ INSTALLED_SYSCFG ?= $(addprefix $(INSTALL_SYSCFGDIR)/,$(SYSCFG_FILES)) # -- HDR # why both SRC_H <-> LOCAL_H? -BUILD_HDRDIR = $(TOPDIR)/include +BUILD_HDRDIR ?= $(TOPDIR)/include LOCAL_H += $(wildcard *.h *.H) SRC_H += $(filter %.h %.H, $(SRC_ALL_CPP)) -BUILD_H += $(patsubst %.h,$(TOPDIR)/include/%.h,$(SRC_H)) +BUILD_H = $(addprefix $(BUILD_HDRDIR)/,$(SRC_H)) +BUILD_HDR = $(addprefix $(BUILD_HDRDIR)/,$(SRC_H)) PREREQ_H += $(foreach dir,$(PREREQ_DIR),$(wildcard $(dir)/*.h)) ALL_H += $(LOCAL_H) $(PREREQ_H) -BUILD_HDR = $(addprefix $(BUILD_HDRDIR)/,$(SRC_H)) INSTALL_HDRDIR ?= $(PREFIX)/include INSTALLED_HDR += $(addprefix $(INSTALL_HDRDIR)/,$(SRC_H))