fix a bug uncovered by the previous commit which checks if a Compressor

[apt.git] / apt-pkg / makefile

diff --git a/apt-pkg/makefile b/apt-pkg/makefile
index e6bcf852470dc158f2b21d72136a382c2e92c899..27d7ead2485d15c8d273286a86955a26f1ebb919 100644 (file)
--- a/apt-pkg/makefile
+++ b/apt-pkg/makefile
@@ -14,17 +14,27 @@ include ../buildlib/libversion.mak
 LIBRARY=apt-pkg
 MAJOR=$(LIBAPTPKG_MAJOR)
 MINOR=$(LIBAPTPKG_RELEASE)
-SLIBS=$(PTHREADLIB) $(INTLLIBS) -lutil -ldl -lz
+SLIBS=$(PTHREADLIB) $(INTLLIBS) -lutil -ldl
+ifeq ($(HAVE_ZLIB),yes)
+SLIBS+= -lz
+endif
+ifeq ($(HAVE_BZ2),yes)
+SLIBS+= -lbz2
+endif
 APT_DOMAIN:=libapt-pkg$(LIBAPTPKG_MAJOR)
 
 # Source code for the contributed non-core things
 SOURCE = contrib/mmap.cc contrib/error.cc contrib/strutl.cc \
          contrib/configuration.cc contrib/progress.cc contrib/cmndline.cc \
-        contrib/md5.cc contrib/sha1.cc contrib/sha256.cc contrib/hashes.cc \
+        contrib/hashsum.cc contrib/md5.cc contrib/sha1.cc \
+        contrib/sha2_internal.cc\
+         contrib/hashes.cc \
         contrib/cdromutl.cc contrib/crc-16.cc contrib/netrc.cc \
         contrib/fileutl.cc 
 HEADERS = mmap.h error.h configuration.h fileutl.h  cmndline.h netrc.h\
-         md5.h crc-16.h cdromutl.h strutl.h sptr.h sha1.h sha256.h hashes.h \
+         md5.h crc-16.h cdromutl.h strutl.h sptr.h sha1.h sha2.h sha256.h\
+         sha2_internal.h \
+          hashes.h hashsum_template.h\
          macros.h weakptr.h
 
 # Source code for the core main library