summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2013-10-22 18:44:14 +0200
committerMichael Vogt <mvo@debian.org>2013-10-22 18:44:14 +0200
commit8336ae355b8a22877cd233063c715688155aa617 (patch)
treeb7e07b1b258114eaa9788b3ff5d2235cbc74d825
parentc7ea1ebaef0edebfe41353f93a81ee2ada5870a8 (diff)
move install-progress.{cc,h} to apt-pkg
-rw-r--r--apt-pkg/install-progress.cc (renamed from apt-private/private-progress.cc)0
-rw-r--r--apt-pkg/install-progress.h (renamed from apt-private/private-progress.h)0
-rw-r--r--apt-pkg/makefile5
-rw-r--r--apt-private/makefile2
4 files changed, 4 insertions, 3 deletions
diff --git a/apt-private/private-progress.cc b/apt-pkg/install-progress.cc
index 1d15228c2..1d15228c2 100644
--- a/apt-private/private-progress.cc
+++ b/apt-pkg/install-progress.cc
diff --git a/apt-private/private-progress.h b/apt-pkg/install-progress.h
index 9c31eac92..9c31eac92 100644
--- a/apt-private/private-progress.h
+++ b/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)