Merge remote-tracking branch 'mvo/bugfix/update-progress-reporting' into debian/exper...

[apt.git] / apt-pkg / makefile

diff --git a/apt-pkg/makefile b/apt-pkg/makefile
index 27d7ead2485d15c8d273286a86955a26f1ebb919..5603b51ed82216666e66c3b2ea2e7715925fe2f3 100644 (file)
--- a/apt-pkg/makefile
+++ b/apt-pkg/makefile
@@ -11,6 +11,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

+

 LIBRARY=apt-pkg
 MAJOR=$(LIBAPTPKG_MAJOR)
 MINOR=$(LIBAPTPKG_RELEASE)
 LIBRARY=apt-pkg
 MAJOR=$(LIBAPTPKG_MAJOR)
 MINOR=$(LIBAPTPKG_RELEASE)


@@ -21,52 +22,12 @@ endif
 ifeq ($(HAVE_BZ2),yes)
 SLIBS+= -lbz2
 endif
 ifeq ($(HAVE_BZ2),yes)
 SLIBS+= -lbz2
 endif

+ifeq ($(HAVE_LZMA),yes)
+SLIBS+= -llzma
+endif

 APT_DOMAIN:=libapt-pkg$(LIBAPTPKG_MAJOR)
 
 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/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\
-         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
-
-# 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 = $(wildcard *.cc */*.cc)
+HEADERS = $(addprefix apt-pkg/,$(notdir $(wildcard *.h */*.h)))

 
 include $(LIBRARY_H)
 
 include $(LIBRARY_H)