* doc/examples/configure-index:

[apt.git] / buildlib / defaults.mak

diff --git a/buildlib/defaults.mak b/buildlib/defaults.mak
index 37ee9f830d4a284e5b85970988159bb6d0354b87..a171522d55c5e59641180aceaabd450a731928f2 100644 (file)
--- a/buildlib/defaults.mak
+++ b/buildlib/defaults.mak
@@ -70,6 +70,9 @@ 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
 
 # Module types
 LIBRARY_H = $(BASE)/buildlib/library.mak


@@ -80,9 +83,11 @@ 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
 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
 FAIL_H = $(BASE)/buildlib/fail.mak

+PODOMAIN_H = $(BASE)/buildlib/podomain.mak

 
 

-include $(wildcard $(BUILD)/environment.*mak)
+include $(BUILD)/environment.mak

 
 ifdef STATICLIBS
 LIBRARY_H += $(BASE)/buildlib/staticlibrary.mak
 
 ifdef STATICLIBS
 LIBRARY_H += $(BASE)/buildlib/staticlibrary.mak


@@ -109,7 +114,7 @@ CPPFLAGS+= -I$(INCLUDE)
 LDFLAGS+= -L$(LIB)
 
 # Directors to create
 LDFLAGS+= -L$(LIB)
 
 # Directors to create

-MKDIRS := $(BIN)
+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


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


@@ -163,11 +174,12 @@ ifeq ($(NUM_PROCS),1)
   PARALLEL_RUN=no
 endif
 
   PARALLEL_RUN=no
 endif
 

-ifndef PARALLEL_RUN
- PARALLEL_RUN=yes
- .EXPORT: PARALLEL_RUN
- # handle recursion
- ifneq ($(NUM_PROCS),)
-  MAKEFLAGS += -j $(NUM_PROCS)
- endif
-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