JoeyH's dpkg::preconfig not working.

[apt.git] / Makefile

diff --git a/Makefile b/Makefile
index 33f40750545f7ccd61ae14d129b3cff03f7d7b43..2a88c1bb1aff4c9b939b9777645dea01e19c9ff8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,37 +6,28 @@ ifndef NOISY
 .SILENT:
 endif
 
 .SILENT:
 endif
 

+.PHONY: default
+default: startup all
+

 .PHONY: headers library clean veryclean all binary program doc
 .PHONY: headers library clean veryclean all binary program doc

-all headers library clean veryclean binary program doc:
+all headers library clean veryclean binary program doc dirs:

        $(MAKE) -C apt-pkg $@
        $(MAKE) -C apt-pkg $@

+       $(MAKE) -C apt-inst $@

        $(MAKE) -C methods $@
        $(MAKE) -C methods $@

-#      $(MAKE) -C methods/ftp $@

        $(MAKE) -C cmdline $@
        $(MAKE) -C cmdline $@

-       $(MAKE) -C deity $@
-       $(MAKE) -C gui $@
+       $(MAKE) -C ftparchive $@
+       $(MAKE) -C dselect $@

        $(MAKE) -C doc $@
 
        $(MAKE) -C doc $@
 

+# Some very common aliases

 .PHONY: maintainer-clean dist-clean distclean pristine sanity 
 maintainer-clean dist-clean distclean pristine sanity: veryclean
 
 .PHONY: maintainer-clean dist-clean distclean pristine sanity 
 maintainer-clean dist-clean distclean pristine sanity: veryclean
 

-

 # The startup target builds the necessary configure scripts. It should
 # be used after a CVS checkout.
 # The startup target builds the necessary configure scripts. It should
 # be used after a CVS checkout.

-.PHONY: startup
-BUILD=build
-CONVERTED=$(BUILD)/environment.mak $(BUILD)/include/config.h $(BUILD)/makefile
-startup: configure $(CONVERTED)
-
-configure: aclocal.m4 configure.in
-       autoconf        
-
-aclocal.m4:
-       aclocal -I buildlib
-
-$(BUILD)/config.status: configure
-       test -e $(BUILD) || mkdir $(BUILD)      
-       (HERE=`pwd`; cd $(BUILD) && $$HERE/configure)
-$(BUILD)/include/config.h: buildlib/config.h.in
-$(BUILD)/environment.mak: buildlib/environment.mak.in
-$(CONVERTED): $(BUILD)/config.status
-       (cd $(BUILD) && ./config.status)
+CONVERTED=environment.mak include/config.h include/apti18n.h makefile
+include buildlib/configure.mak
+$(BUILDDIR)/include/config.h: buildlib/config.h.in
+$(BUILDDIR)/include/apti18n.h: buildlib/apti18n.h.in
+$(BUILDDIR)/environment.mak: buildlib/environment.mak.in
+$(BUILDDIR)/makefile: buildlib/makefile.in