Multiprotocol connect

[ntk/apt.git] / buildlib / defaults.mak

diff --git a/buildlib/defaults.mak b/buildlib/defaults.mak
index c6a2c15..d04b67f 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'
-# 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
@@ -26,13 +28,15 @@
 # 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
+BUILD_POSSIBLE := $(BASE) $(BASE)/build-$(shell uname -m) $(BASE)/build
 endif
 
 BUILDX:= $(foreach i,$(BUILD_POSSIBLE),$(wildcard $(i)/environment.mak*))
@@ -51,13 +55,23 @@ 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
+COPY_H = $(BASE)/buildlib/copy.mak
+YODL_MANPAGE_H = $(BASE)/buildlib/yodl_manpage.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
@@ -85,6 +99,11 @@ binary: library program
 maintainer-clean dist-clean distclean pristine sanity: veryclean
 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
@@ -100,14 +119,14 @@ $(INCLUDE)/%.h $(addprefix $(INCLUDE)/,$(addsuffix /%.h,$(HEADER_TARGETDIRS))) :
 # Compile rules are expected to call this macro after calling the compiler
 ifdef INLINEDEPFLAG
  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 $@ $<
-       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