Merge bzip2-debs branch

[apt.git] / apt-pkg / makefile

diff --git a/apt-pkg/makefile b/apt-pkg/makefile
index cc3e47597158eefeb0d47bd93bd4ddbf8935affd..9b931d654805de197101b88bd6e12972f07e9651 100644 (file)
--- a/apt-pkg/makefile
+++ b/apt-pkg/makefile
@@ -9,19 +9,23 @@ HEADER_TARGETDIRS = apt-pkg
 # Bring in the default rules
 include ../buildlib/defaults.mak
 
-# The library name, don't forget to update init.h
+# The library name, don't forget to update init.h and the copy in 
+# methods/makefile - FIXME
 LIBRARY=apt-pkg
-MAJOR=3.1
+LIBEXT=$(GLIBC_VER)$(LIBSTDCPP_VER)
+MAJOR=3.3
 MINOR=0
-SLIBS=$(PTHREADLIB)
+SLIBS=$(PTHREADLIB) $(INTLLIBS)
+APT_DOMAIN:=libapt-pkg$(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/cdromutl.cc contrib/crc-16.cc \
-        contrib/fileutl.cc
+        contrib/md5.cc contrib/sha1.cc contrib/hashes.cc \
+        contrib/cdromutl.cc contrib/crc-16.cc \
+        contrib/fileutl.cc 
 HEADERS = mmap.h error.h configuration.h fileutl.h  cmndline.h \
-         md5.h crc-16.h cdromutl.h strutl.h sptr.h
+         md5.h crc-16.h cdromutl.h strutl.h sptr.h sha1.h hashes.h
 
 # Source code for the core main library
 SOURCE+= pkgcache.cc version.cc depcache.cc \