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

[apt.git] / apt-pkg / makefile

diff --git a/apt-pkg/makefile b/apt-pkg/makefile
index e1f69dd655d6d52acf5580fb7334677abd44fe8e..59729faf51d3bec540386a3e7970f85d809811ad 100644 (file)
--- a/apt-pkg/makefile
+++ b/apt-pkg/makefile
@@ -14,22 +14,26 @@ include ../buildlib/libversion.mak
 LIBRARY=apt-pkg
 MAJOR=$(LIBAPTPKG_MAJOR)
 MINOR=$(LIBAPTPKG_RELEASE)
 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/hashsum.cc contrib/md5.cc contrib/sha1.cc \
 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/hashsum.cc contrib/md5.cc contrib/sha1.cc \

-        contrib/sha2_internal.cc\
-         contrib/hashes.cc \
+        contrib/sha2_internal.cc contrib/hashes.cc \

         contrib/cdromutl.cc contrib/crc-16.cc contrib/netrc.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 sha2.h sha256.h\
-         sha2_internal.h \
-          hashes.h hashsum_template.h\
-         macros.h weakptr.h
+        contrib/fileutl.cc contrib/gpgv.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 sha2.h sha256.h \
+         sha2_internal.h hashes.h hashsum_template.h \
+         macros.h weakptr.h gpgv.h

 
 # Source code for the core main library
 SOURCE+= pkgcache.cc version.cc depcache.cc \
 
 # Source code for the core main library
 SOURCE+= pkgcache.cc version.cc depcache.cc \