More fixes

[ntk/apt.git] / Makefile

diff --git a/Makefile b/Makefile
index af88270..88a451c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -10,23 +10,23 @@ endif
 all headers library clean veryclean binary program doc:
        $(MAKE) -C apt-pkg $@
        $(MAKE) -C methods $@
-       $(MAKE) -C methods/ftp $@
+#      $(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
-startup: configure
-
-configure: aclocal.m4 configure.in
-       autoconf        
-
-aclocal.m4:
-       aclocal -I buildlib
+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