Merge branch 'debian/sid' into debian/experimental

[apt.git] / buildlib / makefile.in

diff --git a/buildlib/makefile.in b/buildlib/makefile.in
index a2f8300ce855b37847d1add9c087d763b0dc3c13..66144cfc66193356d15809ecbfef845c7fe06ddd 100644 (file)
--- a/buildlib/makefile.in
+++ b/buildlib/makefile.in
@@ -2,23 +2,45 @@
 
 # This is the build directory make file, it sets the build directory
 # and runs the src makefile.
+ifndef NOISY
+.SILENT:
+endif
+include environment.mak
 
 SRCDIR=@top_srcdir@
-SUBDIRS:=./doc ./bin ./obj ./include/apt-pkg ./include/deity
 BUILD:=$(shell pwd)
 export BUILD
 
 # Chain to the parent make to do the actual building
-.PHONY: headers library clean veryclean all binary program doc
-headers library clean veryclean all binary program doc:
-       $(MAKE) -C $(SRCDIR) $@
+.PHONY: headers library clean veryclean all binary program doc \
+        veryclean/local
+all headers library clean veryclean binary program doc:
+       $(MAKE) -C $(SRCDIR) -f Makefile $@
+
+# Purge everything.
+.PHONY: maintainer-clean dist-clean pristine sanity distclean
+maintainer-clean dist-clean pristine sanity distclean:
+       -rm -rf $(DIRS)
+       -rm -f config.cache config.log config.status environment.mak makefile
        
-# This makes any missing directories
+# Create the required directories and build the shims
+# The configure script fills in below, and then we do the right things..
+# This cannot go in the configure script since the directories have not yet
+# been created.. In any event I like the idea that you can change environment.mak
+# and run make dirs and have the shims updated.
 .PHONY: dirs
-MISSING_DIRS:= $(filter-out $(wildcard $(SUBDIRS)),$(SUBDIRS))
-dirs:
-ifneq ($(words $(MISSING_DIRS)),0)
-       @mkdir  $(MISSING_DIRS)
+dirs: 
+       $(MAKE) -C $(SRCDIR) -f Makefile $@
+ifeq ($(HAVE_STATVFS),yes)
+       @rm -f include/statvfs.h > /dev/null 2>&1
+else
+       @cp -p $(SRCDIR)/buildlib/statvfs.h.in include/statvfs.h
+       ln -sf . include/sys
+endif
+ifeq ($(NEED_SOCKLEN_T_DEFINE),yes)
+       @cp -p $(SRCDIR)/buildlib/netdb.h.in include/netdb.h
 else
-       @echo > /dev/null
-endif  
+       @rm -f include/netdb.h > /dev/null 2>&1
+endif
+       rm -f include/python
+       ln -sf $(PYTHONINCLUDE) include/python