merge patch from Daniel Hartwig to Show a error message if {,dist-}upgrade is used...

[apt.git] / methods / makefile

diff --git a/methods/makefile b/methods/makefile
index 134166ba32f12a39c992d1a8d1fa730e378b2df1..a271aff5e0ac220273e4e786843e0f6b3b2d7031 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 := apt

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


@@ -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


@@ -80,22 +79,32 @@ 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)
+
+# SSH method symlink
+binary: $(BIN)/ssh
+veryclean: clean-$(BIN)/ssh
+

 $(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"
-       ln -fs gzip $(BIN)/lzma
-clean-$(BIN)/bzip2:
-       -rm $(BIN)/bzip2
-clean-$(BIN)/lzma:
-       -rm $(BIN)/lzma
+# create links for all other compressors
+COMPRESSORS=bzip2 lzma xz
+
+binary: $(addprefix $(BIN)/,$(COMPRESSORS))
+veryclean: $(addprefix clean-$(BIN)/,$(COMPRESSORS))
+
+$(addprefix $(BIN)/,$(COMPRESSORS)): $(BIN)/gzip
+       echo "Installing $(notdir $@) method link"
+       ln -fs gzip $@
+
+$(addprefix clean-$(BIN)/,$(COMPRESSORS)):
+       -rm $(BIN)/$(notdir $@)