add export-dir and debian-branch

[apt.git] / cmdline / makefile

diff --git a/cmdline/makefile b/cmdline/makefile
index 3260e375b7ef95236dad2992340a23fb6232fc5a..f3712232af9e2ce3671b68983559715813305871 100644 (file)
--- a/cmdline/makefile
+++ b/cmdline/makefile
@@ -33,6 +33,30 @@ LIB_MAKES = apt-pkg/makefile
 SOURCE = apt-cdrom.cc 
 include $(PROGRAM_H)
 
 SOURCE = apt-cdrom.cc 
 include $(PROGRAM_H)
 

+# The apt-key program
+SOURCE=apt-key
+TO=$(BIN)
+TARGET=program
+include $(COPY_H)
+
+# The apt-mark program
+PROGRAM=apt-mark
+SLIBS = -lapt-pkg $(INTLLIBS)
+LIB_MAKES = apt-pkg/makefile
+SOURCE = apt-mark.cc
+include $(PROGRAM_H)
+
+# The apt-report-mirror-failure program
+#SOURCE=apt-report-mirror-failure
+#TO=$(BIN)
+#TARGET=program
+#include $(COPY_H)
+
+#
+# the following programs are shipped in apt-utils
+#
+APT_DOMAIN:=apt-utils
+

 # The apt-sortpkgs program
 PROGRAM=apt-sortpkgs
 SLIBS = -lapt-pkg $(INTLLIBS)
 # The apt-sortpkgs program
 PROGRAM=apt-sortpkgs
 SLIBS = -lapt-pkg $(INTLLIBS)


@@ -47,14 +71,16 @@ LIB_MAKES = apt-pkg/makefile
 SOURCE = apt-extracttemplates.cc 
 include $(PROGRAM_H)
 
 SOURCE = apt-extracttemplates.cc 
 include $(PROGRAM_H)
 

-# The apt-key program
-SOURCE=apt-key
-TO=$(BIN)
-TARGET=program
-include $(COPY_H)
+# The internal solver acting as an external
+PROGRAM=apt-internal-solver
+SLIBS = -lapt-pkg $(INTLLIBS)
+LIB_MAKES = apt-pkg/makefile
+SOURCE = apt-internal-solver.cc
+include $(PROGRAM_H)

 
 

-# The apt-mark program
-SOURCE=apt-mark
-TO=$(BIN)
-TARGET=program
-include $(COPY_H)
+# This just dumps out the state
+PROGRAM=apt-dump-solver
+SLIBS = -lapt-pkg $(INTLLIBS)
+LIB_MAKES = apt-pkg/makefile
+SOURCE = apt-dump-solver.cc
+include $(PROGRAM_H)