prefer upgrading installed provides satisfier

[apt.git] / apt-pkg / makefile

diff --git a/apt-pkg/makefile b/apt-pkg/makefile
index 5603b51ed82216666e66c3b2ea2e7715925fe2f3..e3e6e202e117de57d8b4c8fb33041e68db463c01 100644 (file)
--- a/apt-pkg/makefile
+++ b/apt-pkg/makefile
@@ -12,10 +12,11 @@ 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
+SLIBS=$(PTHREADLIB) $(INTLLIBS) -lutil -ldl -lresolv
 ifeq ($(HAVE_ZLIB),yes)
 SLIBS+= -lz
 endif
@@ -25,9 +26,12 @@ endif
 ifeq ($(HAVE_LZMA),yes)
 SLIBS+= -llzma
 endif
+ifeq ($(HAVE_LZ4),yes)
+SLIBS+= -llz4
+endif
 APT_DOMAIN:=libapt-pkg$(LIBAPTPKG_MAJOR)
 
-SOURCE = $(wildcard *.cc */*.cc)
-HEADERS = $(addprefix apt-pkg/,$(notdir $(wildcard *.h */*.h)))
+SOURCE = $(sort $(wildcard *.cc */*.cc))
+HEADERS = $(addprefix apt-pkg/,$(notdir $(sort $(wildcard *.h */*.h))))
 
 include $(LIBRARY_H)