X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/44ba91bc21cc8c1a0022de1259ee9be882a2ce92..30896d0137b02fc0559642a87cd524f2b6504b3c:/methods/makefile?ds=sidebyside diff --git a/methods/makefile b/methods/makefile index 5c4fa82bf..3274e9279 100644 --- a/methods/makefile +++ b/methods/makefile @@ -6,9 +6,8 @@ SUBDIR=methods include ../buildlib/defaults.mak BIN := $(BIN)/methods -# FIXME.. -LIB_APT_PKG_MAJOR = 4.6 -APT_DOMAIN := libapt-pkg$(LIB_APT_PKG_MAJOR) +include ../buildlib/libversion.mak +APT_DOMAIN := apt # The file method PROGRAM=file @@ -24,11 +23,11 @@ LIB_MAKES = apt-pkg/makefile 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 -SOURCE = gzip.cc +SOURCE = store.cc include $(PROGRAM_H) # The gpgv method @@ -47,21 +46,21 @@ include $(PROGRAM_H) # The http method PROGRAM=http -SLIBS = -lapt-pkg $(SOCKETLIBS) $(INTLLIBS) +SLIBS = -lapt-pkg $(SOCKETLIBS) $(INTLLIBS) -lresolv 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 -SLIBS = -lapt-pkg -lcurl $(INTLLIBS) +SLIBS = -lapt-pkg -lcurl $(INTLLIBS) -lresolv LIB_MAKES = apt-pkg/makefile -SOURCE = https.cc +SOURCE = https.cc server.cc 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) @@ -82,14 +81,14 @@ include $(PROGRAM_H) # The mirror method PROGRAM=mirror -SLIBS = -lapt-pkg $(SOCKETLIBS) +SLIBS = -lapt-pkg $(SOCKETLIBS) -lresolv 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) -# SSH and bzip2 method symlink -binary: $(BIN)/ssh $(BIN)/bzip2 $(BIN)/lzma -veryclean: clean-$(BIN)/ssh clean-$(BIN)/bzip2 clean-$(BIN)/lzma +# SSH method symlink +binary: $(BIN)/ssh +veryclean: clean-$(BIN)/ssh $(BIN)/ssh: echo "Installing ssh method link" @@ -97,13 +96,15 @@ $(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 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 $@)