merge with my debian-sid branch

[apt.git] / methods / makefile

diff --git a/methods/makefile b/methods/makefile
index 589f9fa1c649284d237b1eb052550a0b699c7513..6ba51058ebb3d25ff554af60254781afd6cb041b 100644 (file)
--- a/methods/makefile
+++ b/methods/makefile
@@ -6,9 +6,8 @@ SUBDIR=methods
 include ../buildlib/defaults.mak
 BIN := $(BIN)/methods
 
 include ../buildlib/defaults.mak
 BIN := $(BIN)/methods
 

-# FIXME..
-LIB_APT_PKG_MAJOR = 4.8
-APT_DOMAIN := libapt-pkg$(LIB_APT_PKG_MAJOR)
+include ../buildlib/libversion.mak
+APT_DOMAIN := libapt-pkg$(LIBAPTPKG_MAJOR)

 
 # The file method
 PROGRAM=file
 
 # The file method
 PROGRAM=file


@@ -40,7 +39,7 @@ include $(PROGRAM_H)
 
 # The cdrom method
 PROGRAM=cdrom
 
 # The cdrom method
 PROGRAM=cdrom

-SLIBS = -lapt-pkg $(INTLLIBS)
+SLIBS = -lapt-pkg -ldl $(INTLLIBS)

 LIB_MAKES = apt-pkg/makefile
 SOURCE = cdrom.cc
 include $(PROGRAM_H)
 LIB_MAKES = apt-pkg/makefile
 SOURCE = cdrom.cc
 include $(PROGRAM_H)


@@ -49,7 +48,7 @@ include $(PROGRAM_H)
 PROGRAM=http
 SLIBS = -lapt-pkg $(SOCKETLIBS) $(INTLLIBS)
 LIB_MAKES = apt-pkg/makefile
 PROGRAM=http
 SLIBS = -lapt-pkg $(SOCKETLIBS) $(INTLLIBS)
 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
 include $(PROGRAM_H)
 
 # The https method


@@ -68,7 +67,7 @@ include $(PROGRAM_H)
 
 # The rred method
 PROGRAM=rred
 
 # The rred method
 PROGRAM=rred

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

 LIB_MAKES = apt-pkg/makefile
 SOURCE = rred.cc
 include $(PROGRAM_H)
 LIB_MAKES = apt-pkg/makefile
 SOURCE = rred.cc
 include $(PROGRAM_H)


@@ -80,22 +79,38 @@ LIB_MAKES = apt-pkg/makefile
 SOURCE = rsh.cc
 include $(PROGRAM_H)
 
 SOURCE = rsh.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
+# 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)
+
+# The gzip method
+PROGRAM=bzip2
+SLIBS = -lapt-pkg $(INTLLIBS)
+LIB_MAKES = apt-pkg/makefile
+SOURCE = bzip2.cc
+include $(PROGRAM_H)
+
+# SSH and lzma method symlink
+binary: $(BIN)/ssh $(BIN)/lzma $(BIN)/xz
+veryclean: clean-$(BIN)/ssh clean-$(BIN)/lzma clean-$(BIN)/xz
+

 $(BIN)/ssh:
        echo "Installing ssh method link"
        ln -fs rsh $(BIN)/ssh
 clean-$(BIN)/ssh:
        -rm $(BIN)/ssh
 
 $(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

 $(BIN)/lzma:
        echo "Installing lzma method link"
 $(BIN)/lzma:
        echo "Installing lzma method link"

-       ln -fs gzip $(BIN)/lzma
-clean-$(BIN)/bzip2:
-       -rm $(BIN)/bzip2
+       ln -fs bzip2 $(BIN)/lzma

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

+
+$(BIN)/xz:
+       echo "Installing xz method link"
+       ln -fs bzip2 $(BIN)/xz
+clean-$(BIN)/xz:
+       -rm $(BIN)/xz