Merge remote-tracking branch 'mvo/feature/upgrade-with-cmdline' into debian/sid

[apt.git] / cmdline / makefile

diff --git a/cmdline/makefile b/cmdline/makefile
index 07e9eb8ca7c76cfbff0f588c2de0047f068135bf..e77ad5669d62b397c6be3f820b794f2dbdc39b07 100644 (file)
--- a/cmdline/makefile
+++ b/cmdline/makefile
@@ -5,48 +5,41 @@ SUBDIR=cmdline
 # Bring in the default rules
 include ../buildlib/defaults.mak
 
 # Bring in the default rules
 include ../buildlib/defaults.mak
 

+# The apt program
+PROGRAM=apt
+SLIBS = -lapt-pkg -lapt-private $(INTLLIBS)
+LIB_MAKES = apt-pkg/makefile
+SOURCE = apt.cc
+include $(PROGRAM_H)
+

 # The apt-cache program
 PROGRAM=apt-cache
 # The apt-cache program
 PROGRAM=apt-cache

-SLIBS = -lapt-pkg $(INTLLIBS)
+SLIBS = -lapt-pkg -lapt-private $(INTLLIBS)

 LIB_MAKES = apt-pkg/makefile
 SOURCE = apt-cache.cc
 include $(PROGRAM_H)
 
 # The apt-get program
 PROGRAM=apt-get
 LIB_MAKES = apt-pkg/makefile
 SOURCE = apt-cache.cc
 include $(PROGRAM_H)
 
 # The apt-get program
 PROGRAM=apt-get

-SLIBS = -lapt-pkg -lutil $(INTLLIBS)
+SLIBS = -lapt-pkg -lapt-private $(INTLLIBS)

 LIB_MAKES = apt-pkg/makefile
 LIB_MAKES = apt-pkg/makefile

-SOURCE = apt-get.cc acqprogress.cc
+SOURCE = apt-get.cc 

 include $(PROGRAM_H)
 
 # The apt-config program
 PROGRAM=apt-config
 include $(PROGRAM_H)
 
 # The apt-config program
 PROGRAM=apt-config

-SLIBS = -lapt-pkg $(INTLLIBS)
+SLIBS = -lapt-pkg -lapt-private $(INTLLIBS)

 LIB_MAKES = apt-pkg/makefile
 SOURCE = apt-config.cc
 include $(PROGRAM_H)
 
 # The apt-cdrom program
 PROGRAM=apt-cdrom
 LIB_MAKES = apt-pkg/makefile
 SOURCE = apt-config.cc
 include $(PROGRAM_H)
 
 # The apt-cdrom program
 PROGRAM=apt-cdrom

-SLIBS = -lapt-pkg $(INTLLIBS)
+SLIBS = -lapt-pkg -lapt-private $(INTLLIBS)

 LIB_MAKES = apt-pkg/makefile
 SOURCE = apt-cdrom.cc 
 include $(PROGRAM_H)
 
 LIB_MAKES = apt-pkg/makefile
 SOURCE = apt-cdrom.cc 
 include $(PROGRAM_H)
 

-# The apt-sortpkgs program
-PROGRAM=apt-sortpkgs
-SLIBS = -lapt-pkg $(INTLLIBS)
-LIB_MAKES = apt-pkg/makefile
-SOURCE = apt-sortpkgs.cc
-include $(PROGRAM_H)
-
-# The apt-extracttemplates program
-PROGRAM=apt-extracttemplates
-SLIBS = -lapt-pkg -lapt-inst $(INTLLIBS)
-LIB_MAKES = apt-pkg/makefile
-SOURCE = apt-extracttemplates.cc 
-include $(PROGRAM_H)
-

 # The apt-key program
 SOURCE=apt-key
 TO=$(BIN)
 # The apt-key program
 SOURCE=apt-key
 TO=$(BIN)


@@ -55,7 +48,7 @@ include $(COPY_H)
 
 # The apt-mark program
 PROGRAM=apt-mark
 
 # The apt-mark program
 PROGRAM=apt-mark

-SLIBS = -lapt-pkg $(INTLLIBS)
+SLIBS = -lapt-pkg -lapt-private $(INTLLIBS)

 LIB_MAKES = apt-pkg/makefile
 SOURCE = apt-mark.cc
 include $(PROGRAM_H)
 LIB_MAKES = apt-pkg/makefile
 SOURCE = apt-mark.cc
 include $(PROGRAM_H)


@@ -66,6 +59,25 @@ include $(PROGRAM_H)
 #TARGET=program
 #include $(COPY_H)
 
 #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)
+LIB_MAKES = apt-pkg/makefile
+SOURCE = apt-sortpkgs.cc
+include $(PROGRAM_H)
+
+# The apt-extracttemplates program
+PROGRAM=apt-extracttemplates
+SLIBS = -lapt-pkg -lapt-inst $(INTLLIBS)
+LIB_MAKES = apt-pkg/makefile
+SOURCE = apt-extracttemplates.cc 
+include $(PROGRAM_H)
+

 # The internal solver acting as an external
 PROGRAM=apt-internal-solver
 SLIBS = -lapt-pkg $(INTLLIBS)
 # The internal solver acting as an external
 PROGRAM=apt-internal-solver
 SLIBS = -lapt-pkg $(INTLLIBS)