X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/101030ab14d60497fcba5b1c2866d52fc5ac4780..27dcb3155d74e5f66c86e18aa008ded8b2dd1367:/buildlib/defaults.mak

diff --git a/buildlib/defaults.mak b/buildlib/defaults.mak
index 17a6b8ac8..a171522d5 100644
--- a/buildlib/defaults.mak
+++ b/buildlib/defaults.mak
@@ -48,9 +48,11 @@ ifeq ($(words $(BUILDX)),0)
 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 not find the build directory in $(BUILD_POSSIBLE) -- use BUILD=
+	error-out-and-die
 endif
 
 # Force include below to come to the error target
@@ -68,14 +70,24 @@ LIB := $(BIN)
 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
+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
@@ -98,13 +110,15 @@ SUBDIRS+=
 HEADER_TARGETDIRS+=
 
 # Options
-include $(BUILD)/environment.mak
 CPPFLAGS+= -I$(INCLUDE)
 LDFLAGS+= -L$(LIB)
 
+# Directors to create
+MKDIRS := $(BIN) 
+
 # 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
@@ -115,7 +129,9 @@ 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
@@ -129,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
+ifdef GCC3DEP
+DFILE = $(DEP)/$(basename $(@F)).d
+else
+DFILE = $(basename $(@F)).d
+endif
 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
@@ -147,15 +169,17 @@ else
  endif
 endif	
 
+# Automatic -j support
 ifeq ($(NUM_PROCS),1)
   PARALLEL_RUN=no
 endif
 
-ifndef PARALLEL_RUN
- PARALLEL_RUN=yes
- .EXPORT: PARALLEL_RUN
- ifneq ($(NUM_PROCS),)
-# handle recursion
-  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