prefer upgrading installed provides satisfier

[apt.git] / apt-pkg / makefile

diff --git a/apt-pkg/makefile b/apt-pkg/makefile
index e6bcf852470dc158f2b21d72136a382c2e92c899..e3e6e202e117de57d8b4c8fb33041e68db463c01 100644 (file)
--- a/apt-pkg/makefile
+++ b/apt-pkg/makefile
@@ -11,52 +11,27 @@ include ../buildlib/defaults.mak
 
 # The library name and version (indirectly used from init.h)
 include ../buildlib/libversion.mak
+
+CXXFLAGS+=-DAPT_PKG_EXPOSE_STRING_VIEW
 LIBRARY=apt-pkg
 MAJOR=$(LIBAPTPKG_MAJOR)
 MINOR=$(LIBAPTPKG_RELEASE)
-SLIBS=$(PTHREADLIB) $(INTLLIBS) -lutil -ldl -lz
+SLIBS=$(PTHREADLIB) $(INTLLIBS) -lutil -ldl -lresolv
+ifeq ($(HAVE_ZLIB),yes)
+SLIBS+= -lz
+endif
+ifeq ($(HAVE_BZ2),yes)
+SLIBS+= -lbz2
+endif
+ifeq ($(HAVE_LZMA),yes)
+SLIBS+= -llzma
+endif
+ifeq ($(HAVE_LZ4),yes)
+SLIBS+= -llz4
+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 \
-        contrib/md5.cc contrib/sha1.cc contrib/sha256.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\
-         md5.h crc-16.h cdromutl.h strutl.h sptr.h sha1.h sha256.h hashes.h \
-         macros.h weakptr.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-worker.cc acquire-method.cc init.cc clean.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 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 \
-         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+= deb/deblistparser.cc deb/debrecords.cc deb/dpkgpm.cc \
-         deb/debsrcrecords.cc deb/debversion.cc deb/debsystem.cc \
-        deb/debindexfile.cc deb/debindexfile.cc deb/debmetaindex.cc
-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))
+SOURCE = $(sort $(wildcard *.cc */*.cc))
+HEADERS = $(addprefix apt-pkg/,$(notdir $(sort $(wildcard *.h */*.h))))
 
 include $(LIBRARY_H)