* cmdline/apt-get.cc:

[apt.git] / apt-pkg / makefile

diff --git a/apt-pkg/makefile b/apt-pkg/makefile
index 4e5ec107f09b73af7f7c74c9184ef069f972a445..69d6cbffd6f5504b34b5fca811d8fcff1af3fa62 100644 (file)
--- a/apt-pkg/makefile
+++ b/apt-pkg/makefile
@@ -3,7 +3,7 @@ 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
 HEADER_TARGETDIRS = apt-pkg
 
 # Bring in the default rules


@@ -20,11 +20,15 @@ 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/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\
         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 \
+         sha2_internal.h \
+          hashes.h hashsum_template.h\

          macros.h weakptr.h
 
 # Source code for the core main library
          macros.h weakptr.h
 
 # Source code for the core main library


@@ -35,7 +39,7 @@ 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 cachefilter.cc cacheset.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 \
 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 \


@@ -43,7 +47,7 @@ HEADERS+= algorithms.h depcache.h pkgcachegen.h cacheiterators.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 \
          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 \

-         cachefilter.h cacheset.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..


@@ -53,6 +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
 

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

 HEADERS := $(addprefix apt-pkg/,$(HEADERS))
 
 include $(LIBRARY_H)
 HEADERS := $(addprefix apt-pkg/,$(HEADERS))
 
 include $(LIBRARY_H)