Corrections for object lifetime

[apt.git] / methods / makefile

diff --git a/methods/makefile b/methods/makefile
index 2cfc15cae53b5f1a3bb461ca9d629d9a97b6d9da..80f7492558ac5f02f5b9405c6b4813e95cd955dc 100644 (file)
--- a/methods/makefile
+++ b/methods/makefile
@@ -36,14 +36,36 @@ include $(PROGRAM_H)
 
 # The http method
 PROGRAM=http
-SLIBS = -lapt-pkg 
+SLIBS = -lapt-pkg $(SOCKETLIBS)
 LIB_MAKES = apt-pkg/makefile
-SOURCE = http.cc rfc2553emu.cc
+SOURCE = http.cc rfc2553emu.cc connect.cc
 include $(PROGRAM_H)
 
 # The ftp method
 PROGRAM=ftp
-SLIBS = -lapt-pkg 
+SLIBS = -lapt-pkg $(SOCKETLIBS)
 LIB_MAKES = apt-pkg/makefile
-SOURCE = ftp.cc
+SOURCE = ftp.cc rfc2553emu.cc connect.cc
 include $(PROGRAM_H)
+
+# The rsh method
+PROGRAM=rsh
+SLIBS = -lapt-pkg
+LIB_MAKES = apt-pkg/makefile
+SOURCE = rsh.cc
+include $(PROGRAM_H)
+
+# SSH and vzip2 method symlink
+all: $(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
+
+$(BIN)/bzip2:
+       echo "Installing bzip2 method link"
+       ln -fs gzip $(BIN)/bzip2
+clean-$(BIN)/bzip2:
+       -rm $(BIN)/bzip2