Configuration fragment

[apt.git] / buildlib / defaults.mak

diff --git a/buildlib/defaults.mak b/buildlib/defaults.mak
index a70d4acd857c01d6c77db9b42b6c198876928af6..549be5385169ad51a4eaeb668c0661752a3f608d 100644 (file)
--- a/buildlib/defaults.mak
+++ b/buildlib/defaults.mak
@@ -18,7 +18,9 @@
 # and then within the rule $(@F) gets back $(LOCAL)! Other rules will
 # have to use some other mechanism (filter perhaps?) The reason such
 # lengths are used is so that each directory can contain several 'instances'
 # and then within the rule $(@F) gets back $(LOCAL)! Other rules will
 # have to use some other mechanism (filter perhaps?) The reason such
 # lengths are used is so that each directory can contain several 'instances'

-# of any given module
+# of any given module. I notice that the very latest gmake has the concept
+# of local variables for rules. It is possible this feature in conjunction
+# with the generated names will provide a very powerfull solution indeed!

 
 # A build directory is used by default, all generated items get put into
 # there. However unlike automake this is not done with a VPATH build
 
 # A build directory is used by default, all generated items get put into
 # there. However unlike automake this is not done with a VPATH build


@@ -26,30 +28,34 @@
 # but by explicly setting the BUILD variable. Make is invoked from
 # within the source itself which is much more compatible with compilation
 # environments.
 # but by explicly setting the BUILD variable. Make is invoked from
 # within the source itself which is much more compatible with compilation
 # environments.

+ifndef NOISY

 .SILENT:
 .SILENT:

+endif

 
 # Search for the build directory
 ifdef BUILD
 
 # Search for the build directory
 ifdef BUILD

-BUILD_POSSIBLE = $(BUILD)
+BUILD_POSSIBLE := $(BUILD) $(BASE)/$(BUILD)

 else
 else

-BUILD_POSSIBLE = $(BASE) $(BASE)/build
+BUILD_POSSIBLE := $(BASE) $(BASE)/build

 endif
 
 endif
 

-BUILD:= $(foreach i,$(BUILD_POSSIBLE),$(wildcard $(i)/environment.mak))
-BUILD:= $(patsubst %/,%,$(firstword $(dir $(BUILD))))
+BUILDX:= $(foreach i,$(BUILD_POSSIBLE),$(wildcard $(i)/environment.mak*))
+BUILDX:= $(patsubst %/,%,$(firstword $(dir $(BUILDX))))

 
 

-ifeq ($(words $(BUILD)),0)
+ifeq ($(words $(BUILDX)),0)

 error-all:
        echo Can't find the build directory in $(BUILD_POSSIBLE) -- use BUILD=
 endif
 
 error-all:
        echo Can't find the build directory in $(BUILD_POSSIBLE) -- use BUILD=
 endif
 

+override BUILD := $(BUILDX)
+

 # Base definitions
 INCLUDE := $(BUILD)/include
 BIN := $(BUILD)/bin
 LIB := $(BIN)
 OBJ := $(BUILD)/obj/$(SUBDIR)
 DEP := $(OBJ)
 # Base definitions
 INCLUDE := $(BUILD)/include
 BIN := $(BUILD)/bin
 LIB := $(BIN)
 OBJ := $(BUILD)/obj/$(SUBDIR)
 DEP := $(OBJ)

-DOC := $(BUILD)/doc
+DOC := $(BUILD)/docs

 
 # Module types
 LIBRARY_H = $(BASE)/buildlib/library.mak
 
 # Module types
 LIBRARY_H = $(BASE)/buildlib/library.mak


@@ -77,9 +83,10 @@ LDFLAGS+= -L$(LIB)
 # Phony rules. Other things hook these by appending to the dependency
 # list
 .PHONY: headers library clean veryclean all binary program doc
 # Phony rules. Other things hook these by appending to the dependency
 # list
 .PHONY: headers library clean veryclean all binary program doc

+.PHONY: maintainer-clean dist-clean distclean pristine sanity

 all: binary doc
 binary: library program
 all: binary doc
 binary: library program

-maintainer-clean dist-clean: veryclean
+maintainer-clean dist-clean distclean pristine sanity: veryclean

 headers library clean veryclean program:
 
 # Header file control. We want all published interface headers to go
 headers library clean veryclean program:
 
 # Header file control. We want all published interface headers to go