* merged from apt--mvo

[apt.git] / methods / makefile

diff --git a/methods/makefile b/methods/makefile
index 4345307e22bfd7eac4d841b14568b47ec7fea1dc..d0b5a28c0210cadb478b2cb78a315b11943c2891 100644 (file)
--- a/methods/makefile
+++ b/methods/makefile
@@ -6,6 +6,10 @@ SUBDIR=methods
 include ../buildlib/defaults.mak
 BIN := $(BIN)/methods
 
 include ../buildlib/defaults.mak
 BIN := $(BIN)/methods
 

+# FIXME..
+LIB_APT_PKG_MAJOR = 3.11
+APT_DOMAIN := libapt-pkg$(LIB_APT_PKG_MAJOR)
+

 # The file method
 PROGRAM=file
 SLIBS = -lapt-pkg 
 # The file method
 PROGRAM=file
 SLIBS = -lapt-pkg 


@@ -27,6 +31,13 @@ LIB_MAKES = apt-pkg/makefile
 SOURCE = gzip.cc
 include $(PROGRAM_H)
 
 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 
 # The cdrom method
 PROGRAM=cdrom
 SLIBS = -lapt-pkg 


@@ -36,14 +47,43 @@ include $(PROGRAM_H)
 
 # The http method
 PROGRAM=http
 
 # The http method
 PROGRAM=http

-SLIBS = -lapt-pkg 
+SLIBS = -lapt-pkg $(SOCKETLIBS)

 LIB_MAKES = apt-pkg/makefile
 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
 include $(PROGRAM_H)
 
 # The ftp method
 PROGRAM=ftp

-SLIBS = -lapt-pkg 
+SLIBS = -lapt-pkg $(SOCKETLIBS)
+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
 LIB_MAKES = apt-pkg/makefile

-SOURCE = ftp.cc rfc2553emu.cc
+SOURCE = rred.cc

 include $(PROGRAM_H)
 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
+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
+
+$(BIN)/bzip2:
+       echo "Installing bzip2 method link"
+       ln -fs gzip $(BIN)/bzip2
+clean-$(BIN)/bzip2:
+       -rm $(BIN)/bzip2