prefer upgrading installed provides satisfier

[apt.git] / apt-pkg / makefile

diff --git a/apt-pkg/makefile b/apt-pkg/makefile
index f4e750d34ad72db3bb21af9cc113cf7838f5a8a2..e3e6e202e117de57d8b4c8fb33041e68db463c01 100644 (file)
--- a/apt-pkg/makefile
+++ b/apt-pkg/makefile
@@ -12,6 +12,7 @@ include ../buildlib/defaults.mak
 # The library name and version (indirectly used from init.h)
 include ../buildlib/libversion.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)
 LIBRARY=apt-pkg
 MAJOR=$(LIBAPTPKG_MAJOR)
 MINOR=$(LIBAPTPKG_RELEASE)


@@ -30,7 +31,7 @@ SLIBS+= -llz4
 endif
 APT_DOMAIN:=libapt-pkg$(LIBAPTPKG_MAJOR)
 
 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)
 
 include $(LIBRARY_H)