s/make/$(MAKE)/

[apt.git] / buildlib / defaults.mak

diff --git a/buildlib/defaults.mak b/buildlib/defaults.mak
index e9e7546fe9ee1aedfdb2bc4fc3d586fcbfa8057e..6e504390cf84110da590404bf01a041060ab966f 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,36 +28,66 @@
 # 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-$(shell uname -m) $(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*))
+
+ifeq ($(words $(BUILDX)),0)

 
 

-ifeq ($(words $(BUILD)),0)
-error-all:
+# Check for a busted wildcard function. We use this function in several 
+# places, it must work.
+ifeq ($(words $(wildcard *)),0)
+error-all/environment.mak:
+       echo You have a broken version of GNU Make - upgrade.
+       error-out-and-die
+else
+error-all/environment.mak:

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

+       error-out-and-die
+endif
+
+# Force include below to come to the error target
+BUILDX := error-all
+else
+BUILDX:= $(patsubst %/,%,$(firstword $(dir $(BUILDX))))

 endif
 
 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
 DEBIANDOC_H = $(BASE)/buildlib/debiandoc.mak
 MANPAGE_H = $(BASE)/buildlib/manpage.mak
 PROGRAM_H = $(BASE)/buildlib/program.mak
 
 # Module types
 LIBRARY_H = $(BASE)/buildlib/library.mak
 DEBIANDOC_H = $(BASE)/buildlib/debiandoc.mak
 MANPAGE_H = $(BASE)/buildlib/manpage.mak
 PROGRAM_H = $(BASE)/buildlib/program.mak

+COPY_H = $(BASE)/buildlib/copy.mak
+YODL_MANPAGE_H = $(BASE)/buildlib/yodl_manpage.mak
+
+include $(BUILD)/environment.mak
+
+ifdef STATICLIBS
+LIBRARY_H += $(BASE)/buildlib/staticlibrary.mak
+endif
+
+ifdef ONLYSTATICLIBS
+LIBRARY_H = $(BASE)/buildlib/staticlibrary.mak
+endif

 
 # Source location control
 # SUBDIRS specifies sub components of the module that
 
 # Source location control
 # SUBDIRS specifies sub components of the module that


@@ -70,18 +102,23 @@ SUBDIRS+=
 HEADER_TARGETDIRS+=
 
 # Options
 HEADER_TARGETDIRS+=
 
 # Options

-include $(BUILD)/environment.mak

 CPPFLAGS+= -I$(INCLUDE)
 LDFLAGS+= -L$(LIB)
 
 # Phony rules. Other things hook these by appending to the dependency
 # list
 .PHONY: headers library clean veryclean all binary program doc
 CPPFLAGS+= -I$(INCLUDE)
 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: 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:
 
 headers library clean veryclean program:
 

+veryclean:
+       echo Very Clean done for $(SUBDIR)
+clean:
+       echo Clean done for $(SUBDIR)
+       

 # Header file control. We want all published interface headers to go
 # into the build directory from thier source dirs. We setup some
 # search paths here
 # Header file control. We want all published interface headers to go
 # into the build directory from thier source dirs. We setup some
 # search paths here


@@ -95,16 +132,16 @@ $(INCLUDE)/%.h $(addprefix $(INCLUDE)/,$(addsuffix /%.h,$(HEADER_TARGETDIRS))) :
 # makedep program that can be called after compiling, that's illistrated
 # by the DEPFLAG case.
 # Compile rules are expected to call this macro after calling the compiler
 # makedep program that can be called after compiling, that's illistrated
 # by the DEPFLAG case.
 # Compile rules are expected to call this macro after calling the compiler

- ifdef INLINEDEPFLAG
+ifdef INLINEDEPFLAG

  define DoDep
  define DoDep

-       sed -e "1s/.*:/$(subst /,\\/,$@):/" $(basename $(@F)).d > $(DEP)/$(basename $(@F)).d
+       sed -e "1s/.*:/$(subst /,\\/,$@):/" $(basename $(@F)).d > $(DEP)/$(@F).d

        -rm -f $(basename $(@F)).d
  endef
 else
  ifdef DEPFLAG
   define DoDep
        $(CXX) $(DEPFLAG) $(CPPFLAGS) -o $@ $<
        -rm -f $(basename $(@F)).d
  endef
 else
  ifdef DEPFLAG
   define DoDep
        $(CXX) $(DEPFLAG) $(CPPFLAGS) -o $@ $<

-       sed -e "1s/.*:/$(subst /,\\/,$@):/" $(basename $(@F)).d > $(DEP)/$(basename $(@F)).d
+       sed -e "1s/.*:/$(subst /,\\/,$@):/" $(basename $(@F)).d > $(DEP)/$(@F).d

        -rm -f $(basename $(@F)).d
   endef
  else
        -rm -f $(basename $(@F)).d
   endef
  else


@@ -112,3 +149,17 @@ else
   endef
  endif
 endif  
   endef
  endif
 endif  

+
+# Automatic -j support
+ifeq ($(NUM_PROCS),1)
+  PARALLEL_RUN=no
+endif
+
+ifndef PARALLEL_RUN
+ PARALLEL_RUN=yes
+ .EXPORT: PARALLEL_RUN
+ # handle recursion
+ ifneq ($(NUM_PROCS),)
+  MAKEFLAGS += -j $(NUM_PROCS)
+ endif
+endif