X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/6321777b7bad1303a32b2d5691327adb74074e0a..b21c043804b1be7f4d79ac3f5a6615dc96f26a42:/apt-pkg/makefile

diff --git a/apt-pkg/makefile b/apt-pkg/makefile
index d5e20374d..9b931d654 100644
--- a/apt-pkg/makefile
+++ b/apt-pkg/makefile
@@ -9,36 +9,45 @@ HEADER_TARGETDIRS = apt-pkg
 # Bring in the default rules
 include ../buildlib/defaults.mak
 
-# The library name
+# The library name, don't forget to update init.h and the copy in 
+# methods/makefile - FIXME
 LIBRARY=apt-pkg
-MAJOR=2.7
-MINOR=2
-SLIBS=$(PTHREADLIB)
+LIBEXT=$(GLIBC_VER)$(LIBSTDCPP_VER)
+MAJOR=3.3
+MINOR=0
+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
-
-# Source code for the main library
-SOURCE+= pkgcache.cc version.cc fileutl.cc pkgcachegen.cc depcache.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 sha1.h hashes.h
+
+# Source code for the core main library
+SOURCE+= pkgcache.cc version.cc depcache.cc \
          orderlist.cc tagfile.cc sourcelist.cc packagemanager.cc \
-	 pkgrecords.cc algorithms.cc acquire.cc acquire-item.cc \
+	 pkgrecords.cc algorithms.cc acquire.cc\
 	 acquire-worker.cc acquire-method.cc init.cc clean.cc \
-	 srcrecords.cc cachefile.cc
+	 srcrecords.cc cachefile.cc versionmatch.cc policy.cc \
+	 pkgsystem.cc indexfile.cc pkgcachegen.cc acquire-item.cc
+HEADERS+= algorithms.h depcache.h pkgcachegen.h cacheiterators.h \
+	  orderlist.h sourcelist.h packagemanager.h tagfile.h \
+	  init.h pkgcache.h version.h progress.h pkgrecords.h \
+	  acquire.h acquire-worker.h acquire-item.h acquire-method.h \
+	  clean.h srcrecords.h cachefile.h versionmatch.h policy.h \
+	  pkgsystem.h indexfile.h
 
 # Source code for the debian specific components
-SOURCE+= deb/deblistparser.cc deb/debrecords.cc deb/dpkgpm.cc deb/dpkginit.cc \
-         deb/debsrcrecords.cc
-
-# Public apt-pkg header files
-HEADERS = algorithms.h depcache.h mmap.h pkgcachegen.h cacheiterators.h \
-          error.h orderlist.h sourcelist.h configuration.h fileutl.h \
-          packagemanager.h tagfile.h deblistparser.h init.h pkgcache.h \
-          version.h progress.h pkgrecords.h debrecords.h cmndline.h \
-	  acquire.h acquire-worker.h acquire-item.h acquire-method.h md5.h \
-	  dpkgpm.h dpkginit.h cdromutl.h strutl.h clean.h srcrecords.h \
-	  debsrcrecords.h cachefile.h crc-16.h
+# In theory the deb headers do not need to be exported..
+SOURCE+= deb/deblistparser.cc deb/debrecords.cc deb/dpkgpm.cc \
+         deb/debsrcrecords.cc deb/debversion.cc deb/debsystem.cc \
+	 deb/debindexfile.cc deb/debindexfile.cc
+HEADERS+= debversion.h debsrcrecords.h dpkgpm.h debrecords.h \
+	  deblistparser.h debsystem.h debindexfile.h
 
 HEADERS := $(addprefix apt-pkg/,$(HEADERS))