* merged the install-recommends branch

[apt.git] / methods / makefile

diff --git a/methods/makefile b/methods/makefile
index dfab23ab2a88f3dc064323e5ec2eba8a4ac64088..5bd05eae106f5e62c15c70e15a45eec117445b7a 100644 (file)
--- a/methods/makefile
+++ b/methods/makefile
@@ -6,6 +6,10 @@ SUBDIR=methods
 include ../buildlib/defaults.mak
 BIN := $(BIN)/methods
 
+# FIXME..
+LIB_APT_PKG_MAJOR = 4.2
+APT_DOMAIN := libapt-pkg$(LIB_APT_PKG_MAJOR)
+
 # The file method
 PROGRAM=file
 SLIBS = -lapt-pkg 
@@ -27,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 
@@ -48,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
@@ -55,11 +73,17 @@ LIB_MAKES = apt-pkg/makefile
 SOURCE = rsh.cc
 include $(PROGRAM_H)
 
-# SSH method symlink
-all: $(BIN)/ssh
-veryclean: clean-$(BIN)/ssh    
+# SSH and vzip2 method symlink
+binary: $(BIN)/ssh $(BIN)/bzip2
+veryclean: clean-$(BIN)/ssh clean-$(BIN)/bzip2
 $(BIN)/ssh:
        echo "Installing ssh method link"
        ln -fs rsh $(BIN)/ssh
 clean-$(BIN)/ssh:
-       rm $(BIN)/ssh
+       -rm $(BIN)/ssh
+
+$(BIN)/bzip2:
+       echo "Installing bzip2 method link"
+       ln -fs gzip $(BIN)/bzip2
+clean-$(BIN)/bzip2:
+       -rm $(BIN)/bzip2