merge with the debian tree

[apt.git] / methods / makefile

diff --git a/methods/makefile b/methods/makefile
index 948f27889693db8f047de9c599aeebabc69f09ae..085b357b8a247d1631270d775cf04c5e738af84b 100644 (file)
--- a/methods/makefile
+++ b/methods/makefile
@@ -7,7 +7,7 @@ include ../buildlib/defaults.mak
 BIN := $(BIN)/methods
 
 # FIXME..
 BIN := $(BIN)/methods
 
 # FIXME..

-LIB_APT_PKG_MAJOR = 4.3
+LIB_APT_PKG_MAJOR = 4.6

 APT_DOMAIN := libapt-pkg$(LIB_APT_PKG_MAJOR)
 
 # The file method
 APT_DOMAIN := libapt-pkg$(LIB_APT_PKG_MAJOR)
 
 # The file method


@@ -49,7 +49,21 @@ include $(PROGRAM_H)
 PROGRAM=http
 SLIBS = -lapt-pkg $(SOCKETLIBS)
 LIB_MAKES = apt-pkg/makefile
 PROGRAM=http
 SLIBS = -lapt-pkg $(SOCKETLIBS)
 LIB_MAKES = apt-pkg/makefile

-SOURCE = http.cc rfc2553emu.cc connect.cc
+SOURCE = http.cc http_main.cc rfc2553emu.cc connect.cc
+include $(PROGRAM_H)
+
+# The https method
+PROGRAM=https
+SLIBS = -lapt-pkg -lcurl
+LIB_MAKES = apt-pkg/makefile
+SOURCE = https.cc
+include $(PROGRAM_H)
+
+# The https method
+PROGRAM=https
+SLIBS = -lapt-pkg -lcurl
+LIB_MAKES = apt-pkg/makefile
+SOURCE = https.cc

 include $(PROGRAM_H)
 
 # The ftp method
 include $(PROGRAM_H)
 
 # The ftp method


@@ -73,9 +87,17 @@ LIB_MAKES = apt-pkg/makefile
 SOURCE = rsh.cc
 include $(PROGRAM_H)
 
 SOURCE = rsh.cc
 include $(PROGRAM_H)
 

-# SSH and vzip2 method symlink
-binary: $(BIN)/ssh $(BIN)/bzip2
-veryclean: clean-$(BIN)/ssh clean-$(BIN)/bzip2
+# The mirror method
+PROGRAM=mirror
+SLIBS = -lapt-pkg $(SOCKETLIBS)
+LIB_MAKES = apt-pkg/makefile
+SOURCE = mirror.cc http.cc rfc2553emu.cc connect.cc
+include $(PROGRAM_H)
+
+# SSH and bzip2 method symlink
+binary: $(BIN)/ssh $(BIN)/bzip2 $(BIN)/lzma
+veryclean: clean-$(BIN)/ssh clean-$(BIN)/bzip2 clean-$(BIN)/lzma
+

 $(BIN)/ssh:
        echo "Installing ssh method link"
        ln -fs rsh $(BIN)/ssh
 $(BIN)/ssh:
        echo "Installing ssh method link"
        ln -fs rsh $(BIN)/ssh


@@ -85,5 +107,10 @@ clean-$(BIN)/ssh:
 $(BIN)/bzip2:
        echo "Installing bzip2 method link"
        ln -fs gzip $(BIN)/bzip2
 $(BIN)/bzip2:
        echo "Installing bzip2 method link"
        ln -fs gzip $(BIN)/bzip2

+$(BIN)/lzma:
+       echo "Installing lzma method link"
+       ln -fs gzip $(BIN)/lzma

 clean-$(BIN)/bzip2:
        -rm $(BIN)/bzip2
 clean-$(BIN)/bzip2:
        -rm $(BIN)/bzip2

+clean-$(BIN)/lzma:
+       -rm $(BIN)/lzma