* merged from apt--mvo

[apt.git] / methods / makefile

diff --git a/methods/makefile b/methods/makefile
index dcdb0dc46f0d5bacca90f31bf5f5e7c2adc1e6bb..d0b5a28c0210cadb478b2cb78a315b11943c2891 100644 (file)
--- a/methods/makefile
+++ b/methods/makefile
@@ -7,8 +7,8 @@ include ../buildlib/defaults.mak
 BIN := $(BIN)/methods
 
 # FIXME..
-LIB_APT_PKG_MAJOR = 3.3
-DOMAIN := libapt-pkg$(LIB_APT_PKG_MAJOR)
+LIB_APT_PKG_MAJOR = 3.11
+APT_DOMAIN := libapt-pkg$(LIB_APT_PKG_MAJOR)
 
 # The file method
 PROGRAM=file
@@ -31,6 +31,13 @@ LIB_MAKES = apt-pkg/makefile
 SOURCE = gzip.cc
 include $(PROGRAM_H)
 
+# The gpgv method
+PROGRAM=gpgv
+SLIBS = -lapt-pkg
+LIB_MAKES = apt-pkg/makefile
+SOURCE = gpgv.cc
+include $(PROGRAM_H)
+
 # The cdrom method
 PROGRAM=cdrom
 SLIBS = -lapt-pkg 
@@ -52,6 +59,13 @@ LIB_MAKES = apt-pkg/makefile
 SOURCE = ftp.cc rfc2553emu.cc connect.cc
 include $(PROGRAM_H)
 
+# The rred method
+PROGRAM=rred
+SLIBS = -lapt-pkg $(SOCKETLIBS)
+LIB_MAKES = apt-pkg/makefile
+SOURCE = rred.cc
+include $(PROGRAM_H)
+
 # The rsh method
 PROGRAM=rsh
 SLIBS = -lapt-pkg
@@ -60,7 +74,7 @@ SOURCE = rsh.cc
 include $(PROGRAM_H)
 
 # SSH and vzip2 method symlink
-all: $(BIN)/ssh $(BIN)/bzip2
+binary: $(BIN)/ssh $(BIN)/bzip2
 veryclean: clean-$(BIN)/ssh clean-$(BIN)/bzip2
 $(BIN)/ssh:
        echo "Installing ssh method link"