merged from debian-sid

[apt.git] / buildlib / defaults.mak

diff --git a/buildlib/defaults.mak b/buildlib/defaults.mak
index 464e82ff305def4de5a4f7d42147af37d95bc5e9..a171522d55c5e59641180aceaabd450a731928f2 100644 (file)
--- a/buildlib/defaults.mak
+++ b/buildlib/defaults.mak
@@ -36,15 +36,29 @@ endif
 ifdef BUILD
 BUILD_POSSIBLE := $(BUILD) $(BASE)/$(BUILD)
 else
 ifdef BUILD
 BUILD_POSSIBLE := $(BUILD) $(BASE)/$(BUILD)
 else

-BUILD_POSSIBLE := $(BASE) $(BASE)/build
+BUILD_POSSIBLE := $(BASE) $(BASE)/build-$(shell uname -m) $(BASE)/build

 endif
 
 BUILDX:= $(foreach i,$(BUILD_POSSIBLE),$(wildcard $(i)/environment.mak*))
 endif
 
 BUILDX:= $(foreach i,$(BUILD_POSSIBLE),$(wildcard $(i)/environment.mak*))

-BUILDX:= $(patsubst %/,%,$(firstword $(dir $(BUILDX))))

 
 ifeq ($(words $(BUILDX)),0)
 
 ifeq ($(words $(BUILDX)),0)

-error-all:
-       echo Can't find the build directory in $(BUILD_POSSIBLE) -- use BUILD=
+
+# 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 not 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
 
 override BUILD := $(BUILDX)
 endif
 
 override BUILD := $(BUILDX)


@@ -56,18 +70,33 @@ LIB := $(BIN)
 OBJ := $(BUILD)/obj/$(SUBDIR)
 DEP := $(OBJ)
 DOC := $(BUILD)/docs
 OBJ := $(BUILD)/obj/$(SUBDIR)
 DEP := $(OBJ)
 DOC := $(BUILD)/docs

+PO := $(BUILD)/po
+LOCALE := $(BUILD)/locale
+PO_DOMAINS := $(BUILD)/po/domains

 
 # 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

+PYTHON_H = $(BASE)/buildlib/python.mak

 COPY_H = $(BASE)/buildlib/copy.mak
 COPY_H = $(BASE)/buildlib/copy.mak

+YODL_MANPAGE_H = $(BASE)/buildlib/yodl_manpage.mak
+SGML_MANPAGE_H = $(BASE)/buildlib/sgml_manpage.mak
+XML_MANPAGE_H = $(BASE)/buildlib/xml_manpage.mak
+FAIL_H = $(BASE)/buildlib/fail.mak
+PODOMAIN_H = $(BASE)/buildlib/podomain.mak
+
+include $(BUILD)/environment.mak

 
 ifdef STATICLIBS
 LIBRARY_H += $(BASE)/buildlib/staticlibrary.mak
 endif
 
 
 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
 # may be located in subdrictories of the source dir. 
 # Source location control
 # SUBDIRS specifies sub components of the module that
 # may be located in subdrictories of the source dir. 


@@ -81,13 +110,15 @@ SUBDIRS+=
 HEADER_TARGETDIRS+=
 
 # Options
 HEADER_TARGETDIRS+=
 
 # Options

-include $(BUILD)/environment.mak

 CPPFLAGS+= -I$(INCLUDE)
 LDFLAGS+= -L$(LIB)
 
 CPPFLAGS+= -I$(INCLUDE)
 LDFLAGS+= -L$(LIB)
 

+# Directors to create
+MKDIRS := $(BIN) 
+

 # Phony rules. Other things hook these by appending to the dependency
 # list
 # Phony rules. Other things hook these by appending to the dependency
 # list

-.PHONY: headers library clean veryclean all binary program doc
+.PHONY: headers library clean veryclean all binary program doc dirs

 .PHONY: maintainer-clean dist-clean distclean pristine sanity
 all: binary doc
 binary: library program
 .PHONY: maintainer-clean dist-clean distclean pristine sanity
 all: binary doc
 binary: library program


@@ -98,7 +129,9 @@ veryclean:
        echo Very Clean done for $(SUBDIR)
 clean:
        echo Clean done for $(SUBDIR)
        echo Very Clean done for $(SUBDIR)
 clean:
        echo Clean done for $(SUBDIR)

-       
+dirs:
+       mkdir -p $(patsubst %/,%,$(sort $(MKDIRS)))
+

 # 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


@@ -112,9 +145,15 @@ $(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 GCC3DEP
+DFILE = $(DEP)/$(basename $(@F)).d
+else
+DFILE = $(basename $(@F)).d
+endif

 ifdef INLINEDEPFLAG
  define DoDep
 ifdef INLINEDEPFLAG
  define DoDep

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

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


@@ -129,3 +168,18 @@ else
   endef
  endif
 endif  
   endef
  endif
 endif  

+
+# Automatic -j support
+ifeq ($(NUM_PROCS),1)
+  PARALLEL_RUN=no
+endif
+
+# mvo: commented out, lead to build failures in the arch-build target
+#ifndef PARALLEL_RUN
+# PARALLEL_RUN=yes
+# .EXPORT: PARALLEL_RUN
+# # handle recursion
+# ifneq ($(NUM_PROCS),)
+#  MAKEFLAGS += -j $(NUM_PROCS)
+# endif
+#endif