* merged from Christian Perrier:

[apt.git] / buildlib / defaults.mak

diff --git a/buildlib/defaults.mak b/buildlib/defaults.mak
index 50f27de5a8ad17a6c1e1d6582f4dceee40d77ceb..a171522d55c5e59641180aceaabd450a731928f2 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,23 +28,74 @@
 # 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:
+endif
+
+# Search for the build directory
+ifdef BUILD
+BUILD_POSSIBLE := $(BUILD) $(BASE)/$(BUILD)
+else
+BUILD_POSSIBLE := $(BASE) $(BASE)/build-$(shell uname -m) $(BASE)/build
+endif
+
+BUILDX:= $(foreach i,$(BUILD_POSSIBLE),$(wildcard $(i)/environment.mak*))
+
+ifeq ($(words $(BUILDX)),0)

 
 

-ifndef BUILD
-BUILD=$(BASE)/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
 
 endif
 

+override BUILD := $(BUILDX)
+

 # Base definitions
 INCLUDE := $(BUILD)/include
 BIN := $(BUILD)/bin
 LIB := $(BIN)
 # Base definitions
 INCLUDE := $(BUILD)/include
 BIN := $(BUILD)/bin
 LIB := $(BIN)

-OBJ := $(BUILD)/obj
+OBJ := $(BUILD)/obj/$(SUBDIR)

 DEP := $(OBJ)
 DEP := $(OBJ)

-DOC := $(BUILD)/doc
+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
 
 # 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
+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 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


@@ -57,24 +110,28 @@ SUBDIRS+=
 HEADER_TARGETDIRS+=
 
 # Options
 HEADER_TARGETDIRS+=
 
 # Options

-CXX = c++
-CC = cc

 CPPFLAGS+= -I$(INCLUDE)
 CPPFLAGS+= -I$(INCLUDE)

-CXXFLAGS+= -Wall -g -fno-implicit-templates  -fno-exceptions
-PICFLAGS+= -fPIC -DPIC
-LFLAGS+= 
-INLINEDEPFLAG = -MD
-DEBIANDOC_HTML = yes
-DEBIANDOC_TEXT = yes
+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
 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)
+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


@@ -88,16 +145,22 @@ $(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 GCC3DEP
+DFILE = $(DEP)/$(basename $(@F)).d
+else
+DFILE = $(basename $(@F)).d
+endif
+ifdef INLINEDEPFLAG

  define DoDep
  define DoDep

-       sed -e "1s/.*:/$(subst /,\\/,$@):/" $(basename $(@F)).d > $(DEP)/$(basename $(@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
  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


@@ -105,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