More informative essential warning

[apt.git] / Makefile

diff --git a/Makefile b/Makefile
index 33f40750545f7ccd61ae14d129b3cff03f7d7b43..b10011873bab307e6b94b5733dd16ea711ef6d57 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -16,27 +16,13 @@ all headers library clean veryclean binary program doc:
        $(MAKE) -C gui $@
        $(MAKE) -C doc $@
 
+# Some very common aliases
 .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.
-.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 makefile
+$(BUILDDIR)/include/config.h: buildlib/config.h.in
+$(BUILDDIR)/environment.mak: buildlib/environment.mak.in
+include buildlib/configure.mak