merge from lp:~mvo/apt/mvo

[apt.git] / apt-pkg / makefile

diff --git a/apt-pkg/makefile b/apt-pkg/makefile
index 7816ecf0d0d86db1241ad69f935655c1fde3b38e..e1f69dd655d6d52acf5580fb7334677abd44fe8e 100644 (file)
--- a/apt-pkg/makefile
+++ b/apt-pkg/makefile
@@ -3,29 +3,33 @@ BASE=..
 SUBDIR=apt-pkg
 
 # Header location
 SUBDIR=apt-pkg
 
 # Header location

-SUBDIRS = deb contrib
+SUBDIRS = deb edsp contrib

 HEADER_TARGETDIRS = apt-pkg
 
 # Bring in the default rules
 include ../buildlib/defaults.mak
 
 HEADER_TARGETDIRS = apt-pkg
 
 # Bring in the default rules
 include ../buildlib/defaults.mak
 

-# The library name, don't forget to update init.h and the copy in 
-# methods/makefile - FIXME
+# The library name and version (indirectly used from init.h)
+include ../buildlib/libversion.mak

 LIBRARY=apt-pkg
 LIBRARY=apt-pkg

-LIBEXT=$(GLIBC_VER)$(LIBSTDCPP_VER)
-MAJOR=4.8
-MINOR=1
-SLIBS=$(PTHREADLIB) $(INTLLIBS) -lutil -ldl
-APT_DOMAIN:=libapt-pkg$(MAJOR)
+MAJOR=$(LIBAPTPKG_MAJOR)
+MINOR=$(LIBAPTPKG_RELEASE)
+SLIBS=$(PTHREADLIB) $(INTLLIBS) -lutil -ldl -lz
+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 \
 
 # 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/cdromutl.cc contrib/crc-16.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 
         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 sha256.h hashes.h
+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

 
 # 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 \


@@ -35,14 +39,15 @@ SOURCE+= pkgcache.cc version.cc depcache.cc \
         srcrecords.cc cachefile.cc versionmatch.cc policy.cc \
         pkgsystem.cc indexfile.cc pkgcachegen.cc acquire-item.cc \
         indexrecords.cc vendor.cc vendorlist.cc cdrom.cc indexcopy.cc \
         srcrecords.cc cachefile.cc versionmatch.cc policy.cc \
         pkgsystem.cc indexfile.cc pkgcachegen.cc acquire-item.cc \
         indexrecords.cc vendor.cc vendorlist.cc cdrom.cc indexcopy.cc \

-        aptconfiguration.cc
+        aptconfiguration.cc cachefilter.cc cacheset.cc edsp.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 metaindex.h indexrecords.h vendor.h \
 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 metaindex.h indexrecords.h vendor.h \

-          vendorlist.h cdrom.h indexcopy.h aptconfiguration.h
+         vendorlist.h cdrom.h indexcopy.h aptconfiguration.h \
+         cachefilter.h cacheset.h edsp.h

 
 # Source code for the debian specific components
 # In theory the deb headers do not need to be exported..
 
 # Source code for the debian specific components
 # In theory the deb headers do not need to be exported..


@@ -52,9 +57,10 @@ SOURCE+= deb/deblistparser.cc deb/debrecords.cc deb/dpkgpm.cc \
 HEADERS+= debversion.h debsrcrecords.h dpkgpm.h debrecords.h \
          deblistparser.h debsystem.h debindexfile.h debmetaindex.h
 
 HEADERS+= debversion.h debsrcrecords.h dpkgpm.h debrecords.h \
          deblistparser.h debsystem.h debindexfile.h debmetaindex.h
 

-HEADERS := $(addprefix apt-pkg/,$(HEADERS))
+# Source code for the APT resolver interface specific components
+SOURCE+= edsp/edsplistparser.cc edsp/edspindexfile.cc edsp/edspsystem.cc
+HEADERS+= edsplistparser.h edspindexfile.h edspsystem.h

 
 

-# Private header files
-HEADERS+= system.h
+HEADERS := $(addprefix apt-pkg/,$(HEADERS))

 
 include $(LIBRARY_H)
 
 include $(LIBRARY_H)