allow arch=all to override No-Support-for-Architecture-all

[apt.git] / methods / makefile

diff --git a/methods/makefile b/methods/makefile
index 6ba51058ebb3d25ff554af60254781afd6cb041b..3274e927944cd04e7ad6d0653d3805e989f4e9d8 100644 (file)
--- a/methods/makefile
+++ b/methods/makefile
@@ -7,7 +7,7 @@ include ../buildlib/defaults.mak
 BIN := $(BIN)/methods
 
 include ../buildlib/libversion.mak
 BIN := $(BIN)/methods
 
 include ../buildlib/libversion.mak

-APT_DOMAIN := libapt-pkg$(LIBAPTPKG_MAJOR)
+APT_DOMAIN := apt

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


@@ -23,11 +23,11 @@ LIB_MAKES = apt-pkg/makefile
 SOURCE = copy.cc
 include $(PROGRAM_H)
 
 SOURCE = copy.cc
 include $(PROGRAM_H)
 

-# The gzip method
-PROGRAM=gzip
+# The store method
+PROGRAM=store

 SLIBS = -lapt-pkg $(INTLLIBS)
 LIB_MAKES = apt-pkg/makefile
 SLIBS = -lapt-pkg $(INTLLIBS)
 LIB_MAKES = apt-pkg/makefile

-SOURCE = gzip.cc
+SOURCE = store.cc

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


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

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

 LIB_MAKES = apt-pkg/makefile
 SOURCE = cdrom.cc
 include $(PROGRAM_H)
 
 # The http method
 PROGRAM=http
 LIB_MAKES = apt-pkg/makefile
 SOURCE = cdrom.cc
 include $(PROGRAM_H)
 
 # The http method
 PROGRAM=http

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

 LIB_MAKES = apt-pkg/makefile
 LIB_MAKES = apt-pkg/makefile

-SOURCE = http.cc http_main.cc rfc2553emu.cc connect.cc
+SOURCE = http.cc http_main.cc rfc2553emu.cc connect.cc server.cc

 include $(PROGRAM_H)
 
 # The https method
 PROGRAM=https
 include $(PROGRAM_H)
 
 # The https method
 PROGRAM=https

-SLIBS = -lapt-pkg -lcurl $(INTLLIBS)
+SLIBS = -lapt-pkg -lcurl $(INTLLIBS) -lresolv

 LIB_MAKES = apt-pkg/makefile
 LIB_MAKES = apt-pkg/makefile

-SOURCE = https.cc
+SOURCE = https.cc server.cc

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

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

 LIB_MAKES = apt-pkg/makefile
 SOURCE = ftp.cc rfc2553emu.cc connect.cc
 include $(PROGRAM_H)
 
 # The rred method
 PROGRAM=rred
 LIB_MAKES = apt-pkg/makefile
 SOURCE = ftp.cc rfc2553emu.cc connect.cc
 include $(PROGRAM_H)
 
 # The rred method
 PROGRAM=rred

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

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


@@ -81,21 +81,14 @@ include $(PROGRAM_H)
 
 # The mirror method
 PROGRAM=mirror
 
 # The mirror method
 PROGRAM=mirror

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

 LIB_MAKES = apt-pkg/makefile
 LIB_MAKES = apt-pkg/makefile

-SOURCE = mirror.cc http.cc rfc2553emu.cc connect.cc
+SOURCE = mirror.cc http.cc rfc2553emu.cc connect.cc server.cc

 include $(PROGRAM_H)
 
 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
+# SSH method symlink
+binary: $(BIN)/ssh
+veryclean: clean-$(BIN)/ssh

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


@@ -103,14 +96,15 @@ $(BIN)/ssh:
 clean-$(BIN)/ssh:
        -rm $(BIN)/ssh
 
 clean-$(BIN)/ssh:
        -rm $(BIN)/ssh
 

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