X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/2c618e31b932f5c583bae5f144bef8035e68cb22..30d3bf59b326d61373a5802906eaa53ab0d81fb8:/Makefile

diff --git a/Makefile b/Makefile
index 33f407505..88a451c93 100644
--- a/Makefile
+++ b/Makefile
@@ -12,31 +12,21 @@ all headers library clean veryclean binary program doc:
 	$(MAKE) -C methods $@
 #	$(MAKE) -C methods/ftp $@
 	$(MAKE) -C cmdline $@
+	$(MAKE) -C dselect $@
+ifdef GUI	
 	$(MAKE) -C deity $@
 	$(MAKE) -C gui $@
+endif
 	$(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
+include buildlib/configure.mak
+$(BUILDDIR)/include/config.h: buildlib/config.h.in
+$(BUILDDIR)/environment.mak: buildlib/environment.mak.in
+$(BUILDDIR)/makefile: buildlib/makefile.in