Merge apt--mvo--0

[apt.git] / cmdline / makefile

diff --git a/cmdline/makefile b/cmdline/makefile
index d521c58db2ac1954de3e54b6227261330a978753..882a0e1b564a9d8125225e6a92b1f961a874392b 100644 (file)
--- a/cmdline/makefile
+++ b/cmdline/makefile
@@ -1,14 +1,54 @@
 # -*- make -*-
 BASE=..
+SUBDIR=cmdline
 
 # Bring in the default rules
 include ../buildlib/defaults.mak
 
-# The library name
+# The apt-cache program
 PROGRAM=apt-cache
-SLIBS = -lapt-pkg 
-
-# Source code for the contributed non-core things
+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
+LIB_MAKES = apt-pkg/makefile
+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
+LIB_MAKES = apt-pkg/makefile
+SOURCE = apt-cdrom.cc 
 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)