* merged apt--tasks, this brings in the latest changes from apt--mvo as well

[apt.git] / cmdline / makefile

diff --git a/cmdline/makefile b/cmdline/makefile
index c3a4d81d91002f33da5e15bac570867a2fe49c9f..49035be4493c8d08d3a2d1ac63ea4cd13d4418aa 100644 (file)
--- a/cmdline/makefile
+++ b/cmdline/makefile
@@ -8,23 +8,53 @@ include ../buildlib/defaults.mak
 # The apt-cache program
 PROGRAM=apt-cache
 SLIBS = -lapt-pkg
 # The apt-cache program
 PROGRAM=apt-cache
 SLIBS = -lapt-pkg

+LIB_MAKES = apt-pkg/makefile

 SOURCE = apt-cache.cc
 include $(PROGRAM_H)
 
 # The apt-get program
 PROGRAM=apt-get
 SLIBS = -lapt-pkg
 SOURCE = apt-cache.cc
 include $(PROGRAM_H)
 
 # The apt-get program
 PROGRAM=apt-get
 SLIBS = -lapt-pkg

+LIB_MAKES = apt-pkg/makefile

 SOURCE = apt-get.cc acqprogress.cc
 include $(PROGRAM_H)
 
 # The apt-config program
 PROGRAM=apt-config
 SLIBS = -lapt-pkg
 SOURCE = apt-get.cc acqprogress.cc
 include $(PROGRAM_H)
 
 # The apt-config program
 PROGRAM=apt-config
 SLIBS = -lapt-pkg

+LIB_MAKES = apt-pkg/makefile

 SOURCE = apt-config.cc
 include $(PROGRAM_H)
 
 # The apt-cdrom program
 PROGRAM=apt-cdrom
 SLIBS = -lapt-pkg
 SOURCE = apt-config.cc
 include $(PROGRAM_H)
 
 # The apt-cdrom program
 PROGRAM=apt-cdrom
 SLIBS = -lapt-pkg

-SOURCE = apt-cdrom.cc
+LIB_MAKES = apt-pkg/makefile
+SOURCE = apt-cdrom.cc 

 include $(PROGRAM_H)
 include $(PROGRAM_H)

+
+# The apt-sortpkgs program
+PROGRAM=apt-sortpkgs
+SLIBS = -lapt-pkg
+LIB_MAKES = apt-pkg/makefile
+SOURCE = apt-sortpkgs.cc
+include $(PROGRAM_H)
+
+# The apt-extracttemplates program
+PROGRAM=apt-extracttemplates
+SLIBS = -lapt-pkg -lapt-inst
+LIB_MAKES = apt-pkg/makefile
+SOURCE = apt-extracttemplates.cc 
+include $(PROGRAM_H)
+
+# The apt-key program
+SOURCE=apt-key
+TO=$(BIN)
+TARGET=program
+include $(COPY_H)
+
+# The apt-mark program
+SOURCE=apt-mark
+TO=$(BIN)
+TARGET=program
+include $(COPY_H)