merged typo fixes from david

[apt.git] / buildlib / makefile.in

diff --git a/buildlib/makefile.in b/buildlib/makefile.in
index 2ea7e63d5f3741f1bd7bcd5d43cec2b0b9d76df2..756565f40dca63d6041d2a1b7ca0b5e1702111d4 100644 (file)
--- a/buildlib/makefile.in
+++ b/buildlib/makefile.in
@@ -2,26 +2,50 @@
 
 # This is the build directory make file, it sets the build directory
 # and runs the src makefile.
 
 # This is the build directory make file, it sets the build directory
 # and runs the src makefile.

+ifndef NOISY

 .SILENT:
 .SILENT:

+endif
+include environment.mak

 
 SRCDIR=@top_srcdir@
 
 SRCDIR=@top_srcdir@

-SUBDIRS:=./doc ./bin ./bin/methods ./obj ./include/apt-pkg ./include/deity
-SUBDIRS+=./obj/docs ./obj/apt-pkg ./obj/deity ./obj/gui ./obj/cmdline \
-       ./obj/test ./obj/methods ./obj/methods/ftp

 BUILD:=$(shell pwd)
 export BUILD
 
 # Chain to the parent make to do the actual building
 BUILD:=$(shell pwd)
 export BUILD
 
 # Chain to the parent make to do the actual building

-.PHONY: headers library clean veryclean all binary program doc
+.PHONY: headers library clean veryclean all binary program doc \
+        veryclean/local

 all headers library clean veryclean binary program doc:
        $(MAKE) -C $(SRCDIR) -f Makefile $@
 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
 .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_C9X),yes)
+       @rm -f include/inttypes.h > /dev/null 2>&1
+else
+       @cp -p $(SRCDIR)/buildlib/inttypes.h.in include/inttypes.h
+endif
+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
 else

-       @echo > /dev/null
-endif  
+       @rm -f include/netdb.h > /dev/null 2>&1
+endif
+       rm -f include/python
+       ln -sf $(PYTHONINCLUDE) include/python