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 1a7078693e0ad0abfecf0284c034d5105c4eb861..59729faf51d3bec540386a3e7970f85d809811ad 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


@@ -15,17 +15,25 @@ LIBRARY=apt-pkg
 MAJOR=$(LIBAPTPKG_MAJOR)
 MINOR=$(LIBAPTPKG_RELEASE)
 SLIBS=$(PTHREADLIB) $(INTLLIBS) -lutil -ldl
 MAJOR=$(LIBAPTPKG_MAJOR)
 MINOR=$(LIBAPTPKG_RELEASE)
 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 \
 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/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/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 \
-         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 \


@@ -35,15 +43,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 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 \
          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 \
-         cacheset.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..


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