summaryrefslogtreecommitdiff
path: root/methods/makefile
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2012-04-05 18:51:06 +0200
committerDavid Kalnischkies <kalnischkies@gmail.com>2012-04-05 18:51:06 +0200
commitd6bbcaad675a746e958d0736ead63bf44c2787ee (patch)
tree688ea3fbd6389824f9897aae85e7baafe075e36b /methods/makefile
parent2024154c6d4fa1142b022d54f8c88cf8991929ff (diff)
* methods/bzip2.cc:
- remove it as the functionality for all compressors can be provided by gzip.cc now with the usage of FileFD
Diffstat (limited to 'methods/makefile')
-rw-r--r--methods/makefile36
1 files changed, 15 insertions, 21 deletions
diff --git a/methods/makefile b/methods/makefile
index 6fe95f29a..a271aff5e 100644
--- a/methods/makefile
+++ b/methods/makefile
@@ -86,16 +86,9 @@ 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
+# SSH method symlink
+binary: $(BIN)/ssh
+veryclean: clean-$(BIN)/ssh
$(BIN)/ssh:
echo "Installing ssh method link"
@@ -103,14 +96,15 @@ $(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 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 $@)