From 8336ae355b8a22877cd233063c715688155aa617 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 22 Oct 2013 18:44:14 +0200 Subject: [PATCH] move install-progress.{cc,h} to apt-pkg --- .../private-progress.cc => apt-pkg/install-progress.cc | 0 apt-private/private-progress.h => apt-pkg/install-progress.h | 0 apt-pkg/makefile | 5 +++-- apt-private/makefile | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) rename apt-private/private-progress.cc => apt-pkg/install-progress.cc (100%) rename apt-private/private-progress.h => apt-pkg/install-progress.h (100%) diff --git a/apt-private/private-progress.cc b/apt-pkg/install-progress.cc similarity index 100% rename from apt-private/private-progress.cc rename to apt-pkg/install-progress.cc diff --git a/apt-private/private-progress.h b/apt-pkg/install-progress.h similarity index 100% rename from apt-private/private-progress.h rename to apt-pkg/install-progress.h diff --git a/apt-pkg/makefile b/apt-pkg/makefile index abf701511..503bd7839 100644 --- a/apt-pkg/makefile +++ b/apt-pkg/makefile @@ -43,7 +43,8 @@ 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 \ - aptconfiguration.cc cachefilter.cc cacheset.cc edsp.cc + aptconfiguration.cc cachefilter.cc cacheset.cc edsp.cc \ + install-progress.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 \ @@ -51,7 +52,7 @@ HEADERS+= algorithms.h depcache.h pkgcachegen.h cacheiterators.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 + cachefilter.h cacheset.h edsp.h install-progress.h # Source code for the debian specific components # In theory the deb headers do not need to be exported.. diff --git a/apt-private/makefile b/apt-private/makefile index 9b074f189..1d179f0b2 100644 --- a/apt-private/makefile +++ b/apt-private/makefile @@ -17,7 +17,7 @@ MAJOR=0.0 MINOR=0 SLIBS=$(PTHREADLIB) -lapt-pkg -PRIVATES=list install download output cachefile cacheset update upgrade cmndline moo search show main progress +PRIVATES=list install download output cachefile cacheset update upgrade cmndline moo search show main SOURCE += $(foreach private, $(PRIVATES), private-$(private).cc) HEADERS += $(foreach private, $(PRIVATES), private-$(private).h) -- 2.45.2